Merge branches 'dcmt/katana-permit', 'e1Ru1o/changelog-fix' and 'dcmt/release'

Author: duncancmt

CHANGELOG.md

@@ -42,6 +42,12 @@ Master list of UniV3 forks:
 
 ### Breaking changes
 
+### Non-breaking changes
+
+## 2026-01-16
+
+### Breaking changes
+
 * Remove EulerSwap action `EULERSWAP` from Base as it has no liquidity
 * Remove the following UniV3 forks from Base because they do little-to-no volume
   * Thick
@@ -56,16 +62,16 @@ Master list of UniV3 forks:
     attempting to buy WETH (wrapped native) is not possible. You will always get
     raw ETH (native).
 * Added new VIP `TRANSFER_FROM_WITH_PERMIT` to TakerSubmitted settlers.
-  It is Similar to `TRANSFER_FROM` action but instead of a signature it 
+  * It is Similar to `TRANSFER_FROM` action but instead of a signature it
   receives a permit calldata to be executed before transfering the assets.
   Permit calldata is encoded as follow:
-  1. 0x00 for ERC2612 or 0x01 for DAIPermit or 0x02 for NativeMetaTransaction
-  2. Encoding of:
-    a. owner, amount, deadline, v, r, s in case of regular ERC2612 permit
-    b. owner, nonce, expiry, allowed, v, r, s in case of regular DAI permit
-    c. owner, amount, v, r, s in case of native meta transaction
-  In all cases spender is allways set to be AllowanceHolder
-  On native meta transactions `approve` function is allways the function called
+    1. 0x00 for ERC2612 or 0x01 for DAIPermit or 0x02 for NativeMetaTransaction
+    2. Encoding of:
+        1. owner, amount, deadline, v, r, s in case of regular ERC2612 permit
+        2. owner, nonce, expiry, allowed, v, r, s in case of regular DAI permit
+        3. owner, amount, v, r, s in case of native meta transaction
+  * In all cases spender is allways set to be AllowanceHolder.
+  * On native meta transactions `approve` function is allways the function called
 
 ## 2025-12-29
 

chain_config.json

@@ -914,7 +914,7 @@
       "allowanceHolder": "0x0000000000001fF3684f28c67538d4D072C22734",
       "deployer": "0x00000000000004533Fe15556B1E086BB1A72cEae"
     },
-    "sourcifyApi": "https://sourcify-api-monad.blockvision.org",
+    "sourcifyApi": "https://sourcify-api-monad.blockvision.org/",
     "blockscoutApi": "https://api.socialscan.io/monad/v1/explorer/command_api/contract",
     "etherscanApi": "https://api.etherscan.io/v2/api?chainid=143"
   },

sh/common_gas.sh

@@ -27,24 +27,28 @@ function apply_gas_multiplier {
     declare -i _gas_estimate="$1"
     shift
 
-    # Mantle has funky gas rules, exclude it from this logic
-    if (( chainid != 5000 )) && (( _gas_estimate > eip7825_gas_limit )) ; then
-        echo 'Gas estimate without buffer /already/ exceeds the EIP-7825 limit' >&2
-        exit 1
+    # Mantle has funky gas rules, exclude it from this logic. EraVm chains similarly price in ergs, not gas.
+    if (( _gas_estimate > eip7825_gas_limit )) ; then
+        if (( chainid != 5000 )) && [[ $era_vm != [Tt]rue ]] ; then
+            echo 'Gas estimate without buffer /already/ exceeds the EIP-7825 limit' >&2
+            exit 1
+        fi
     fi
 
     declare -i _gas_limit=$((_gas_estimate * gas_estimate_multiplier / 100))
 
-    if (( chainid != 5000 )) && (( _gas_limit > eip7825_gas_limit )) ; then
-        declare _gas_limit_keep_going
-        IFS='' read -p 'Gas limit with multiplier exceeds EIP-7825 limit. Cap gas limit and keep going? [y/N]: ' -e -r -i n _gas_limit_keep_going
-        declare -r _gas_limit_keep_going
-        if [[ "${_gas_limit_keep_going:-n}" != [Yy] ]] ; then
-            echo >&2
-            echo 'Exiting as requested' >&2
-            exit 1
+    if (( _gas_limit > eip7825_gas_limit )) ; then
+        if (( chainid != 5000 )) && [[ $era_vm != [Tt]rue ]] ; then
+            declare _gas_limit_keep_going
+            IFS='' read -p 'Gas limit with multiplier exceeds EIP-7825 limit. Cap gas limit and keep going? [y/N]: ' -e -r -i n _gas_limit_keep_going
+            declare -r _gas_limit_keep_going
+            if [[ "${_gas_limit_keep_going:-n}" != [Yy] ]] ; then
+                echo >&2
+                echo 'Exiting as requested' >&2
+                exit 1
+            fi
+            _gas_limit=$eip7825_gas_limit
         fi
-        _gas_limit=$eip7825_gas_limit
     fi
 
     echo $_gas_limit

src/Settler.sol

@@ -70,6 +70,10 @@ abstract contract Settler is ISettlerTakerSubmitted, Permit2PaymentTakerSubmitte
     }
 
     function _dispatchVIP(uint256 action, bytes calldata data) internal virtual returns (bool) {
+        //// NOTICE: Portions of this function have been copy/paste'd into
+        //// `src/chains/Katana/TakerSubmitted.sol:KatanaSettler._dispatchVIP`. If you make changes
+        //// here, you need to make sure that corresponding changes are made to that function.
+
         if (action == uint32(ISettlerActions.TRANSFER_FROM.selector)) {
             (address recipient, ISignatureTransfer.PermitTransferFrom memory permit, bytes memory sig) =
                 abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom, bytes));

src/chains/Katana/TakerSubmitted.sol

@@ -7,6 +7,8 @@ import {Settler} from "../../Settler.sol";
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {ISettlerActions} from "../../ISettlerActions.sol";
+import {FastLogic} from "../../utils/FastLogic.sol";
+import {revertConfusedDeputy} from "../../core/SettlerErrors.sol";
 
 // Solidity inheritance is stupid
 import {SettlerAbstract} from "../../SettlerAbstract.sol";
@@ -16,6 +18,8 @@ import {AbstractContext} from "../../Context.sol";
 
 /// @custom:security-contact security@0x.org
 contract KatanaSettler is Settler, KatanaMixin {
+    using FastLogic for bool;
+
     constructor(bytes20 gitCommit) SettlerBase(gitCommit) {}
 
     function _dispatchVIP(uint256 action, bytes calldata data) internal override DANGEROUS_freeMemory returns (bool) {
@@ -27,6 +31,16 @@ contract KatanaSettler is Settler, KatanaMixin {
             (ISignatureTransfer.SignatureTransferDetails memory transferDetails,) =
                 _permitToTransferDetails(permit, recipient);
             _transferFrom(permit, transferDetails, sig);
+        } else if (action == uint32(ISettlerActions.TRANSFER_FROM_WITH_PERMIT.selector)) {
+            (address recipient, ISignatureTransfer.PermitTransferFrom memory permit, bytes memory permitData) =
+                abi.decode(data, (address, ISignatureTransfer.PermitTransferFrom, bytes));
+            if (_isRestrictedTarget(permit.permitted.token).or(!_isForwarded())) {
+                revertConfusedDeputy();
+            }
+            _dispatchPermit(permit.permitted.token, permitData);
+            (ISignatureTransfer.SignatureTransferDetails memory transferDetails,) =
+                _permitToTransferDetails(permit, recipient);
+            _transferFrom(permit, transferDetails, new bytes(0), true);
         } else {
             return false;
         }