feat: fix input decoding in usv3 executor and execution dispatcher

foundry/lib/v3-updated/CallbackValidationV2.sol

@@ -20,9 +20,11 @@ library CallbackValidationV2 {
         address tokenB,
         uint24 fee
     ) internal view returns (IUniswapV3Pool pool) {
-        return verifyCallback(
+        return
-            factory, PoolAddressV2.getPoolKey(tokenA, tokenB, fee)
+            verifyCallback(
-        );
+                factory,
+                PoolAddressV2.getPoolKey(tokenA, tokenB, fee)
+            );
     }
 
     /// @notice Returns the address of a valid Uniswap V3 Pool

foundry/src/ExecutionDispatcher.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.26;
 
 import "@interfaces/IExecutor.sol";
+import "forge-std/console.sol";
 
 error ExecutionDispatcher__UnapprovedExecutor();
 error ExecutionDispatcher__NonContractExecutor();
@@ -80,11 +81,16 @@ contract ExecutionDispatcher {
         calculatedAmount = abi.decode(result, (uint256));
     }
 
-    function _handleCallback(address executor, bytes calldata data) internal {
+    function _handleCallback(bytes calldata data) internal {
+        // Take last 20 bytes (excluding the final byte)
+        address executor =
+            address(bytes20(data[data.length - 21:data.length - 1]));
+
         if (!executors[executor]) {
             revert ExecutionDispatcher__UnapprovedExecutor();
         }
 
+        // slither-disable-next-line controlled-delegatecall,low-level-calls
         (bool success, bytes memory result) = executor.delegatecall(
             abi.encodeWithSelector(IExecutor.handleCallback.selector, data)
         );

foundry/src/TychoRouter.sol

@@ -57,21 +57,16 @@ contract TychoRouter is
     uint256 public fee;
 
     event Withdrawal(
-        address indexed token,
+        address indexed token, uint256 amount, address indexed receiver
-        uint256 amount,
-        address indexed receiver
     );
     event FeeReceiverSet(
-        address indexed oldFeeReceiver,
+        address indexed oldFeeReceiver, address indexed newFeeReceiver
-        address indexed newFeeReceiver
     );
     event FeeSet(uint256 indexed oldFee, uint256 indexed newFee);
 
-    constructor(
+    constructor(IPoolManager _poolManager, address _permit2, address weth)
-        IPoolManager _poolManager,
+        SafeCallback(_poolManager)
-        address _permit2,
+    {
-        address weth
-    ) SafeCallback(_poolManager) {
         if (_permit2 == address(0) || weth == address(0)) {
             revert TychoRouter__AddressZero();
         }
@@ -185,11 +180,10 @@ contract TychoRouter is
      *
      * @return The total amount of the buy token obtained after all swaps have been executed.
      */
-    function _swap(
+    function _swap(uint256 amountIn, uint256 nTokens, bytes calldata swaps_)
-        uint256 amountIn,
+        internal
-        uint256 nTokens,
+        returns (uint256)
-        bytes calldata swaps_
+    {
-    ) internal returns (uint256) {
         if (swaps_.length == 0) {
             revert TychoRouter__EmptySwaps();
         }
@@ -235,7 +229,7 @@ contract TychoRouter is
      *  caller is not a pool.
      */
     fallback() external {
-        _handleCallback(msg.sender, msg.data);
+        _handleCallback(msg.data);
     }
 
     /**
@@ -255,10 +249,10 @@ contract TychoRouter is
     /**
      * @dev Allows granting roles to multiple accounts in a single call.
      */
-    function batchGrantRole(
+    function batchGrantRole(bytes32 role, address[] memory accounts)
-        bytes32 role,
+        external
-        address[] memory accounts
+        onlyRole(DEFAULT_ADMIN_ROLE)
-    ) external onlyRole(DEFAULT_ADMIN_ROLE) {
+    {
         for (uint256 i = 0; i < accounts.length; i++) {
             _grantRole(role, accounts[i]);
         }
@@ -268,9 +262,10 @@ contract TychoRouter is
      * @dev Entrypoint to add or replace an approved executor contract address
      * @param targets address of the executor contract
      */
-    function setExecutors(
+    function setExecutors(address[] memory targets)
-        address[] memory targets
+        external
-    ) external onlyRole(EXECUTOR_SETTER_ROLE) {
+        onlyRole(EXECUTOR_SETTER_ROLE)
+    {
         for (uint256 i = 0; i < targets.length; i++) {
             _setExecutor(targets[i]);
         }
@@ -280,9 +275,10 @@ contract TychoRouter is
      * @dev Entrypoint to remove an approved executor contract address
      * @param target address of the executor contract
      */
-    function removeExecutor(
+    function removeExecutor(address target)
-        address target
+        external
-    ) external onlyRole(EXECUTOR_SETTER_ROLE) {
+        onlyRole(EXECUTOR_SETTER_ROLE)
+    {
         _removeExecutor(target);
     }
 
@@ -290,9 +286,10 @@ contract TychoRouter is
      * @dev Entrypoint to add or replace an approved callback verifier contract address
      * @param target address of the callback verifier contract
      */
-    function setCallbackVerifier(
+    function setCallbackVerifier(address target)
-        address target
+        external
-    ) external onlyRole(EXECUTOR_SETTER_ROLE) {
+        onlyRole(EXECUTOR_SETTER_ROLE)
+    {
         _setCallbackVerifier(target);
     }
 
@@ -300,18 +297,20 @@ contract TychoRouter is
      * @dev Entrypoint to remove an approved callback verifier contract address
      * @param target address of the callback verifier contract
      */
-    function removeCallbackVerifier(
+    function removeCallbackVerifier(address target)
-        address target
+        external
-    ) external onlyRole(EXECUTOR_SETTER_ROLE) {
+        onlyRole(EXECUTOR_SETTER_ROLE)
+    {
         _removeCallbackVerifier(target);
     }
 
     /**
      * @dev Allows setting the fee receiver.
      */
-    function setFeeReceiver(
+    function setFeeReceiver(address newfeeReceiver)
-        address newfeeReceiver
+        external
-    ) external onlyRole(FEE_SETTER_ROLE) {
+        onlyRole(FEE_SETTER_ROLE)
+    {
         if (newfeeReceiver == address(0)) revert TychoRouter__AddressZero();
         emit FeeReceiverSet(feeReceiver, newfeeReceiver);
         feeReceiver = newfeeReceiver;
@@ -328,10 +327,10 @@ contract TychoRouter is
     /**
      * @dev Allows withdrawing any ERC20 funds if funds get stuck in case of a bug.
      */
-    function withdraw(
+    function withdraw(IERC20[] memory tokens, address receiver)
-        IERC20[] memory tokens,
+        external
-        address receiver
+        onlyRole(FUND_RESCUER_ROLE)
-    ) external onlyRole(FUND_RESCUER_ROLE) {
+    {
         if (receiver == address(0)) revert TychoRouter__AddressZero();
 
         for (uint256 i = 0; i < tokens.length; i++) {
@@ -348,9 +347,10 @@ contract TychoRouter is
      * @dev Allows withdrawing any NATIVE funds if funds get stuck in case of a bug.
      * The contract should never hold any NATIVE tokens for security reasons.
      */
-    function withdrawNative(
+    function withdrawNative(address receiver)
-        address receiver
+        external
-    ) external onlyRole(FUND_RESCUER_ROLE) {
+        onlyRole(FUND_RESCUER_ROLE)
+    {
         if (receiver == address(0)) revert TychoRouter__AddressZero();
 
         uint256 amount = address(this).balance;
@@ -378,9 +378,8 @@ contract TychoRouter is
      * @param amount of WETH to unwrap.
      */
     function _unwrapETH(uint256 amount) internal {
-        uint256 unwrapAmount = amount == 0
+        uint256 unwrapAmount =
-            ? _weth.balanceOf(address(this))
+            amount == 0 ? _weth.balanceOf(address(this)) : amount;
-            : amount;
         _weth.withdraw(unwrapAmount);
     }
 
@@ -389,9 +388,11 @@ contract TychoRouter is
      */
     receive() external payable {}
 
-    function _unlockCallback(
+    function _unlockCallback(bytes calldata data)
-        bytes calldata data
+        internal
-    ) internal override returns (bytes memory) {
+        override
+        returns (bytes memory)
+    {
         require(data.length >= 20, "Invalid data length");
         bytes4 selector = bytes4(data[data.length - 24:data.length - 20]);
         address executor = address(uint160(bytes20(data[data.length - 20:])));
@@ -402,7 +403,7 @@ contract TychoRouter is
         }
 
         // slither-disable-next-line controlled-delegatecall,low-level-calls
-        (bool success, ) = executor.delegatecall(
+        (bool success,) = executor.delegatecall(
             abi.encodeWithSelector(selector, protocolData)
         );
         require(success, "delegatecall to uniswap v4 callback failed");

foundry/src/executors/BalancerV2Executor.sol

@@ -2,7 +2,10 @@
 pragma solidity ^0.8.26;
 
 import "@interfaces/IExecutor.sol";
-import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {
+    IERC20,
+    SafeERC20
+} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 // slither-disable-next-line solc-version
 import {IAsset} from "@balancer-labs/v2-interfaces/contracts/vault/IAsset.sol";
 // slither-disable-next-line solc-version
@@ -16,10 +19,11 @@ contract BalancerV2Executor is IExecutor {
     address private constant VAULT = 0xBA12222222228d8Ba445958a75a0704d566BF2C8;
 
     // slither-disable-next-line locked-ether
-    function swap(
+    function swap(uint256 givenAmount, bytes calldata data)
-        uint256 givenAmount,
+        external
-        bytes calldata data
+        payable
-    ) external payable returns (uint256 calculatedAmount) {
+        returns (uint256 calculatedAmount)
+    {
         (
             IERC20 tokenIn,
             IERC20 tokenOut,
@@ -51,21 +55,16 @@ contract BalancerV2Executor is IExecutor {
 
         uint256 limit = 0;
 
-        calculatedAmount = IVault(VAULT).swap(
+        calculatedAmount =
-            singleSwap,
+            IVault(VAULT).swap(singleSwap, funds, limit, block.timestamp);
-            funds,
-            limit,
-            block.timestamp
-        );
     }
 
-    function handleCallback(
+    function handleCallback(bytes calldata data)
-        bytes calldata data
+        external
-    ) external returns (bytes memory result) {}
+        returns (bytes memory result)
+    {}
 
-    function _decodeData(
+    function _decodeData(bytes calldata data)
-        bytes calldata data
-    )
         internal
         pure
         returns (

foundry/src/executors/UniswapV2Executor.sol

@@ -11,10 +11,11 @@ contract UniswapV2Executor is IExecutor {
     using SafeERC20 for IERC20;
 
     // slither-disable-next-line locked-ether
-    function swap(
+    function swap(uint256 givenAmount, bytes calldata data)
-        uint256 givenAmount,
+        external
-        bytes calldata data
+        payable
-    ) external payable returns (uint256 calculatedAmount) {
+        returns (uint256 calculatedAmount)
+    {
         address target;
         address receiver;
         bool zeroForOne;
@@ -32,13 +33,12 @@ contract UniswapV2Executor is IExecutor {
         }
     }
 
-    function handleCallback(
+    function handleCallback(bytes calldata data)
-        bytes calldata data
+        external
-    ) external returns (bytes memory result) {}
+        returns (bytes memory result)
+    {}
 
-    function _decodeData(
+    function _decodeData(bytes calldata data)
-        bytes calldata data
-    )
         internal
         pure
         returns (
@@ -57,20 +57,20 @@ contract UniswapV2Executor is IExecutor {
         zeroForOne = uint8(data[60]) > 0;
     }
 
-    function _getAmountOut(
+    function _getAmountOut(address target, uint256 amountIn, bool zeroForOne)
-        address target,
+        internal
-        uint256 amountIn,
+        view
-        bool zeroForOne
+        returns (uint256 amount)
-    ) internal view returns (uint256 amount) {
+    {
         IUniswapV2Pair pair = IUniswapV2Pair(target);
         uint112 reserveIn;
         uint112 reserveOut;
         if (zeroForOne) {
             // slither-disable-next-line unused-return
-            (reserveIn, reserveOut, ) = pair.getReserves();
+            (reserveIn, reserveOut,) = pair.getReserves();
         } else {
             // slither-disable-next-line unused-return
-            (reserveOut, reserveIn, ) = pair.getReserves();
+            (reserveOut, reserveIn,) = pair.getReserves();
         }
 
         require(reserveIn > 0 && reserveOut > 0, "L");

foundry/src/executors/UniswapV3Executor.sol

@@ -7,6 +7,7 @@ import "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
 import "@uniswap/v3-updated/CallbackValidationV2.sol";
 
 error UniswapV3Executor__InvalidDataLength();
+error UniswapV3Executor__InvalidFactory();
 
 contract UniswapV3Executor is IExecutor {
     using SafeERC20 for IERC20;
@@ -16,16 +17,22 @@ contract UniswapV3Executor is IExecutor {
         1461446703485210103287273052203988822378723970342;
 
     address public immutable factory;
+    address private immutable self;
 
     constructor(address _factory) {
+        if (_factory == address(0)) {
+            revert UniswapV3Executor__InvalidFactory();
+        }
         factory = _factory;
+        self = address(this);
     }
 
     // slither-disable-next-line locked-ether
-    function swap(
+    function swap(uint256 amountIn, bytes calldata data)
-        uint256 amountIn,
+        external
-        bytes calldata data
+        payable
-    ) external payable returns (uint256 amountOut) {
+        returns (uint256 amountOut)
+    {
         (
             address tokenIn,
             address tokenOut,
@@ -58,23 +65,19 @@ contract UniswapV3Executor is IExecutor {
         }
     }
 
-    function handleCallback(
+    function handleCallback(bytes calldata msgData)
-        bytes calldata msgData
+        external
-    ) external returns (bytes memory result) {
+        returns (bytes memory result)
-        int256 amount0Delta;
+    {
-        int256 amount1Delta;
+        // Skip first 4 bytes of function selector and decode the two int256 values
+        (int256 amount0Delta, int256 amount1Delta) =
+            abi.decode(msgData[4:68], (int256, int256));
 
-        (amount0Delta, amount1Delta) = abi.decode(
+        bytes calldata remainingData = msgData[68:];
-            msgData[:64],
+
-            (int256, int256)
+        (uint256 amountOwed, address tokenOwed) =
-        );
+            _verifyUSV3Callback(amount0Delta, amount1Delta, remainingData);
 
-        bytes calldata remainingData = msgData[64:];
-        (uint256 amountOwed, address tokenOwed) = _verifyUSV3Callback(
-            amount0Delta,
-            amount1Delta,
-            remainingData
-        );
         IERC20(tokenOwed).safeTransfer(msg.sender, amountOwed);
         return abi.encode(amountOwed, tokenOwed);
     }
@@ -84,28 +87,23 @@ contract UniswapV3Executor is IExecutor {
         int256 amount1Delta,
         bytes calldata data
     ) internal view returns (uint256 amountIn, address tokenIn) {
+        // Skip the first 64 bytes (32 bytes offset + 32 bytes length)
+        data = data[64:];
+
         tokenIn = address(bytes20(data[0:20]));
         address tokenOut = address(bytes20(data[20:40]));
         uint24 poolFee = uint24(bytes3(data[40:43]));
 
         // slither-disable-next-line unused-return
-        CallbackValidationV2.verifyCallback(
+        CallbackValidationV2.verifyCallback(factory, tokenIn, tokenOut, poolFee);
-            factory,
-            tokenIn,
-            tokenOut,
-            poolFee
-        );
 
-        amountIn = amount0Delta > 0
+        amountIn =
-            ? uint256(amount0Delta)
+            amount0Delta > 0 ? uint256(amount0Delta) : uint256(amount1Delta);
-            : uint256(amount1Delta);
 
         return (amountIn, tokenIn);
     }
 
-    function _decodeData(
+    function _decodeData(bytes calldata data)
-        bytes calldata data
-    )
         internal
         pure
         returns (
@@ -128,11 +126,11 @@ contract UniswapV3Executor is IExecutor {
         zeroForOne = uint8(data[83]) > 0;
     }
 
-    function _makeV3CallbackData(
+    function _makeV3CallbackData(address tokenIn, address tokenOut, uint24 fee)
-        address tokenIn,
+        internal
-        address tokenOut,
+        view
-        uint24 fee
+        returns (bytes memory)
-    ) internal pure returns (bytes memory) {
+    {
-        return abi.encodePacked(tokenIn, tokenOut, fee);
+        return abi.encodePacked(tokenIn, tokenOut, fee, self);
     }
 }

foundry/src/executors/UniswapV4Executor.sol

@@ -2,9 +2,14 @@
 pragma solidity ^0.8.26;
 
 import "@interfaces/IExecutor.sol";
-import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {
+    IERC20,
+    SafeERC20
+} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
-import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
+import {
+    Currency, CurrencyLibrary
+} from "@uniswap/v4-core/src/types/Currency.sol";
 import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
 import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
 import {V4Router} from "@uniswap/v4-periphery/src/V4Router.sol";
@@ -21,16 +26,13 @@ contract UniswapV4Executor is IExecutor, V4Router {
 
     constructor(IPoolManager _poolManager) V4Router(_poolManager) {}
 
-    function swap(
+    function swap(uint256, bytes calldata data)
-        uint256,
+        external
-        bytes calldata data
+        payable
-    ) external payable returns (uint256 calculatedAmount) {
+        returns (uint256 calculatedAmount)
-        (
+    {
-            address tokenIn,
+        (address tokenIn, address tokenOut, bool isExactInput, uint256 amount) =
-            address tokenOut,
+            _decodeData(data);
-            bool isExactInput,
-            uint256 amount
-        ) = _decodeData(data);
 
         uint256 tokenOutBalanceBefore;
         uint256 tokenInBalanceBefore;
@@ -65,9 +67,7 @@ contract UniswapV4Executor is IExecutor, V4Router {
         return calculatedAmount;
     }
 
-    function _decodeData(
+    function _decodeData(bytes calldata data)
-        bytes calldata data
-    )
         internal
         pure
         returns (
@@ -77,19 +77,15 @@ contract UniswapV4Executor is IExecutor, V4Router {
             uint256 amount
         )
     {
-        (bytes memory actions, bytes[] memory params) = abi.decode(
+        (bytes memory actions, bytes[] memory params) =
-            data,
+            abi.decode(data, (bytes, bytes[]));
-            (bytes, bytes[])
-        );
 
         // First byte of actions determines the swap type
         uint8 action = uint8(bytes1(actions[0]));
 
         if (action == uint8(Actions.SWAP_EXACT_IN_SINGLE)) {
-            IV4Router.ExactInputSingleParams memory swapParams = abi.decode(
+            IV4Router.ExactInputSingleParams memory swapParams =
-                params[0],
+                abi.decode(params[0], (IV4Router.ExactInputSingleParams));
-                (IV4Router.ExactInputSingleParams)
-            );
 
             tokenIn = swapParams.zeroForOne
                 ? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -100,10 +96,8 @@ contract UniswapV4Executor is IExecutor, V4Router {
             isExactInput = true;
             amount = swapParams.amountIn;
         } else if (action == uint8(Actions.SWAP_EXACT_OUT_SINGLE)) {
-            IV4Router.ExactOutputSingleParams memory swapParams = abi.decode(
+            IV4Router.ExactOutputSingleParams memory swapParams =
-                params[0],
+                abi.decode(params[0], (IV4Router.ExactOutputSingleParams));
-                (IV4Router.ExactOutputSingleParams)
-            );
 
             tokenIn = swapParams.zeroForOne
                 ? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -114,23 +108,18 @@ contract UniswapV4Executor is IExecutor, V4Router {
             isExactInput = false;
             amount = swapParams.amountOut;
         } else if (action == uint8(Actions.SWAP_EXACT_IN)) {
-            IV4Router.ExactInputParams memory swapParams = abi.decode(
+            IV4Router.ExactInputParams memory swapParams =
-                params[0],
+                abi.decode(params[0], (IV4Router.ExactInputParams));
-                (IV4Router.ExactInputParams)
-            );
 
             tokenIn = address(uint160(swapParams.currencyIn.toId()));
-            PathKey memory lastPath = swapParams.path[
+            PathKey memory lastPath =
-                swapParams.path.length - 1
+                swapParams.path[swapParams.path.length - 1];
-            ];
             tokenOut = address(uint160(lastPath.intermediateCurrency.toId()));
             isExactInput = true;
             amount = swapParams.amountIn;
         } else if (action == uint8(Actions.SWAP_EXACT_OUT)) {
-            IV4Router.ExactOutputParams memory swapParams = abi.decode(
+            IV4Router.ExactOutputParams memory swapParams =
-                params[0],
+                abi.decode(params[0], (IV4Router.ExactOutputParams));
-                (IV4Router.ExactOutputParams)
-            );
 
             PathKey memory firstPath = swapParams.path[0];
             tokenIn = address(uint160(firstPath.intermediateCurrency.toId()));
@@ -140,14 +129,12 @@ contract UniswapV4Executor is IExecutor, V4Router {
         }
     }
 
-    function _pay(
+    function _pay(Currency token, address payer, uint256 amount)
-        Currency token,
+        internal
-        address payer,
+        override
-        uint256 amount
+    {
-    ) internal override {
         IERC20(Currency.unwrap(token)).safeTransfer(
-            address(poolManager),
+            address(poolManager), amount
-            amount
         );
     }
 
@@ -155,7 +142,8 @@ contract UniswapV4Executor is IExecutor, V4Router {
         return address(this);
     }
 
-    function handleCallback(
+    function handleCallback(bytes calldata data)
-        bytes calldata data
+        external
-    ) external returns (bytes memory result) {}
+        returns (bytes memory result)
+    {}
 }

foundry/test/TychoRouter.t.sol

@@ -18,9 +18,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
 
     event CallbackVerifierSet(address indexed callbackVerifier);
     event Withdrawal(
-        address indexed token,
+        address indexed token, uint256 amount, address indexed receiver
-        uint256 amount,
-        address indexed receiver
     );
 
     function testSetExecutorsValidRole() public {
@@ -241,10 +239,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         deal(WETH_ADDR, tychoRouterAddr, amountIn);
 
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -281,10 +276,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
             address(usv2Executor),
             bytes4(0),
             encodeUniswapV2Swap(
-                WETH_ADDR,
+                WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-                WETH_DAI_POOL,
-                tychoRouterAddr,
-                false
             )
         );
 
@@ -323,10 +315,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
             address(usv2Executor),
             bytes4(0),
             encodeUniswapV2Swap(
-                WETH_ADDR,
+                WETH_ADDR, WETH_WBTC_POOL, tychoRouterAddr, false
-                WETH_WBTC_POOL,
-                tychoRouterAddr,
-                false
             )
         );
         // WBTC -> USDC
@@ -337,10 +326,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
             address(usv2Executor),
             bytes4(0),
             encodeUniswapV2Swap(
-                WBTC_ADDR,
+                WBTC_ADDR, USDC_WBTC_POOL, tychoRouterAddr, true
-                USDC_WBTC_POOL,
-                tychoRouterAddr,
-                true
             )
         );
         // WETH -> DAI
@@ -351,10 +337,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
             address(usv2Executor),
             bytes4(0),
             encodeUniswapV2Swap(
-                WETH_ADDR,
+                WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-                WETH_DAI_POOL,
-                tychoRouterAddr,
-                false
             )
         );
 
@@ -390,10 +373,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         ) = handlePermit2Approval(WETH_ADDR, amountIn);
 
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -446,10 +426,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         ) = handlePermit2Approval(WETH_ADDR, amountIn);
 
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -508,10 +485,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         ) = handlePermit2Approval(WETH_ADDR, amountIn);
 
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -543,10 +517,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         assertEq(amountOut, expectedAmount);
         uint256 daiBalance = IERC20(DAI_ADDR).balanceOf(ALICE);
         assertEq(daiBalance, expectedAmount);
-        assertEq(
+        assertEq(IERC20(DAI_ADDR).balanceOf(FEE_RECEIVER), 26598819248184436997);
-            IERC20(DAI_ADDR).balanceOf(FEE_RECEIVER),
-            26598819248184436997
-        );
 
         vm.stopPrank();
     }
@@ -559,22 +530,19 @@ contract TychoRouterTest is TychoRouterTestSetup {
 
         vm.startPrank(ALICE);
 
-        IAllowanceTransfer.PermitSingle
+        IAllowanceTransfer.PermitSingle memory emptyPermitSingle =
-            memory emptyPermitSingle = IAllowanceTransfer.PermitSingle({
+        IAllowanceTransfer.PermitSingle({
-                details: IAllowanceTransfer.PermitDetails({
+            details: IAllowanceTransfer.PermitDetails({
-                    token: address(0),
+                token: address(0),
-                    amount: 0,
+                amount: 0,
-                    expiration: 0,
+                expiration: 0,
-                    nonce: 0
+                nonce: 0
-                }),
+            }),
-                spender: address(0),
+            spender: address(0),
-                sigDeadline: 0
+            sigDeadline: 0
-            });
+        });
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -623,12 +591,8 @@ contract TychoRouterTest is TychoRouterTestSetup {
             bytes memory signature
         ) = handlePermit2Approval(DAI_ADDR, amountIn);
 
-        bytes memory protocolData = encodeUniswapV2Swap(
+        bytes memory protocolData =
-            DAI_ADDR,
+            encodeUniswapV2Swap(DAI_ADDR, WETH_DAI_POOL, tychoRouterAddr, true);
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            true
-        );
 
         bytes memory swap = encodeSwap(
             uint8(0),
@@ -690,11 +654,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         uint256 expAmountOut = 1205_128428842122129186; //Swap 1 WETH for 1205.12 DAI
         bool zeroForOne = false;
         bytes memory protocolData = encodeUniswapV3Swap(
-            WETH_ADDR,
+            WETH_ADDR, DAI_ADDR, tychoRouterAddr, DAI_WETH_USV3, zeroForOne
-            DAI_ADDR,
-            tychoRouterAddr,
-            DAI_WETH_USV3,
-            zeroForOne
         );
         bytes memory swap = encodeSwap(
             uint8(0),
@@ -736,7 +696,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         // but manually replacing the executor address
         // `5c2f5a71f67c01775180adc06909288b4c329308` with the one in this test
         // `5615deb798bb3e4dfa0139dfa1b3d433cc23b72f`
-        (bool success, ) = tychoRouterAddr.call(
+        (bool success,) = tychoRouterAddr.call(
             hex"4860f9ed0000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000067d481bb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000067acfbc3000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000041f2740fde9662d8bc1f8fe8e8fc29447c1832d625f06f4a56ee5103ad555c12323af5d50eb840f73d17873383ae3b7573956d5df7b2bf76bddba768c2837894a51b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c005a00010000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625abc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a478c2975ab1ea89e8196811f51a7b7ade33eb113ede3eca2a72b3aecc820e955b36f38437d013950000000000"
         );
 
@@ -765,7 +725,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         // but manually replacing the executor address
         // `5c2f5a71f67c01775180adc06909288b4c329308` with the one in this test
         // `5615deb798bb3e4dfa0139dfa1b3d433cc23b72f`
-        (bool success, ) = tychoRouterAddr.call{value: 1 ether}(
+        (bool success,) = tychoRouterAddr.call{value: 1 ether}(
             hex"4860f9ed0000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000067d4806b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000067acfa73000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000041c36406a750c499ac7f79f7666650f0d4f20fc27bb49ab68121c0be6554cb5cab6caf90dc3aab2e21083a8fa46976521a1e9df41ce74be59abf03e0d3691541e91c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c005a00020000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625abc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a478c2975ab1ea89e8196811f51a7b7ade33eb113ede3eca2a72b3aecc820e955b36f38437d013950000000000"
         );
 
@@ -794,7 +754,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         // but manually replacing the executor address
         // `5c2f5a71f67c01775180adc06909288b4c329308` with the one in this test
         // `5615deb798bb3e4dfa0139dfa1b3d433cc23b72f`
-        (bool success, ) = tychoRouterAddr.call(
+        (bool success,) = tychoRouterAddr.call(
             hex"4860f9ed0000000000000000000000000000000000000000000000a2a15d09519be000000000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000a2a15d09519be000000000000000000000000000000000000000000000000000000000000067d4809800000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000067acfaa000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000004146411c70ec7fee0d5d260803cb220f5365792426c5d94f7a0a4d37abb05205752c5418b1fadd059570a71f0911814e546728e1f21876f2a1c6d38d34bd235fd61c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c005a00010000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625ab6b175474e89094c44da98b954eedeac495271d0fa478c2975ab1ea89e8196811f51a7b7ade33eb113ede3eca2a72b3aecc820e955b36f38437d013950100000000"
         );
 
@@ -825,7 +785,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         // but manually replacing the executor address
         // `5c2f5a71f67c01775180adc06909288b4c329308` with the one in this test
         // `5615deb798bb3e4dfa0139dfa1b3d433cc23b72f`
-        (bool success, ) = tychoRouterAddr.call(
+        (bool success,) = tychoRouterAddr.call(
             hex"4860f9ed0000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000067d4810d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000067acfb15000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000041ecaab75f0791c9683b001ea2f0e01a0a6aaf03e6e49c83e9c8a8e588a38e3be9230d962926628ffbf6a5370cda559ff0e7876a63ed38eebe33dbef5b5e2e46ef1b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000170005a00028000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625abc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a478c2975ab1ea89e8196811f51a7b7ade33eb113ede3eca2a72b3aecc820e955b36f38437d0139500005a00010000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625abc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2bb2b8038a1640196fbe3e38816f3e67cba72d9403ede3eca2a72b3aecc820e955b36f38437d0139500005a02030000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625ab6b175474e89094c44da98b954eedeac495271d0fae461ca67b15dc8dc81ce7615e0320da1a9ab8d53ede3eca2a72b3aecc820e955b36f38437d0139501005a01030000005615deb798bb3e4dfa0139dfa1b3d433cc23b72fbd0625ab2260fac5e5542a773aa44fbcfedf7c193bc2c599004375dff511095cc5a197a54140a24efef3a4163ede3eca2a72b3aecc820e955b36f38437d013950100000000000000000000000000000000"
         );
 
@@ -855,10 +815,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         ) = handlePermit2Approval(WETH_ADDR, amountIn);
 
         bytes memory protocolData = encodeUniswapV2Swap(
-            WETH_ADDR,
+            WETH_ADDR, WETH_DAI_POOL, tychoRouterAddr, false
-            WETH_DAI_POOL,
-            tychoRouterAddr,
-            false
         );
 
         bytes memory swap = encodeSwap(
@@ -875,8 +832,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                TychoRouter__AmountInNotFullySpent.selector,
+                TychoRouter__AmountInNotFullySpent.selector, 400000000000000000
-                400000000000000000
             )
         );
 
@@ -902,12 +858,7 @@ contract TychoRouterTest is TychoRouterTestSetup {
         deal(USDE_ADDR, tychoRouterAddr, amountIn);
 
         bytes memory protocolData = UniswapV4Utils.encodeExactInputSingle(
-            USDE_ADDR,
+            USDE_ADDR, USDT_ADDR, 100, true, 1, uint128(amountIn)
-            USDT_ADDR,
-            100,
-            true,
-            1,
-            uint128(amountIn)
         );
 
         // add executor and selector for callback

foundry/test/TychoRouterTestSetup.sol

@@ -12,11 +12,9 @@ import {WETH} from "../lib/permit2/lib/solmate/src/tokens/WETH.sol";
 import {PoolManager} from "@uniswap/v4-core/src/PoolManager.sol";
 
 contract TychoRouterExposed is TychoRouter {
-    constructor(
+    constructor(IPoolManager _poolManager, address _permit2, address weth)
-        IPoolManager _poolManager,
+        TychoRouter(_poolManager, _permit2, weth)
-        address _permit2,
+    {}
-        address weth
-    ) TychoRouter(_poolManager, _permit2, weth) {}
 
     function wrapETH(uint256 amount) external payable {
         return _wrapETH(amount);
@@ -38,8 +36,7 @@ contract TychoRouterExposed is TychoRouter {
 contract TychoRouterTestSetup is Test, Constants {
     TychoRouterExposed tychoRouter;
     address tychoRouterAddr;
-    address permit2Address =
+    address permit2Address = address(0x000000000022D473030F116dDEE9F6B43aC78BA3);
-        address(0x000000000022D473030F116dDEE9F6B43aC78BA3);
     UniswapV2Executor public usv2Executor;
     UniswapV3Executor public usv3Executor;
     UniswapV4Executor public usv4Executor;
@@ -53,19 +50,15 @@ contract TychoRouterTestSetup is Test, Constants {
         address factoryV3 = address(0x1F98431c8aD98523631AE4a59f267346ea31F984);
         address poolManagerAddress = 0x000000000004444c5dc75cB358380D2e3dE08A90;
         IPoolManager poolManager = IPoolManager(poolManagerAddress);
-        tychoRouter = new TychoRouterExposed(
+        tychoRouter =
-            poolManager,
+            new TychoRouterExposed(poolManager, permit2Address, WETH_ADDR);
-            permit2Address,
-            WETH_ADDR
-        );
         tychoRouterAddr = address(tychoRouter);
         tychoRouter.grantRole(keccak256("FUND_RESCUER_ROLE"), FUND_RESCUER);
         tychoRouter.grantRole(keccak256("FEE_SETTER_ROLE"), FEE_SETTER);
         tychoRouter.grantRole(keccak256("PAUSER_ROLE"), PAUSER);
         tychoRouter.grantRole(keccak256("UNPAUSER_ROLE"), UNPAUSER);
         tychoRouter.grantRole(
-            keccak256("EXECUTOR_SETTER_ROLE"),
+            keccak256("EXECUTOR_SETTER_ROLE"), EXECUTOR_SETTER
-            EXECUTOR_SETTER
         );
         deployDummyContract();
         vm.stopPrank();
@@ -113,22 +106,22 @@ contract TychoRouterTestSetup is Test, Constants {
      * @return permitSingle The `PermitSingle` struct containing the approval details.
      * @return signature The EIP-712 signature for the approval.
      */
-    function handlePermit2Approval(
+    function handlePermit2Approval(address tokenIn, uint256 amount_in)
-        address tokenIn,
+        internal
-        uint256 amount_in
+        returns (IAllowanceTransfer.PermitSingle memory, bytes memory)
-    ) internal returns (IAllowanceTransfer.PermitSingle memory, bytes memory) {
+    {
         IERC20(tokenIn).approve(permit2Address, amount_in);
         IAllowanceTransfer.PermitSingle memory permitSingle = IAllowanceTransfer
             .PermitSingle({
-                details: IAllowanceTransfer.PermitDetails({
+            details: IAllowanceTransfer.PermitDetails({
-                    token: tokenIn,
+                token: tokenIn,
-                    amount: uint160(amount_in),
+                amount: uint160(amount_in),
-                    expiration: uint48(block.timestamp + 1 days),
+                expiration: uint48(block.timestamp + 1 days),
-                    nonce: 0
+                nonce: 0
-                }),
+            }),
-                spender: tychoRouterAddr,
+            spender: tychoRouterAddr,
-                sigDeadline: block.timestamp + 1 days
+            sigDeadline: block.timestamp + 1 days
-            });
+        });
 
         bytes memory signature = signPermit2(permitSingle, ALICE_PK);
         return (permitSingle, signature);
@@ -160,9 +153,8 @@ contract TychoRouterTestSetup is Test, Constants {
                 permit2Address
             )
         );
-        bytes32 detailsHash = keccak256(
+        bytes32 detailsHash =
-            abi.encode(_PERMIT_DETAILS_TYPEHASH, permit.details)
+            keccak256(abi.encode(_PERMIT_DETAILS_TYPEHASH, permit.details));
-        );
         bytes32 permitHash = keccak256(
             abi.encode(
                 _PERMIT_SINGLE_TYPEHASH,
@@ -172,17 +164,18 @@ contract TychoRouterTestSetup is Test, Constants {
             )
         );
 
-        bytes32 digest = keccak256(
+        bytes32 digest =
-            abi.encodePacked("\x19\x01", domainSeparator, permitHash)
+            keccak256(abi.encodePacked("\x19\x01", domainSeparator, permitHash));
-        );
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
 
         return abi.encodePacked(r, s, v);
     }
 
-    function pleEncode(
+    function pleEncode(bytes[] memory data)
-        bytes[] memory data
+        public
-    ) public pure returns (bytes memory encoded) {
+        pure
+        returns (bytes memory encoded)
+    {
         for (uint256 i = 0; i < data.length; i++) {
             encoded = bytes.concat(
                 encoded,
@@ -199,15 +192,9 @@ contract TychoRouterTestSetup is Test, Constants {
         bytes4 selector,
         bytes memory protocolData
     ) internal pure returns (bytes memory) {
-        return
+        return abi.encodePacked(
-            abi.encodePacked(
+            tokenInIndex, tokenOutIndex, split, executor, selector, protocolData
-                tokenInIndex,
+        );
-                tokenOutIndex,
-                split,
-                executor,
-                selector,
-                protocolData
-            );
     }
 
     function encodeUniswapV2Swap(
@@ -227,14 +214,8 @@ contract TychoRouterTestSetup is Test, Constants {
         bool zero2one
     ) internal view returns (bytes memory) {
         IUniswapV3Pool pool = IUniswapV3Pool(target);
-        return
+        return abi.encodePacked(
-            abi.encodePacked(
+            tokenIn, tokenOut, pool.fee(), receiver, target, zero2one
-                tokenIn,
+        );
-                tokenOut,
-                pool.fee(),
-                receiver,
-                target,
-                zero2one
-            );
     }
 }

foundry/test/executors/UniswapV3Executor.t.sol

@@ -8,9 +8,7 @@ import {Constants} from "../Constants.sol";
 contract UniswapV3ExecutorExposed is UniswapV3Executor {
     constructor(address _factory) UniswapV3Executor(_factory) {}
 
-    function decodeData(
+    function decodeData(bytes calldata data)
-        bytes calldata data
-    )
         external
         pure
         returns (
@@ -44,12 +42,7 @@ contract UniswapV3ExecutorTest is Test, Constants {
     function testDecodeParams() public view {
         uint24 expectedPoolFee = 500;
         bytes memory data = abi.encodePacked(
-            WETH_ADDR,
+            WETH_ADDR, DAI_ADDR, expectedPoolFee, address(2), address(3), false
-            DAI_ADDR,
-            expectedPoolFee,
-            address(2),
-            address(3),
-            false
         );
 
         (
@@ -70,11 +63,8 @@ contract UniswapV3ExecutorTest is Test, Constants {
     }
 
     function testDecodeParamsInvalidDataLength() public {
-        bytes memory invalidParams = abi.encodePacked(
+        bytes memory invalidParams =
-            WETH_ADDR,
+            abi.encodePacked(WETH_ADDR, address(2), address(3));
-            address(2),
-            address(3)
-        );
 
         vm.expectRevert(UniswapV3Executor__InvalidDataLength.selector);
         uniswapV3Exposed.decodeData(invalidParams);