Danoctavian/sc 1162/implement generalized withdrawal queue manager

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "lib/openzeppelin-contracts-upgradeable"]
 	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
-	commit = 723f8cab09cdae1aca9ec9cc1cfa040c2d4b06c1
+	commit = 22489db15621b9a42ebddb1facade6962034e9b9
 [submodule "lib/safe-smart-account"]
 	path = lib/safe-smart-account
 	url = https://github.com/safe-global/safe-smart-account
@@ -17,4 +17,4 @@
 [submodule "lib/eigenlayer-contracts"]
 	path = lib/eigenlayer-contracts
 	url = https://github.com/layr-labs/eigenlayer-contracts
-	commit = 90a0f6aee79b4a38e1b63b32f9627f21b1162fbb
+	commit = bda003385c5fec59e35196dc14d01f17d1eb7001

deployments/ynETH-17000.json

@@ -11,11 +11,10 @@
   "STAKING_NODES_OPERATOR": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
   "STAKING_NODE_CREATOR": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
   "VALIDATOR_MANAGER": "0x9Dd8F69b62ddFd990241530F47dcEd0Dad7f7d39",
-  "implementation-StakingNodesManager": "0xDDd8f9Ad981444a0C44c611E9438b06FFc2bd354",
+  "implementation-StakingNodesManager": "0x104f0c5156BC0D9Cbda3f30d1B74F42b5610A2dF",
   "implementation-ynETH": "0x0E60A5db38c545ced3d3480B6768811cc603649A",
   "implementation-executionLayerReceiver": "0x1fbedf3773418f20b9dfeafcd9d263030eb0e42f",
   "implementation-consensusLayerReceiver": "0xe7acc0533c650ad0cc11f57f81c38fa19634b1d7",
-  "implementation-StakingNode": "0xe01a7328090c95e89Ec689b005392Cf7e5De90d9",
   "implementation-RewardsDistributor": "0xb6ec4d9f71e437c672147c576f1c70ba5da8d159",
   "proxy-consensusLayerReceiver": "0x706EED02702fFE9CBefD6A65E63f3C2b59B7eF2d",
   "proxy-executionLayerReceiver": "0xA5E9E1ceb4cC1854d0e186a9B3E67158b84AD072",
@@ -27,5 +26,5 @@
   "proxyAdmin-rewardsDistributor": "0xc0300eefe38a393681b6eca7912985a165d37c0e",
   "proxyAdmin-executionLayerReceiver": "0x319f70591f72c5d69823dfc673acdfefd6aee5a1",
   "proxyAdmin-consensusLayerReceiver": "0x6234fd395c1f090334606efbf3cbf3be46fcf177",
-  "stakingNodeImplementation": "0xe01a7328090c95e89Ec689b005392Cf7e5De90d9"
+  "stakingNodeImplementation": "0x5B70F2Fc1a33bB96828edc08B87C35392F2F0591"
 }

deployments/ynETHWithdrawals-17000.json

@@ -0,0 +1,12 @@
+{
+  "DEPLOYER": "0xd7d4A7f14265B0A69AE482b85B0a8496c3F99fb9",
+  "implementation-stakingNodesManager": "0xC9cf6740282617f3B392f900De0449E687Ce05e3",
+  "implementation-withdrawalQueueManager": "0x28732d8061D35B77dC2997926e0449dAdc3Ef3DD",
+  "implementation-ynETH": "0x090D67d3C97712f6C17a037515CbB8502561EE57",
+  "implementation-ynETHRedemptionAssetsVault": "0x7eBE6EAC9AD9B5e4D637c8f05191b273b009461a",
+  "proxy-withdrawalQueueManager": "0x141aAb320857145fB42240C979b800f48CE5B678",
+  "proxy-ynETHRedemptionAssetsVault": "0x3a2DD2f0f5A20768110a52fC4f091AB9d8631b58",
+  "proxyAdmin-withdrawalQueueManager": "0x26425968beb4bD9c09b02C433996Cd05B1Fd4f07",
+  "proxyAdmin-ynETHRedemptionAssetsVault": "0xd4d8E80d1c959CdC4601Cc6A0cc1EC18aBeB1888",
+  "stakingNodeImplementation": "0xf07861349Ed0cB4603590B47D2269768Ed6E2821"
+}

script/Actors.sol

@@ -27,6 +27,10 @@ contract ActorAddresses {
         address POOLED_DEPOSITS_OWNER;
         address PAUSE_ADMIN;
         address REFERRAL_PUBLISHER;
+        address WITHDRAWAL_MANAGER;
+        address REDEMPTION_ASSET_WITHDRAWER;
+        address REQUEST_FINALIZER;
+        address STAKING_NODES_WITHDRAWER;
         address STRATEGY_CONTROLLER;
         address TOKEN_STAKING_NODE_OPERATOR;
     }
@@ -62,7 +66,6 @@ contract ActorAddresses {
                 // TODO: replace with concrete deployment
                 YNTokenStakingNodeOperator: 0x2234567890123456789012345678901234567890
             });
-
             actors[17000] = Actors({
                 eoa: EOAActors({
                     DEFAULT_SIGNER: 0x72fdBD51085bDa5eEEd3b55D1a46E2e92f0837a5,
@@ -89,7 +92,11 @@ contract ActorAddresses {
                     PAUSE_ADMIN: holeskyWallets.YNSecurityCouncil,
                     REFERRAL_PUBLISHER: holeskyWallets.YNDev,
                     STRATEGY_CONTROLLER: holeskyWallets.YNStrategyController,
-                    TOKEN_STAKING_NODE_OPERATOR: holeskyWallets.YNTokenStakingNodeOperator
+                    TOKEN_STAKING_NODE_OPERATOR: holeskyWallets.YNTokenStakingNodeOperator,
+                    WITHDRAWAL_MANAGER: holeskyWallets.YNDev,
+                    REDEMPTION_ASSET_WITHDRAWER: holeskyWallets.YNDev,
+                    REQUEST_FINALIZER: holeskyWallets.YNDev,
+                    STAKING_NODES_WITHDRAWER: holeskyWallets.YNDev
                 }),
                 wallets: holeskyWallets
             });
@@ -131,6 +138,14 @@ contract ActorAddresses {
                 POOLED_DEPOSITS_OWNER: 0xE1fAc59031520FD1eb901da990Da12Af295e6731,
                 PAUSE_ADMIN: mainnetWallets.YNDev,
                 REFERRAL_PUBLISHER: mainnetWallets.YNDev,
+                // TODO: fix for mainnet deployment
+                WITHDRAWAL_MANAGER: mainnetWallets.YNDev,
+                // TODO: fix for mainnet deployment
+                REDEMPTION_ASSET_WITHDRAWER: mainnetWallets.YNDev,
+                // TODO: fix for mainnet deployment
+                REQUEST_FINALIZER: mainnetWallets.YNDev,
+                // TODO: fix for mainnet deployment
+                STAKING_NODES_WITHDRAWER: mainnetWallets.YNDev,
                 STRATEGY_CONTROLLER: mainnetWallets.YNStrategyController,
                 TOKEN_STAKING_NODE_OPERATOR: mainnetWallets.YNTokenStakingNodeOperator
             }),

script/ContractAddresses.sol

@@ -20,6 +20,8 @@ contract ContractAddresses {
         address REWARDS_DISTRIBUTOR_ADDRESS;
         address EXECUTION_LAYER_RECEIVER_ADDRESS;
         address CONSENSUS_LAYER_RECEIVER_ADDRESS;  
+        address YNETH_REDEMPTION_ASSETS_VAULT_ADDRESS;
+        address WITHDRAWAL_QUEUE_MANAGER_ADDRESS;
     }
 
     struct EigenlayerAddresses {
@@ -119,7 +121,9 @@ contract ContractAddresses {
                 STAKING_NODES_MANAGER_ADDRESS: 0x8C33A1d6d062dB7b51f79702355771d44359cD7d,
                 REWARDS_DISTRIBUTOR_ADDRESS: 0x40d5FF3E218f54f4982661a0464a298Cf6652351,
                 EXECUTION_LAYER_RECEIVER_ADDRESS: 0x1D6b2a11FFEa5F9a8Ed85A02581910b3d695C12b,
-                CONSENSUS_LAYER_RECEIVER_ADDRESS: 0xE439fe4563F7666FCd7405BEC24aE7B0d226536e
+                CONSENSUS_LAYER_RECEIVER_ADDRESS: 0xE439fe4563F7666FCd7405BEC24aE7B0d226536e,
+                YNETH_REDEMPTION_ASSETS_VAULT_ADDRESS: address(0),
+                WITHDRAWAL_QUEUE_MANAGER_ADDRESS: address(0)
             }),
             ynEigen: YnEigenAddresses({
                 YNEIGEN_ADDRESS: 0x35Ec69A77B79c255e5d47D5A3BdbEFEfE342630c,
@@ -174,7 +178,9 @@ contract ContractAddresses {
                 STAKING_NODES_MANAGER_ADDRESS: 0xc2387EBb4Ea66627E3543a771e260Bd84218d6a1,
                 REWARDS_DISTRIBUTOR_ADDRESS: 0x82915efF62af9FCC0d0735b8681959e069E3f2D8,
                 EXECUTION_LAYER_RECEIVER_ADDRESS: 0xA5E9E1ceb4cC1854d0e186a9B3E67158b84AD072,
-                CONSENSUS_LAYER_RECEIVER_ADDRESS: 0x706EED02702fFE9CBefD6A65E63f3C2b59B7eF2d
+                CONSENSUS_LAYER_RECEIVER_ADDRESS: 0x706EED02702fFE9CBefD6A65E63f3C2b59B7eF2d,
+                YNETH_REDEMPTION_ASSETS_VAULT_ADDRESS: 0x3a2DD2f0f5A20768110a52fC4f091AB9d8631b58,
+                WITHDRAWAL_QUEUE_MANAGER_ADDRESS: 0x141aAb320857145fB42240C979b800f48CE5B678
             }),
             ynEigen: YnEigenAddresses({
                 YNEIGEN_ADDRESS: 0x071bdC8eDcdD66730f45a3D3A6F794FAA37C75ED,

script/DeployYieldNest.s.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.24;
 import {TransparentUpgradeableProxy} from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {IEigenPodManager} from "lib/eigenlayer-contracts/src/contracts/interfaces/IEigenPodManager.sol";
 import {IDelegationManager} from "lib/eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
-import {IDelayedWithdrawalRouter} from "lib/eigenlayer-contracts/src/contracts/interfaces/IDelayedWithdrawalRouter.sol";
+// import {IDelayedWithdrawalRouter} from "lib/eigenlayer-contracts/src/contracts/interfaces/IDelayedWithdrawalRouter.sol";
 import {IStrategyManager} from "lib/eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";
 import {IDepositContract} from "src/external/ethereum/IDepositContract.sol";
 import {IRewardsDistributor} from "src/interfaces/IRewardsDistributor.sol";
@@ -42,7 +42,7 @@ contract DeployYieldNest is BaseYnETHScript {
 
     IEigenPodManager public eigenPodManager;
     IDelegationManager public delegationManager;
-    IDelayedWithdrawalRouter public delayedWithdrawalRouter;
+    // IDelayedWithdrawalRouter public delayedWithdrawalRouter;
     IStrategyManager public strategyManager;
     IDepositContract public depositContract;
     IWETH public weth;
@@ -72,7 +72,7 @@ contract DeployYieldNest is BaseYnETHScript {
         ContractAddresses.ChainAddresses memory chainAddresses = contractAddresses.getChainAddresses(block.chainid);
         eigenPodManager = IEigenPodManager(chainAddresses.eigenlayer.EIGENPOD_MANAGER_ADDRESS);
         delegationManager = IDelegationManager(chainAddresses.eigenlayer.DELEGATION_MANAGER_ADDRESS);
-        delayedWithdrawalRouter = IDelayedWithdrawalRouter(chainAddresses.eigenlayer.DELAYED_WITHDRAWAL_ROUTER_ADDRESS);
+        // delayedWithdrawalRouter = IDelayedWithdrawalRouter(chainAddresses.eigenlayer.DELAYED_WITHDRAWAL_ROUTER_ADDRESS);
         strategyManager = IStrategyManager(chainAddresses.eigenlayer.STRATEGY_MANAGER_ADDRESS);
         depositContract = IDepositContract(chainAddresses.ethereum.DEPOSIT_2_ADDRESS);
         weth = IWETH(chainAddresses.ethereum.WETH_ADDRESS);
@@ -131,7 +131,7 @@ contract DeployYieldNest is BaseYnETHScript {
             depositContract: depositContract,
             eigenPodManager: eigenPodManager,
             delegationManager: delegationManager,
-            delayedWithdrawalRouter: delayedWithdrawalRouter,
+            // delayedWithdrawalRouter: delayedWithdrawalRouter,
             strategyManager: strategyManager
         });
         stakingNodesManager.initialize(stakingNodesManagerInit);