From ab5779a7c34c49bfdc1688620d85471b262b5232 Mon Sep 17 00:00:00 2001 From: danoctavian Date: Sun, 29 Sep 2024 07:01:45 +0300 Subject: [PATCH] remove HoleskyStakingNodesManager --- src/HoleskyStakingNodesManager.sol | 37 ----------------------------- test/scenarios/ScenarioBaseTest.sol | 5 +--- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 src/HoleskyStakingNodesManager.sol diff --git a/src/HoleskyStakingNodesManager.sol b/src/HoleskyStakingNodesManager.sol deleted file mode 100644 index 232433f45..000000000 --- a/src/HoleskyStakingNodesManager.sol +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: BSD 3-Clause License -pragma solidity ^0.8.24; - -import {StakingNodesManager} from "src/StakingNodesManager.sol"; -import {IStakingNode} from "src/interfaces/IStakingNode.sol"; -import {IStakingNodesManager} from "src/interfaces/IStakingNodesManager.sol"; - -contract HoleskyStakingNodesManager is StakingNodesManager { - // Additional functionality can be added here - - function initializeStakingNode(IStakingNode node, uint256 nodeCount) override internal { - uint64 initializedVersion = node.getInitializedVersion(); - if (initializedVersion == 0) { - node.initialize( - IStakingNode.Init(IStakingNodesManager(address(this)), nodeCount) - ); - - // update to the newly upgraded version. - initializedVersion = node.getInitializedVersion(); - emit NodeInitialized(address(node), initializedVersion); - } - - if (initializedVersion == 1) { - - if (node.nodeId() == 2) { - // assuming 20 unverified validators at upgrade-time - node.initializeV2(20 * 32 ether); - } else { - // assuming no unverified validators at upgrade-time - node.initializeV2(0); - } - - } - // NOTE: for future versions add additional if clauses that initialize the node - // for the next version while keeping the previous initializers - } -} diff --git a/test/scenarios/ScenarioBaseTest.sol b/test/scenarios/ScenarioBaseTest.sol index 990f746c5..6e718b1da 100644 --- a/test/scenarios/ScenarioBaseTest.sol +++ b/test/scenarios/ScenarioBaseTest.sol @@ -25,7 +25,6 @@ import {StakingNode} from "src/StakingNode.sol"; import {Utils} from "script/Utils.sol"; import {ActorAddresses} from "script/Actors.sol"; import {TestAssetUtils} from "test/utils/TestAssetUtils.sol"; -import {HoleskyStakingNodesManager} from "src/HoleskyStakingNodesManager.sol"; import {ITransparentUpgradeableProxy} from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; import {ProxyAdmin} from "lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; import {WithdrawalQueueManager} from "src/WithdrawalQueueManager.sol"; @@ -106,9 +105,7 @@ contract ScenarioBaseTest is Test, Utils { vm.prank(actors.admin.UNPAUSE_ADMIN); yneth.unpauseTransfers(); - address newStakingNodesManagerImpl = block.chainid == 17000 - ? address(new HoleskyStakingNodesManager()) - : address(new StakingNodesManager()); + address newStakingNodesManagerImpl = address(new StakingNodesManager()); vm.prank(actors.wallets.YNSecurityCouncil); ProxyAdmin(getTransparentUpgradeableProxyAdminAddress(address(stakingNodesManager))).upgradeAndCall(ITransparentUpgradeableProxy(address(stakingNodesManager)), newStakingNodesManagerImpl, "");