Sparrow dom/deploy 064 (#1558)

* Deploy OETH Morpho AAVE contract * OETH Morpho Aave v2 Fork tests (#1544) * Add fork tests * Lint * Switch to new governor * Proxy init to change governor at the end (#1557) * Init of Morpho strategy from proxy init (cherry picked from commit 4fee664) * set governor on proxy init (cherry picked from commit d6d9fb9) * Proxy init to do gov change after init of impl Simplified oeth morpho deploy script (cherry picked from commit c38c6a7) * fix sol prettier (cherry picked from commit ecb7d00) * change governance in fork tests * reduce time with deployment script * skipping some fork tests * remove .only --------- Co-authored-by: Domen Grabec <[email protected]> * mainnet deploy 64 * Updated logs of OETH Morpho Aave strategy deploy --------- Co-authored-by: Daniel Von Fange <[email protected]> Co-authored-by: Shahul Hameed <[email protected]> Co-authored-by: Nick Addison <[email protected]>
OriginProtocol · May 30, 2023 · 88bccea · 88bccea
1 parent 36332fe
commit 88bccea
Show file tree

Hide file tree

Showing 7 changed files with 796 additions and 4 deletions.
diff --git a/contracts/deploy/064_oeth_mopho_aave_v2.js b/contracts/deploy/064_oeth_mopho_aave_v2.js
@@ -6,7 +6,7 @@ module.exports = deploymentWithProposal(
     deployName: "064_oeth_morpho_aave_v2",
     forceDeploy: false,
     reduceQueueTime: true,
-    // proposalId: ,
+    proposalId: 52,
   },
   async ({
     assetAddresses,
@@ -70,14 +70,14 @@ module.exports = deploymentWithProposal(
     );
 
     console.log(
-      "OUSD Morpho Aave strategy address: ",
+      "OETH Morpho Aave strategy address: ",
       cMorphoAaveStrategy.address
     );
 
     // Governance Actions
     // ----------------
     return {
-      name: "Deploy new OUSD Morpho Aave strategy",
+      name: "Deploy new OETH Morpho Aave strategy",
       governorAddr: addresses.mainnet.OldTimelock,
       actions: [
         // 1. Add new Morpho strategy to vault

diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -54,5 +54,6 @@
   "056_harvest_crv_limit": 17287144,
   "061_oeth_timelock_part_1": 1685054965,
   "062_oeth_timelock_part_2": 1685054965,
-  "063_oeth_harvest_crv_limit": 1685178827
+  "063_oeth_harvest_crv_limit": 1685178827,
+  "064_oeth_morpho_aave_v2": 1685393284
 }
diff --git a/contracts/deployments/mainnet/OETHMorphoAaveStrategyProxy.json b/contracts/deployments/mainnet/OETHMorphoAaveStrategyProxy.json
diff --git a/contracts/deployments/mainnet/solcInputs/e2c5ee485cf51b67ed7342bdf5e3180c.json b/contracts/deployments/mainnet/solcInputs/e2c5ee485cf51b67ed7342bdf5e3180c.json
diff --git a/contracts/storageLayout/mainnet/OETHMorphoAaveStrategyProxy.json b/contracts/storageLayout/mainnet/OETHMorphoAaveStrategyProxy.json
@@ -0,0 +1,4 @@
+{
+  "storage": [],
+  "types": {}
+}
diff --git a/dapp/network.mainnet.json b/dapp/network.mainnet.json
@@ -27769,6 +27769,192 @@
           "type": "function"
         }
       ]
+    },
+    "OETHMorphoAaveStrategyProxy": {
+      "address": "0xc1fc9E5eC3058921eA5025D703CBE31764756319",
+      "abi": [
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "previousGovernor",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "newGovernor",
+              "type": "address"
+            }
+          ],
+          "name": "GovernorshipTransferred",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "previousGovernor",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "newGovernor",
+              "type": "address"
+            }
+          ],
+          "name": "PendingGovernorshipTransfer",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "implementation",
+              "type": "address"
+            }
+          ],
+          "name": "Upgraded",
+          "type": "event"
+        },
+        {
+          "stateMutability": "payable",
+          "type": "fallback"
+        },
+        {
+          "inputs": [],
+          "name": "admin",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "claimGovernance",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "governor",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "implementation",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_logic",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "_initGovernor",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "_data",
+              "type": "bytes"
+            }
+          ],
+          "name": "initialize",
+          "outputs": [],
+          "stateMutability": "payable",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "isGovernor",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_newGovernor",
+              "type": "address"
+            }
+          ],
+          "name": "transferGovernance",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "newImplementation",
+              "type": "address"
+            }
+          ],
+          "name": "upgradeTo",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "newImplementation",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "name": "upgradeToAndCall",
+          "outputs": [],
+          "stateMutability": "payable",
+          "type": "function"
+        }
+      ]
     }
   }
 }