withdrawals contract addresses + cleanup

yieldnest · Oct 13, 2024 · 843fb89 · 843fb89
1 parent a236431
commit 843fb89
Show file tree

Hide file tree

Showing 15 changed files with 252 additions and 960 deletions.
diff --git a/deployments/ynETH-1.json b/deployments/ynETH-1.json
@@ -15,20 +15,29 @@
   "implementation-consensusLayerReceiver": "0xa98e8652DAF2407839b18f4e215D86D88Eb91582",
   "implementation-executionLayerReceiver": "0x863Ba8f64b1528De6c8A7239D80D4f2b7CfF159B",
   "implementation-rewardsDistributor": "0x306EBed66642867B94b29752be37b8f20fEb5F72",
-  "implementation-stakingNodesManager": "0xaBD3A755E4eEF24f862c268D21Fd5235904cc811",
-  "implementation-ynETH": "0x14DC3d915107DcA9ed39E29E14fbdfe4358a1346",
+  "implementation-stakingNodesManager": "0x33Ffb713C73Cdf668b11296Bb9B1C9a0C3100626",
+  "implementation-ynETH": "0x87E2A51d3B88FC2f5917a7aB793ea595b243710a",
   "implementation-ynViewer": "0x0365a6eF790e05EEe386B57326e5Ceaf5B10899e",
+  "implementation-withdrawalQueueManager": "0x6ac38ab99053a2585B6184D0AD72018Ae22185CD",
+  "implementation-withdrawalsProcessor": "0x97e619c4573ce55A3Aa8e105E339dce00e3bF3B2",
+  "implementation-ynETHRedemptionAssetsVault": "0xe1a2A7FAc6729360e6794f2f137621E2Cdb0Fed5",
   "proxy-consensusLayerReceiver": "0xE439fe4563F7666FCd7405BEC24aE7B0d226536e",
   "proxy-executionLayerReceiver": "0x1D6b2a11FFEa5F9a8Ed85A02581910b3d695C12b",
   "proxy-rewardsDistributor": "0x40d5FF3E218f54f4982661a0464a298Cf6652351",
   "proxy-stakingNodesManager": "0x8C33A1d6d062dB7b51f79702355771d44359cD7d",
   "proxy-ynETH": "0x09db87A538BD693E9d08544577d5cCfAA6373A48",
   "proxy-ynViewer": "0xF0207Ffa0b793E009DF9Df62fEE95B8FC6c93EcF",
+  "proxy-withdrawalQueueManager": "0x0BC9BC81aD379810B36AD5cC95387112990AA67b",
+  "proxy-withdrawalsProcessor": "0x6d052CdEd3F64aea51f6051F33b68b42016C5FbA",
+  "proxy-ynETHRedemptionAssetsVault": "0x5D6e53c42E3B37f82F693937BC508940769c5caf",
   "proxyAdmin-consensusLayerReceiver": "0xaB5CC95BD4F5C45F637B6D319169Bbbc212CfEE8",
   "proxyAdmin-executionLayerReceiver": "0x5a3d6625C6d26E3650675bF2b7041cd7d16A63B2",
   "proxyAdmin-rewardsDistributor": "0x17ecBFce53B364Fd571D159eA2b766bA3114d85E",
   "proxyAdmin-stakingNodesManager": "0x091929600D3891861615098fc9eA3a0270966398",
   "proxyAdmin-ynETH": "0x12e9DA7e671342E7A5fDD7197348C8019e72C31F",
   "proxyAdmin-ynViewer": "0xcAD4147b889D5A5564575fDA6B2910eeF5eBA03A",
-  "stakingNodeImplementation": "0xF8A37F34a427611C4c54F82bF43230FA041d237B"
+  "proxyAdmin-withdrawalQueueManager": "0xd3f08F92D6752B01FC5b706AdbE254B222A1BdaA",
+  "proxyAdmin-withdrawalsProcessor": "0xb5234121Be2144975a123C4457606e6F4e5E2a6b",
+  "proxyAdmin-ynETHRedemptionAssetsVault": "0x364b8154Ea1673E360446c3D17480d32C3E71B2c",
+  "stakingNodeImplementation": "0xA8bD8f089F5Bd0BeE61e23B3A0a4aA1332Fe929d"
 }
diff --git a/deployments/ynETHWithdrawals-1.json b/deployments/ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/StakingNode-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/StakingNode-ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/StakingNodesManager-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/StakingNodesManager-ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/WithdrawalQueueManager-implementation-nETHWithdrawals-1.json b/deployments/yneth-withdrawals/WithdrawalQueueManager-implementation-nETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/WithdrawalQueueManager-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/WithdrawalQueueManager-ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/WithdrawalsProcessor-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/WithdrawalsProcessor-ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/ynETH-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/ynETH-ynETHWithdrawals-1.json
diff --git a/deployments/yneth-withdrawals/ynETHRedemptionAssetsVault-ynETHWithdrawals-1.json b/deployments/yneth-withdrawals/ynETHRedemptionAssetsVault-ynETHWithdrawals-1.json
diff --git a/script/ynETH/BaseYnETHScript.s.sol b/script/ynETH/BaseYnETHScript.s.sol
@@ -118,16 +118,14 @@ abstract contract BaseYnETHScript is BaseScript {
         deployment.ynViewer = ynViewer(payable(jsonContent.readAddress(".proxy-ynViewer")));
         proxies.ynViewer = loadProxyAddresses(jsonContent, "ynViewer");
 
-        if (block.chainid == 17000) { // Holesky chain ID
-            deployment.withdrawalQueueManager = WithdrawalQueueManager(payable(jsonContent.readAddress(".proxy-withdrawalQueueManager")));
-            proxies.withdrawalQueueManager = loadProxyAddresses(jsonContent, "withdrawalQueueManager");
+        deployment.withdrawalQueueManager = WithdrawalQueueManager(payable(jsonContent.readAddress(".proxy-withdrawalQueueManager")));
+        proxies.withdrawalQueueManager = loadProxyAddresses(jsonContent, "withdrawalQueueManager");
 
-            deployment.ynETHRedemptionAssetsVaultInstance = ynETHRedemptionAssetsVault(payable(jsonContent.readAddress(".proxy-ynETHRedemptionAssetsVault")));
-            proxies.ynETHRedemptionAssetsVault = loadProxyAddresses(jsonContent, "ynETHRedemptionAssetsVault");
+        deployment.ynETHRedemptionAssetsVaultInstance = ynETHRedemptionAssetsVault(payable(jsonContent.readAddress(".proxy-ynETHRedemptionAssetsVault")));
+        proxies.ynETHRedemptionAssetsVault = loadProxyAddresses(jsonContent, "ynETHRedemptionAssetsVault");
 
-            deployment.withdrawalsProcessor = WithdrawalsProcessor(payable(jsonContent.readAddress(".proxy-withdrawalsProcessor")));
-            proxies.withdrawalsProcessor = loadProxyAddresses(jsonContent, "withdrawalsProcessor");
-        }
+        deployment.withdrawalsProcessor = WithdrawalsProcessor(payable(jsonContent.readAddress(".proxy-withdrawalsProcessor")));
+        proxies.withdrawalsProcessor = loadProxyAddresses(jsonContent, "withdrawalsProcessor");
 
         deployment.proxies = proxies;