Merge pull request #350 from euler-xyz/development

Merge development into master

Author: kasperpawlowski

audits/CD Security HookTargetMarketStatus.pdf

@@ -15,6 +15,11 @@ fs_permissions = [
 
 gas_reports = ["*"]
 
+[profile.default.lint]
+severity = ["high", "med"]
+ignore = ["test/**/*.sol", "script/**/*.sol"]
+exclude_lints = ["erc20-unchecked-transfer", "unchecked-call"]
+
 [profile.default.fmt]
 line_length = 120
 tab_width = 4

foundry.toml

@@ -4,9 +4,10 @@ pragma solidity ^0.8.0;
 
 import {ScriptUtils} from "./utils/ScriptUtils.s.sol";
 import {FeeFlowController} from "fee-flow/FeeFlowController.sol";
+import {FeeFlowControllerUtil} from "../src/Util/FeeFlowControllerUtil.sol";
 
 contract FeeFlow is ScriptUtils {
-    function run() public broadcast returns (address feeFlowController) {
+    function run() public broadcast returns (address feeFlowController, address feeFlowControllerUtil) {
         string memory inputScriptFileName = "11_FeeFlow_input.json";
         string memory outputScriptFileName = "11_FeeFlow_output.json";
         string memory json = getScriptFile(inputScriptFileName);
@@ -18,11 +19,12 @@ contract FeeFlow is ScriptUtils {
         uint256 priceMultiplier = vm.parseJsonUint(json, ".priceMultiplier");
         uint256 minInitPrice = vm.parseJsonUint(json, ".minInitPrice");
 
-        feeFlowController =
+        (feeFlowController, feeFlowControllerUtil) =
             execute(evc, initPrice, paymentToken, paymentReceiver, epochPeriod, priceMultiplier, minInitPrice);
 
         string memory object;
         object = vm.serializeAddress("feeFlow", "feeFlowController", feeFlowController);
+        object = vm.serializeAddress("feeFlow", "feeFlowControllerUtil", feeFlowControllerUtil);
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
@@ -34,8 +36,8 @@ contract FeeFlow is ScriptUtils {
         uint256 epochPeriod,
         uint256 priceMultiplier,
         uint256 minInitPrice
-    ) public broadcast returns (address feeFlowController) {
-        feeFlowController =
+    ) public broadcast returns (address feeFlowController, address feeFlowControllerUtil) {
+        (feeFlowController, feeFlowControllerUtil) =
             execute(evc, initPrice, paymentToken, paymentReceiver, epochPeriod, priceMultiplier, minInitPrice);
     }
 
@@ -47,11 +49,12 @@ contract FeeFlow is ScriptUtils {
         uint256 epochPeriod,
         uint256 priceMultiplier,
         uint256 minInitPrice
-    ) public returns (address feeFlowController) {
+    ) public returns (address feeFlowController, address feeFlowControllerUtil) {
         feeFlowController = address(
             new FeeFlowController(
                 evc, initPrice, paymentToken, paymentReceiver, epochPeriod, priceMultiplier, minInitPrice
             )
         );
+        feeFlowControllerUtil = address(new FeeFlowControllerUtil(address(feeFlowController)));
     }
 }

script/11_FeeFlow.s.sol

@@ -84,6 +84,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         address uniswapV3Router;
         uint256 feeFlowInitPrice;
         bool deployOFT;
+        bool deployEulerEarn;
         bool deployEulerSwapV1;
         address uniswapPoolManager;
         address eulerSwapFeeOwner;
@@ -171,6 +172,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             uniswapV3Router: vm.parseJsonAddress(json, ".uniswapV3Router"),
             feeFlowInitPrice: vm.parseJsonUint(json, ".feeFlowInitPrice"),
             deployOFT: vm.parseJsonBool(json, ".deployOFT"),
+            deployEulerEarn: vm.parseJsonBool(json, ".deployEulerEarn"),
             deployEulerSwapV1: vm.parseJsonBool(json, ".deployEulerSwapV1"),
             uniswapPoolManager: vm.parseJsonAddress(json, ".uniswapPoolManager"),
             eulerSwapFeeOwner: vm.parseJsonAddress(json, ".eulerSwapFeeOwner"),
@@ -680,13 +682,15 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             console.log("- At least one of the Periphery factories contracts already deployed. Skipping...");
         }
 
-        if (peripheryAddresses.feeFlowController == address(0)) {
+        if (
+            peripheryAddresses.feeFlowController == address(0) && peripheryAddresses.feeFlowControllerUtil == address(0)
+        ) {
             address paymentToken = bridgeAddresses.oftAdapter == address(0) ? getWETHAddress() : tokenAddresses.EUL;
 
             if (input.feeFlowInitPrice != 0 && paymentToken != address(0)) {
-                console.log("+ Deploying FeeFlow...");
+                console.log("+ Deploying FeeFlowController and FeeFlowControllerUtil...");
                 FeeFlow deployer = new FeeFlow();
-                peripheryAddresses.feeFlowController = deployer.deploy(
+                (peripheryAddresses.feeFlowController, peripheryAddresses.feeFlowControllerUtil) = deployer.deploy(
                     coreAddresses.evc,
                     input.feeFlowInitPrice,
                     paymentToken,
@@ -696,7 +700,9 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
                     FEE_FLOW_MIN_INIT_PRICE
                 );
             } else {
-                console.log("! feeFlowInitPrice or paymentToken is not set for FeeFlow deployment. Skipping...");
+                console.log(
+                    "! feeFlowInitPrice or paymentToken is not set for FeeFlowController and FeeFlowControllerUtil deployment. Skipping..."
+                );
             }
 
             address feeReceiver = peripheryAddresses.feeFlowController == address(0)
@@ -857,10 +863,15 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         }
 
         if (coreAddresses.eulerEarnFactory == address(0) && peripheryAddresses.eulerEarnPublicAllocator == address(0)) {
-            console.log("+ Deploying EulerEarn factory and public allocator...");
-            EulerEarnFactoryDeployer deployer = new EulerEarnFactoryDeployer();
-            (coreAddresses.eulerEarnFactory, peripheryAddresses.eulerEarnPublicAllocator) =
-                deployer.deploy(coreAddresses.evc, coreAddresses.permit2, peripheryAddresses.evkFactoryPerspective);
+            if (input.deployEulerEarn) {
+                console.log("+ Deploying EulerEarn factory and public allocator...");
+                EulerEarnFactoryDeployer deployer = new EulerEarnFactoryDeployer();
+                (coreAddresses.eulerEarnFactory, peripheryAddresses.eulerEarnPublicAllocator) =
+                    deployer.deploy(coreAddresses.evc, coreAddresses.permit2, peripheryAddresses.evkFactoryPerspective);
+            } else {
+                console.log("- EulerEarn not deployed. Skipping...");
+                if (vm.isDir("out-euler-earn")) vm.removeDir("out-euler-earn", true);
+            }
         } else {
             console.log("- EulerEarn factory and public allocator already deployed. Skipping...");
             if (vm.isDir("out-euler-earn")) vm.removeDir("out-euler-earn", true);
@@ -870,11 +881,15 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
             peripheryAddresses.eulerEarnFactoryPerspective == address(0)
                 && peripheryAddresses.eulerEarnGovernedPerspective == address(0)
         ) {
-            console.log("+ Deploying EulerEarnFactoryPerspective and Euler Earn GovernedPerspective...");
-            EulerEarnPerspectivesDeployer deployer = new EulerEarnPerspectivesDeployer();
-            address[] memory perspectives = deployer.deploy(coreAddresses.eulerEarnFactory);
-            peripheryAddresses.eulerEarnFactoryPerspective = perspectives[0];
-            peripheryAddresses.eulerEarnGovernedPerspective = perspectives[1];
+            if (input.deployEulerEarn) {
+                console.log("+ Deploying EulerEarnFactoryPerspective and Euler Earn GovernedPerspective...");
+                EulerEarnPerspectivesDeployer deployer = new EulerEarnPerspectivesDeployer();
+                address[] memory perspectives = deployer.deploy(coreAddresses.eulerEarnFactory);
+                peripheryAddresses.eulerEarnFactoryPerspective = perspectives[0];
+                peripheryAddresses.eulerEarnGovernedPerspective = perspectives[1];
+            } else {
+                console.log("- EulerEarn perspectives not deployed. Skipping...");
+            }
         } else {
             console.log("- At least one of the Euler Earn perspectives is already deployed. Skipping...");
         }

script/50_CoreAndPeriphery.s.sol

@@ -1275,6 +1275,10 @@ while true; do
                 read -p "Should deploy and configure OFT Adapter? (y/n) (default: n): " deploy_oft
             fi
 
+            if [ -z "$eulerEarnFactory" ] || [ "$eulerEarnFactory" == "$addressZero" ]; then
+                read -p "Should deploy Euler Earn? (y/n) (default: n): " deploy_euler_earn
+            fi
+
             if [ -z "$eulerSwapV1Factory" ] || [ "$eulerSwapV1Factory" == "$addressZero" ]; then
                 read -p "Should deploy EulerSwap V1? (y/n) (default: n): " deploy_euler_swap_v1
 
@@ -1295,6 +1299,7 @@ while true; do
             uniswap_router_v3=${uniswap_router_v3:-$addressZero}
             init_price=${init_price:-1000000000000000000}
             deploy_oft=${deploy_oft:-n}
+            deploy_euler_earn=${deploy_euler_earn:-n}
             deploy_euler_swap_v1=${deploy_euler_swap_v1:-n}
             uniswap_pool_manager=${uniswap_pool_manager:-$addressZero}
             euler_swap_fee_owner=${euler_swap_fee_owner:-$multisig_dao}
@@ -1323,6 +1328,7 @@ while true; do
                 --arg uniswapRouterV3 "$uniswap_router_v3" \
                 --arg initPrice "$init_price" \
                 --argjson deployOFT "$(jq -n --argjson val \"$deploy_oft\" 'if $val == "y" then true else false end')" \
+                --argjson deployEulerEarn "$(jq -n --argjson val \"$deploy_euler_earn\" 'if $val == "y" then true else false end')" \
                 --argjson deployEulerSwapV1 "$(jq -n --argjson val \"$deploy_euler_swap_v1\" 'if $val == "y" then true else false end')" \
                 --arg uniswapPoolManager "$uniswap_pool_manager" \
                 --arg eulerSwapFeeOwner "$euler_swap_fee_owner" \
@@ -1338,6 +1344,7 @@ while true; do
                     uniswapV3Router: $uniswapRouterV3,
                     feeFlowInitPrice: $initPrice,
                     deployOFT: $deployOFT,
+                    deployEulerEarn: $deployEulerEarn,
                     deployEulerSwapV1: $deployEulerSwapV1,
                     uniswapPoolManager: $uniswapPoolManager,
                     eulerSwapFeeOwner: $eulerSwapFeeOwner,

script/interactiveDeployment.sh

@@ -12,6 +12,16 @@ import {FactoryGovernor} from "../../src/Governor/FactoryGovernor.sol";
 import {CapRiskSteward} from "../../src/Governor/CapRiskSteward.sol";
 import {GovernorAccessControlEmergency} from "../../src/Governor/GovernorAccessControlEmergency.sol";
 import {LayerZeroSendEUL} from "../utils/LayerZeroUtils.s.sol";
+import {
+    LensAccountDeployer,
+    LensOracleDeployer,
+    LensIRMDeployer,
+    LensVaultDeployer,
+    LensUtilsDeployer,
+    LensEulerEarnVaultDeployer
+} from "../08_Lenses.s.sol";
+import {VaultLens, VaultInfoFull} from "../../src/Lens/VaultLens.sol";
+import {AccountLens, AccountInfo, AccountMultipleVaultsInfo} from "../../src/Lens/AccountLens.sol";
 
 abstract contract CustomScriptBase is BatchBuilder {
     function run() public {
@@ -22,6 +32,24 @@ abstract contract CustomScriptBase is BatchBuilder {
     function execute() public virtual {}
 }
 
+contract GetVaultInfoFull is ScriptUtils {
+    function run(address vault) public view returns (VaultInfoFull memory) {
+        return VaultLens(lensAddresses.vaultLens).getVaultInfoFull(vault);
+    }
+}
+
+contract GetAccountInfo is ScriptUtils {
+    function run(address account, address vault) public view returns (AccountInfo memory) {
+        return AccountLens(lensAddresses.accountLens).getAccountInfo(account, vault);
+    }
+}
+
+contract GetAccountEnabledVaultsInfo is ScriptUtils {
+    function run(address account, address vault) public view returns (AccountMultipleVaultsInfo memory) {
+        return AccountLens(lensAddresses.accountLens).getAccountEnabledVaultsInfo(account, vault);
+    }
+}
+
 contract BridgeEULToLabsMultisig is ScriptUtils, SafeMultisendBuilder {
     function run(uint256 dstChainId, uint256 amountNoDecimals) public {
         uint256[] memory dstChainIds = new uint256[](1);
@@ -385,3 +413,25 @@ contract DeployAndConfigureCapRiskSteward is CustomScriptBase {
         }
     }
 }
+
+contract RedeployOracleUtilsAndVaultLenses is CustomScriptBase {
+    function execute() public override {
+        {
+            LensOracleDeployer deployer = new LensOracleDeployer();
+            lensAddresses.oracleLens = deployer.deploy(peripheryAddresses.oracleAdapterRegistry);
+        }
+        {
+            LensUtilsDeployer deployer = new LensUtilsDeployer();
+            lensAddresses.utilsLens = deployer.deploy(coreAddresses.eVaultFactory, lensAddresses.oracleLens);
+        }
+        {
+            LensVaultDeployer deployer = new LensVaultDeployer();
+            lensAddresses.vaultLens =
+                deployer.deploy(lensAddresses.oracleLens, lensAddresses.utilsLens, lensAddresses.irmLens);
+        }
+        {
+            LensEulerEarnVaultDeployer deployer = new LensEulerEarnVaultDeployer();
+            lensAddresses.eulerEarnVaultLens = deployer.deploy(lensAddresses.utilsLens);
+        }
+    }
+}

script/production/CustomScripts.s.sol

@@ -879,7 +879,7 @@ abstract contract ManageClusterBase is BatchBuilder {
                 timeDiff -= block.timestamp;
                 selectFork(block.chainid);
 
-                intervals = TimelockController(timelock).getMinDelay() / timeDiff + 1;
+                intervals = TimelockController(timelock).getMinDelay() / timeDiff + 5;
                 fromBlock = block.number - intervals * 1e4;
             }
 

script/production/ManageClusterBase.s.sol

@@ -115,7 +115,7 @@ Options:
 - `--emergency-operations` should be used if you intend disable all the operations of the `VAULT_ADDRESS`
 
 ```bash
-./script/production/ExecuteSolidityScript.sh PATH_TO_CLUSTER_SPECIFIC_SCRIPT --rpc-url RPC_URL --batch-via-safe --safe-address SAFE_ADDRESS --vault-address VAULT_ADDRESS [--emergency-ltv-collateral] [--emergency-ltv-borrowing] [--emergency-caps] [--emergency-caps]
+./script/production/ExecuteSolidityScript.sh PATH_TO_CLUSTER_SPECIFIC_SCRIPT --rpc-url RPC_URL --batch-via-safe --safe-address SAFE_ADDRESS --vault-address VAULT_ADDRESS [--emergency-ltv-collateral] [--emergency-ltv-borrowing] [--emergency-caps]
 ```
 
 Example command for the `PrimeCluster.s.sol` script:

script/production/README.md

@@ -11,6 +11,7 @@
     "0xF7c774aCFA136F527287Dbc05477c015Ee6ED2C9",
     "0xF7c774aCFA136F527287Dbc05477c015Ee6ED2C9",
     "0xF7c774aCFA136F527287Dbc05477c015Ee6ED2C9",
+    "0xF7c774aCFA136F527287Dbc05477c015Ee6ED2C9",
     "0xabD4606a6643EE58E42f8CdF65F47cA201Cf703f",
     "0x9ca9d2f95D0fBf4Aa5ff16ad2B3ebAc04C9bE2Dd"
   ],
@@ -26,6 +27,7 @@
     "0x94B6924796CcC98e5237615F8710Ef5732190F66",
     "0x94B6924796CcC98e5237615F8710Ef5732190F66",
     "0x94B6924796CcC98e5237615F8710Ef5732190F66",
+    "0x94B6924796CcC98e5237615F8710Ef5732190F66",
     "0x94B6924796CcC98e5237615F8710Ef5732190F66"
   ],
   "stubOracle": "0x0000000000000000000000000000000000000000",
@@ -40,6 +42,7 @@
     "0xE96e07C16661744836a742Ef2090F11e84a86f4F",
     "0xDBD974Eb5360d053ea0c56B4DaCF4A9D3E894Ee2",
     "0xaA525D3142A5BDD3E55E8e983D3789b88F2FEB8f",
+    "0x1Ed564CFC30b385C9C2B184F25602764dD6A16c9",
     "0x889E1c458B2469b70aCcdfb5B59726dC1668896C",
     "0x7eD866D2D66c3149FaFE854C30C68a8BA7ceE8B9"
   ]