From 731cb7373cc2d4156542f54ba8d5c7acbc4f3c24 Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 30 Oct 2023 11:22:47 -0400 Subject: [PATCH] chore: remove unused code --- remappings.txt | 7 - script/AVSContractsDeploy.s.sol | 1 - src/StakeRegistry.sol | 1 - test/EigenLayerDeployer.t.sol | 375 ---------------------------- test/Registration.t.sol | 128 ---------- test/unit/StakeRegistryUnit.t.sol | 2 +- test/unit/VoteWeigherBaseUnit.t.sol | 1 - test/utils/MockAVSDeployer.sol | 1 - 8 files changed, 1 insertion(+), 515 deletions(-) delete mode 100644 remappings.txt delete mode 100644 test/EigenLayerDeployer.t.sol delete mode 100644 test/Registration.t.sol diff --git a/remappings.txt b/remappings.txt deleted file mode 100644 index 26950b6a..00000000 --- a/remappings.txt +++ /dev/null @@ -1,7 +0,0 @@ -@openzeppelin-upgrades/=lib/eigenlayer-contracts/lib/openzeppelin-contracts-upgradeable/ -@openzeppelin/=lib/eigenlayer-contracts/lib/openzeppelin-contracts/ -ds-test/=lib/ds-test/src/ -eigenlayer-contracts/=lib/eigenlayer-contracts/ -forge-std/=lib/forge-std/src/ -openzeppelin-contracts-upgradeable/=lib/eigenlayer-contracts/lib/openzeppelin-contracts-upgradeable/ -openzeppelin-contracts/=lib/eigenlayer-contracts/lib/openzeppelin-contracts/ diff --git a/script/AVSContractsDeploy.s.sol b/script/AVSContractsDeploy.s.sol index 6e715431..d3386dd3 100644 --- a/script/AVSContractsDeploy.s.sol +++ b/script/AVSContractsDeploy.s.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; import "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol"; diff --git a/src/StakeRegistry.sol b/src/StakeRegistry.sol index a03c5408..9c45023b 100644 --- a/src/StakeRegistry.sol +++ b/src/StakeRegistry.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/utils/math/Math.sol"; import "eigenlayer-contracts/src/contracts/libraries/BitmapUtils.sol"; import "src/interfaces/IServiceManager.sol"; import "src/interfaces/IStakeRegistry.sol"; diff --git a/test/EigenLayerDeployer.t.sol b/test/EigenLayerDeployer.t.sol deleted file mode 100644 index bb8d94c5..00000000 --- a/test/EigenLayerDeployer.t.sol +++ /dev/null @@ -1,375 +0,0 @@ -// SPDX-License-Identifier: BUSL-1.1 -pragma solidity =0.8.12; - -import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; -import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; -import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; -import "@openzeppelin/contracts/proxy/beacon/IBeacon.sol"; -import "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol"; - -import "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol"; -import "eigenlayer-contracts/src/contracts/core/DelegationManager.sol"; -import {StakeRegistry} from "src/StakeRegistry.sol"; -import {IVoteWeigher} from "src/interfaces/IVoteWeigher.sol"; - -import {IETHPOSDeposit} from "eigenlayer-contracts/src/contracts/interfaces/IETHPOSDeposit.sol"; -import {IBeaconChainOracle} from "eigenlayer-contracts/src/contracts/interfaces/IBeaconChainOracle.sol"; - -import {StrategyManager} from "eigenlayer-contracts/src/contracts/core/StrategyManager.sol"; -import {StrategyBase} from "eigenlayer-contracts/src/contracts/strategies/StrategyBase.sol"; -import {Slasher} from "eigenlayer-contracts/src/contracts/core/Slasher.sol"; - -import {EigenPod} from "eigenlayer-contracts/src/contracts/pods/EigenPod.sol"; -import {EigenPodManager} from "eigenlayer-contracts/src/contracts/pods/EigenPodManager.sol"; -import {DelayedWithdrawalRouter} from "eigenlayer-contracts/src/contracts/pods/DelayedWithdrawalRouter.sol"; - -import {PauserRegistry} from "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol"; - - -import {Operators} from "test/utils/Operators.sol"; - -import {WETH} from "eigenlayer-contracts/src/test/mocks/LiquidStakingToken.sol"; -import {IDelayedWithdrawalRouter} from "eigenlayer-contracts/src/contracts/interfaces/IDelayedWithdrawalRouter.sol"; -import {EmptyContract} from "eigenlayer-contracts/src/test/mocks/EmptyContract.sol"; -import {ETHPOSDepositMock } from "eigenlayer-contracts/src/test/mocks/ETHDepositMock.sol"; -import {BeaconChainOracleMock} from "eigenlayer-contracts/src/test/mocks/BeaconChainOracleMock.sol"; - -import "forge-std/Test.sol"; - -contract EigenLayerDeployer is Operators { - - Vm cheats = Vm(HEVM_ADDRESS); - - // EigenLayer contracts - ProxyAdmin public eigenLayerProxyAdmin; - PauserRegistry public eigenLayerPauserReg; - - Slasher public slasher; - DelegationManager public delegation; - StrategyManager public strategyManager; - EigenPodManager public eigenPodManager; - IEigenPod public pod; - IDelayedWithdrawalRouter public delayedWithdrawalRouter; - IETHPOSDeposit public ethPOSDeposit; - IBeacon public eigenPodBeacon; - - // testing/mock contracts - IERC20 public eigenToken; - IERC20 public weth; - StrategyBase public wethStrat; - StrategyBase public eigenStrat; - StrategyBase public baseStrategyImplementation; - EmptyContract public emptyContract; - - mapping(uint256 => IStrategy) public strategies; - - //from testing seed phrase - bytes32 priv_key_0 = 0x1234567812345678123456781234567812345678123456781234567812345678; - bytes32 priv_key_1 = 0x1234567812345678123456781234567812345698123456781234567812348976; - - //strategy indexes for undelegation (see commitUndelegation function) - uint256[] public strategyIndexes; - address[2] public stakers; - address sample_registrant = cheats.addr(436364636); - - address[] public slashingContracts; - - uint256 wethInitialSupply = 10e50; - uint256 public constant eigenTotalSupply = 1000e18; - uint256 nonce = 69; - uint256 public gasLimit = 750000; - uint32 PARTIAL_WITHDRAWAL_FRAUD_PROOF_PERIOD_BLOCKS = 7 days / 12 seconds; - uint256 REQUIRED_BALANCE_WEI = 31 ether; - uint64 MAX_PARTIAL_WTIHDRAWAL_AMOUNT_GWEI = 1 ether / 1e9; - uint64 MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR = 32e9; - uint64 GOERLI_GENESIS_TIME = 1616508000; - - address pauser; - address unpauser; - address theMultiSig = address(420); - address operator = address(0x4206904396bF2f8b173350ADdEc5007A52664293); //sk: e88d9d864d5d731226020c5d2f02b62a4ce2a4534a39c225d32d3db795f83319 - address acct_0 = cheats.addr(uint256(priv_key_0)); - address acct_1 = cheats.addr(uint256(priv_key_1)); - address _challenger = address(0x6966904396bF2f8b173350bCcec5007A52669873); - address public eigenLayerReputedMultisig = address(this); - - address eigenLayerProxyAdminAddress; - address eigenLayerPauserRegAddress; - address slasherAddress; - address delegationAddress; - address strategyManagerAddress; - address eigenPodManagerAddress; - address podAddress; - address delayedWithdrawalRouterAddress; - address eigenPodBeaconAddress; - address beaconChainOracleAddress; - address emptyContractAddress; - address operationsMultisig; - address executorMultisig; - - - uint256 public initialBeaconChainOracleThreshold = 3; - - string internal goerliDeploymentConfig = vm.readFile("script/output/M1_deployment_goerli_2023_3_23.json"); - - - // addresses excluded from fuzzing due to abnormal behavior. TODO: @Sidu28 define this better and give it a clearer name - mapping (address => bool) fuzzedAddressMapping; - - - //ensures that a passed in address is not set to true in the fuzzedAddressMapping - modifier fuzzedAddress(address addr) virtual { - cheats.assume(fuzzedAddressMapping[addr] == false); - _; - } - - modifier cannotReinit() { - cheats.expectRevert(bytes("Initializable: contract is already initialized")); - _; - } - - //performs basic deployment before each test - // for fork tests run: forge test -vv --fork-url https://eth-goerli.g.alchemy.com/v2/demo -vv - function setUp() public virtual { - try vm.envUint("CHAIN_ID") returns (uint256 chainId) { - if (chainId == 31337) { - _deployEigenLayerContractsLocal(); - } else if (chainId == 5) { - _deployEigenLayerContractsGoerli(); - } - // If CHAIN_ID ENV is not set, assume local deployment on 31337 - } catch { - _deployEigenLayerContractsLocal(); - } - - fuzzedAddressMapping[address(0)] = true; - fuzzedAddressMapping[address(eigenLayerProxyAdmin)] = true; - fuzzedAddressMapping[address(strategyManager)] = true; - fuzzedAddressMapping[address(eigenPodManager)] = true; - fuzzedAddressMapping[address(delegation)] = true; - fuzzedAddressMapping[address(slasher)] = true; - } - - function _deployEigenLayerContractsGoerli() internal { - _setAddresses(goerliDeploymentConfig); - pauser = operationsMultisig; - unpauser = executorMultisig; - // deploy proxy admin for ability to upgrade proxy contracts - eigenLayerProxyAdmin = ProxyAdmin(eigenLayerProxyAdminAddress); - - emptyContract = new EmptyContract(); - - //deploy pauser registry - eigenLayerPauserReg = PauserRegistry(eigenLayerPauserRegAddress); - - delegation = DelegationManager(delegationAddress); - strategyManager = StrategyManager(strategyManagerAddress); - slasher = Slasher(slasherAddress); - eigenPodManager = EigenPodManager(eigenPodManagerAddress); - delayedWithdrawalRouter = DelayedWithdrawalRouter(delayedWithdrawalRouterAddress); - - beaconChainOracleAddress = address(new BeaconChainOracleMock()); - - ethPOSDeposit = new ETHPOSDepositMock(); - pod = new EigenPod(ethPOSDeposit, delayedWithdrawalRouter, eigenPodManager, MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR, GOERLI_GENESIS_TIME); - - eigenPodBeacon = new UpgradeableBeacon(address(pod)); - - - - //simple ERC20 (**NOT** WETH-like!), used in a test strategy - weth = new ERC20PresetFixedSupply( - "weth", - "WETH", - wethInitialSupply, - address(this) - ); - - // deploy StrategyBase contract implementation, then create upgradeable proxy that points to implementation and initialize it - baseStrategyImplementation = new StrategyBase(strategyManager); - wethStrat = StrategyBase( - address( - new TransparentUpgradeableProxy( - address(baseStrategyImplementation), - address(eigenLayerProxyAdmin), - abi.encodeWithSelector(StrategyBase.initialize.selector, weth, eigenLayerPauserReg) - ) - ) - ); - - eigenToken = new ERC20PresetFixedSupply( - "eigen", - "EIGEN", - wethInitialSupply, - address(this) - ); - - // deploy upgradeable proxy that points to StrategyBase implementation and initialize it - eigenStrat = StrategyBase( - address( - new TransparentUpgradeableProxy( - address(baseStrategyImplementation), - address(eigenLayerProxyAdmin), - abi.encodeWithSelector(StrategyBase.initialize.selector, eigenToken, eigenLayerPauserReg) - ) - ) - ); - - stakers = [acct_0, acct_1]; - } - - function _deployEigenLayerContractsLocal() internal { - pauser = address(69); - unpauser = address(489); - // deploy proxy admin for ability to upgrade proxy contracts - eigenLayerProxyAdmin = new ProxyAdmin(); - - //deploy pauser registry - address[] memory pausers = new address[](1); - pausers[0] = pauser; - eigenLayerPauserReg = new PauserRegistry(pausers, unpauser); - - /** - * First, deploy upgradeable proxy contracts that **will point** to the implementations. Since the implementation contracts are - * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code. - */ - emptyContract = new EmptyContract(); - delegation = DelegationManager( - address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), "")) - ); - strategyManager = StrategyManager( - address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), "")) - ); - slasher = Slasher( - address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), "")) - ); - eigenPodManager = EigenPodManager( - address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), "")) - ); - delayedWithdrawalRouter = DelayedWithdrawalRouter( - address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), "")) - ); - - ethPOSDeposit = new ETHPOSDepositMock(); - pod = new EigenPod(ethPOSDeposit, delayedWithdrawalRouter, eigenPodManager, MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR, GOERLI_GENESIS_TIME); - - eigenPodBeacon = new UpgradeableBeacon(address(pod)); - - // Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs - DelegationManager delegationImplementation = new DelegationManager(strategyManager, slasher, eigenPodManager); - StrategyManager strategyManagerImplementation = new StrategyManager(delegation, eigenPodManager, slasher); - Slasher slasherImplementation = new Slasher(strategyManager, delegation); - EigenPodManager eigenPodManagerImplementation = new EigenPodManager(ethPOSDeposit, eigenPodBeacon, strategyManager, slasher, delegation); - DelayedWithdrawalRouter delayedWithdrawalRouterImplementation = new DelayedWithdrawalRouter(eigenPodManager); - - // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them. - eigenLayerProxyAdmin.upgradeAndCall( - TransparentUpgradeableProxy(payable(address(delegation))), - address(delegationImplementation), - abi.encodeWithSelector( - DelegationManager.initialize.selector, - eigenLayerReputedMultisig, - eigenLayerPauserReg, - 0/*initialPausedStatus*/ - ) - ); - eigenLayerProxyAdmin.upgradeAndCall( - TransparentUpgradeableProxy(payable(address(strategyManager))), - address(strategyManagerImplementation), - abi.encodeWithSelector( - StrategyManager.initialize.selector, - eigenLayerReputedMultisig, - eigenLayerReputedMultisig, - eigenLayerPauserReg, - 0/*initialPausedStatus*/ - ) - ); - eigenLayerProxyAdmin.upgradeAndCall( - TransparentUpgradeableProxy(payable(address(slasher))), - address(slasherImplementation), - abi.encodeWithSelector( - Slasher.initialize.selector, - eigenLayerReputedMultisig, - eigenLayerPauserReg, - 0/*initialPausedStatus*/ - ) - ); - eigenLayerProxyAdmin.upgradeAndCall( - TransparentUpgradeableProxy(payable(address(eigenPodManager))), - address(eigenPodManagerImplementation), - abi.encodeWithSelector( - EigenPodManager.initialize.selector, - type(uint256).max, // maxPods - beaconChainOracleAddress, - eigenLayerReputedMultisig, - eigenLayerPauserReg, - 0/*initialPausedStatus*/ - ) - ); - uint256 initPausedStatus = 0; - uint256 withdrawalDelayBlocks = PARTIAL_WITHDRAWAL_FRAUD_PROOF_PERIOD_BLOCKS; - eigenLayerProxyAdmin.upgradeAndCall( - TransparentUpgradeableProxy(payable(address(delayedWithdrawalRouter))), - address(delayedWithdrawalRouterImplementation), - abi.encodeWithSelector(DelayedWithdrawalRouter.initialize.selector, - eigenLayerReputedMultisig, - eigenLayerPauserReg, - initPausedStatus, - withdrawalDelayBlocks) - ); - - //simple ERC20 (**NOT** WETH-like!), used in a test strategy - weth = new ERC20PresetFixedSupply( - "weth", - "WETH", - wethInitialSupply, - address(this) - ); - - // deploy StrategyBase contract implementation, then create upgradeable proxy that points to implementation and initialize it - baseStrategyImplementation = new StrategyBase(strategyManager); - wethStrat = StrategyBase( - address( - new TransparentUpgradeableProxy( - address(baseStrategyImplementation), - address(eigenLayerProxyAdmin), - abi.encodeWithSelector(StrategyBase.initialize.selector, weth, eigenLayerPauserReg) - ) - ) - ); - - eigenToken = new ERC20PresetFixedSupply( - "eigen", - "EIGEN", - wethInitialSupply, - address(this) - ); - - // deploy upgradeable proxy that points to StrategyBase implementation and initialize it - eigenStrat = StrategyBase( - address( - new TransparentUpgradeableProxy( - address(baseStrategyImplementation), - address(eigenLayerProxyAdmin), - abi.encodeWithSelector(StrategyBase.initialize.selector, eigenToken, eigenLayerPauserReg) - ) - ) - ); - - stakers = [acct_0, acct_1]; - } - - function _setAddresses(string memory config) internal { - eigenLayerProxyAdminAddress = stdJson.readAddress(config, ".addresses.eigenLayerProxyAdmin"); - eigenLayerPauserRegAddress = stdJson.readAddress(config, ".addresses.eigenLayerPauserReg"); - delegationAddress = stdJson.readAddress(config, ".addresses.delegation"); - strategyManagerAddress = stdJson.readAddress(config, ".addresses.strategyManager"); - slasherAddress = stdJson.readAddress(config, ".addresses.slasher"); - eigenPodManagerAddress = stdJson.readAddress(config, ".addresses.eigenPodManager"); - delayedWithdrawalRouterAddress = stdJson.readAddress(config, ".addresses.delayedWithdrawalRouter"); - emptyContractAddress = stdJson.readAddress(config, ".addresses.emptyContract"); - operationsMultisig = stdJson.readAddress(config, ".parameters.operationsMultisig"); - executorMultisig = stdJson.readAddress(config, ".parameters.executorMultisig"); - } - -} diff --git a/test/Registration.t.sol b/test/Registration.t.sol deleted file mode 100644 index 23707a5b..00000000 --- a/test/Registration.t.sol +++ /dev/null @@ -1,128 +0,0 @@ -// SPDX-License-Identifier: BUSL-1.1 -pragma solidity =0.8.12; - -// import "./EigenLayerTestHelper.t.sol"; - -// import "@openzeppelin/contracts/utils/math/Math.sol"; - -// import "../contracts/libraries/BytesLib.sol"; - -// import "./mocks/MiddlewareVoteWeigherMock.sol"; -// import "./mocks/ServiceManagerMock.sol"; -// import "./mocks/PublicKeyCompendiumMock.sol"; -// import "./mocks/StrategyManagerMock.sol"; - -// import "../../src/contracts/middleware/BLSRegistry.sol"; -// import "../../src/contracts/middleware/BLSPublicKeyCompendium.sol"; - - - -// contract RegistrationTests is EigenLayerTestHelper { - -// BLSRegistry public dlRegImplementation; -// BLSPublicKeyCompendiumMock public pubkeyCompendium; - -// BLSPublicKeyCompendiumMock public pubkeyCompendiumImplementation; -// BLSRegistry public dlReg; -// ProxyAdmin public dataLayrProxyAdmin; - -// ServiceManagerMock public dlsm; -// StrategyManagerMock public strategyManagerMock; - -// function setUp() public virtual override { -// EigenLayerDeployer.setUp(); -// initializeMiddlewares(); -// } - - -// function initializeMiddlewares() public { -// dataLayrProxyAdmin = new ProxyAdmin(); -// fuzzedAddressMapping[address(dataLayrProxyAdmin)] = true; - -// pubkeyCompendium = new BLSPublicKeyCompendiumMock(); - -// strategyManagerMock = new StrategyManagerMock(); -// strategyManagerMock.setAddresses(delegation, eigenPodManager, slasher); - -// dlsm = new ServiceManagerMock(slasher); - -// dlReg = BLSRegistry( -// address(new TransparentUpgradeableProxy(address(emptyContract), address(dataLayrProxyAdmin), "")) -// ); - -// dlRegImplementation = new BLSRegistry( -// strategyManagerMock, -// dlsm, -// pubkeyCompendium -// ); - -// uint256[] memory _quorumBips = new uint256[](2); -// // split 60% ETH quorum, 40% EIGEN quorum -// _quorumBips[0] = 6000; -// _quorumBips[1] = 4000; - -// VoteWeigherBaseStorage.StrategyAndWeightingMultiplier[] memory ethStratsAndMultipliers = -// new VoteWeigherBaseStorage.StrategyAndWeightingMultiplier[](1); -// ethStratsAndMultipliers[0].strategy = wethStrat; -// ethStratsAndMultipliers[0].multiplier = 1e18; -// VoteWeigherBaseStorage.StrategyAndWeightingMultiplier[] memory eigenStratsAndMultipliers = -// new VoteWeigherBaseStorage.StrategyAndWeightingMultiplier[](1); -// eigenStratsAndMultipliers[0].strategy = eigenStrat; -// eigenStratsAndMultipliers[0].multiplier = 1e18; - -// dataLayrProxyAdmin.upgradeAndCall( -// TransparentUpgradeableProxy(payable(address(dlReg))), -// address(dlRegImplementation), -// abi.encodeWithSelector(BLSRegistry.initialize.selector, address(this), false, _quorumBips, ethStratsAndMultipliers, eigenStratsAndMultipliers) -// ); - -// } - - -// function testRegisterOperator(address operator, uint32 operatorIndex, string calldata socket) public fuzzedAddress(operator) { -// cheats.assume(operatorIndex < 15); -// BN254.G1Point memory pk = getOperatorPubkeyG1(operatorIndex); - - //register as both ETH and EIGEN operator - // uint256 wethToDeposit = 1e18; - // uint256 eigenToDeposit = 1e18; - // _testDepositWeth(operator, wethToDeposit); - // _testDepositEigen(operator, eigenToDeposit); - // IDelegationManager.OperatorDetails memory operatorDetails = IDelegationManager.OperatorDetails({ - // earningsReceiver: operator, - // delegationApprover: address(0), - // stakerOptOutWindowBlocks: 0 - // }); - // _testRegisterAsOperator(operator, operatorDetails); - -// cheats.startPrank(operator); -// slasher.optIntoSlashing(address(dlsm)); -// pubkeyCompendium.registerPublicKey(pk); -// dlReg.registerOperator(1, pk, socket); -// cheats.stopPrank(); - -// bytes32 pubkeyHash = BN254.hashG1Point(pk); - -// (uint32 toBlockNumber, uint32 index) = dlReg.pubkeyHashToIndexHistory(pubkeyHash,0); - -// assertTrue(toBlockNumber == 0, "block number set when it shouldn't be"); -// assertTrue(index == 0, "index has been set incorrectly"); -// assertTrue(dlReg.operatorList(0) == operator, "incorrect operator added"); -// } - -// function testDeregisterOperator(address operator, uint32 operatorIndex, string calldata socket) public fuzzedAddress(operator) { -// cheats.assume(operatorIndex < 15); -// BN254.G1Point memory pk = getOperatorPubkeyG1(operatorIndex); - -// testRegisterOperator(operator, operatorIndex, socket); -// cheats.startPrank(operator); -// dlReg.deregisterOperator(pk, 0); -// cheats.stopPrank(); - -// bytes32 pubkeyHash = BN254.hashG1Point(pk); -// (uint32 toBlockNumber, /*uint32 index*/) = dlReg.pubkeyHashToIndexHistory(pubkeyHash,0); -// assertTrue(toBlockNumber == block.number, "toBlockNumber has been set incorrectly"); -// } - - -// } \ No newline at end of file diff --git a/test/unit/StakeRegistryUnit.t.sol b/test/unit/StakeRegistryUnit.t.sol index f46af60b..64599d44 100644 --- a/test/unit/StakeRegistryUnit.t.sol +++ b/test/unit/StakeRegistryUnit.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; +import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; import {Slasher} from "eigenlayer-contracts/src/contracts/core/Slasher.sol"; diff --git a/test/unit/VoteWeigherBaseUnit.t.sol b/test/unit/VoteWeigherBaseUnit.t.sol index fb2d1309..0ea8cd3b 100644 --- a/test/unit/VoteWeigherBaseUnit.t.sol +++ b/test/unit/VoteWeigherBaseUnit.t.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; diff --git a/test/utils/MockAVSDeployer.sol b/test/utils/MockAVSDeployer.sol index 456e3bd8..64611832 100644 --- a/test/utils/MockAVSDeployer.sol +++ b/test/utils/MockAVSDeployer.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol"; import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";