Merge branch 'main' into router/tnl/more-protocol-integration

foundry/test/TychoRouterSingleSwap.t.sol

@@ -367,4 +367,22 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
         assertTrue(success, "Call Failed");
         assertEq(balanceAfter - balanceBefore, 1475644707225677606);
     }
+
+    function testSingleSwapIntegrationNoTransferIn() public {
+        // Tests swapping WETH -> DAI on a USV2 pool assuming that the tokens are already inside the router
+        deal(WETH_ADDR, tychoRouterAddr, 1 ether);
+        uint256 balanceBefore = IERC20(DAI_ADDR).balanceOf(ALICE);
+
+        vm.startPrank(ALICE);
+        // Encoded solution generated using `test_single_swap_strategy_encoder_no_transfer_in`
+        (bool success,) = tychoRouterAddr.call(
+            hex"20144a070000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000008f1d5c1cae3740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000525615deb798bb3e4dfa0139dfa1b3d433cc23b72fc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a478c2975ab1ea89e8196811f51a7b7ade33eb11cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc200000000000000000000000000000000"
+        );
+
+        vm.stopPrank();
+
+        uint256 balanceAfter = IERC20(DAI_ADDR).balanceOf(ALICE);
+        assertTrue(success, "Call Failed");
+        assertEq(balanceAfter - balanceBefore, 2659881924818443699787);
+    }
 }

foundry/test/TychoRouterTestSetup.sol

@@ -99,7 +99,7 @@ contract TychoRouterTestSetup is Constants, Permit2TestHelper {
 
         IPoolManager poolManager = IPoolManager(poolManagerAddress);
         usv2Executor =
-            new UniswapV2Executor(factoryV2, initCodeV2, PERMIT2_ADDRESS);
+            new UniswapV2Executor(factoryV2, initCodeV2, PERMIT2_ADDRESS, 30);
         usv3Executor =
             new UniswapV3Executor(factoryV3, initCodeV3, PERMIT2_ADDRESS);
         usv4Executor = new UniswapV4Executor(poolManager, PERMIT2_ADDRESS);

foundry/test/executors/CurveExecutor.t.sol

@@ -254,15 +254,15 @@ contract CurveExecutorTest is Test, Constants {
     function testStableSwapPool() public {
         // Swapping CRVUSD -> USDT on a StableSwap pool, deployed by factory 0x4F8846Ae9380B90d2E71D5e3D042dff3E7ebb40d (plain pool)
         uint256 amountIn = 1 ether;
-        deal(CRVUSD_ADDR, address(curveExecutorExposed), amountIn);
+        deal(USDT_ADDR, address(curveExecutorExposed), amountIn);
 
         bytes memory data =
-            _getData(CRVUSD_ADDR, USDT_ADDR, CRVUSD_USDT_POOL, 1, ALICE);
+            _getData(USDT_ADDR, CRVUSD_ADDR, CRVUSD_USDT_POOL, 1, ALICE);
 
         uint256 amountOut = curveExecutorExposed.swap(amountIn, data);
 
-        assertEq(amountOut, 999910);
-        assertEq(IERC20(USDT_ADDR).balanceOf(ALICE), amountOut);
+        assertEq(amountOut, 10436946786333182306400100);
+        assertEq(IERC20(CRVUSD_ADDR).balanceOf(ALICE), amountOut);
     }
 
     function testMetaPool() public {

foundry/test/executors/UniswapV2Executor.t.sol

@@ -8,9 +8,12 @@ import {Constants} from "../Constants.sol";
 import {Permit2TestHelper} from "../Permit2TestHelper.sol";
 
 contract UniswapV2ExecutorExposed is UniswapV2Executor {
-    constructor(address _factory, bytes32 _initCode, address _permit2)
-        UniswapV2Executor(_factory, _initCode, _permit2)
-    {}
+    constructor(
+        address _factory,
+        bytes32 _initCode,
+        address _permit2,
+        uint256 _feeBps
+    ) UniswapV2Executor(_factory, _initCode, _permit2, _feeBps) {}
 
     function decodeParams(bytes calldata data)
         external
@@ -63,17 +66,19 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
         uint256 forkBlock = 17323404;
         vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock);
         uniswapV2Exposed = new UniswapV2ExecutorExposed(
-            USV2_FACTORY_ETHEREUM, USV2_POOL_CODE_INIT_HASH, PERMIT2_ADDRESS
+            USV2_FACTORY_ETHEREUM, USV2_POOL_CODE_INIT_HASH, PERMIT2_ADDRESS, 30
         );
         sushiswapV2Exposed = new UniswapV2ExecutorExposed(
             SUSHISWAPV2_FACTORY_ETHEREUM,
             SUSHIV2_POOL_CODE_INIT_HASH,
-            PERMIT2_ADDRESS
+            PERMIT2_ADDRESS,
+            30
         );
         pancakeswapV2Exposed = new UniswapV2ExecutorExposed(
             PANCAKESWAPV2_FACTORY_ETHEREUM,
             PANCAKEV2_POOL_CODE_INIT_HASH,
-            PERMIT2_ADDRESS
+            PERMIT2_ADDRESS,
+            25
         );
         permit2 = IAllowanceTransfer(PERMIT2_ADDRESS);
     }

foundry/test/executors/UniswapV3Executor.t.sol

@@ -96,6 +96,29 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper {
         );
     }
 
+    function testSwapIntegration() public {
+        uint256 amountIn = 10 ** 18;
+        deal(WETH_ADDR, address(uniswapV3Exposed), amountIn);
+
+        uint256 expAmountOut = 1205_128428842122129186; //Swap 1 WETH for 1205.12 DAI
+        bool zeroForOne = false;
+
+        bytes memory data = encodeUniswapV3Swap(
+            WETH_ADDR,
+            DAI_ADDR,
+            address(this),
+            DAI_WETH_USV3,
+            zeroForOne,
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
+        );
+
+        uint256 amountOut = uniswapV3Exposed.swap(amountIn, data);
+
+        assertGe(amountOut, expAmountOut);
+        assertEq(IERC20(WETH_ADDR).balanceOf(address(uniswapV3Exposed)), 0);
+        assertGe(IERC20(DAI_ADDR).balanceOf(address(this)), expAmountOut);
+    }
+
     function testDecodeParamsInvalidDataLength() public {
         bytes memory invalidParams =
             abi.encodePacked(WETH_ADDR, address(2), address(3));