Merge pull request #220 from yieldnest/feat/slashing-ynETH

Feat/slashing yn eth

Author: danoctavian

.gitmodules

@@ -16,5 +16,5 @@
 	commit = 1edc2ae004974ebf053f4eba26b45469937b9381
 [submodule "lib/eigenlayer-contracts"]
 	path = lib/eigenlayer-contracts
-	url = https://github.com/yieldnest/eigenlayer-contracts
-	branch = v1.1.1-v4.9.0
+	url = https://github.com/yieldnest/eigenlayer-contracts.git
+	branch = v1.3.0-v4.9.0

deployments/ynETH-17000.json

@@ -11,12 +11,12 @@
   "STAKING_NODES_OPERATOR": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
   "STAKING_NODE_CREATOR": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
   "VALIDATOR_MANAGER": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
-  "implementation-stakingNodesManager": "0xC9cf6740282617f3B392f900De0449E687Ce05e3",
+  "implementation-stakingNodesManager": "0x99a108a79419c62F2Ff384cE2441b435b918a252",
   "implementation-ynETH": "0x090D67d3C97712f6C17a037515CbB8502561EE57",
   "implementation-executionLayerReceiver": "0x1fbedf3773418f20b9dfeafcd9d263030eb0e42f",
   "implementation-consensusLayerReceiver": "0xe7acc0533c650ad0cc11f57f81c38fa19634b1d7",
   "implementation-rewardsDistributor": "0xb6ec4d9f71e437c672147c576f1c70ba5da8d159",
-  "implementation-withdrawalsProcessor": "0x36a38AA91947DbE6539e19512E6FF26576015Bb2",
+  "implementation-withdrawalsProcessor": "0xAbE3b5bF154d6441C63Dc34691E4F51Dbfac3bB0",
   "implementation-withdrawalQueueManager": "0x28732d8061D35B77dC2997926e0449dAdc3Ef3DD",
   "implementation-ynETHRedemptionAssetsVault": "0x7eBE6EAC9AD9B5e4D637c8f05191b273b009461a",
   "implementation-ynViewer": "0xBf1035e71E4a770a08462B20C95dE14763E1D186",
@@ -38,5 +38,5 @@
   "proxyAdmin-withdrawalQueueManager": "0x26425968beb4bD9c09b02C433996Cd05B1Fd4f07",
   "proxyAdmin-ynETHRedemptionAssetsVault": "0xd4d8E80d1c959CdC4601Cc6A0cc1EC18aBeB1888",
   "proxyAdmin-ynViewer": "0x3ffa0c3fba4adfe2b6e4d7e2f8e6e6324be5305b",
-  "stakingNodeImplementation": "0xf07861349Ed0cB4603590B47D2269768Ed6E2821"
+  "stakingNodeImplementation": "0xdd8e2B6B4D71E0E1b077dFcaea3Ca85fF31803a6"
 }

lib/eigenlayer-contracts

@@ -35,6 +35,7 @@ contract ContractAddresses {
         address STRATEGY_MANAGER_ADDRESS;
         address STRATEGY_MANAGER_PAUSER_ADDRESS;
         address REWARDS_COORDINATOR_ADDRESS;
+        address ALLOCATION_MANAGER_ADDRESS;
     }
 
     struct LSDAddresses {
@@ -97,7 +98,8 @@ contract ContractAddresses {
                 DELEGATION_PAUSER_ADDRESS: 0x369e6F597e22EaB55fFb173C6d9cD234BD699111, // TODO: remove this if unused
                 STRATEGY_MANAGER_ADDRESS: 0x858646372CC42E1A627fcE94aa7A7033e7CF075A,
                 STRATEGY_MANAGER_PAUSER_ADDRESS: 0xBE1685C81aA44FF9FB319dD389addd9374383e90,
-                REWARDS_COORDINATOR_ADDRESS: 0x7750d328b314EfFa365A0402CcfD489B80B0adda
+                REWARDS_COORDINATOR_ADDRESS: 0x7750d328b314EfFa365A0402CcfD489B80B0adda,
+                ALLOCATION_MANAGER_ADDRESS: 0x0000000000000000000000000000000000000000 // TODO: Update this with correct address after mainnet deployment
             }),
             lsd: LSDAddresses({
                 SFRXETH_ADDRESS: 0xac3E018457B222d93114458476f3E3416Abbe38F,
@@ -158,7 +160,8 @@ contract ContractAddresses {
                 DELEGATION_PAUSER_ADDRESS: 0x28Ade60640fdBDb2609D8d8734D1b5cBeFc0C348, // Placeholder address, replaced with address(1) for holesky
                 STRATEGY_MANAGER_ADDRESS: 0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6, // Placeholder address, replaced with address(1) for holesky
                 STRATEGY_MANAGER_PAUSER_ADDRESS: 0x28Ade60640fdBDb2609D8d8734D1b5cBeFc0C348,
-                REWARDS_COORDINATOR_ADDRESS: 0xAcc1fb458a1317E886dB376Fc8141540537E68fE
+                REWARDS_COORDINATOR_ADDRESS: 0xAcc1fb458a1317E886dB376Fc8141540537E68fE,
+                ALLOCATION_MANAGER_ADDRESS: 0x78469728304326CBc65f8f95FA756B0B73164462
             }),
             lsd: LSDAddresses({
                 SFRXETH_ADDRESS: 0xa63f56985F9C7F3bc9fFc5685535649e0C1a55f3,

lib/forge-std

@@ -9,7 +9,7 @@ import {PooledDepositsVault} from "src/PooledDepositsVault.sol"; // Renamed from
 import {ActorAddresses} from "script/Actors.sol";
 import {console} from "lib/forge-std/src/console.sol";
 import {IStakingNode} from "src/interfaces/IStakingNode.sol";
-import {ISignatureUtils} from "lib/eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
+import {ISignatureUtilsMixinTypes} from "lib/eigenlayer-contracts/src/contracts/interfaces/ISignatureUtilsMixin.sol";
 import {IStakingNodesManager} from "src/interfaces/IStakingNodesManager.sol";
 import {ContractAddresses} from "script/ContractAddresses.sol";
 
@@ -52,7 +52,7 @@ contract DelegateTransactionBuilder is BaseScript {
             bytes memory delegateTxData = abi.encodeWithSelector(
                 IStakingNode.delegate.selector,
                 currentOperator,
-                ISignatureUtils.SignatureWithExpiry({signature: "", expiry: 0}),
+                ISignatureUtilsMixinTypes.SignatureWithExpiry({signature: "", expiry: 0}),
                 bytes32(0)
             );
             console.log("Node address:", stakingNodes[i]);

lib/openzeppelin-contracts

@@ -33,3 +33,8 @@ contract DeployStakingNode is BaseYnETHScript {
 //   Deployer Public Key: 0x445b64828683ae4B6D5f0542f9E97707d631A847
 //   Staking Node Implementation: 0x79388c8cc46069c0e3f285f053692D7397e65e1e
 //   Deployment JSON file written successfully: /Users/parth/Desktop/coding/yieldnest/prod-code-repos/yieldnest-protocol-private/deployments/ynETH-1.json
+
+
+// HOLESKY DEPLOYMENT
+//   Staking Node Implementation: 0xdd8e2B6B4D71E0E1b077dFcaea3Ca85fF31803a6
+

lib/openzeppelin-contracts-upgradeable

@@ -33,3 +33,6 @@ contract DeployStakingNodesManager is BaseYnETHScript {
 //   Deployer Public Key: 0x445b64828683ae4B6D5f0542f9E97707d631A847
 //   StakingNodesManager Implementation: 0x8E0b49B4A4384D812Bc6F55fA6412547524D41Ab
 //   Deployment JSON file written successfully: /Users/parth/Desktop/coding/yieldnest/prod-code-repos/yieldnest-protocol-private/deployments/ynETH-1.json
+
+// HOLESKY DEPLOYMENT
+//   StakingNodesManager Implementation: 0x99a108a79419c62F2Ff384cE2441b435b918a252

script/ContractAddresses.sol

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: BSD 3-Clause License
+pragma solidity ^0.8.24;
+
+import {BaseYnETHScript} from "script/ynETH/BaseYnETHScript.s.sol";
+import {WithdrawalsProcessor} from "src/WithdrawalsProcessor.sol";
+import {console} from "lib/forge-std/src/console.sol";
+
+contract DeployWithdrawalsProcessor is BaseYnETHScript {
+
+    function run() external {
+
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+
+        address publicKey = vm.addr(deployerPrivateKey);
+        console.log("Deployer Public Key:", publicKey);
+
+        address _broadcaster = vm.addr(deployerPrivateKey);
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        console.log("Current Block Number:", block.number);
+        console.log("Current Chain ID:", block.chainid);
+
+        WithdrawalsProcessor withdrawalsProcessorImplementation = new WithdrawalsProcessor();
+
+        console.log("Withdrawals Processor Implementation:", address(withdrawalsProcessorImplementation));
+
+        vm.stopBroadcast();
+        
+    }
+}
+
+// HOLESKY DEPLOYMENT
+//   Withdrawals Processor Implementation: 0xAbE3b5bF154d6441C63Dc34691E4F51Dbfac3bB0

script/delegation/DelegateTransactionDataBuilder.sol

@@ -639,12 +639,15 @@ contract Verify is BaseYnETHScript {
     function veryifySanityChecks() internal view {
         // Check that previewDeposit of 1 ETH is less than 1 ether
         uint256 previewDepositResult = deployment.ynETH.previewDeposit(1 ether);
+        console.log("previewDepositResult", previewDepositResult);
         require(previewDepositResult < 1 ether, "previewDeposit of 1 ETH should be less than 1 ether");
         console.log("\u2705 previewDeposit of 1 ETH is less than 1 ether");
 
         // Check that totalSupply is less than totalAssets
         uint256 totalSupply = deployment.ynETH.totalSupply();
         uint256 totalAssets = deployment.ynETH.totalAssets();
+        console.log("totalSupply", totalSupply);
+        console.log("totalAssets", totalAssets);
         require(totalSupply < totalAssets, "totalSupply should be less than totalAssets");
         console.log("\u2705 totalSupply is less than totalAssets");
 
@@ -665,7 +668,8 @@ contract Verify is BaseYnETHScript {
         for (uint256 i = 0; i < stakingNodes.length; i++) {
             stakingNodesBalance += stakingNodes[i].getETHBalance();     
             console.log(string.concat("Balance for node ", vm.toString(i), ": ", vm.toString(stakingNodes[i].getETHBalance()), " wei (", vm.toString(stakingNodes[i].getETHBalance() / 1e18), " ETH)"));
-
+            console.log(string.concat("Pre ELIP002 queued shares for node ", vm.toString(i), ": ", vm.toString(stakingNodes[i].preELIP002QueuedSharesAmount()), " wei (", vm.toString(stakingNodes[i].preELIP002QueuedSharesAmount() / 1e18), " ETH)"));
+            console.log(string.concat("Queued shares for node ", vm.toString(i), ": ", vm.toString(stakingNodes[i].queuedSharesAmount()), " wei (", vm.toString(stakingNodes[i].queuedSharesAmount() / 1e18), " ETH)"));
         }
 
         uint256 totalCalculatedBalance = ynETHBalance + redemptionVaultBalance + stakingNodesBalance;

script/ynETH/DeployStakingNode.s.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BSD 3-Clause License
+pragma solidity ^0.8.24;
+
+import {StakingNodesManager} from "./StakingNodesManager.sol";
+import {IRewardsCoordinator} from "lib/eigenlayer-contracts/src/contracts/interfaces/IRewardsCoordinator.sol";
+
+contract HoleskyStakingNodesManager is StakingNodesManager {
+
+     function initializeV3(
+        IRewardsCoordinator _rewardsCoordinator
+    ) external override reinitializer(3) {
+        if (address(_rewardsCoordinator) == address(0)) revert ZeroAddress();
+        rewardsCoordinator = _rewardsCoordinator;
+    }
+
+}