mainnet native staking fork tests

contracts/.eslintrc.js

@@ -18,5 +18,7 @@ module.exports = {
     getNamedAccounts: "readable",
     hre: "readable",
   },
-  rules: {},
+  rules: {
+    "no-constant-condition": ["error", { checkLoops: false }],
+  },
 };

contracts/contracts/harvest/BaseHarvester.sol

@@ -477,6 +477,23 @@ abstract contract BaseHarvester is Governable {
         address _rewardTo,
         IOracle _priceProvider
     ) internal virtual {
+        uint256 balance = IERC20(_swapToken).balanceOf(address(this));
+
+        // No need to swap if the reward token is the base token. eg USDT or WETH.
+        // There is also no limit on the transfer. Everything in the harvester will be transferred
+        // to the Dripper regardless of the liquidationLimit config.
+        if (_swapToken == baseTokenAddress) {
+            IERC20(_swapToken).safeTransfer(rewardProceedsAddress, balance);
+            // currently not paying the farmer any rewards as there is no swap
+            emit RewardProceedsTransferred(
+                baseTokenAddress,
+                address(0),
+                balance,
+                0
+            );
+            return;
+        }
+
         RewardTokenConfig memory tokenConfig = rewardTokenConfigs[_swapToken];
 
         /* This will trigger a return when reward token configuration has not yet been set
@@ -487,8 +504,6 @@ abstract contract BaseHarvester is Governable {
             return;
         }
 
-        uint256 balance = IERC20(_swapToken).balanceOf(address(this));
-
         if (balance == 0) {
             return;
         }
@@ -548,14 +563,14 @@ abstract contract BaseHarvester is Governable {
             tokenConfig.harvestRewardBps,
             1e4
         );
-        uint256 protcolYield = baseTokenBalance - farmerFee;
+        uint256 protocolYield = baseTokenBalance - farmerFee;
 
-        baseToken.safeTransfer(rewardProceedsAddress, protcolYield);
+        baseToken.safeTransfer(rewardProceedsAddress, protocolYield);
         baseToken.safeTransfer(_rewardTo, farmerFee);
         emit RewardProceedsTransferred(
             baseTokenAddress,
             _rewardTo,
-            protcolYield,
+            protocolYield,
             farmerFee
         );
     }

contracts/contracts/strategies/NativeStaking/NativeStakingSSVStrategy.sol

@@ -5,11 +5,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import { InitializableAbstractStrategy } from "../../utils/InitializableAbstractStrategy.sol";
-import { ISSVNetwork, Cluster } from "../../interfaces/ISSVNetwork.sol";
 import { IWETH9 } from "../../interfaces/IWETH9.sol";
 import { FeeAccumulator } from "./FeeAccumulator.sol";
 import { ValidatorAccountant } from "./ValidatorAccountant.sol";
-import { Cluster } from "../../interfaces/ISSVNetwork.sol";
 
 struct ValidatorStakeData {
     bytes pubkey;

contracts/contracts/strategies/NativeStaking/README.md

@@ -16,6 +16,10 @@
 
 ## Fee Accumulator
 
+### Hierarchy
+
+![Fee Accumulator Hierarchy](../../../docs/FeeAccumulatorHierarchy.svg)
+
 ### Squashed
 
 ![Fee Accumulator Squashed](../../../docs/FeeAccumulatorSquashed.svg)

contracts/contracts/strategies/NativeStaking/ValidatorAccountant.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Pausable } from "@openzeppelin/contracts/security/Pausable.sol";
 import { ValidatorRegistrator } from "./ValidatorRegistrator.sol";
 import { IWETH9 } from "../../interfaces/IWETH9.sol";
 
@@ -108,12 +107,7 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
         returns (bool accountingValid)
     {
         if (address(this).balance < consensusRewards) {
-            // pause if not already
-            if (pauseOnFail) {
-                _pause();
-            }
-            // fail the accounting
-            return false;
+            return _failAccounting(pauseOnFail);
         }
 
         // Calculate all the new ETH that has been swept to the contract since the last accounting
@@ -123,6 +117,9 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
         // send the ETH that is from fully withdrawn validators to the Vault
         if (newSweptETH >= MAX_STAKE) {
             uint256 fullyWithdrawnValidators = newSweptETH / MAX_STAKE;
+            if (activeDepositedValidators < fullyWithdrawnValidators) {
+                return _failAccounting(pauseOnFail);
+            }
             activeDepositedValidators -= fullyWithdrawnValidators;
 
             uint256 wethToVault = MAX_STAKE * fullyWithdrawnValidators;
@@ -164,13 +161,21 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
         }
         // Oh no... Fuse is blown. The Strategist needs to adjust the accounting values.
         else {
-            // pause if not already
-            if (pauseOnFail) {
-                _pause();
-            }
-            // fail the accounting
-            accountingValid = false;
+            return _failAccounting(pauseOnFail);
+        }
+    }
+
+    /// @dev pause any further accounting if required and return false
+    function _failAccounting(bool pauseOnFail)
+        internal
+        returns (bool accountingValid)
+    {
+        // pause if not already
+        if (pauseOnFail) {
+            _pause();
         }
+        // fail the accounting
+        accountingValid = false;
     }
 
     /// @notice Allow the Strategist to fix the accounting of this strategy and unpause.

contracts/deploy/deployActions.js

@@ -543,11 +543,26 @@ const deployOUSDHarvester = async (ousdDripper) => {
   return dHarvesterProxy;
 };
 
+const upgradeOETHHarvester = async () => {
+  const assetAddresses = await getAssetAddresses(deployments);
+  const cOETHVaultProxy = await ethers.getContract("OETHVaultProxy");
+  const cOETHHarvesterProxy = await ethers.getContract("OETHHarvesterProxy");
+
+  const dOETHHarvester = await deployWithConfirmation("OETHHarvester", [
+    cOETHVaultProxy.address,
+    assetAddresses.WETH,
+  ]);
+
+  await withConfirmation(cOETHHarvesterProxy.upgradeTo(dOETHHarvester.address));
+
+  log("Upgraded OETHHarvesterProxy");
+  return cOETHHarvesterProxy;
+};
+
 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(
@@ -568,11 +583,13 @@ const deployOETHHarvester = async (oethDripper) => {
   );
 
   await withConfirmation(
-    cOETHHarvesterProxy["initialize(address,address,bytes)"](
-      dOETHHarvester.address,
-      governorAddr,
-      []
-    )
+    // prettier-ignore
+    cOETHHarvesterProxy
+      .connect(sGovernor)["initialize(address,address,bytes)"](
+        dOETHHarvester.address,
+        governorAddr,
+        []
+      )
   );
 
   log("Initialized OETHHarvesterProxy");
@@ -581,11 +598,11 @@ const deployOETHHarvester = async (oethDripper) => {
     cOETHHarvester
       .connect(sGovernor)
       .setRewardProceedsAddress(
-        isMainnet || isHolesky ? oethDripper.address : cVaultProxy.address
+        isMainnet || isHolesky ? oethDripper.address : cOETHVaultProxy.address
       )
   );
 
-  return dOETHHarvesterProxy;
+  return cOETHHarvester;
 };
 
 /**
@@ -1509,6 +1526,7 @@ module.exports = {
   deployHarvesters,
   deployOETHHarvester,
   deployOUSDHarvester,
+  upgradeOETHHarvester,
   configureVault,
   configureOETHVault,
   configureStrategies,

contracts/deploy/holesky/004_upgrade_strategy.js

@@ -0,0 +1,41 @@
+const {
+  upgradeNativeStakingSSVStrategy,
+  upgradeOETHHarvester,
+} = require("../deployActions");
+const { withConfirmation } = require("../../utils/deploy");
+
+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 upgradeOETHHarvester(cOETHDripperProxy.address);
+
+  const strategyProxy = await ethers.getContract(
+    "NativeStakingSSVStrategyProxy"
+  );
+  const cStrategy = await ethers.getContractAt(
+    "NativeStakingSSVStrategy",
+    strategyProxy.address
+  );
+
+  console.log("configuring harvester and the strategy");
+  await withConfirmation(
+    cOETHHarvester.setSupportedStrategy(strategyProxy.address, true)
+  );
+
+  await withConfirmation(cStrategy.setHarvesterAddress(cOETHHarvester.address));
+
+  console.log("Running 004 deployment done");
+  return true;
+};
+
+mainExport.id = "004_upgrade_strategy";
+mainExport.tags = [];
+mainExport.dependencies = [];
+mainExport.skip = () => false;
+
+module.exports = mainExport;

contracts/deploy/holesky/005_new_harvester.js

@@ -0,0 +1,61 @@
+const { parseEther } = require("ethers/lib/utils");
+
+const { deployNativeStakingSSVStrategy } = require("../deployActions");
+const { withConfirmation } = require("../../utils/deploy");
+const { resolveContract } = require("../../utils/resolvers");
+
+const mainExport = async () => {
+  console.log("Running 005 deployment on Holesky...");
+
+  console.log("Deploying a new Native Staking strategy and proxy");
+
+  console.log("Deploying Native Staking");
+  const nativeStakingSSVStrategy = await deployNativeStakingSSVStrategy();
+
+  const { governorAddr } = await getNamedAccounts();
+  const sGovernor = await ethers.provider.getSigner(governorAddr);
+
+  const cOETHHarvester = await resolveContract(
+    "OETHHarvesterProxy",
+    "OETHHarvester"
+  );
+  const cVault = await resolveContract("OETHVaultProxy", "VaultAdmin");
+
+  await withConfirmation(
+    nativeStakingSSVStrategy
+      .connect(sGovernor)
+      .setHarvesterAddress(cOETHHarvester.address)
+  );
+
+  console.log("configuring harvester and the strategy");
+  await withConfirmation(
+    cOETHHarvester
+      .connect(sGovernor)
+      .setSupportedStrategy(nativeStakingSSVStrategy.address, true)
+  );
+
+  await withConfirmation(
+    cVault.connect(sGovernor).approveStrategy(nativeStakingSSVStrategy.address)
+  );
+
+  await withConfirmation(
+    nativeStakingSSVStrategy.connect(sGovernor).setRegistrator(governorAddr)
+  );
+
+  const fuseStartBn = parseEther("21.6");
+  const fuseEndBn = parseEther("25.6");
+
+  await nativeStakingSSVStrategy
+    .connect(sGovernor)
+    .setFuseInterval(fuseStartBn, fuseEndBn);
+
+  console.log("Running 005 deployment done");
+  return true;
+};
+
+mainExport.id = "005_deploy_new_harvester";
+mainExport.tags = [];
+mainExport.dependencies = [];
+mainExport.skip = () => false;
+
+module.exports = mainExport;

contracts/deploy/mainnet/091_native_ssv_staking.js

@@ -114,11 +114,23 @@ module.exports = deploymentWithGovernanceProposal(
     // 7. Safe approve SSV token spending
     await cStrategy.connect(sDeployer).safeApproveAllTokens();
 
+    // 8. Deploy Harvester
+    const cOETHHarvesterProxy = await ethers.getContract("OETHHarvesterProxy");
+    await deployWithConfirmation("OETHHarvester", [
+      cVaultProxy.address,
+      addresses.mainnet.WETH,
+    ]);
+    const dOETHHarvesterImpl = await ethers.getContract("OETHHarvester");
+
     console.log(
       "Native Staking SSV Strategy address: ",
       cStrategyProxy.address
     );
     console.log("Fee accumulator address: ", cFeeAccumulator.address);
+    console.log(
+      "New OETHHarvester implementation address: ",
+      dOETHHarvesterImpl.address
+    );
 
     // Governance Actions
     // ----------------
@@ -152,6 +164,18 @@ module.exports = deploymentWithGovernanceProposal(
             ethers.utils.parseEther("25.6"),
           ],
         },
+        // 5. set validator registrator
+        {
+          contract: cStrategy,
+          signature: "setRegistrator(address)",
+          args: [addresses.mainnet.validatorRegistrator],
+        },
+        // 6. Upgrade the OETH Harvester
+        {
+          contract: cOETHHarvesterProxy,
+          signature: "upgradeTo(address)",
+          args: [dOETHHarvesterImpl.address],
+        },
       ],
     };
   }

contracts/deployments/holesky/.migrations.json

@@ -1,5 +1,7 @@
 {
   "001_core": 1714168010,
   "002_upgrade_strategy": 1714233842,
-  "003_deposit_to_native_strategy": 1714307581
+  "003_deposit_to_native_strategy": 1714307581,
+  "004_upgrade_strategy": 1714944723,
+  "005_deploy_new_harvester": 1714998707
 }