Merge pull request #283 from propeller-heads/dc/deploy-univ4-unichain-and-base

feat: Deploy new UniswapV4Executor to unichain and base

config/executor_addresses.json

@@ -18,14 +18,14 @@
   "base": {
     "uniswap_v2": "0xF744EBfaA580cF3fFc25aD046E92BD8B770a0700",
     "uniswap_v3": "0x647bffbf8bd72bf6341ecba8b0279e090313a40d",
-    "uniswap_v4": "0x7Dfa502736C7bd84DA1402F7524214215BC9534d",
+    "uniswap_v4": "0x8a3520889fE0bbF9E1F4a9724C27d8D6Ed9f0e29",
-    "uniswap_v4_hooks": "0x7Dfa502736C7bd84DA1402F7524214215BC9534d",
+    "uniswap_v4_hooks": "0x8a3520889fE0bbF9E1F4a9724C27d8D6Ed9f0e29",
     "rfq:bebop": "0x489A3f531dA3873D6585BF3f8E0dEE48CAC6F7BC"
   },
   "unichain": {
     "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
     "uniswap_v3": "0xD26A838A41af3d4815DfD745a080B2062c4124d1",
-    "uniswap_v4": "0x647bfFbF8Bd72bF6341ECBa8B0279e090313A40D",
+    "uniswap_v4": "0x052a40Ab2875437e0fF7f68976954AD62aB1f235",
-    "uniswap_v4_hooks": "0x647bfFbF8Bd72bF6341ECBa8B0279e090313A40D"
+    "uniswap_v4_hooks": "0x052a40Ab2875437e0fF7f68976954AD62aB1f235"
   }
 }

foundry/src/TychoRouter.sol

@@ -806,15 +806,15 @@ contract TychoRouter is
     /**
      * @dev Gets balance of a token for a given address. Supports both native ETH and ERC20 tokens.
      */
-    // forgefmt: disable-start
     function _balanceOf(address token, address owner)
         internal
         view
         returns (uint256)
     {
-        return
+        return token == address(0)
-            token == address(0) ? owner.balance : IERC20(token).balanceOf(owner);
+            ? owner.balance
-    }// forgefmt: disable-end
+            : IERC20(token).balanceOf(owner);
+    }
 
     /**
      * @dev Verifies that the expected amount of output tokens was received by the receiver.

foundry/src/executors/CurveExecutor.sol

@@ -93,10 +93,9 @@ contract CurveExecutor is IExecutor, RestrictTransferFrom {
             // crypto or llamma
             if (tokenIn == nativeToken || tokenOut == nativeToken) {
                 // slither-disable-next-line arbitrary-send-eth
-                CryptoPoolETH(pool)
+                CryptoPoolETH(pool).exchange{value: ethAmount}(
-                .exchange{
+                    uint256(int256(i)), uint256(int256(j)), amountIn, 0, true
-                    value: ethAmount
+                );
-                }(uint256(int256(i)), uint256(int256(j)), amountIn, 0, true);
             } else {
                 CryptoPool(pool)
                     .exchange(

foundry/test/TychoRouterSequentialSwap.t.sol

@@ -216,9 +216,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
             )
         );
 
-        uint256 amountOut = tychoRouter.sequentialSwapPermit2{
+        uint256 amountOut = tychoRouter.sequentialSwapPermit2{value: amountIn}(
-            value: amountIn
-        }(
             amountIn,
             address(0),
             USDC_ADDR,

foundry/test/TychoRouterSingleSwap.t.sol

@@ -222,9 +222,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
         bytes memory swap =
             encodeSingleSwap(address(usv2Executor), protocolData);
 
-        uint256 amountOut = tychoRouter.singleSwapPermit2{
+        uint256 amountOut = tychoRouter.singleSwapPermit2{value: amountIn}(
-            value: amountIn
-        }(
             amountIn,
             address(0),
             DAI_ADDR,

foundry/test/TychoRouterSplitSwap.t.sol

@@ -271,9 +271,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
         bytes[] memory swaps = new bytes[](1);
         swaps[0] = swap;
 
-        uint256 amountOut = tychoRouter.splitSwapPermit2{
+        uint256 amountOut = tychoRouter.splitSwapPermit2{value: amountIn}(
-            value: amountIn
-        }(
             amountIn,
             address(0),
             DAI_ADDR,