front run protection changes

contracts/contracts/strategies/NativeStaking/ValidatorRegistrator.sol

@@ -109,16 +109,15 @@ abstract contract ValidatorRegistrator is Governable, Pausable {
         validatorRegistrator = _address;
     }
 
-    /// @notice Set the address of the staking monitor that is allowed to modify
-    /// stakeETHThreshold and reset stakeETHTally
+    /// @notice Set the address of the staking monitor that is allowed to reset stakeETHTally
     function setStakingMonitor(address _address) external onlyGovernor {
         emit StakingMonitorChanged(_address);
         stakingMonitor = _address;
     }
 
-    /// @notice Set the amount of ETH that can be staked before governor needs to a approve
-    /// further staking.
-    function setStakeETHThreshold(uint256 _amount) external onlyStakingMonitor {
+    /// @notice Set the amount of ETH that can be staked before staking monitor
+    // needs to a approve further staking by resetting the stake ETH tally
+    function setStakeETHThreshold(uint256 _amount) external onlyGovernor {
         emit StakeETHThresholdChanged(_amount);
         stakeETHThreshold = _amount;
     }
@@ -149,7 +148,7 @@ abstract contract ValidatorRegistrator is Governable, Pausable {
 
         require(
             stakeETHTally + requiredETH <= stakeETHThreshold,
-            "Staking ETH over approved threshold"
+            "Staking ETH over threshold"
         );
         stakeETHTally += requiredETH;
 

contracts/deploy/holesky/010_upgrade_strategy.js

@@ -0,0 +1,59 @@
+const { upgradeNativeStakingSSVStrategy } = require("../deployActions");
+const { isFork } = require("../../test/helpers");
+const { withConfirmation } = require("../../utils/deploy");
+const { resolveContract } = require("../../utils/resolvers");
+const addresses = require("../../utils/addresses");
+const { parseEther } = require("ethers/lib/utils");
+// const { impersonateAndFund } = require("../../utils/signers.js");
+
+const mainExport = async () => {
+  console.log("Running 010 deployment on Holesky...");
+
+  console.log("Upgrading native staking strategy");
+  await upgradeNativeStakingSSVStrategy();
+
+  const cNativeStakingStrategy = await resolveContract(
+    "NativeStakingSSVStrategyProxy",
+    "NativeStakingSSVStrategy"
+  );
+
+  if (isFork) {
+    const { governorAddr } = await getNamedAccounts();
+    const sGovernor = await ethers.provider.getSigner(governorAddr);
+
+    await withConfirmation(
+      cNativeStakingStrategy
+        .connect(sGovernor)
+        // Holesky defender relayer
+        .setStakingMonitor(addresses.holesky.Guardian)
+    );
+
+    await withConfirmation(
+      cNativeStakingStrategy
+        .connect(sGovernor)
+        .setStakeETHThreshold(parseEther("64"))
+    );
+
+    console.log(
+      `Set the staking monitor to ${addresses.holesky.Guardian} and stake ETH threshold to 32 ETH`
+    );
+  } else {
+    console.log(
+      `Set the staking monitor to ${addresses.holesky.Guardian} using Hardhat task`
+    );
+  }
+
+  console.log(
+    `Staking monitor set to ${await cNativeStakingStrategy.stakingMonitor()}`
+  );
+
+  console.log("Running 010 deployment done");
+  return true;
+};
+
+mainExport.id = "010_upgrade_strategy";
+mainExport.tags = [];
+mainExport.dependencies = [];
+mainExport.skip = () => false;
+
+module.exports = mainExport;

contracts/deploy/mainnet/097_native_ssv_staking.js

@@ -202,13 +202,14 @@ module.exports = deploymentWithGovernanceProposal(
           contract: cStrategy,
           signature: "setStakeETHThreshold(uint256)",
           // TODO: confirm this number makes sense
-          args: [ethers.utils.parseEther("32")], // 32ETH * 32
+          args: [ethers.utils.parseEther("1024")], // 32ETH * 32
         },
         // 7. set staking monitor
         {
           contract: cStrategy,
           signature: "setStakingMonitor(address)",
-          args: [addresses.mainnet.Guardian], // 32ETH * 32
+          // The 5/8 multisig
+          args: [addresses.mainnet.Guardian],
         },
         // 8. Upgrade the OETH Harvester
         {

contracts/test/behaviour/ssvStrategy.js

@@ -84,7 +84,7 @@ const shouldBehaveLikeAnSsvStrategy = (context) => {
       );
       await expect(await nativeStakingSSVStrategy.stakingMonitor()).to.equal(
         addresses.Guardian,
-        "Incorrect validator registrator"
+        "Incorrect staking monitor"
       );
     });
   });

contracts/test/strategies/nativeSSVStaking.js

@@ -1060,7 +1060,7 @@ describe("Unit test: Native SSV Staking Strategy", function () {
         .setStakingMonitor(anna.address);
 
       await nativeStakingSSVStrategy
-        .connect(anna)
+        .connect(governor)
         .setStakeETHThreshold(stakeThreshold);
     });
 
@@ -1094,9 +1094,7 @@ describe("Unit test: Native SSV Staking Strategy", function () {
           ]);
 
         if (stakeTresholdErrorTriggered && i == validators - 1) {
-          await expect(tx).to.be.revertedWith(
-            "Staking ETH over approved threshold"
-          );
+          await expect(tx).to.be.revertedWith("Staking ETH over threshold");
         } else {
           await tx;
         }
@@ -1145,7 +1143,7 @@ describe("Unit test: Native SSV Staking Strategy", function () {
         nativeStakingSSVStrategy
           .connect(josh)
           .setStakeETHThreshold(ethUnits("32"))
-      ).to.be.revertedWith("Caller is not the Monitor");
+      ).to.be.revertedWith("Caller is not the Governor");
     });
   });
 

contracts/test/strategies/ousd-metapool-balanced-pool.fork-test.js

@@ -80,7 +80,7 @@ describe("ForkTest: Convex 3pool/OUSD Meta Strategy - Balanced Metapool", functi
       const currentBalance = await ousd.connect(anna).balanceOf(anna.address);
 
       // Now try to redeem the amount
-      const redeemAmount = ousdUnits("29990");
+      const redeemAmount = ousdUnits("29900");
       await vault.connect(anna).redeem(redeemAmount, 0);
 
       // User balance should be down by 30k