Merge pull request #278 from euler-xyz/development

Development

Author: kasperpawlowski

audits/MixBytes CapRiskSteward.pdf

@@ -26,8 +26,8 @@ override_spacing = true
 wrap_comments = true
 ignore = [
     "script/production/mainnet/clusters/PrimeCluster.s.sol",
-    "script/production/mainnet/clusters/PendeulCluster.s.sol",
     "script/production/mainnet/clusters/YieldCluster.s.sol",
+    "script/production/mainnet/clusters/RepoCluster.s.sol",
     "script/production/base/clusters/BaseCluster.s.sol",
     "script/production/swell/clusters/SwellCluster.s.sol",
     "script/production/swell/clusters/SwellETHCluster.s.sol"

audits/MixBytes HookTargetStakeDelegator.pdf

@@ -15,11 +15,12 @@ contract Lenses is ScriptUtils {
         string memory inputScriptFileName = "08_Lenses_input.json";
         string memory outputScriptFileName = "08_Lenses_output.json";
         string memory json = getScriptFile(inputScriptFileName);
+        address eVaultFactory = vm.parseJsonAddress(json, ".eVaultFactory");
         address oracleAdapterRegistry = vm.parseJsonAddress(json, ".oracleAdapterRegistry");
         address kinkIRMFactory = vm.parseJsonAddress(json, ".kinkIRMFactory");
         address adaptiveCurveIRMFactory = vm.parseJsonAddress(json, ".adaptiveCurveIRMFactory");
 
-        lenses = execute(oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
+        lenses = execute(eVaultFactory, oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
 
         string memory object;
         object = vm.serializeAddress("lenses", "accountLens", lenses[0]);
@@ -31,23 +32,26 @@ contract Lenses is ScriptUtils {
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address oracleAdapterRegistry, address kinkIRMFactory, address adaptiveCurveIRMFactory)
-        public
-        broadcast
-        returns (address[] memory lenses)
-    {
-        lenses = execute(oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
+    function deploy(
+        address eVaultFactory,
+        address oracleAdapterRegistry,
+        address kinkIRMFactory,
+        address adaptiveCurveIRMFactory
+    ) public broadcast returns (address[] memory lenses) {
+        lenses = execute(eVaultFactory, oracleAdapterRegistry, kinkIRMFactory, adaptiveCurveIRMFactory);
     }
 
-    function execute(address oracleAdapterRegistry, address kinkIRMFactory, address adaptiveCurveIRMFactory)
-        public
-        returns (address[] memory lenses)
-    {
+    function execute(
+        address eVaultFactory,
+        address oracleAdapterRegistry,
+        address kinkIRMFactory,
+        address adaptiveCurveIRMFactory
+    ) public returns (address[] memory lenses) {
         lenses = new address[](6);
         lenses[0] = address(new AccountLens());
         lenses[1] = address(new OracleLens(oracleAdapterRegistry));
         lenses[2] = address(new IRMLens(kinkIRMFactory, adaptiveCurveIRMFactory));
-        lenses[3] = address(new UtilsLens(address(lenses[1])));
+        lenses[3] = address(new UtilsLens(eVaultFactory, address(lenses[1])));
         lenses[4] = address(new VaultLens(address(lenses[1]), address(lenses[3]), address(lenses[2])));
         lenses[5] = address(new EulerEarnVaultLens(address(lenses[1]), address(lenses[3])));
     }
@@ -158,21 +162,22 @@ contract LensUtilsDeployer is ScriptUtils {
         string memory inputScriptFileName = "08_LensUtils_input.json";
         string memory outputScriptFileName = "08_LensUtils_output.json";
         string memory json = getScriptFile(inputScriptFileName);
+        address eVaultFactory = vm.parseJsonAddress(json, ".eVaultFactory");
         address oracleLens = vm.parseJsonAddress(json, ".oracleLens");
 
-        utilsLens = execute(oracleLens);
+        utilsLens = execute(eVaultFactory, oracleLens);
 
         string memory object;
         object = vm.serializeAddress("lens", "utilsLens", utilsLens);
         vm.writeJson(object, string.concat(vm.projectRoot(), "/script/", outputScriptFileName));
     }
 
-    function deploy(address oracleLens) public broadcast returns (address utilsLens) {
-        utilsLens = execute(oracleLens);
+    function deploy(address eVaultFactory, address oracleLens) public broadcast returns (address utilsLens) {
+        utilsLens = execute(eVaultFactory, oracleLens);
     }
 
-    function execute(address oracleLens) public returns (address utilsLens) {
-        utilsLens = address(new UtilsLens(oracleLens));
+    function execute(address eVaultFactory, address oracleLens) public returns (address utilsLens) {
+        utilsLens = address(new UtilsLens(eVaultFactory, oracleLens));
     }
 }
 

foundry.toml

@@ -935,7 +935,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         if (lensAddresses.utilsLens == address(0)) {
             console.log("+ Deploying LensUtils...");
             LensUtilsDeployer deployer = new LensUtilsDeployer();
-            lensAddresses.utilsLens = deployer.deploy(lensAddresses.oracleLens);
+            lensAddresses.utilsLens = deployer.deploy(coreAddresses.eVaultFactory, lensAddresses.oracleLens);
         } else {
             console.log("- LensUtils already deployed. Skipping...");
         }

script/08_Lenses.s.sol

@@ -46,7 +46,7 @@ To use the interactive deployment script, run the following command:
 or with options, i.e.:
 
 ```sh
-./script/interactiveDeployment.sh --account ACC_NAME --verify
+./script/interactiveDeployment.sh --account ACC_NAME --rpc-url RPC_URL
 ```
 
 You will be walked through the deployment process step by step.
@@ -56,23 +56,23 @@ You will be walked through the deployment process step by step.
 ### Core and Periphery contracts deployment and configuration
 
 ```sh
-./script/interactiveDeployment.sh --account ACC_NAME --verify
+./script/interactiveDeployment.sh --account ACC_NAME --rpc-url RPC_URL
 ```
 
 After that, select option 50 and provide necessary input values.
 
 ### Core contracts ownership transfer
 
 ```sh
-./script/interactiveDeployment.sh --account ACC_NAME --verify
+./script/interactiveDeployment.sh --account ACC_NAME --rpc-url RPC_URL
 ```
 
 After that, select option 51 and provide necessary input values.
 
 ### Periphery contracts ownership transfer
 
 ```sh
-./script/interactiveDeployment.sh --account ACC_NAME --verify
+./script/interactiveDeployment.sh --account ACC_NAME --rpc-url RPC_URL
 ```
 
 After that, select option 52 and provide necessary input values.
@@ -133,6 +133,16 @@ You can pass `--verify` option to the deployment script in order to verify the d
 
 You can pass `--dry-run` option to the deployment script in order to simulate the deployment without actually executing transactions.
 
+### RPC URL
+
+You can pass the RPC to the script using the `--rpc-url RPC_URL` option.
+
+### Private key management
+
+You can use standard Foundry options for providing the private key to the script, i.e. `--account ACC_NAME` or `--ledger`.
+
+If neither option is provided, the script will look for `DEPLOYER_KEY` in your `.env` file.
+
 ### Batch via Safe
 
 You can pass `--batch-via-safe` option to the deployment script in order to create the a batch transaction in the Safe UI. This only works if the result of the script is a transaction to be executed via the EVC batch. For this option to be used, ensure that `SAFE_KEY` and `SAFE_ADDRESS` are defined in the `.env` file or provide a different option to derive the Safe signer key instead, i.e. `--ledger` or `--account ACC_NAME`. The address associated must either be a signer or a delegate of the Safe in order to be able to send the transactions. You can also provide the `--safe-address` option to the command instead of `SAFE_ADDRESS` environment variable.
@@ -144,3 +154,16 @@ In case a timelock controller is installed as part of the governor contracts sui
 ### Risk Steward
 
 In case a risk steward contract is installed as part of the governor contracts suite, you can additionally pass `--risk-steward-address` option with the risk steward contract address to the deployment script in order to execute the transactions via the risk steward contract instead of trying to execute it directly.
+
+## Timelock transaction execution
+
+A utility script is provided to execute scheduled timelock transactions automatically. To use it, run:
+
+```sh
+./script/production/ExecuteSolidityScript.sh ./script/utils/ExecuteTimelockTx.s.sol --account <ACCOUNT> --timelock-address <TIMELOCK_ADDRESS> --timelock-id <TIMELOCK_ID> --rpc-url <RPC_URL>
+```
+
+Required options:
+- `--timelock-address`: The address of the timelock controller contract
+- `--timelock-id`: The ID of the scheduled transaction, which can be found in the logs emitted when the transaction was scheduled
+- `--timelock-salt`: (Optional) The salt used for the timelock operation. If not provided, zero is assumed

script/50_CoreAndPeriphery.s.sol

@@ -770,13 +770,16 @@ while true; do
                     scriptName=${baseName}.s.sol:Lenses
                     jsonName=08_Lenses
 
+                    read -p "Enter the EVault Factory address: " eVaultFactory
                     read -p "Enter the Oracle Adapter Registry address: " oracle_adapter_registry
                     read -p "Enter the Kink IRM Factory address: " kink_irm_factory
 
                     jq -n \
+                        --arg eVaultFactory "$eVaultFactory" \
                         --arg oracleAdapterRegistry "$oracle_adapter_registry" \
                         --arg kinkIRMFactory "$kink_irm_factory" \
                         '{
+                            eVaultFactory: $eVaultFactory,
                             oracleAdapterRegistry: $oracleAdapterRegistry,
                             kinkIRMFactory: $kinkIRMFactory
                         }' --indent 4 > script/${jsonName}_input.json
@@ -858,11 +861,14 @@ while true; do
                     scriptName=${baseName}.s.sol:LensUtilsDeployer
                     jsonName=08_LensUtils
 
+                    read -p "Enter the EVault Factory address: " eVaultFactory
                     read -p "Enter the Oracle Lens address: " oracle_lens
 
                     jq -n \
+                        --arg eVaultFactory "$eVaultFactory" \
                         --arg oracleLens "$oracle_lens" \
                         '{
+                            eVaultFactory: $eVaultFactory,
                             oracleLens: $oracleLens
                         }' --indent 4 > script/${jsonName}_input.json
                     ;;

script/README.md

@@ -778,13 +778,15 @@ abstract contract ManageClusterBase is BatchBuilder {
     }
 
     function simulatePendingTransactions() internal {
+        if (isSkipPendingSimulation()) return;
+
         if (isBatchViaSafe()) {
             SafeTransaction safeUtil = new SafeTransaction();
             if (!safeUtil.isTransactionServiceAPIAvailable()) return;
 
             vm.recordLogs();
             console.log("Simulating pending safe transactions");
-            SafeTransaction.TransactionSimple[] memory transactions = safeUtil.getPendingTransactions(getSafe());
+            SafeTransaction.TransactionSimple[] memory transactions = safeUtil.getPendingTransactions(getSimulateSafe());
 
             for (uint256 i = 0; i < transactions.length; ++i) {
                 try safeUtil.simulate(
@@ -797,7 +799,7 @@ abstract contract ManageClusterBase is BatchBuilder {
             }
         }
 
-        address payable timelock = payable(getTimelock());
+        address payable timelock = payable(getSimulateTimelock());
         if (timelock != address(0)) {
             console.log("Simulating pending timelock transactions");
 
@@ -843,16 +845,15 @@ abstract contract ManageClusterBase is BatchBuilder {
 
             Vm.Log[] memory logs = vm.getRecordedLogs();
             for (uint256 i = 0; i < logs.length; ++i) {
-                bytes32 id = logs[i].topics[1];
-
                 if (
-                    timelock != logs[i].emitter || topic[0] != logs[i].topics[0]
-                        || !TimelockController(timelock).isOperationPending(id)
+                    timelock != logs[i].emitter || logs[i].topics.length < 2 || topic[0] != logs[i].topics[0]
+                        || !TimelockController(timelock).isOperationPending(logs[i].topics[1])
                 ) continue;
 
                 (address target, uint256 value, bytes memory data, bytes32 predecessor, uint256 delay) =
                     abi.decode(logs[i].data, (address, uint256, bytes, bytes32, uint256));
 
+                bytes32 id = logs[i].topics[1];
                 vm.store(
                     timelock, keccak256(abi.encode(uint256(id), uint256(1))), bytes32(uint256(block.timestamp - delay))
                 );