update

Author: haythemsellami

README.md

@@ -46,8 +46,8 @@ forge coverage
 
 ## Private Deployment
 
-- EulerSwapFactory: 0xB6cFe9b23d18A034cE925Ee84b97D20a52Db1940
-- EulerSwapPeriphery: 0x7fc1edF54d86DfAA90F1069E81D4B520A2A44d2B
+- EulerSwapFactory: 0x04C54FF83e4BC428FD1eDA2f41cdBd583A2e9cF8
+- EulerSwapPeriphery: 0x64A8410D7D2ecF3Aaf32b6C3932e4586f3C42ecE
 
 ## Safety
 

script/README.md

@@ -23,6 +23,7 @@ After filling the `.env` file, make sure to run: `source .env` in your terminal.
 
 ## Exact in swap
 
-- Fill the `SwapExactIn_input.json` file with the needed inputs.
+- Fill the `SwapExactIn_input.json` file with the needed inputs. For the `swapUtil` field, use the address of the `SwapUtil` contract deployed in the network you are using:
+  - For mainnet, use `0xcdd2d349eeD309a0016C9A17f01bF1670913708b`
 - Run `forge script ./script/SwapExactIn.s.sol --rpc-url network_name --broadcast --slow`
 

script/SwapExactIn.s.sol

@@ -2,12 +2,12 @@
 pragma solidity ^0.8.0;
 
 import {ScriptUtil} from "./ScriptUtil.s.sol";
-import {IERC20, EulerSwap} from "../src/EulerSwap.sol";
-import {EulerSwapPeriphery} from "../src/EulerSwapPeriphery.sol";
-
-import "forge-std/console2.sol";
+import {IERC20, SafeERC20, EulerSwap} from "../src/EulerSwap.sol";
+import {SwapUtil} from "./util/SwapUtil.sol";
 
 contract SwapExactIn is ScriptUtil {
+    using SafeERC20 for IERC20;
+
     function run() public {
         // load wallet
         uint256 swapperKey = vm.envUint("WALLET_PRIVATE_KEY");
@@ -17,24 +17,17 @@ contract SwapExactIn is ScriptUtil {
         string memory inputScriptFileName = "SwapExactIn_input.json";
         string memory json = _getJsonFile(inputScriptFileName);
 
+        SwapUtil swapUtil = SwapUtil(vm.parseJsonAddress(json, ".swapUtil"));   // Do not change address of this one unless u manually deploy new one
         EulerSwap pool = EulerSwap(vm.parseJsonAddress(json, ".pool"));
-        EulerSwapPeriphery periphery = EulerSwapPeriphery(vm.parseJsonAddress(json, ".periphery"));
-
         address tokenIn = vm.parseJsonAddress(json, ".tokenIn");
         address tokenOut = vm.parseJsonAddress(json, ".tokenOut");
         uint256 amountIn = vm.parseJsonUint(json, ".amountIn");
-        bool isAsset0In = tokenIn < tokenOut;
-
-        uint256 expectedAmountOut = periphery.quoteExactInput(address(pool), tokenIn, tokenOut, amountIn);
-        uint256 swapperBalanceBefore = IERC20(tokenOut).balanceOf(swapperAddress);
 
         vm.startBroadcast(swapperAddress);
 
-        IERC20(tokenIn).transfer(address(pool), amountIn);
-
-        (isAsset0In) ? pool.swap(0, expectedAmountOut, swapperAddress, "") : pool.swap(expectedAmountOut, 0, swapperAddress, "");
+        IERC20(tokenIn).forceApprove(address(swapUtil), amountIn);
 
-        require(IERC20(tokenOut).balanceOf(swapperAddress) > swapperBalanceBefore, "noo");
+        swapUtil.executeSwap(address(pool), tokenIn, tokenOut, amountIn, true);
 
         vm.stopBroadcast();
     }

script/json/DeployPool_input.json

@@ -1,5 +1,5 @@
 {
-    "factory": "0xB6cFe9b23d18A034cE925Ee84b97D20a52Db1940",
+    "factory": "0x04C54FF83e4BC428FD1eDA2f41cdBd583A2e9cF8",
     "vault0": "0xa66957e58b60d6b92b850c8773a9ff9b0ba96a65",
     "vault1": "0x4212e01c7c8e1c21dea6030c74ae2084f5337bd1",
     "swapAccount": "0x603765f9e9B8E3CBACbdf7A6e963B7EAD77AE86f",

script/json/SetOperatorAndActivatePool_input.json

@@ -1,3 +1,3 @@
 {
-    "pool": "0xdFFC67B59708a1c108E4121cabB9AF5A4DB28C17"
+    "pool": "0x67c30405250e395f31d661274352da404e624682"
 }

script/json/SwapExactIn_input.json

@@ -1,7 +1,7 @@
 {
-    "pool": "0xdFFC67B59708a1c108E4121cabB9AF5A4DB28C17",
-    "periphery": "0x7fc1edF54d86DfAA90F1069E81D4B520A2A44d2B",
+    "pool": "0x67C30405250e395f31d661274352dA404e624682",
+    "swapUtil": "0xcdd2d349eeD309a0016C9A17f01bF1670913708b",
     "tokenIn": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
     "tokenOut": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-    "amountIn": 20e6
+    "amountIn": 9e6
 }

script/util/SwapUtil.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.8.0;
+
+import {IEulerSwapPeriphery} from "../../src/interfaces/IEulerSwapPeriphery.sol";
+import {IERC20, IEulerSwap, SafeERC20} from "../../src/EulerSwap.sol";
+
+// This is not meant to be run in production, just for testing purposes
+contract SwapUtil {
+    using SafeERC20 for IERC20;
+    
+    IEulerSwapPeriphery public immutable periphery;
+
+    constructor(address peripheryAddr) {
+        periphery = IEulerSwapPeriphery(peripheryAddr);
+    }
+
+    function executeSwap(address pool, address tokenIn, address tokenOut, uint256 amount, bool isExactIn) external {
+        bool isAsset0In = tokenIn < tokenOut;
+
+        (uint256 amountIn, uint256 amountOut) = (isExactIn)
+            ? (amount, periphery.quoteExactInput(address(pool), tokenIn, tokenOut, amount))
+            : (periphery.quoteExactOutput(address(pool), tokenIn, tokenOut, amount), amount);
+
+        IERC20(tokenIn).safeTransferFrom(msg.sender, address(pool), amountIn);
+
+        (isAsset0In)
+            ? IEulerSwap(pool).swap(0, amountOut, msg.sender, "")
+            : IEulerSwap(pool).swap(amountOut, 0, msg.sender, "");
+    }
+}