Merge pull request #65 from euler-xyz/update-scripts

Update scripts

Author: hoytech

README.md

@@ -59,6 +59,12 @@ forge doc --serve --port 4000
 - EulerSwapPeriphery: 0x813D74E832b3d9E9451d8f0E871E877edf2a5A5f
 - USDT-USDT pool: 0x2bFED8dBEb8e6226a15300AC77eE9130E52410fE
 
+------ with Uniswap hook contracts (latest)
+
+- EulerSwap implementation: 0x0B8CD42911551882638f4C762A66570e1fAc624f
+- EulerSwapFactory: 0x52177559e6430396b9A7E2176Ef33b4e4052D125
+- EulerSwapPeriphery: 0x9F27Bc363DB128cdC349CA54671E6Fbe2bE194D0
+- USDT-USDT pool: 0x13f627635CD96a2A75c2efBDba979172cAb2E888
 
 ## Safety
 

script.old/json/SwapExactIn_input.json

@@ -4,6 +4,9 @@ pragma solidity ^0.8.0;
 import {ScriptUtil} from "./ScriptUtil.s.sol";
 import {IEulerSwapFactory, IEulerSwap, EulerSwapFactory} from "../src/EulerSwapFactory.sol";
 import {IEVC, IEulerSwap} from "../src/EulerSwap.sol";
+import {HookMiner} from "../test/utils/HookMiner.sol";
+import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
+import {MetaProxyDeployer} from "../src/utils/MetaProxyDeployer.sol";
 
 /// @title Script to deploy new pool.
 contract DeployPool is ScriptUtil {
@@ -23,21 +26,32 @@ contract DeployPool is ScriptUtil {
             eulerAccount: eulerAccount,
             equilibriumReserve0: uint112(vm.parseJsonUint(json, ".equilibriumReserve0")),
             equilibriumReserve1: uint112(vm.parseJsonUint(json, ".equilibriumReserve1")),
-            currReserve0: uint112(vm.parseJsonUint(json, ".currReserve0")),
-            currReserve1: uint112(vm.parseJsonUint(json, ".currReserve1")),
-            fee: vm.parseJsonUint(json, ".fee")
-        });
-        IEulerSwap.CurveParams memory curveParams = IEulerSwap.CurveParams({
             priceX: vm.parseJsonUint(json, ".priceX"),
             priceY: vm.parseJsonUint(json, ".priceY"),
             concentrationX: vm.parseJsonUint(json, ".concentrationX"),
-            concentrationY: vm.parseJsonUint(json, ".concentrationY")
+            concentrationY: vm.parseJsonUint(json, ".concentrationY"),
+            fee: vm.parseJsonUint(json, ".fee"),
+            protocolFee: vm.parseJsonUint(json, ".protocolFee"),
+            protocolFeeRecipient: vm.parseJsonAddress(json, ".protocolFeeRecipient")
+        });
+        IEulerSwap.InitialState memory initialState = IEulerSwap.InitialState({
+            currReserve0: uint112(vm.parseJsonUint(json, ".currReserve0")),
+            currReserve1: uint112(vm.parseJsonUint(json, ".currReserve1"))
         });
-        bytes32 salt = bytes32(uint256(vm.parseJsonUint(json, ".salt")));
+        address eulerSwapImpl = vm.parseJsonAddress(json, ".eulerSwapImplementation");
 
-        IEVC evc = IEVC(factory.EVC());
-        address predictedPoolAddress = factory.computePoolAddress(poolParams, curveParams, salt);
+        bytes memory creationCode = MetaProxyDeployer.creationCodeMetaProxy(eulerSwapImpl, abi.encode(poolParams));
+        (address predictedPoolAddress, bytes32 salt) = HookMiner.find(
+            address(address(factory)),
+            eulerAccount,
+            uint160(
+                Hooks.BEFORE_INITIALIZE_FLAG | Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTA_FLAG
+                    | Hooks.BEFORE_ADD_LIQUIDITY_FLAG
+            ),
+            creationCode
+        );
 
+        IEVC evc = IEVC(factory.EVC());
         IEVC.BatchItem[] memory items = new IEVC.BatchItem[](2);
 
         items[0] = IEVC.BatchItem({
@@ -50,7 +64,7 @@ contract DeployPool is ScriptUtil {
             onBehalfOfAccount: eulerAccount,
             targetContract: address(factory),
             value: 0,
-            data: abi.encodeCall(EulerSwapFactory.deployPool, (poolParams, curveParams, salt))
+            data: abi.encodeCall(EulerSwapFactory.deployPool, (poolParams, initialState, salt))
         });
 
         vm.startBroadcast(eulerAccount);

script.old/DeployPool.s.sol renamed to script/DeployPool.s.sol

@@ -5,6 +5,7 @@ import {ScriptUtil} from "./ScriptUtil.s.sol";
 import {EulerSwapFactory} from "../src/EulerSwapFactory.sol";
 import {EulerSwapPeriphery} from "../src/EulerSwapPeriphery.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {EulerSwap} from "../src/EulerSwap.sol";
 
 /// @title Script to deploy EulerSwapFactory & EulerSwapPeriphery.
 contract DeployProtocol is ScriptUtil {
@@ -19,13 +20,14 @@ contract DeployProtocol is ScriptUtil {
 
         address evc = vm.parseJsonAddress(json, ".evc");
         address poolManager = vm.parseJsonAddress(json, ".poolManager");
-        address factory = vm.parseJsonAddress(json, ".factory");
+        address evkFactory = vm.parseJsonAddress(json, ".evkFactory");
+        address feeOwner = vm.parseJsonAddress(json, ".feeOwner");
 
         vm.startBroadcast(deployerAddress);
 
-        new EulerSwapFactory(IPoolManager(poolManager), evc, factory);
+        address eulerSwapImpl = address(new EulerSwap(evc, poolManager));
+        new EulerSwapFactory(evc, evkFactory, eulerSwapImpl, feeOwner);
         new EulerSwapPeriphery();
-
         vm.stopBroadcast();
     }
 }

script.old/DeployProtocol.s.sol renamed to script/DeployProtocol.s.sol

@@ -8,7 +8,6 @@ import {EulerSwapPeriphery} from "../src/EulerSwapPeriphery.sol";
 
 import {ScriptUtil} from "./ScriptUtil.s.sol";
 
-
 contract SwapExactIn is ScriptUtil {
     using SafeERC20 for IERC20;
 
@@ -26,13 +25,14 @@ contract SwapExactIn is ScriptUtil {
         address tokenIn = vm.parseJsonAddress(json, ".tokenIn");
         address tokenOut = vm.parseJsonAddress(json, ".tokenOut");
         uint256 amountIn = vm.parseJsonUint(json, ".amountIn");
-        uint256 amountOutMin = vm.parseJsonUint(json, ".amountOutMin");
+
+        uint256 amountOutMin = periphery.quoteExactInput(address(pool), tokenIn, tokenOut, amountIn);
 
         vm.startBroadcast(swapperAddress);
 
         IERC20(tokenIn).forceApprove(address(periphery), amountIn);
 
-        periphery.swapExactIn(address(pool), tokenIn, tokenOut, amountIn, amountOutMin);
+        periphery.swapExactIn(address(pool), tokenIn, tokenOut, amountIn, swapperAddress, amountOutMin, 0);
 
         vm.stopBroadcast();
     }

script.old/README.md renamed to script/README.md

@@ -1,15 +1,17 @@
 {
-    "factory": "0xF75548aF02f1928CbE9015985D4Fcbf96d728544",
-    "salt": "1",
+    "factory": "0x52177559e6430396b9A7E2176Ef33b4e4052D125",
+    "eulerSwapImplementation": "0x0B8CD42911551882638f4C762A66570e1fAc624f",
     "vault0": "0xa66957e58b60d6b92b850c8773a9ff9b0ba96a65",
     "vault1": "0x4212e01c7c8e1c21dea6030c74ae2084f5337bd1",
     "equilibriumReserve0": 2000e6,
     "equilibriumReserve1": 2000e6,
-    "currReserve0": 2000e6,
-    "currReserve1": 2000e6,
-    "fee": 0,
     "priceX": 1e18,
     "priceY": 1e18,
     "concentrationX": 0.97e18,
-    "concentrationY": 0.97e18
+    "concentrationY": 0.97e18,
+    "fee": 0,
+    "protocolFee": 0,
+    "protocolFeeRecipient": "0x0000000000000000000000000000000000000000",
+    "currReserve0": 2000e6,
+    "currReserve1": 2000e6
 }

script.old/ScriptUtil.s.sol renamed to script/ScriptUtil.s.sol

@@ -1,5 +1,6 @@
 {
     "evc": "0x0C9a3dd6b8F28529d72d7f9cE918D493519EE383",
     "poolManager": "0x000000000004444c5dc75cB358380D2e3dE08A90",
-    "factory": "0xF75548aF02f1928CbE9015985D4Fcbf96d728544"
+    "evkFactory": "0x29a56a1b8214D9Cf7c5561811750D5cBDb45CC8e",
+    "feeOwner": "0x603765f9e9B8E3CBACbdf7A6e963B7EAD77AE86f"
 }

script.old/SwapExactIn.s.sol renamed to script/SwapExactIn.s.sol

@@ -0,0 +1,7 @@
+{
+    "periphery": "0x9F27Bc363DB128cdC349CA54671E6Fbe2bE194D0",
+    "pool": "0x13f627635CD96a2A75c2efBDba979172cAb2E888",
+    "tokenIn": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    "tokenOut": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+    "amountIn": 4e6
+}