Merge branches 'dcmt/tempo-expansion' and 'jparklev/changelog-usdd-psm'

duncancmt · duncancmt · commit 340ffbb23734 · 2026-03-30T16:28:39.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,11 +18,18 @@
 * EkuboV2 VIP actions `EKUBO_VIP` and `METATXN_EKUBO_VIP` are not
   supported anymore and were removed from `ISettlerActions.sol`.
 * Add new `CHECK_SLIPPAGE` action to taker-submitted Settlers
+* Add USDD full PSM support (USDT/USDD pair) to the `MAKERPSM` action on Mainnet
 * Update the following chains to the Osaka EVM hardfork:
   * Arbitrum
   * Polygon
   * Monad
   * Scroll
+* Add the following liquidity on Tempo
+  * RFQ
+  * UniswapV2
+  * VelodromeV2
+  * UniswapV3
+  * UniswapV4
 
 ## 2026-03-17
 
diff --git a/src/SettlerBase.sol b/src/SettlerBase.sol
@@ -114,7 +114,7 @@ abstract contract SettlerBase is ISettlerBase, Basic, RfqOrderSettlement, Uniswa
         }
     }
 
-    function _dispatch(uint256, uint256 action, bytes calldata data, AllowedSlippage memory slippage)
+    function _dispatch(uint256, uint256 action, bytes calldata data, AllowedSlippage memory)
         internal
         virtual
         override
diff --git a/src/chains/Tempo/Common.sol b/src/chains/Tempo/Common.sol
@@ -5,58 +5,54 @@ import {SettlerBase} from "../../SettlerBase.sol";
 
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {FreeMemory} from "../../utils/FreeMemory.sol";
-import {SafeTransferLib} from "../../vendor/SafeTransferLib.sol";
-import {Ternary} from "../../utils/Ternary.sol";
+
+import {UniswapV4} from "../../core/UniswapV4.sol";
+import {IPoolManager} from "../../core/UniswapV4Types.sol";
 
 import {ISettlerActions} from "../../ISettlerActions.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {revertUnknownForkId} from "../../core/SettlerErrors.sol";
 
+import {
+    uniswapV3TempoFactory,
+    uniswapV3InitHash,
+    uniswapV3ForkId,
+    IUniswapV3Callback
+} from "../../core/univ3forks/UniswapV3.sol";
+
+import {TEMPO_POOL_MANAGER} from "../../core/UniswapV4Addresses.sol";
+
 // Solidity inheritance is stupid
 import {SettlerSwapAbstract} from "../../SettlerAbstract.sol";
 import {Permit2PaymentAbstract} from "../../core/Permit2PaymentAbstract.sol";
 
-abstract contract TempoMixin is FreeMemory, SettlerBase {
-    using Ternary for bool;
-    using SafeTransferLib for IERC20;
-    using SafeTransferLib for address payable;
-
+abstract contract TempoMixin is FreeMemory, SettlerBase, UniswapV4 {
     constructor() {
         assert(block.chainid == 4217 || block.chainid == 31337);
     }
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data, AllowedSlippage memory slippage)
         internal
         virtual
-        override(/* SettlerSwapAbstract, */ SettlerBase)
+        override(SettlerSwapAbstract, SettlerBase)
         DANGEROUS_freeMemory
         returns (bool)
     {
-        // This does not make use of `super._dispatch`. This chain's Settler is extremely
-        // stripped-down and has almost no capabilities
-        if (action == uint32(ISettlerActions.BASIC.selector)) {
-            (IERC20 sellToken, uint256 bps, address pool, uint256 offset, bytes memory _data) =
-                abi.decode(data, (IERC20, uint256, address, uint256, bytes));
+        if (super._dispatch(i, action, data, slippage)) {
+            return true;
+        } else if (action == uint32(ISettlerActions.UNISWAPV4.selector)) {
+            (
+                address recipient,
+                IERC20 sellToken,
+                uint256 bps,
+                bool feeOnTransfer,
+                uint256 hashMul,
+                uint256 hashMod,
+                bytes memory fills,
+                uint256 amountOutMin
+            ) = abi.decode(data, (address, IERC20, uint256, bool, uint256, uint256, bytes, uint256));
 
-            basicSellToPool(sellToken, bps, pool, offset, _data);
-        } else if (action == uint32(ISettlerActions.POSITIVE_SLIPPAGE.selector)) {
-            (address payable recipient, IERC20 token, uint256 expectedAmount, uint256 maxBps) =
-                abi.decode(data, (address, IERC20, uint256, uint256));
-            bool isETH = (token == ETH_ADDRESS);
-            uint256 balance = isETH ? address(this).balance : token.fastBalanceOf(address(this));
-            if (balance > expectedAmount) {
-                uint256 cap;
-                unchecked {
-                    cap = balance * maxBps / BASIS;
-                    balance -= expectedAmount;
-                }
-                balance = (balance > cap).ternary(cap, balance);
-                if (isETH) {
-                    recipient.safeTransferETH(balance);
-                } else {
-                    token.safeTransfer(recipient, balance);
-                }
-            }
+            sellToUniswapV4(recipient, sellToken, bps, feeOnTransfer, hashMul, hashMod, fills, amountOutMin);
         } else {
             return false;
         }
@@ -69,14 +65,24 @@ abstract contract TempoMixin is FreeMemory, SettlerBase {
         override
         returns (address factory, bytes32 initHash, uint32 callbackSelector)
     {
-        revertUnknownForkId(forkId);
+        if (forkId == uniswapV3ForkId) {
+            factory = uniswapV3TempoFactory;
+            initHash = uniswapV3InitHash;
+            callbackSelector = uint32(IUniswapV3Callback.uniswapV3SwapCallback.selector);
+        } else {
+            revertUnknownForkId(forkId);
+        }
+    }
+
+    function _POOL_MANAGER() internal pure override returns (IPoolManager) {
+        return TEMPO_POOL_MANAGER;
     }
 
     // I hate Solidity inheritance
     function _fallback(bytes calldata data)
         internal
         virtual
-        override(Permit2PaymentAbstract)
+        override(Permit2PaymentAbstract, UniswapV4)
         returns (bool success, bytes memory returndata)
     {
         return super._fallback(data);
diff --git a/src/chains/Tempo/MetaTxn.sol b/src/chains/Tempo/MetaTxn.sol
@@ -25,17 +25,22 @@ contract TempoSettlerMetaTxn is SettlerMetaTxn, TempoMixin {
         DANGEROUS_freeMemory
         returns (bool)
     {
-        // This does not make use of `super._dispatchVIP`. This chain's Settler is extremely
-        // stripped-down and has almost no capabilities
-        if (action == uint32(ISettlerActions.METATXN_TRANSFER_FROM.selector)) {
-            (address recipient, ISignatureTransfer.PermitTransferFrom memory permit) =
-                abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom));
-            (ISignatureTransfer.SignatureTransferDetails memory transferDetails,) =
-                _permitToTransferDetails(permit, recipient);
+        if (super._dispatchVIP(action, data, sig)) {
+            return true;
+        } else if (action == uint32(ISettlerActions.METATXN_UNISWAPV4_VIP.selector)) {
+            (
+                address recipient,
+                ISignatureTransfer.PermitTransferFrom memory permit,
+                bool feeOnTransfer,
+                uint256 hashMul,
+                uint256 hashMod,
+                bytes memory fills,
+                uint256 amountOutMin
+            ) = abi.decode(
+                data, (address, ISignatureTransfer.PermitTransferFrom, bool, uint256, uint256, bytes, uint256)
+            );
 
-            // We simultaneously transfer-in the taker's tokens and authenticate the
-            // metatransaction.
-            _transferFrom(permit, transferDetails, sig);
+            sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig, amountOutMin);
         } else {
             return false;
         }
diff --git a/src/chains/Tempo/TakerSubmitted.sol b/src/chains/Tempo/TakerSubmitted.sol
@@ -18,14 +18,23 @@ contract TempoSettler is Settler, TempoMixin {
     constructor(bytes20 gitCommit) SettlerBase(gitCommit) {}
 
     function _dispatchVIP(uint256 action, bytes calldata data) internal override DANGEROUS_freeMemory returns (bool) {
-        // This does not make use of `super._dispatchVIP`. This chain's Settler is extremely
-        // stripped-down and has almost no capabilities
-        if (action == uint32(ISettlerActions.TRANSFER_FROM.selector)) {
-            (address recipient, ISignatureTransfer.PermitTransferFrom memory permit, bytes memory sig) =
-                abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom, bytes));
-            (ISignatureTransfer.SignatureTransferDetails memory transferDetails,) =
-                _permitToTransferDetails(permit, recipient);
-            _transferFrom(permit, transferDetails, sig);
+        if (super._dispatchVIP(action, data)) {
+            return true;
+        } else if (action == uint32(ISettlerActions.UNISWAPV4_VIP.selector)) {
+            (
+                address recipient,
+                ISignatureTransfer.PermitTransferFrom memory permit,
+                bool feeOnTransfer,
+                uint256 hashMul,
+                uint256 hashMod,
+                bytes memory fills,
+                bytes memory sig,
+                uint256 amountOutMin
+            ) = abi.decode(
+                data, (address, ISignatureTransfer.PermitTransferFrom, bool, uint256, uint256, bytes, bytes, uint256)
+            );
+
+            sellToUniswapV4VIP(recipient, feeOnTransfer, hashMul, hashMod, fills, permit, sig, amountOutMin);
         } else {
             return false;
         }
diff --git a/src/core/UniswapV4Addresses.sol b/src/core/UniswapV4Addresses.sol
@@ -15,3 +15,4 @@ IPoolManager constant INK_POOL_MANAGER = IPoolManager(0x360E68faCcca8cA495c1B759
 IPoolManager constant UNICHAIN_POOL_MANAGER = IPoolManager(0x1F98400000000000000000000000000000000004); // https://github.com/Uniswap/contracts/blob/main/deployments/130.md#wed-jan-22-2025
 IPoolManager constant SEPOLIA_POOL_MANAGER = IPoolManager(0xE03A1074c86CFeDd5C142C4F04F1a1536e203543);
 IPoolManager constant MONAD_POOL_MANAGER = IPoolManager(0x188d586Ddcf52439676Ca21A244753fA19F9Ea8e);
+IPoolManager constant TEMPO_POOL_MANAGER = IPoolManager(0x33620f62C5b9B2086dD6b62F4A297A9f30347029);
diff --git a/src/core/univ3forks/UniswapV3.sol b/src/core/univ3forks/UniswapV3.sol
@@ -16,6 +16,7 @@ address constant uniswapV3UnichainFactory = 0x1F98400000000000000000000000000000
 address constant uniswapV3PlasmaFactory = 0xcb2436774C3e191c85056d248EF4260ce5f27A9D;
 address constant uniswapV3MonadFactory = 0x204FAca1764B154221e35c0d20aBb3c525710498;
 address constant uniswapV3AbstractFactory = 0xA1160e73B63F322ae88cC2d8E700833e71D0b2a1;
+address constant uniswapV3TempoFactory = 0x24a3d4757E330890A8b8978028c9e58E04611fd6;
 
 bytes32 constant uniswapV3InitHash = 0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54;
 // This isn't a "hash" inasmuch as it's a versioned discriminator

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ abstract contract SettlerBase is ISettlerBase, Basic, RfqOrderSettlement, Uniswa`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- function _dispatch(uint256, uint256 action, bytes calldata data, AllowedSlippage memory slippage)`
	`117`	`+ function _dispatch(uint256, uint256 action, bytes calldata data, AllowedSlippage memory)`
`118`	`118`	`internal`
`119`	`119`	`virtual`
`120`	`120`	`override`