wip

Author: hoytech

TODO

@@ -1,6 +1,8 @@
+admin methods
 reserves
 hook operations
 early repay fees
+history
 
 lens
 UI

script/DeployScenario.s.sol

@@ -8,6 +8,7 @@ import {Script, console} from "forge-std/Script.sol";
 // Deploy base
 
 import {GenericFactory} from "evk/GenericFactory/GenericFactory.sol";
+import {EulerRouterFactory} from "../src/vendor/EulerRouterFactory/EulerRouterFactory.sol";
 
 import {EVault} from "evk/EVault/EVault.sol";
 import {ProtocolConfig} from "evk/ProtocolConfig/ProtocolConfig.sol";
@@ -36,19 +37,6 @@ import {IRMTestDefault} from "evk-test/mocks/IRMTestDefault.sol";
 import {IHookTarget} from "evk/interfaces/IHookTarget.sol";
 import {SequenceRegistry} from "evk/SequenceRegistry/SequenceRegistry.sol";
 
-// Euler swap
-
-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 {EulerSwapPeriphery} from "euler-swap/EulerSwapPeriphery.sol";
-import {PoolManagerDeployer} from "euler-swap/../test/utils/PoolManagerDeployer.sol";
-
-// Maglev stuff
-
-import {MaglevLens} from "src/MaglevLens.sol";
-
 struct Asset {
     string symbol;
     address asset;
@@ -83,6 +71,7 @@ contract DeployScenario is Script {
     address permit2;
     address sequenceRegistry;
     GenericFactory public factory;
+    EulerRouterFactory routerFactory;
 
     Base.Integrations integrations;
     Dispatch.DeployedModules modules;
@@ -118,24 +107,11 @@ contract DeployScenario is Script {
     TestERC20 assetUSDZ;
     IEVault eUSDZ;
 
-    //////// EulerSwap
-
-    address poolManager;
-    address eulerSwapImpl;
-    EulerSwapFactory eulerSwapFactory;
-    EulerSwapPeriphery eulerSwapPeriphery;
-
-    //////// Maglev
-
-    MaglevLens maglevLens;
-
     function run() public {
         vm.startBroadcast(user3PK);
 
         deployEulerSystem();
         deployAssets();
-        deployEulerSwap();
-        deployMaglevLens();
 
         vm.stopBroadcast();
 
@@ -148,9 +124,11 @@ contract DeployScenario is Script {
         admin = makeAddr("admin");
         feeReceiver = makeAddr("feeReceiver");
         protocolFeeReceiver = makeAddr("protocolFeeReceiver");
-        factory = new GenericFactory(user3);
 
         evc = new EthereumVaultConnector();
+        factory = new GenericFactory(user3);
+        routerFactory = new EulerRouterFactory(address(evc));
+
         protocolConfig = new ProtocolConfig(admin, protocolFeeReceiver);
         balanceTracker = address(new MockBalanceTracker());
         oracle = new MockPriceOracle();
@@ -267,24 +245,6 @@ contract DeployScenario is Script {
         }
     }
 
-    function deployEulerSwap() internal {
-        poolManager = address(PoolManagerDeployer.deploy(address(0)));
-        eulerSwapImpl = address(new EulerSwap(address(evc), poolManager));
-        eulerSwapFactory = new EulerSwapFactory(address(evc), address(factory), eulerSwapImpl, address(0), address(0));
-        eulerSwapPeriphery = new EulerSwapPeriphery();
-
-        string memory result = vm.serializeAddress("eulerSwap", "eulerSwapFactory", address(eulerSwapFactory));
-        result = vm.serializeAddress("eulerSwap", "eulerSwapPeriphery", address(eulerSwapPeriphery));
-        vm.writeJson(result, "./dev-ctx/addresses/31337/EulerSwapAddresses.json");
-    }
-
-    function deployMaglevLens() internal {
-        maglevLens = new MaglevLens();
-
-        string memory result = vm.serializeAddress("maglev", "maglevLens", address(maglevLens));
-        vm.writeJson(result, "./dev-ctx/addresses/31337/MaglevAddresses.json");
-    }
-
     function getSubaccount(address user, uint8 account) internal pure returns (address) {
         return address(uint160(user) ^ account);
     }

script/scenarios/EulerSwapBasic.s.sol

@@ -1,12 +1,39 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.27;
 
+// Euler swap
+
+import {IEVault} from "evk/EVault/IEVault.sol";
+import {IEulerSwap, IEVC, EulerSwap} from "euler-swap/EulerSwap.sol";
+import {EulerSwapFactory} from "euler-swap/EulerSwapFactory.sol";
+import {EulerSwapPeriphery} from "euler-swap/EulerSwapPeriphery.sol";
+import {PoolManagerDeployer} from "euler-swap/../test/utils/PoolManagerDeployer.sol";
+
+// Maglev stuff
+
+import {MaglevLens} from "src/MaglevLens.sol";
+
+
 import {DeployScenario} from "../DeployScenario.s.sol";
 
 contract EulerSwapBasic is DeployScenario {
+    //////// EulerSwap
+
+    address poolManager;
+    address eulerSwapImpl;
+    EulerSwapFactory eulerSwapFactory;
+    EulerSwapPeriphery eulerSwapPeriphery;
+
+    //////// Maglev
+
+    MaglevLens maglevLens;
+
     function setup() internal virtual override {
         vm.startBroadcast(user0PK);
 
+        deployEulerSwap();
+        deployMaglevLens();
+
         giveLotsOfCash(user0);
 
         // Deposit some assets
@@ -29,4 +56,22 @@ contract EulerSwapBasic is DeployScenario {
 
         vm.stopBroadcast();
     }
+
+    function deployEulerSwap() internal {
+        poolManager = address(PoolManagerDeployer.deploy(address(0)));
+        eulerSwapImpl = address(new EulerSwap(address(evc), poolManager));
+        eulerSwapFactory = new EulerSwapFactory(address(evc), address(factory), eulerSwapImpl, address(0), address(0));
+        eulerSwapPeriphery = new EulerSwapPeriphery();
+
+        string memory result = vm.serializeAddress("eulerSwap", "eulerSwapFactory", address(eulerSwapFactory));
+        result = vm.serializeAddress("eulerSwap", "eulerSwapPeriphery", address(eulerSwapPeriphery));
+        vm.writeJson(result, "./dev-ctx/addresses/31337/EulerSwapAddresses.json");
+    }
+
+    function deployMaglevLens() internal {
+        maglevLens = new MaglevLens();
+
+        string memory result = vm.serializeAddress("maglev", "maglevLens", address(maglevLens));
+        vm.writeJson(result, "./dev-ctx/addresses/31337/MaglevAddresses.json");
+    }
 }

script/scenarios/LayerCreditBasic.s.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.27;
+
+import {DeployScenario} from "../DeployScenario.s.sol";
+
+import {LayerCredit} from "../../src/LayerCredit.sol";
+import {LayerCreditLens} from "../../src/LayerCreditLens.sol";
+
+contract LayerCreditBasic is DeployScenario {
+    LayerCredit layerCredit;
+    LayerCreditLens layerCreditLens;
+
+    function setup() internal virtual override {
+        vm.startBroadcast(user0PK);
+
+        giveLotsOfCash(user0);
+
+        // Deposit some assets
+
+        assetUSDC.approve(address(eUSDC), type(uint256).max);
+        eUSDC.deposit(20000e6, user0);
+
+        assetUSDT.approve(address(eUSDT), type(uint256).max);
+        eUSDT.deposit(10000e6, user0);
+
+        assetWETH.approve(address(eWETH), type(uint256).max);
+        eWETH.deposit(10e18, user0);
+
+        assetUSDZ.approve(address(eUSDZ), type(uint256).max);
+        eUSDZ.deposit(10000e6, user0);
+
+        // Some extra USDT to subaccount 1
+        assetUSDT.approve(address(eUSDT), type(uint256).max);
+        eUSDT.deposit(5000e6, getSubaccount(user0, 1));
+
+        vm.stopBroadcast();
+    }
+
+    function deployLayerCredit() internal {
+        layerCredit = new LayerCredit(address(evc), address(factory), address(routerFactory), address(0));
+        layerCreditLens = new LayerCreditLens();
+
+        string memory result = vm.serializeAddress("layerCredit", "layerCredit", address(layerCredit));
+        result = vm.serializeAddress("layerCredit", "layerCreditLens", address(layerCreditLens));
+        vm.writeJson(result, "./dev-ctx/addresses/31337/LayerCredit.json");
+    }
+}

src/vendor/BaseFactory/BaseFactory.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.8.0;
+
+import {IFactory} from "./interfaces/IFactory.sol";
+
+/// @title BaseFactory
+/// @custom:security-contact [email protected]
+/// @author Euler Labs (https://www.eulerlabs.com/)
+/// @notice A minimal factory for deploying various contracts.
+abstract contract BaseFactory is IFactory {
+    /// @notice Contracts deployed by the factory.
+    mapping(address => DeploymentInfo) internal deploymentInfo;
+
+    /// @notice An array of addresses of all the contracts deployed by the factory
+    address[] public deployments;
+
+    /// @inheritdoc IFactory
+    function getDeploymentInfo(address contractAddress) external view returns (address deployer, uint96 deployedAt) {
+        DeploymentInfo memory info = deploymentInfo[contractAddress];
+        return (info.deployer, info.deployedAt);
+    }
+
+    /// @inheritdoc IFactory
+    function isValidDeployment(address contractAddress) external view returns (bool) {
+        return deploymentInfo[contractAddress].deployedAt != 0;
+    }
+
+    /// @inheritdoc IFactory
+    function getDeploymentsListLength() external view returns (uint256) {
+        return deployments.length;
+    }
+
+    /// @inheritdoc IFactory
+    function getDeploymentsListSlice(uint256 start, uint256 end) external view returns (address[] memory list) {
+        if (end == type(uint256).max) end = deployments.length;
+        if (end < start || end > deployments.length) revert Factory_BadQuery();
+
+        list = new address[](end - start);
+        for (uint256 i; i < end - start; ++i) {
+            list[i] = deployments[start + i];
+        }
+    }
+}

src/vendor/BaseFactory/interfaces/IFactory.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity >=0.8.0;
+
+/// @title IFactory
+/// @custom:security-contact [email protected]
+/// @author Euler Labs (https://www.eulerlabs.com/)
+/// @notice A minimal factory interface for deploying contracts.
+interface IFactory {
+    struct DeploymentInfo {
+        /// @notice The sender of the deployment call.
+        address deployer;
+        /// @notice The timestamp when the contract was deployed.
+        uint96 deployedAt;
+    }
+
+    /// @notice An instance of a contract was deployed.
+    /// @param deployedContract The deployment address of the contract.
+    /// @param deployer The sender of the deployment call.
+    /// @param deployedAt The deployment timestamp of the contract.
+    event ContractDeployed(address indexed deployedContract, address indexed deployer, uint256 deployedAt);
+
+    /// @notice Error thrown when the query is incorrect.
+    error Factory_BadQuery();
+
+    /// @notice Contracts deployed by the factory.
+    function getDeploymentInfo(address contractAddress) external view returns (address deployer, uint96 deployedAt);
+
+    /// @notice Checks if the deployment at the given address is valid.
+    /// @param contractAddress The address of the contract to check.
+    /// @return True if the deployment is valid, false otherwise.
+    function isValidDeployment(address contractAddress) external view returns (bool);
+
+    /// @notice Returns the number of contracts deployed by the factory.
+    /// @return The number of deployed contracts.
+    function getDeploymentsListLength() external view returns (uint256);
+
+    /// @notice Returns a slice of the list of deployments.
+    /// @param start The starting index of the slice.
+    /// @param end The ending index of the slice (exclusive).
+    /// @return list An array of addresses of the deployed contracts in the specified range.
+    function getDeploymentsListSlice(uint256 start, uint256 end) external view returns (address[] memory list);
+}