refactor: rm callback verifier dispatcher

2025-02-14 23:11:01 +05:30
parent 260f9d866f
commit d0027e6cf2
11 changed files with 216 additions and 496 deletions
--- a/foundry/src/executors/BalancerV2Executor.sol
+++ b/foundry/src/executors/BalancerV2Executor.sol
@@ -2,10 +2,7 @@
 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
@@ -19,11 +16,10 @@ contract BalancerV2Executor is IExecutor {
    address private constant VAULT = 0xBA12222222228d8Ba445958a75a0704d566BF2C8;

    // slither-disable-next-line locked-ether
-    function swap(uint256 givenAmount, bytes calldata data)
-        external
-        payable
-        returns (uint256 calculatedAmount)
-    {
+    function swap(
+        uint256 givenAmount,
+        bytes calldata data
+    ) external payable returns (uint256 calculatedAmount) {
        (
            IERC20 tokenIn,
            IERC20 tokenOut,
@@ -55,16 +51,17 @@ contract BalancerV2Executor is IExecutor {

        uint256 limit = 0;

-        calculatedAmount =
-            IVault(VAULT).swap(singleSwap, funds, limit, block.timestamp);
+        calculatedAmount = IVault(VAULT).swap(
+            singleSwap,
+            funds,
+            limit,
+            block.timestamp
+        );
    }

-    function handleCallback(bytes calldata data)
-        external
-        returns (bytes memory result)
-    {}
-
-    function _decodeData(bytes calldata data)
+    function _decodeData(
+        bytes calldata data
+    )
        internal
        pure
        returns (
--- a/foundry/src/executors/UniswapV2Executor.sol
+++ b/foundry/src/executors/UniswapV2Executor.sol
@@ -11,11 +11,10 @@ contract UniswapV2Executor is IExecutor {
    using SafeERC20 for IERC20;

    // slither-disable-next-line locked-ether
-    function swap(uint256 givenAmount, bytes calldata data)
-        external
-        payable
-        returns (uint256 calculatedAmount)
-    {
+    function swap(
+        uint256 givenAmount,
+        bytes calldata data
+    ) external payable returns (uint256 calculatedAmount) {
        address target;
        address receiver;
        bool zeroForOne;
@@ -33,12 +32,9 @@ contract UniswapV2Executor is IExecutor {
        }
    }

-    function handleCallback(bytes calldata data)
-        external
-        returns (bytes memory result)
-    {}
-
-    function _decodeData(bytes calldata data)
+    function _decodeData(
+        bytes calldata data
+    )
        internal
        pure
        returns (
@@ -57,20 +53,20 @@ contract UniswapV2Executor is IExecutor {
        zeroForOne = uint8(data[60]) > 0;
    }

-    function _getAmountOut(address target, uint256 amountIn, bool zeroForOne)
-        internal
-        view
-        returns (uint256 amount)
-    {
+    function _getAmountOut(
+        address target,
+        uint256 amountIn,
+        bool zeroForOne
+    ) 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");
--- a/foundry/src/executors/UniswapV4Executor.sol
+++ b/foundry/src/executors/UniswapV4Executor.sol
@@ -2,14 +2,9 @@
 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";
@@ -23,13 +18,16 @@ contract UniswapV4Executor is IExecutor, V4Router {

    constructor(IPoolManager _poolManager) V4Router(_poolManager) {}

-    function swap(uint256, bytes calldata data)
-        external
-        payable
-        returns (uint256 calculatedAmount)
-    {
-        (address tokenIn, address tokenOut, bool isExactInput, uint256 amount) =
-            _decodeData(data);
+    function swap(
+        uint256,
+        bytes calldata data
+    ) external payable returns (uint256 calculatedAmount) {
+        (
+            address tokenIn,
+            address tokenOut,
+            bool isExactInput,
+            uint256 amount
+        ) = _decodeData(data);

        uint256 tokenOutBalanceBefore;
        uint256 tokenInBalanceBefore;
@@ -64,7 +62,9 @@ contract UniswapV4Executor is IExecutor, V4Router {
        return calculatedAmount;
    }

-    function _decodeData(bytes calldata data)
+    function _decodeData(
+        bytes calldata data
+    )
        internal
        pure
        returns (
@@ -74,15 +74,19 @@ contract UniswapV4Executor is IExecutor, V4Router {
            uint256 amount
        )
    {
-        (bytes memory actions, bytes[] memory params) =
-            abi.decode(data, (bytes, bytes[]));
+        (bytes memory actions, bytes[] memory params) = abi.decode(
+            data,
+            (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(params[0], (IV4Router.ExactInputSingleParams));
+            IV4Router.ExactInputSingleParams memory swapParams = abi.decode(
+                params[0],
+                (IV4Router.ExactInputSingleParams)
+            );

            tokenIn = swapParams.zeroForOne
                ? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -93,8 +97,10 @@ 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(params[0], (IV4Router.ExactOutputSingleParams));
+            IV4Router.ExactOutputSingleParams memory swapParams = abi.decode(
+                params[0],
+                (IV4Router.ExactOutputSingleParams)
+            );

            tokenIn = swapParams.zeroForOne
                ? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -105,18 +111,23 @@ contract UniswapV4Executor is IExecutor, V4Router {
            isExactInput = false;
            amount = swapParams.amountOut;
        } else if (action == uint8(Actions.SWAP_EXACT_IN)) {
-            IV4Router.ExactInputParams memory swapParams =
-                abi.decode(params[0], (IV4Router.ExactInputParams));
+            IV4Router.ExactInputParams memory swapParams = abi.decode(
+                params[0],
+                (IV4Router.ExactInputParams)
+            );

            tokenIn = address(uint160(swapParams.currencyIn.toId()));
-            PathKey memory lastPath =
-                swapParams.path[swapParams.path.length - 1];
+            PathKey memory lastPath = 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(params[0], (IV4Router.ExactOutputParams));
+            IV4Router.ExactOutputParams memory swapParams = abi.decode(
+                params[0],
+                (IV4Router.ExactOutputParams)
+            );

            PathKey memory firstPath = swapParams.path[0];
            tokenIn = address(uint160(firstPath.intermediateCurrency.toId()));
@@ -126,21 +137,18 @@ contract UniswapV4Executor is IExecutor, V4Router {
        }
    }

-    function _pay(Currency token, address payer, uint256 amount)
-        internal
-        override
-    {
+    function _pay(
+        Currency token,
+        address payer,
+        uint256 amount
+    ) internal override {
        IERC20(Currency.unwrap(token)).safeTransfer(
-            address(poolManager), amount
+            address(poolManager),
+            amount
        );
    }

    function msgSender() public view override returns (address) {
        return address(this);
    }
-
-    function handleCallback(bytes calldata data)
-        external
-        returns (bytes memory result)
-    {}
 }