fix: Fix tests (not there yet)

Took 58 minutes

foundry/src/executors/BalancerV2Executor.sol

@@ -12,7 +12,7 @@ import {IAsset} from "@balancer-labs/v2-interfaces/contracts/vault/IAsset.sol";
 import {IVault} from "@balancer-labs/v2-interfaces/contracts/vault/IVault.sol";
 import {RestrictTransferFrom} from "../RestrictTransferFrom.sol";
 
-    error BalancerV2Executor__InvalidDataLength();
+error BalancerV2Executor__InvalidDataLength();
 
 contract BalancerV2Executor is IExecutor, RestrictTransferFrom {
     using SafeERC20 for IERC20;
@@ -36,7 +36,7 @@ contract BalancerV2Executor is IExecutor, RestrictTransferFrom {
             TransferType transferType
         ) = _decodeData(data);
 
-        _transfer(address(this), transferType, tokenIn, givenAmount);
+        _transfer(address(this), transferType, address(tokenIn), givenAmount);
 
         if (approvalNeeded) {
             // slither-disable-next-line unused-return
@@ -73,7 +73,8 @@ contract BalancerV2Executor is IExecutor, RestrictTransferFrom {
             IERC20 tokenOut,
             bytes32 poolId,
             address receiver,
-            bool approvalNeeded
+            bool approvalNeeded,
+            TransferType transferType
         )
     {
         if (data.length != 93) {
@@ -85,5 +86,6 @@ contract BalancerV2Executor is IExecutor, RestrictTransferFrom {
         poolId = bytes32(data[40:72]);
         receiver = address(bytes20(data[72:92]));
         approvalNeeded = data[92] != 0;
+        transferType = TransferType(uint8(data[93]));
     }
 }

foundry/src/executors/CurveExecutor.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import {RestrictTransferFrom} from "../RestrictTransferFrom.sol";
 
-    error CurveExecutor__AddressZero();
+error CurveExecutor__AddressZero();
 error CurveExecutor__InvalidDataLength();
 
 interface CryptoPool {
@@ -40,7 +40,9 @@ contract CurveExecutor is IExecutor, RestrictTransferFrom {
 
     address public immutable nativeToken;
 
-    constructor(address _nativeToken, address _permit2) RestrictTransferFrom(_permit2) {
+    constructor(address _nativeToken, address _permit2)
+        RestrictTransferFrom(_permit2)
+    {
         if (_nativeToken == address(0)) {
             revert CurveExecutor__AddressZero();
         }

foundry/src/executors/EkuboExecutor.sol

@@ -11,7 +11,7 @@ import {SafeTransferLib} from "@solady/utils/SafeTransferLib.sol";
 import {LibBytes} from "@solady/utils/LibBytes.sol";
 import {Config, EkuboPoolKey} from "@ekubo/types/poolKey.sol";
 import {MAX_SQRT_RATIO, MIN_SQRT_RATIO} from "@ekubo/types/sqrtRatio.sol";
-import "../RestrictTransferFrom.sol";
+import {RestrictTransferFrom} from "../RestrictTransferFrom.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 
 contract EkuboExecutor is
@@ -19,7 +19,7 @@ contract EkuboExecutor is
     ILocker,
     IPayer,
     ICallback,
-RestrictTransferFrom
+    RestrictTransferFrom
 {
     error EkuboExecutor__InvalidDataLength();
     error EkuboExecutor__CoreOnly();
@@ -166,11 +166,9 @@ RestrictTransferFrom
         return nextAmountIn;
     }
 
-    function _pay(
-        address token,
-        uint128 amount,
-        TransferType transferType
-    ) internal {
+    function _pay(address token, uint128 amount, TransferType transferType)
+        internal
+    {
         address target = address(core);
 
         if (token == NATIVE_TOKEN_ADDRESS) {
@@ -198,7 +196,7 @@ RestrictTransferFrom
         address token = address(bytes20(payData[12:32])); // This arg is abi-encoded
         uint128 amount = uint128(bytes16(payData[32:48]));
         TransferType transferType = TransferType(uint8(payData[48]));
-        _transfer(core, transferType, token, amount);
+        _transfer(address(core), transferType, token, amount);
     }
 
     // To receive withdrawals from Core

foundry/src/executors/MaverickV2Executor.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import {RestrictTransferFrom} from "../RestrictTransferFrom.sol";
 
-    error MaverickV2Executor__InvalidDataLength();
+error MaverickV2Executor__InvalidDataLength();
 error MaverickV2Executor__InvalidTarget();
 error MaverickV2Executor__InvalidFactory();
 
@@ -15,7 +15,9 @@ contract MaverickV2Executor is IExecutor, RestrictTransferFrom {
 
     address public immutable factory;
 
-    constructor(address _factory, address _permit2) RestrictTransferFrom(_permit2) {
+    constructor(address _factory, address _permit2)
+        RestrictTransferFrom(_permit2)
+    {
         if (_factory == address(0)) {
             revert MaverickV2Executor__InvalidFactory();
         }
@@ -48,7 +50,7 @@ contract MaverickV2Executor is IExecutor, RestrictTransferFrom {
             tickLimit: tickLimit
         });
 
-        _transfer(target, transferType, tokenIn, givenAmount);
+        _transfer(target, transferType, address(tokenIn), givenAmount);
 
         // slither-disable-next-line unused-return
         (, calculatedAmount) = pool.swap(receiver, swapParams, "");

foundry/src/executors/UniswapV2Executor.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@uniswap-v2/contracts/interfaces/IUniswapV2Pair.sol";
 import {RestrictTransferFrom} from "../RestrictTransferFrom.sol";
 
-    error UniswapV2Executor__InvalidDataLength();
+error UniswapV2Executor__InvalidDataLength();
 error UniswapV2Executor__InvalidTarget();
 error UniswapV2Executor__InvalidFactory();
 error UniswapV2Executor__InvalidInitCode();
@@ -78,7 +78,7 @@ contract UniswapV2Executor is IExecutor, RestrictTransferFrom {
             address target,
             address receiver,
             bool zeroForOne,
-            TransferType transferType,
+            TransferType transferType
         )
     {
         if (data.length != 62) {

foundry/src/executors/UniswapV3Executor.sol

@@ -51,7 +51,7 @@ contract UniswapV3Executor is IExecutor, ICallback, RestrictTransferFrom {
             address receiver,
             address target,
             bool zeroForOne,
-            uint8 transferType
+            TransferType transferType
         ) = _decodeData(data);
 
         _verifyPairAddress(tokenIn, tokenOut, fee, target);
@@ -60,9 +60,8 @@ contract UniswapV3Executor is IExecutor, ICallback, RestrictTransferFrom {
         int256 amount1;
         IUniswapV3Pool pool = IUniswapV3Pool(target);
 
-        bytes memory callbackData = _makeV3CallbackData(
-            tokenIn, tokenOut, fee, transferType
-        );
+        bytes memory callbackData =
+            _makeV3CallbackData(tokenIn, tokenOut, fee, transferType);
 
         {
             (amount0, amount1) = pool.swap(
@@ -98,7 +97,7 @@ contract UniswapV3Executor is IExecutor, ICallback, RestrictTransferFrom {
             abi.decode(msgData[4:68], (int256, int256));
 
         address tokenIn = address(bytes20(msgData[132:152]));
-        bool transferType = TransferType(uint8(msgData[175]));
+        TransferType transferType = TransferType(uint8(msgData[175]));
 
         verifyCallback(msgData[132:]);
 
@@ -136,7 +135,7 @@ contract UniswapV3Executor is IExecutor, ICallback, RestrictTransferFrom {
             address receiver,
             address target,
             bool zeroForOne,
-            uint8 transferType
+            TransferType transferType
         )
     {
         if (data.length != 85) {
@@ -148,18 +147,16 @@ contract UniswapV3Executor is IExecutor, ICallback, RestrictTransferFrom {
         receiver = address(bytes20(data[43:63]));
         target = address(bytes20(data[63:83]));
         zeroForOne = uint8(data[83]) > 0;
-        transferType = uint8(data[84]);
+        transferType = TransferType(uint8(data[84]));
     }
 
     function _makeV3CallbackData(
         address tokenIn,
         address tokenOut,
         uint24 fee,
-        uint8 transferType
+        TransferType transferType
     ) internal pure returns (bytes memory) {
-        return abi.encodePacked(
-            tokenIn, tokenOut, fee, transferType
-        );
+        return abi.encodePacked(tokenIn, tokenOut, fee, uint8(transferType));
     }
 
     function _verifyPairAddress(

foundry/src/executors/UniswapV4Executor.sol

@@ -399,7 +399,7 @@ RestrictTransferFrom
             _transfer(
                 address(poolManager),
                 transferType,
-                address(currency),
+                Currency.unwrap(currency),
                 amount
             );
             // slither-disable-next-line unused-return