Switch to EulerSwap2

Author: hoytech

POOL_CREATION.md

@@ -5,7 +5,7 @@ openzeppelin-contracts/=libflat/openzeppelin-contracts/contracts/
 @uniswap/v4-periphery/=libflat/v4-periphery/
 v4-periphery/=libflat/v4-periphery/
 v4-core/=libflat/v4-core/src/
-solmate/=libflat/solmate/
+solmate/=libflat/solmate/src/
 
 ethereum-vault-connector/=libflat/ethereum-vault-connector/src/
 evc/=libflat/ethereum-vault-connector/src/

libflat/euler-swap

@@ -42,8 +42,10 @@ import {TestERC20} from "evk-test/unit/evault/EVaultTestBase.t.sol";
 import {IEVault} from "evk/EVault/IEVault.sol";
 import {IEulerSwap, IEVC, EulerSwap} from "euler-swap/EulerSwap.sol";
 import {EulerSwapFactory} from "euler-swap/EulerSwapFactory.sol";
+import {EulerSwapRegistry} from "euler-swap/EulerSwapRegistry.sol";
 import {EulerSwapPeriphery} from "euler-swap/EulerSwapPeriphery.sol";
 import {PoolManagerDeployer} from "euler-swap/../test/utils/PoolManagerDeployer.sol";
+import {PerspectiveMock} from "euler-swap/../test/utils/PerspectiveMock.sol";
 
 // Maglev stuff
 
@@ -123,7 +125,9 @@ contract DeployScenario is Script {
     address poolManager;
     address eulerSwapImpl;
     EulerSwapFactory eulerSwapFactory;
+    EulerSwapRegistry eulerSwapRegistry;
     EulerSwapPeriphery eulerSwapPeriphery;
+    PerspectiveMock perspectiveMock;
 
     //////// Maglev
 
@@ -268,9 +272,14 @@ contract DeployScenario is Script {
     }
 
     function deployEulerSwap() internal {
+        // Mocks
         poolManager = address(PoolManagerDeployer.deploy(address(0)));
+        perspectiveMock = new PerspectiveMock();
+
+        // EulerSwap contracts
         eulerSwapImpl = address(new EulerSwap(address(evc), poolManager));
-        eulerSwapFactory = new EulerSwapFactory(address(evc), address(factory), eulerSwapImpl, address(0), address(0));
+        eulerSwapFactory = new EulerSwapFactory(address(evc), eulerSwapImpl, address(0), address(0));
+        eulerSwapRegistry = new EulerSwapRegistry(address(evc), address(eulerSwapFactory), address(perspectiveMock), address(0));
         eulerSwapPeriphery = new EulerSwapPeriphery();
 
         string memory result = vm.serializeAddress("eulerSwap", "eulerSwapFactory", address(eulerSwapFactory));

remappings.txt

@@ -39,25 +39,37 @@ contract EulerSwapPoolCreation is DeployScenario, Test {
         }
 
         // Prepare pool parameters
-        IEulerSwap.Params memory poolParams = IEulerSwap.Params({
-            vault0: vault0,
-            vault1: vault1,
+        IEulerSwap.StaticParams memory sParams = IEulerSwap.StaticParams({
+            supplyVault0: vault0,
+            supplyVault1: vault1,
+            borrowVault0: vault0,
+            borrowVault1: vault1,
             eulerAccount: user0,
+            feeRecipient: user0,
+            protocolFee: 0,
+            protocolFeeRecipient: address(0)
+        });
+
+        IEulerSwap.DynamicParams memory dParams = IEulerSwap.DynamicParams({
             equilibriumReserve0: 10000e18, // 10k virtual reserves
             equilibriumReserve1: 10000e18, // 10k virtual reserves
+            minReserve0: 0,
+            minReserve1: 0,
             priceX: 1e18, // 1:1 price
             priceY: 1e18,
             concentrationX: 0.5e18, // 50% concentration
             concentrationY: 0.5e18, // 50% concentration
-            fee: 0.003e18, // 0.3% fee
-            protocolFee: 0,
-            protocolFeeRecipient: address(0)
+            fee0: 0.003e18, // 0.3% fee
+            fee1: 0.003e18, // 0.3% fee
+            expiration: 0,
+            swapHookedOperations: 0,
+            swapHook: address(0)
         });
 
         // Prepare initial state
         IEulerSwap.InitialState memory initialState = IEulerSwap.InitialState({
-            currReserve0: 10000e18,
-            currReserve1: 10000e18
+            reserve0: 10000e18,
+            reserve1: 10000e18
         });
 
         // Mine salt using HookMiner to find a valid hook address
@@ -71,7 +83,7 @@ contract EulerSwapPoolCreation is DeployScenario, Test {
         );
 
         // Prepare creation code
-        bytes memory creationCode = MetaProxyDeployer.creationCodeMetaProxy(eulerSwapImpl, abi.encode(poolParams));
+        bytes memory creationCode = MetaProxyDeployer.creationCodeMetaProxy(eulerSwapImpl, abi.encode(sParams));
         (address hookAddress, bytes32 salt) = HookMiner.find(address(eulerSwapFactory), flags, creationCode);
 
         console.log("Found salt:", uint256(salt));
@@ -91,7 +103,7 @@ contract EulerSwapPoolCreation is DeployScenario, Test {
             onBehalfOfAccount: user0,
             targetContract: address(eulerSwapFactory),
             value: 0,
-            data: abi.encodeCall(IEulerSwapFactory.deployPool, (poolParams, initialState, salt))
+            data: abi.encodeCall(IEulerSwapFactory.deployPool, (sParams, dParams, initialState, salt))
         });
         console.log("\nDeploying EulerSwap pool...");
         console.log("Pool manager address:", address(poolManager));
@@ -115,7 +127,7 @@ contract EulerSwapPoolCreation is DeployScenario, Test {
         console.log("- USDT Vault:", vault1);
 
         // Check if pool exists
-        address deployedPool = eulerSwapFactory.poolByEulerAccount(user0);
+        address deployedPool = eulerSwapRegistry.poolByEulerAccount(user0);
         if (deployedPool != address(0)) {
             console.log("- Pool deployed at:", deployedPool);
             console.log("");
@@ -125,4 +137,4 @@ contract EulerSwapPoolCreation is DeployScenario, Test {
             console.log("Error: Pool deployment may have failed!");
         }
     }
-}
+}

script/DeployScenario.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import {IEVC} from "evc/interfaces/IEthereumVaultConnector.sol";
 import {IEVault, IERC20} from "evk/EVault/IEVault.sol";
 import {RPow} from "evk/EVault/shared/lib/RPow.sol";
-import {IEulerSwapFactory} from "euler-swap/interfaces/IEulerSwapFactory.sol";
+import {IEulerSwapRegistry} from "euler-swap/interfaces/IEulerSwapRegistry.sol";
 import {IEulerSwap} from "euler-swap/interfaces/IEulerSwap.sol";
 
 contract MaglevLens {
@@ -189,7 +189,8 @@ contract MaglevLens {
 
     struct EulerSwapData {
         address addr;
-        IEulerSwap.Params params;
+        IEulerSwap.StaticParams sParams;
+        IEulerSwap.DynamicParams dParams;
         address asset0;
         address asset1;
         uint256 reserve0;
@@ -203,7 +204,8 @@ contract MaglevLens {
     function getEulerSwapData(address poolAddr) internal view returns (EulerSwapData memory output) {
         IEulerSwap pool = IEulerSwap(poolAddr);
         output.addr = poolAddr;
-        output.params = pool.getParams();
+        output.sParams = pool.getStaticParams();
+        output.dParams = pool.getDynamicParams();
         {
             (uint112 reserve0, uint112 reserve1,) = pool.getReserves();
             output.reserve0 = reserve0;
@@ -216,13 +218,13 @@ contract MaglevLens {
         (output.inLimit10, output.outLimit10) = pool.getLimits(asset1, asset0);
     }
 
-    function getMyEulerSwap(address eulerSwapFactory, address me) external view returns (EulerSwapData memory output) {
-        address poolAddr = IEulerSwapFactory(eulerSwapFactory).poolByEulerAccount(me);
+    function getMyEulerSwap(address eulerSwapRegistry, address me) external view returns (EulerSwapData memory output) {
+        address poolAddr = IEulerSwapRegistry(eulerSwapRegistry).poolByEulerAccount(me);
         if (poolAddr != address(0)) output = getEulerSwapData(poolAddr);
     }
 
-    function getEulerSwaps(address eulerSwapFactory) external view returns (EulerSwapData[] memory output) {
-        address[] memory addrs = IEulerSwapFactory(eulerSwapFactory).pools();
+    function getEulerSwaps(address eulerSwapRegistry) external view returns (EulerSwapData[] memory output) {
+        address[] memory addrs = IEulerSwapRegistry(eulerSwapRegistry).pools();
 
         output = new EulerSwapData[](addrs.length);