Feat: v2 Core Features

.gitmodules

@@ -16,3 +16,7 @@
 [submodule "lib/chainlink-brownie-contracts"]
 	path = lib/chainlink-brownie-contracts
 	url = https://github.com/smartcontractkit/chainlink-brownie-contracts
+[submodule "lib/v3-core"]
+	path = lib/v3-core
+	url = https://github.com/Uniswap/v3-core.git
+	branch = 0.8

remappings.txt

@@ -8,4 +8,5 @@ lib/eigenlayer-contracts/=lib/eigenlayer-contracts/
 @openzeppelin-upgradeable/contracts/=lib/eigenlayer-contracts/lib/openzeppelin-contracts-upgradeable-v4.9.0/contracts/
 @openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol=lib/eigenlayer-contracts/lib/openzeppelin-contracts-v4.9.0/contracts/proxy/transparent/TransparentUpgradeableProxy.sol
 @openzeppelin/contracts/proxy/beacon/IBeacon.sol=lib/eigenlayer-contracts/lib/openzeppelin-contracts-v4.9.0/contracts/proxy/beacon/IBeacon.sol
-@chainlink/contracts/src/interfaces/feeds/=lib/foundry-chainlink-toolkit/src/interfaces/feeds/
+@chainlink/contracts/src/interfaces/feeds/=lib/foundry-chainlink-toolkit/src/interfaces/feeds/
+@uniswap/v3-core/=lib/v3-core/

script/deploy/holesky/Deploy.s.sol

@@ -1,3 +1,8 @@
+ /*
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+TO BE DEPRECATED
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.27;
 
@@ -20,9 +25,12 @@ import {TokenRegistryOracle} from "../../../src/utils/TokenRegistryOracle.sol";
 import {ITokenRegistryOracle} from "../../../src/interfaces/ITokenRegistryOracle.sol";
 import {LiquidTokenManager} from "../../../src/core/LiquidTokenManager.sol";
 import {ILiquidTokenManager} from "../../../src/interfaces/ILiquidTokenManager.sol";
+import {ILSTSwapRouter} from "../../../src/interfaces/ILSTSwapRouter.sol";
 import {StakerNode} from "../../../src/core/StakerNode.sol";
 import {StakerNodeCoordinator} from "../../../src/core/StakerNodeCoordinator.sol";
 import {IStakerNodeCoordinator} from "../../../src/interfaces/IStakerNodeCoordinator.sol";
+import {WithdrawalManager} from "../../../src/core/WithdrawalManager.sol";
+import {IWithdrawalManager} from "../../../src/interfaces/IWithdrawalManager.sol";
 
 /// @dev To load env file:
 // source .env
@@ -89,13 +97,15 @@ contract Deploy is Script, Test {
     TokenRegistryOracle tokenRegistryOracleImpl;
     LiquidTokenManager liquidTokenManagerImpl;
     StakerNodeCoordinator stakerNodeCoordinatorImpl;
+    WithdrawalManager withdrawalManagerImpl;
     StakerNode stakerNodeImpl;
 
     // Proxy contracts
     LiquidToken liquidToken;
     TokenRegistryOracle tokenRegistryOracle;
     LiquidTokenManager liquidTokenManager;
     StakerNodeCoordinator stakerNodeCoordinator;
+    WithdrawalManager withdrawalManager;
 
     // Deployment blocks and timestamps
     uint256 public proxyAdminDeployBlock;
@@ -109,6 +119,8 @@ contract Deploy is Script, Test {
     uint256 public liquidTokenManagerImplDeployTimestamp;
     uint256 public stakerNodeCoordinatorImplDeployBlock;
     uint256 public stakerNodeCoordinatorImplDeployTimestamp;
+    uint256 public withdrawalManagerImplDeployBlock;
+    uint256 public withdrawalManagerImplDeployTimestamp;
     uint256 public stakerNodeImplDeployBlock;
     uint256 public stakerNodeImplDeployTimestamp;
 
@@ -120,6 +132,8 @@ contract Deploy is Script, Test {
     uint256 public liquidTokenManagerProxyDeployTimestamp;
     uint256 public stakerNodeCoordinatorProxyDeployBlock;
     uint256 public stakerNodeCoordinatorProxyDeployTimestamp;
+    uint256 public withdrawalManagerProxyDeployBlock;
+    uint256 public withdrawalManagerProxyDeployTimestamp;
 
     // Initialization timestamps and blocks
     uint256 public tokenRegistryOracleInitBlock;
@@ -130,6 +144,8 @@ contract Deploy is Script, Test {
     uint256 public liquidTokenManagerInitTimestamp;
     uint256 public stakerNodeCoordinatorInitBlock;
     uint256 public stakerNodeCoordinatorInitTimestamp;
+    uint256 public withdrawalManagerInitBlock;
+    uint256 public withdrawalManagerInitTimestamp;
     uint256 public oracleSalt;
 
     function run(string memory deployConfigFileName) external {
@@ -156,7 +172,7 @@ contract Deploy is Script, Test {
     }
 
     // Helper function to count array entries
-    function _countTokens(string memory deployConfigData) internal returns (uint256) {
+    function _countTokens(string memory deployConfigData) internal view returns (uint256) {
         uint256 i = 0;
         while (true) {
             string memory prefix = string.concat(".tokens[", vm.toString(i), "].addresses.token");
@@ -263,6 +279,10 @@ contract Deploy is Script, Test {
         stakerNodeCoordinatorImplDeployTimestamp = block.timestamp;
         stakerNodeCoordinatorImpl = new StakerNodeCoordinator();
 
+        withdrawalManagerImplDeployBlock = block.number;
+        withdrawalManagerImplDeployTimestamp = block.timestamp;
+        withdrawalManagerImpl = new WithdrawalManager();
+
         stakerNodeImplDeployBlock = block.number;
         stakerNodeImplDeployTimestamp = block.timestamp;
         stakerNodeImpl = new StakerNode();
@@ -278,7 +298,7 @@ contract Deploy is Script, Test {
         liquidTokenManagerProxyDeployBlock = block.number;
         liquidTokenManagerProxyDeployTimestamp = block.timestamp;
         liquidTokenManager = LiquidTokenManager(
-            address(new TransparentUpgradeableProxy(address(liquidTokenManagerImpl), address(proxyAdmin), ""))
+            payable(address(new TransparentUpgradeableProxy(address(liquidTokenManagerImpl), address(proxyAdmin), "")))
         );
 
         stakerNodeCoordinatorProxyDeployBlock = block.number;
@@ -292,13 +312,20 @@ contract Deploy is Script, Test {
         liquidToken = LiquidToken(
             address(new TransparentUpgradeableProxy(address(liquidTokenImpl), address(proxyAdmin), ""))
         );
+
+        withdrawalManagerProxyDeployBlock = block.number;
+        withdrawalManagerProxyDeployTimestamp = block.timestamp;
+        withdrawalManager = WithdrawalManager(
+            address(new TransparentUpgradeableProxy(address(withdrawalManagerImpl), address(proxyAdmin), ""))
+        );
     }
 
     function initializeProxies() internal {
         _initializeTokenRegistryOracle();
         _initializeLiquidTokenManager();
         _initializeStakerNodeCoordinator();
         _initializeLiquidToken();
+        _initializeWithdrawalManager();
     }
 
     function _initializeTokenRegistryOracle() internal {
@@ -327,6 +354,8 @@ contract Deploy is Script, Test {
                 delegationManager: IDelegationManager(delegationManager),
                 stakerNodeCoordinator: stakerNodeCoordinator,
                 tokenRegistryOracle: ITokenRegistryOracle(address(tokenRegistryOracle)),
+                withdrawalManager: withdrawalManager,
+                lstSwapRouter: ILSTSwapRouter(address(0)), // Will be set later
                 initialOwner: msg.sender, // burner, will transfer to admin
                 strategyController: admin,
                 priceUpdater: address(tokenRegistryOracle)
@@ -340,6 +369,7 @@ contract Deploy is Script, Test {
         stakerNodeCoordinator.initialize(
             IStakerNodeCoordinator.Init({
                 liquidTokenManager: liquidTokenManager,
+                withdrawalManager: withdrawalManager,
                 strategyManager: IStrategyManager(strategyManager),
                 delegationManager: IDelegationManager(delegationManager),
                 maxNodes: STAKER_NODE_COORDINATOR_MAX_NODES,
@@ -362,7 +392,22 @@ contract Deploy is Script, Test {
                 initialOwner: admin,
                 pauser: pauser,
                 liquidTokenManager: ILiquidTokenManager(address(liquidTokenManager)),
-                tokenRegistryOracle: ITokenRegistryOracle(address(tokenRegistryOracle))
+                tokenRegistryOracle: ITokenRegistryOracle(address(tokenRegistryOracle)),
+                withdrawalManager: withdrawalManager
+            })
+        );
+    }
+
+    function _initializeWithdrawalManager() internal {
+        withdrawalManagerInitBlock = block.number;
+        withdrawalManagerInitTimestamp = block.timestamp;
+        withdrawalManager.initialize(
+            IWithdrawalManager.Init({
+                initialOwner: admin,
+                delegationManager: IDelegationManager(delegationManager),
+                liquidToken: liquidToken,
+                liquidTokenManager: liquidTokenManager,
+                stakerNodeCoordinator: stakerNodeCoordinator
             })
         );
     }
@@ -460,6 +505,12 @@ contract Deploy is Script, Test {
             _getImplementationFromProxy(address(tokenRegistryOracle)) == address(tokenRegistryOracleImpl),
             "TokenRegistryOracle proxy implementation mismatch"
         );
+
+        // WithdrawalManager
+        require(
+            _getImplementationFromProxy(address(withdrawalManager)) == address(withdrawalManagerImpl),
+            "WithdrawalManager proxy implementation mismatch"
+        );
     }
 
     function _verifyContractConnections() internal view {
@@ -511,6 +562,24 @@ contract Deploy is Script, Test {
             "TokenRegistryOracle: wrong liquidTokenManager"
         );
 
+        // WithdrawalManager
+        require(
+            address(withdrawalManager.delegationManager()) == address(delegationManager),
+            "WithdrawalManager: wrong delegationManager"
+        );
+        require(
+            address(withdrawalManager.liquidToken()) == address(liquidToken),
+            "WithdrawalManager: wrong liquidToken"
+        );
+        require(
+            address(withdrawalManager.liquidTokenManager()) == address(liquidTokenManager),
+            "WithdrawalManager: wrong liquidTokenManager"
+        );
+        require(
+            address(withdrawalManager.stakerNodeCoordinator()) == address(stakerNodeCoordinator),
+            "WithdrawalManager: wrong stakerNodeCoordinator"
+        );
+
         // Assets and strategies
         IERC20[] memory registeredTokens = liquidTokenManager.getSupportedTokens();
         TokenConfig[] memory addableTokens = tokens;
@@ -594,11 +663,13 @@ contract Deploy is Script, Test {
             tokenRegistryOracle.hasRole(tokenRegistryOracle.RATE_UPDATER_ROLE(), priceUpdater),
             "Rate Updater role not assigned to priceUpdater in TokenRegistryOracle"
         );
-
         require(
             tokenRegistryOracle.hasRole(tokenRegistryOracle.RATE_UPDATER_ROLE(), address(liquidToken)),
             "Rate Updater role not assigned to LiquidToken in TokenRegistryOracle"
         );
+
+        // WithdrawalManager
+        require(withdrawalManager.hasRole(adminRole, admin), "Admin role not assigned in WithdrawalManager");
     }
 
     function writeDeploymentOutput() internal {
@@ -663,9 +734,20 @@ contract Deploy is Script, Test {
             tokenRegistryOracleImplDeployTimestamp * 1000
         );
 
+        // WithdrawalManager implementation
+        string memory withdrawalManagerImpl_obj = "withdrawalManager";
+        vm.serializeAddress(withdrawalManagerImpl_obj, "address", address(withdrawalManagerImpl));
+        vm.serializeUint(withdrawalManagerImpl_obj, "block", withdrawalManagerImplDeployBlock);
+        string memory withdrawalManagerImpl_output = vm.serializeUint(
+            withdrawalManagerImpl_obj,
+            "timestamp",
+            withdrawalManagerImplDeployTimestamp * 1000
+        );
+
         // Combine all implementation objects
         vm.serializeString(implementation, "liquidTokenManager", liquidTokenManagerImpl_output);
         vm.serializeString(implementation, "stakerNodeCoordinator", stakerNodeCoordinatorImpl_output);
+        vm.serializeString(implementation, "withdrawalManager", withdrawalManagerImpl_output);
         vm.serializeString(implementation, "stakerNode", stakerNodeImpl_output);
         string memory implementation_output = vm.serializeString(
             implementation,
@@ -706,10 +788,21 @@ contract Deploy is Script, Test {
             tokenRegistryOracleProxyDeployTimestamp * 1000
         );
 
+        // WithdrawalManager proxy
+        string memory withdrawalManager_obj = "withdrawalManager";
+        vm.serializeAddress(withdrawalManager_obj, "address", address(withdrawalManager));
+        vm.serializeUint(withdrawalManager_obj, "block", withdrawalManagerProxyDeployBlock);
+        string memory withdrawalManager_output = vm.serializeUint(
+            withdrawalManager_obj,
+            "timestamp",
+            withdrawalManagerProxyDeployTimestamp * 1000
+        );
+
         // Combine all proxy objects
         vm.serializeString(proxy, "liquidTokenManager", liquidTokenManager_output);
         vm.serializeString(proxy, "stakerNodeCoordinator", stakerNodeCoordinator_output);
-        string memory proxy_output = vm.serializeString(proxy, "tokenRegistryOracle", tokenRegistryOracle_output);
+        vm.serializeString(proxy, "tokenRegistryOracle", tokenRegistryOracle_output);
+        string memory proxy_output = vm.serializeString(proxy, "withdrawalManager", withdrawalManager_output);
 
         // Combine implementation and proxy under contractDeployments
         vm.serializeString(contractDeployments, "implementation", implementation_output);
@@ -769,3 +862,5 @@ contract Deploy is Script, Test {
             );
     }
 }
+
+*/