Deploy 123 - Simple Harvester v2 (#2387)

* Deploy- 123. * fix: add proposal ID
OriginProtocol · Feb 14, 2025 · 07c7d62 · 07c7d62
1 parent 83b8790
commit 07c7d62
Show file tree

Hide file tree

Showing 7 changed files with 1,390 additions and 73 deletions.
diff --git a/...deploy/mainnet/122_simple_harvester_v2.js → ...deploy/mainnet/123_simple_harvester_v2.js b/...deploy/mainnet/122_simple_harvester_v2.js → ...deploy/mainnet/123_simple_harvester_v2.js
@@ -3,12 +3,13 @@ const { deploymentWithGovernanceProposal } = require("../../utils/deploy");
 
 module.exports = deploymentWithGovernanceProposal(
   {
-    deployName: "122_simple_harvester_v2",
+    deployName: "123_simple_harvester_v2",
     forceDeploy: false,
     //forceSkip: true,
     reduceQueueTime: true,
     deployerIsProposer: false,
-    proposalId: "",
+    proposalId:
+      "26550610486664057138305516943450169995813254080724548319324256884874259231291",
   },
   async ({ deployWithConfirmation, withConfirmation }) => {
     const { multichainStrategistAddr, deployerAddr } = await getNamedAccounts();

diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -110,5 +110,6 @@
   "119_multisig_as_canceller": 1737991984,
   "120_remove_ousd_amo": 1737992146,
   "121_pool_booster_curve": 1737965774,
-  "122_delegate_yield_curve_pool": 1739200325
+  "122_delegate_yield_curve_pool": 1739200325,
+  "123_simple_harvester_v2": 1739168735
 }
diff --git a/contracts/deployments/mainnet/OETHHarvesterSimple.json b/contracts/deployments/mainnet/OETHHarvesterSimple.json
diff --git a/contracts/deployments/mainnet/OETHSimpleHarvesterProxy.json b/contracts/deployments/mainnet/OETHSimpleHarvesterProxy.json
diff --git a/contracts/deployments/mainnet/solcInputs/1a4540a671d50d17a736b05d22d3601b.json b/contracts/deployments/mainnet/solcInputs/1a4540a671d50d17a736b05d22d3601b.json
diff --git a/contracts/storageLayout/mainnet/OETHHarvesterSimple.json b/contracts/storageLayout/mainnet/OETHHarvesterSimple.json
@@ -1,36 +1,80 @@
 {
-  "solcVersion": "0.8.7",
+  "solcVersion": "0.8.28",
   "storage": [
     {
-      "label": "strategistAddr",
+      "label": "initialized",
       "offset": 0,
       "slot": "0",
+      "type": "t_bool",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:12"
+    },
+    {
+      "label": "initializing",
+      "offset": 1,
+      "slot": "0",
+      "type": "t_bool",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:17"
+    },
+    {
+      "label": "______gap",
+      "offset": 0,
+      "slot": "1",
+      "type": "t_array(t_uint256)50_storage",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:41"
+    },
+    {
+      "label": "strategistAddr",
+      "offset": 0,
+      "slot": "51",
       "type": "t_address",
       "contract": "Strategizable",
       "src": "contracts/governance/Strategizable.sol:10"
     },
     {
       "label": "__gap",
       "offset": 0,
-      "slot": "1",
+      "slot": "52",
       "type": "t_array(t_uint256)50_storage",
       "contract": "Strategizable",
       "src": "contracts/governance/Strategizable.sol:13"
     },
+    {
+      "label": "dripper",
+      "offset": 0,
+      "slot": "102",
+      "type": "t_address",
+      "contract": "OETHHarvesterSimple",
+      "src": "contracts/harvest/OETHHarvesterSimple.sol:26"
+    },
     {
       "label": "supportedStrategies",
       "offset": 0,
-      "slot": "51",
+      "slot": "103",
       "type": "t_mapping(t_address,t_bool)",
       "contract": "OETHHarvesterSimple",
-      "src": "contracts/harvest/OETHHarvesterSimple.sol:15"
+      "src": "contracts/harvest/OETHHarvesterSimple.sol:29"
+    },
+    {
+      "label": "___gap",
+      "offset": 0,
+      "slot": "104",
+      "type": "t_array(t_uint256)48_storage",
+      "contract": "OETHHarvesterSimple",
+      "src": "contracts/harvest/OETHHarvesterSimple.sol:32"
     }
   ],
   "types": {
     "t_address": {
       "label": "address",
       "numberOfBytes": "20"
     },
+    "t_array(t_uint256)48_storage": {
+      "label": "uint256[48]",
+      "numberOfBytes": "1536"
+    },
     "t_array(t_uint256)50_storage": {
       "label": "uint256[50]",
       "numberOfBytes": "1600"

diff --git a/contracts/storageLayout/mainnet/OETHSimpleHarvesterProxy.json b/contracts/storageLayout/mainnet/OETHSimpleHarvesterProxy.json
@@ -0,0 +1,5 @@
+{
+  "solcVersion": "0.8.28",
+  "storage": [],
+  "types": {}
+}