chore: renamings for clarity

- Also added a check for length in the Curve executor.

foundry/src/TychoRouter.sol

@@ -58,9 +58,6 @@ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 error TychoRouter__AddressZero();
 error TychoRouter__EmptySwaps();
 error TychoRouter__NegativeSlippage(uint256 amount, uint256 minAmount);
-error TychoRouter__AmountInDiffersFromConsumed(
-    uint256 amountIn, uint256 amountConsumed
-);
 error TychoRouter__MessageValueMismatch(uint256 value, uint256 amount);
 error TychoRouter__InvalidDataLength();
 error TychoRouter__UndefinedMinAmountOut();

foundry/src/executors/CurveExecutor.sol

@@ -6,6 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "./TokenTransfer.sol";
 
 error CurveExecutor__AddressZero();
+error CurveExecutor__InvalidDataLength();
 
 interface CryptoPool {
     // slither-disable-next-line naming-convention
@@ -53,6 +54,8 @@ contract CurveExecutor is IExecutor, TokenTransfer {
         payable
         returns (uint256)
     {
+        if (data.length != 65) revert CurveExecutor__InvalidDataLength();
+
         (
             address tokenIn,
             address tokenOut,

foundry/src/executors/TokenTransfer.sol

@@ -14,15 +14,15 @@ contract TokenTransfer {
 
     enum TransferType {
         // Assume funds are in the TychoRouter - transfer into the pool
-        TRANSFER,
+        TRANSFER_TO_PROTOCOL,
         // Assume funds are in msg.sender's wallet - transferFrom into the pool
-        TRANSFER_FROM,
+        TRANSFER_FROM_TO_PROTOCOL,
         // Assume funds are in msg.sender's wallet - permit2TransferFrom into the pool
-        TRANSFER_PERMIT2,
+        TRANSFER_PERMIT2_TO_PROTOCOL,
         // Assume funds are in msg.sender's wallet - but the pool requires it to be
         // in the router contract when calling swap - transferFrom into the router
         // contract
-        TRANSFER_TO_ROUTER,
+        TRANSFER_FROM_TO_ROUTER,
         // Assume funds are in msg.sender's wallet - but the pool requires it to be
         // in the router contract when calling swap - transferFrom into the router
         // contract using permit2
@@ -45,19 +45,19 @@ contract TokenTransfer {
         uint256 amount,
         TransferType transferType
     ) internal {
-        if (transferType == TransferType.TRANSFER) {
+        if (transferType == TransferType.TRANSFER_TO_PROTOCOL) {
             if (tokenIn == address(0)) {
                 payable(receiver).transfer(amount);
             } else {
                 IERC20(tokenIn).safeTransfer(receiver, amount);
             }
-        } else if (transferType == TransferType.TRANSFER_FROM) {
+        } else if (transferType == TransferType.TRANSFER_FROM_TO_PROTOCOL) {
             // slither-disable-next-line arbitrary-send-erc20
             IERC20(tokenIn).safeTransferFrom(sender, receiver, amount);
-        } else if (transferType == TransferType.TRANSFER_PERMIT2) {
+        } else if (transferType == TransferType.TRANSFER_PERMIT2_TO_PROTOCOL) {
             // Permit2.permit is already called from the TychoRouter
             permit2.transferFrom(sender, receiver, uint160(amount), tokenIn);
-        } else if (transferType == TransferType.TRANSFER_TO_ROUTER) {
+        } else if (transferType == TransferType.TRANSFER_FROM_TO_ROUTER) {
             // slither-disable-next-line arbitrary-send-erc20
             IERC20(tokenIn).safeTransferFrom(sender, address(this), amount);
         } else if (transferType == TransferType.TRANSFER_PERMIT2_TO_ROUTER) {

foundry/test/TychoRouterSequentialSwap.t.sol

@@ -18,8 +18,8 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
         //       (univ2)     (univ2)
 
         TokenTransfer.TransferType transferType = permit2
-            ? TokenTransfer.TransferType.TRANSFER_PERMIT2
-            : TokenTransfer.TransferType.TRANSFER_FROM;
+            ? TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
+            : TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL;
 
         bytes[] memory swaps = new bytes[](2);
         // WETH -> DAI
@@ -38,7 +38,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
                 DAI_USDC_POOL,
                 tychoRouterAddr,
                 true,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
         return swaps;
@@ -222,7 +222,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
                 WETH_DAI_POOL,
                 tychoRouterAddr,
                 false,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
 
@@ -234,7 +234,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
                 DAI_USDC_POOL,
                 tychoRouterAddr,
                 true,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
 
@@ -282,7 +282,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
                 DAI_USDC_POOL,
                 tychoRouterAddr,
                 false,
-                TokenTransfer.TransferType.TRANSFER_PERMIT2
+                TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
             )
         );
 
@@ -294,7 +294,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
                 WETH_DAI_POOL,
                 tychoRouterAddr,
                 true,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
 
@@ -331,7 +331,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3,
             true,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes memory usdcWethV3Pool2OneZeroData = encodeUniswapV3Swap(
@@ -340,7 +340,7 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3_2,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes[] memory swaps = new bytes[](2);

foundry/test/TychoRouterSingleSwap.t.sol

@@ -26,7 +26,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER_PERMIT2
+            TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -67,7 +67,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -108,7 +108,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -134,7 +134,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -169,7 +169,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -218,7 +218,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes memory swap =
@@ -261,7 +261,7 @@ contract TychoRouterSingleSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             true,
-            TokenTransfer.TransferType.TRANSFER_PERMIT2
+            TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
         );
 
         bytes memory swap =

foundry/test/TychoRouterSplitSwap.t.sol

@@ -21,8 +21,8 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
         bytes[] memory swaps = new bytes[](4);
 
         TokenTransfer.TransferType inTransferType = permit2
-            ? TokenTransfer.TransferType.TRANSFER_PERMIT2
-            : TokenTransfer.TransferType.TRANSFER_FROM;
+            ? TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
+            : TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL;
 
         // WETH -> WBTC (60%)
         swaps[0] = encodeSplitSwap(
@@ -49,7 +49,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
                 USDC_WBTC_POOL,
                 tychoRouterAddr,
                 true,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
         // WETH -> DAI
@@ -74,7 +74,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
                 DAI_USDC_POOL,
                 tychoRouterAddr,
                 true,
-                TokenTransfer.TransferType.TRANSFER
+                TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
             )
         );
 
@@ -270,7 +270,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes memory swap = encodeSplitSwap(
@@ -319,7 +319,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             WETH_DAI_POOL,
             tychoRouterAddr,
             true,
-            TokenTransfer.TransferType.TRANSFER_PERMIT2
+            TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
         );
 
         bytes memory swap = encodeSplitSwap(
@@ -370,7 +370,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             DAI_WETH_USV3,
             zeroForOne,
-            TokenTransfer.TransferType.TRANSFER_PERMIT2
+            TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL
         );
         bytes memory swap = encodeSplitSwap(
             uint8(0), uint8(1), uint24(0), address(usv3Executor), protocolData
@@ -511,7 +511,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3,
             true,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory usdcWethV3Pool2ZeroOneData = encodeUniswapV3Swap(
@@ -520,7 +520,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3_2,
             true,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory wethUsdcV2OneZeroData = encodeUniswapV2Swap(
@@ -528,7 +528,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             USDC_WETH_USV2,
             tychoRouterAddr,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes[] memory swaps = new bytes[](3);
@@ -578,7 +578,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             USDC_WETH_USV2,
             tychoRouterAddr,
             true,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes memory usdcWethV3Pool1OneZeroData = encodeUniswapV3Swap(
@@ -587,7 +587,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes memory usdcWethV3Pool2OneZeroData = encodeUniswapV3Swap(
@@ -596,7 +596,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             tychoRouterAddr,
             USDC_WETH_USV3_2,
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         bytes[] memory swaps = new bytes[](3);
@@ -639,7 +639,7 @@ contract TychoRouterSplitSwapTest is TychoRouterTestSetup {
             USDC_MAG7_POOL,
             tychoRouterAddr,
             true,
-            TokenTransfer.TransferType.TRANSFER_FROM
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL
         );
 
         bytes memory swap = encodeSplitSwap(

foundry/test/executors/UniswapV2Executor.t.sol

@@ -84,7 +84,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             address(2),
             address(3),
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         (
@@ -100,7 +100,8 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
         assertEq(receiver, address(3));
         assertEq(zeroForOne, false);
         assertEq(
-            uint8(TokenTransfer.TransferType.TRANSFER), uint8(transferType)
+            uint8(TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL),
+            uint8(transferType)
         );
     }
 
@@ -157,7 +158,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             WETH_DAI_POOL,
             BOB,
             zeroForOne,
-            uint8(TokenTransfer.TransferType.TRANSFER)
+            uint8(TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL)
         );
 
         deal(WETH_ADDR, address(uniswapV2Exposed), amountIn);
@@ -176,7 +177,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             WETH_DAI_POOL,
             BOB,
             zeroForOne,
-            uint8(TokenTransfer.TransferType.TRANSFER_FROM)
+            uint8(TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL)
         );
 
         deal(WETH_ADDR, address(this), amountIn);
@@ -197,7 +198,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             WETH_DAI_POOL,
             ALICE,
             zeroForOne,
-            uint8(TokenTransfer.TransferType.TRANSFER_PERMIT2)
+            uint8(TokenTransfer.TransferType.TRANSFER_PERMIT2_TO_PROTOCOL)
         );
 
         deal(WETH_ADDR, ALICE, amountIn);
@@ -283,7 +284,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             fakePool,
             BOB,
             zeroForOne,
-            uint8(TokenTransfer.TransferType.TRANSFER)
+            uint8(TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL)
         );
 
         deal(WETH_ADDR, address(uniswapV2Exposed), amountIn);
@@ -303,7 +304,7 @@ contract UniswapV2ExecutorTest is Test, Constants, Permit2TestHelper {
             USDC_MAG7_POOL,
             BOB,
             zeroForOne,
-            uint8(TokenTransfer.TransferType.TRANSFER)
+            uint8(TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL)
         );
 
         deal(BASE_USDC, address(uniswapV2Exposed), amountIn);

foundry/test/executors/UniswapV3Executor.t.sol

@@ -71,7 +71,7 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper {
             address(2),
             address(3),
             false,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         (
@@ -91,7 +91,8 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper {
         assertEq(target, address(3));
         assertEq(zeroForOne, false);
         assertEq(
-            uint8(transferType), uint8(TokenTransfer.TransferType.TRANSFER)
+            uint8(transferType),
+            uint8(TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL)
         );
     }
 
@@ -126,7 +127,7 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper {
             WETH_ADDR,
             DAI_ADDR,
             poolFee,
-            TokenTransfer.TransferType.TRANSFER,
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL,
             address(uniswapV3Exposed)
         );
         uint256 dataOffset = 3; // some offset
@@ -160,7 +161,7 @@ contract UniswapV3ExecutorTest is Test, Constants, Permit2TestHelper {
             address(this),
             fakePool,
             zeroForOne,
-            TokenTransfer.TransferType.TRANSFER
+            TokenTransfer.TransferType.TRANSFER_TO_PROTOCOL
         );
 
         vm.expectRevert(UniswapV3Executor__InvalidTarget.selector);

foundry/test/executors/UniswapV4Executor.t.sol

@@ -52,7 +52,7 @@ contract UniswapV4ExecutorTest is Test, Constants {
         uint24 pool2Fee = 1000;
         int24 tickSpacing2 = -10;
         TokenTransfer.TransferType transferType =
-            TokenTransfer.TransferType.TRANSFER_FROM;
+            TokenTransfer.TransferType.TRANSFER_FROM_TO_PROTOCOL;
 
         UniswapV4Executor.UniswapV4Pool[] memory pools =
             new UniswapV4Executor.UniswapV4Pool[](2);