Merge branch 'dcmt/explicit-deadline'

Author: duncancmt

CHANGELOG.md

@@ -47,6 +47,11 @@ Master list of UniV3 forks:
   payer/solver/relayer) to be `msgSender` (the taker)
 * Remove `LimitOrderFeeCollector`
 
+### Non-breaking changes
+
+* Add `NATIVE_CHECK` to taker-submitted Settlers on all chains to correctly
+  handle the selling of the chain-native asset
+
 ## 2025-07-07
 
 ### Breaking changes

lib/forge-std

@@ -8,6 +8,9 @@ interface ISettlerActions {
     function TRANSFER_FROM(address recipient, ISignatureTransfer.PermitTransferFrom memory permit, bytes memory sig)
         external;
 
+    // @dev msgValue is interpreted as an upper bound on the expected msg.value, not as an exact specification
+    function NATIVE_CHECK(uint256 deadline, uint256 msgValue) external;
+
     /// @dev Transfer funds from metatransaction requestor into the Settler contract using Permit2. Only for use in `Settler.executeMetaTxn` where the signature is provided as calldata
     function METATXN_TRANSFER_FROM(address recipient, ISignatureTransfer.PermitTransferFrom memory permit) external;
 

src/ISettlerActions.sol

@@ -12,7 +12,10 @@ import {CalldataDecoder, SettlerBase} from "./SettlerBase.sol";
 import {UnsafeMath} from "./utils/UnsafeMath.sol";
 
 import {ISettlerActions} from "./ISettlerActions.sol";
-import {revertActionInvalid} from "./core/SettlerErrors.sol";
+import {revertActionInvalid, SignatureExpired, MsgValueMismatch} from "./core/SettlerErrors.sol";
+
+// ugh; solidity inheritance
+import {SettlerAbstract} from "./SettlerAbstract.sol";
 
 abstract contract Settler is ISettlerTakerSubmitted, Permit2PaymentTakerSubmitted, SettlerBase {
     using UnsafeMath for uint256;
@@ -26,6 +29,37 @@ abstract contract Settler is ISettlerTakerSubmitted, Permit2PaymentTakerSubmitte
         return false;
     }
 
+    function _dispatch(uint256 i, uint256 action, bytes calldata data)
+        internal
+        virtual
+        override(SettlerAbstract, SettlerBase)
+        returns (bool)
+    {
+        if (super._dispatch(i, action, data)) {
+            return true;
+        } else if (action == uint32(ISettlerActions.NATIVE_CHECK.selector)) {
+            (uint256 deadline, uint256 msgValue) = abi.decode(data, (uint256, uint256));
+            if (block.timestamp > deadline) {
+                assembly ("memory-safe") {
+                    mstore(0x00, 0xcd21db4f) // selector for `SignatureExpired(uint256)`
+                    mstore(0x20, deadline)
+                    revert(0x1c, 0x24)
+                }
+            }
+            if (msg.value > msgValue) {
+                assembly ("memory-safe") {
+                    mstore(0x00, 0x4a094431) // selector for `MsgValueMismatch(uint256,uint256)`
+                    mstore(0x20, msgValue)
+                    mstore(0x40, callvalue())
+                    revert(0x1c, 0x44)
+                }
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
     function _dispatchVIP(uint256 action, bytes calldata data) internal virtual returns (bool) {
         if (action == uint32(ISettlerActions.TRANSFER_FROM.selector)) {
             (address recipient, ISignatureTransfer.PermitTransferFrom memory permit, bytes memory sig) =

src/Settler.sol

@@ -90,7 +90,7 @@ contract ArbitrumSettler is Settler, ArbitrumMixin {
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, ArbitrumMixin)
+        override(Settler, ArbitrumMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);

src/chains/Arbitrum/TakerSubmitted.sol

@@ -69,7 +69,7 @@ contract AvalancheSettler is Settler, AvalancheMixin {
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, AvalancheMixin)
+        override(Settler, AvalancheMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);

src/chains/Avalanche/TakerSubmitted.sol

@@ -80,7 +80,7 @@ contract BaseSettler is Settler, BaseMixin {
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, BaseMixin)
+        override(Settler, BaseMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);

src/chains/Base/TakerSubmitted.sol

@@ -39,7 +39,7 @@ contract BerachainSettler is Settler, BerachainMixin {
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, BerachainMixin)
+        override(Settler, BerachainMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);

src/chains/Berachain/TakerSubmitted.sol

@@ -49,7 +49,7 @@ contract BlastSettler is Settler, BlastMixin {
     // Solidity inheritance is stupid
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, BlastMixin)
+        override(Settler, BlastMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);

src/chains/Blast/TakerSubmitted.sol

@@ -80,7 +80,7 @@ contract BnbSettler is Settler, BnbMixin {
 
     function _dispatch(uint256 i, uint256 action, bytes calldata data)
         internal
-        override(SettlerAbstract, SettlerBase, BnbMixin)
+        override(Settler, BnbMixin)
         returns (bool)
     {
         return super._dispatch(i, action, data);