Merge remote-tracking branch 'origin/master' into nicka/sonic

OriginProtocol · Jan 13, 2025 · 01d4cc2 · 01d4cc2
2 parents 8a0bf43 + 82baad3
commit 01d4cc2
Show file tree

Hide file tree

Showing 9 changed files with 1,676 additions and 315 deletions.
diff --git a/contracts/deploy/mainnet/114_simple_harvester.js b/contracts/deploy/mainnet/114_simple_harvester.js
@@ -8,7 +8,8 @@ module.exports = deploymentWithGovernanceProposal(
     // forceSkip: true,
     reduceQueueTime: true,
     deployerIsProposer: false,
-    // proposalId: "",
+    proposalId:
+      "24744476590264145931226505760829226060179710806211802903308139275399713774496",
   },
   async ({ deployWithConfirmation }) => {
     const { strategistAddr } = await getNamedAccounts();

diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -100,5 +100,6 @@
   "109_3rd_native_ssv_staking": 1731456871,
   "111_morpho_wrap_and_transfer": 1732639817,
   "112_ousd_morpho_gauntlet_usdc": 1734483227,
-  "113_ousd_morpho_gauntlet_usdt": 1734560711
+  "113_ousd_morpho_gauntlet_usdt": 1734560711,
+  "114_simple_harvester": 1736329331
 }
diff --git a/contracts/deployments/mainnet/OETHHarvesterSimple.json b/contracts/deployments/mainnet/OETHHarvesterSimple.json
diff --git a/contracts/deployments/mainnet/OETHVaultAdmin.json b/contracts/deployments/mainnet/OETHVaultAdmin.json
diff --git a/contracts/deployments/mainnet/OETHVaultCore.json b/contracts/deployments/mainnet/OETHVaultCore.json
diff --git a/contracts/deployments/mainnet/solcInputs/d7c660a3891a398302ba4accfb7a44b7.json b/contracts/deployments/mainnet/solcInputs/d7c660a3891a398302ba4accfb7a44b7.json
diff --git a/contracts/storageLayout/mainnet/OETHHarvesterSimple.json b/contracts/storageLayout/mainnet/OETHHarvesterSimple.json
@@ -0,0 +1,51 @@
+{
+  "solcVersion": "0.8.7",
+  "storage": [
+    {
+      "label": "strategistAddr",
+      "offset": 0,
+      "slot": "0",
+      "type": "t_address",
+      "contract": "Strategizable",
+      "src": "contracts/governance/Strategizable.sol:10"
+    },
+    {
+      "label": "__gap",
+      "offset": 0,
+      "slot": "1",
+      "type": "t_array(t_uint256)50_storage",
+      "contract": "Strategizable",
+      "src": "contracts/governance/Strategizable.sol:13"
+    },
+    {
+      "label": "supportedStrategies",
+      "offset": 0,
+      "slot": "51",
+      "type": "t_mapping(t_address,t_bool)",
+      "contract": "OETHHarvesterSimple",
+      "src": "contracts/harvest/OETHHarvesterSimple.sol:15"
+    }
+  ],
+  "types": {
+    "t_address": {
+      "label": "address",
+      "numberOfBytes": "20"
+    },
+    "t_array(t_uint256)50_storage": {
+      "label": "uint256[50]",
+      "numberOfBytes": "1600"
+    },
+    "t_bool": {
+      "label": "bool",
+      "numberOfBytes": "1"
+    },
+    "t_mapping(t_address,t_bool)": {
+      "label": "mapping(address => bool)",
+      "numberOfBytes": "32"
+    },
+    "t_uint256": {
+      "label": "uint256",
+      "numberOfBytes": "32"
+    }
+  }
+}