add TransferFromSender

Author: dglowinski

script/10_Swap.s.sol

@@ -16,28 +16,30 @@ contract Swap is ScriptUtils {
         string memory json = getScriptFile(inputScriptFileName);
         address uniswapRouterV2 = vm.parseJsonAddress(json, ".uniswapRouterV2");
         address uniswapRouterV3 = vm.parseJsonAddress(json, ".uniswapRouterV3");
+        address evc = vm.parseJsonAddress(json, ".evc");
+        address permit2 = vm.parseJsonAddress(json, ".permit2");
 
-        (swapper, swapVerifier) = execute(uniswapRouterV2, uniswapRouterV3);
+        (swapper, swapVerifier) = execute(evc, permit2, uniswapRouterV2, uniswapRouterV3);
 
         string memory object;
         object = vm.serializeAddress("swap", "swapper", swapper);
         object = vm.serializeAddress("swap", "swapVerifier", swapVerifier);
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address uniswapRouterV2, address uniswapRouterV3)
+    function deploy(address evc, address permit2, address uniswapRouterV2, address uniswapRouterV3)
         public
         broadcast
         returns (address swapper, address swapVerifier)
     {
-        (swapper, swapVerifier) = execute(uniswapRouterV2, uniswapRouterV3);
+        (swapper, swapVerifier) = execute(evc, permit2, uniswapRouterV2, uniswapRouterV3);
     }
 
-    function execute(address uniswapRouterV2, address uniswapRouterV3)
+    function execute(address evc, address permit2, address uniswapRouterV2, address uniswapRouterV3)
         public
         returns (address swapper, address swapVerifier)
     {
         swapper = address(new Swapper(uniswapRouterV2, uniswapRouterV3));
-        swapVerifier = address(new SwapVerifier());
+        swapVerifier = address(new SwapVerifier(evc, permit2));
     }
 }

script/50_CoreAndPeriphery.s.sol

@@ -804,7 +804,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("+ Deploying Swapper...");
             Swap deployer = new Swap();
             (peripheryAddresses.swapper, peripheryAddresses.swapVerifier) =
-                deployer.deploy(input.uniswapV2Router, input.uniswapV3Router);
+                deployer.deploy(coreAddresses.evc, input.permit2, input.uniswapV2Router, input.uniswapV3Router);
         } else {
             console.log("- At least one of the Swapper contracts already deployed. Skipping...");
         }

src/Swaps/SwapVerifier.sol

@@ -3,17 +3,23 @@
 pragma solidity ^0.8.0;
 
 import {IEVault, IERC20} from "evk/EVault/IEVault.sol";
+import {TransferFromSender} from "./TransferFromSender.sol";
 
 /// @title SwapVerifier
 /// @custom:security-contact security@euler.xyz
 /// @author Euler Labs (https://www.eulerlabs.com/)
 /// @notice Simple contract used to verify post swap conditions
 /// @dev This contract is the only trusted code in the EVK swap periphery
-contract SwapVerifier {
+contract SwapVerifier is TransferFromSender {
     error SwapVerifier_skimMin();
     error SwapVerifier_debtMax();
     error SwapVerifier_pastDeadline();
 
+    /// @notice Contract constructor
+    /// @param evc Address of the EthereumVaultConnector contract
+    /// @param permit2 Address of the Permit2 contract
+    constructor(address evc, address permit2) TransferFromSender(evc, permit2) {}
+
     /// @notice Verify results of a regular swap, when bought tokens are sent to the vault and skim for the buyer
     /// @param vault The EVault to query
     /// @param receiver Account to skim to

src/Swaps/TransferFromSender.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.8.0;
+
+import {IERC20} from "evk/EVault/IEVault.sol";
+import {SafeERC20Lib} from "evk/EVault/shared/lib/SafeERC20Lib.sol";
+import {EVCUtil} from "ethereum-vault-connector/utils/EVCUtil.sol";
+
+/// @title TransferFromSender
+/// @custom:security-contact security@euler.xyz
+/// @author Euler Labs (https://www.eulerlabs.com/)
+/// @notice Simple contract used to pull tokens from the sender.
+/// @dev This contract is trusted and can safely receive allowance on token transfers from users.
+contract TransferFromSender is EVCUtil {
+    using SafeERC20Lib for IERC20;
+
+    error TransferFromSender_InvalidAddress();
+
+    /// @notice Address of Permit2 contract
+    address public immutable permit2;
+
+    /// @param _permit2 Address of the Permit2 contract
+    constructor(address _evc, address _permit2) EVCUtil(_evc) {
+        if (_permit2 == address(0)) revert TransferFromSender_InvalidAddress();
+        permit2 = _permit2;
+    }
+
+    /// @notice Pull tokens from sender to the designated receiver
+    /// @param token ERC20 token address
+    /// @param amount Amount of the token to transfer
+    /// @param to Receiver of the token
+    function transferFromSender(address token, uint256 amount, address to) public {
+        IERC20(token).safeTransferFrom(_msgSender(), to, amount, permit2);
+    }
+}

test/Swaps/Swaps1Inch.sol

@@ -53,7 +53,7 @@ contract Swaps1Inch is EVaultTestBase {
         user2 = makeAddr("user2");
 
         swapper = new Swapper(uniswapRouterV2, uniswapRouterV3);
-        swapVerifier = new SwapVerifier();
+        swapVerifier = new SwapVerifier(address(1), address(1));
 
         if (bytes(FORK_RPC_URL).length != 0) {
             mainnetFork = vm.createSelectFork(FORK_RPC_URL);