also re-deploy the harvester

OriginProtocol · May 3, 2024 · 22a31d7 · 22a31d7
1 parent f89f245
commit 22a31d7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 29 deletions.
diff --git a/contracts/deploy/deployActions.js b/contracts/deploy/deployActions.js
@@ -547,7 +547,6 @@ const deployOETHHarvester = async (oethDripper) => {
   const assetAddresses = await getAssetAddresses(deployments);
   const { governorAddr } = await getNamedAccounts();
   const sGovernor = await ethers.provider.getSigner(governorAddr);
-  const cVaultProxy = await ethers.getContract("VaultProxy");
   const cOETHVaultProxy = await ethers.getContract("OETHVaultProxy");
 
   const dOETHHarvesterProxy = await deployWithConfirmation(
@@ -581,7 +580,7 @@ const deployOETHHarvester = async (oethDripper) => {
     cOETHHarvester
       .connect(sGovernor)
       .setRewardProceedsAddress(
-        isMainnet || isHolesky ? oethDripper.address : cVaultProxy.address
+        isMainnet || isHolesky ? oethDripper.address : cOETHVaultProxy.address
       )
   );
 

diff --git a/contracts/deploy/holesky/004_upgrade_strategy.js b/contracts/deploy/holesky/004_upgrade_strategy.js
@@ -1,11 +1,14 @@
-const { upgradeNativeStakingSSVStrategy } = require("../deployActions");
+const { upgradeNativeStakingSSVStrategy, deployOETHHarvester } = require("../deployActions");
 
 const mainExport = async () => {
   console.log("Running 004 deployment on Holesky...");
 
   console.log("Upgrading native staking strategy");
   await upgradeNativeStakingSSVStrategy();
 
+  console.log("deploying harvester")
+  const cOETHDripperProxy = await ethers.getContract("OETHDripperProxy");
+  const cOETHHarvester = await deployOETHHarvester(cOETHDripperProxy.address);
   console.log("Running 004 deployment done");
   return true;
 };

diff --git a/contracts/deployments/holesky/.migrations.json b/contracts/deployments/holesky/.migrations.json
@@ -1,6 +1,5 @@
 {
   "001_core": 1714168010,
   "002_upgrade_strategy": 1714233842,
-  "003_deposit_to_native_strategy": 1714307581,
-  "004_upgrade_strategy": 1714761605
+  "003_deposit_to_native_strategy": 1714307581
 }
diff --git a/contracts/deployments/holesky/OETHHarvester.json b/contracts/deployments/holesky/OETHHarvester.json
diff --git a/contracts/scripts/deploy/verifySimpleOETHDeployment.sh b/contracts/scripts/deploy/verifySimpleOETHDeployment.sh
@@ -10,10 +10,10 @@ export FEE_ACC=0x79681d3f14a0068479420eE5fDdF59B62301f810
 export FEE_ACC_PROXY=0x590B781b511e953dbFC49e7E7864A6E787aFBDCc
 export OETH_DRIPPER=0x3833C32826A7f2a93C48D50ae44D45F45Ab17B7F
 export OETH_DRIPPER_PROXY=0xaFF1E6263F4004C95Ae611DEb2ADaC049B5aD121
-export OETH_HARVESTER=0x22b00a89531E199bd90eC162F9810298b9FBC8b3
+export OETH_HARVESTER=0xBd09F938259AE61e089959d52580235b76C69A83
 export OETH_HARVESTER_PROXY=0xB7491cdf36367C89001cc41312F22f63A3a17931
 export OETH_ORACLE_ROUTER=0x7e2bf9A89180f20591EcFA42C0dd7e52b2C546E3
-export NATIVE_STAKING=0x33Eeb0996f6981ff7d11F643630734856BEc09f5
+export NATIVE_STAKING=0x51766Fd366D6C9121F6Aeec20267ecA87c2c9793
 export NATIVE_STAKING_PROXY=0x4Eac8847c7AE50e3A3551B1Aa4FF7Cc162151410
 export WETH=0x94373a4919b3240d86ea41593d5eba789fef3848
 export ZERO=0x0000000000000000000000000000000000000000