@@ -20,11 +20,8 @@ import "eigenlayer-contracts/src/contracts/core/RewardsCoordinator.sol";
2020import "eigenlayer-contracts/src/contracts/strategies/StrategyBase.sol " ;
2121import "eigenlayer-contracts/src/contracts/pods/EigenPodManager.sol " ;
2222import "eigenlayer-contracts/src/contracts/pods/EigenPod.sol " ;
23- import "eigenlayer-contracts/src/contracts/pods/DelayedWithdrawalRouter.sol " ;
2423import "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol " ;
2524import "eigenlayer-contracts/src/test/mocks/ETHDepositMock.sol " ;
26- // import "eigenlayer-contracts/src/test/integration/mocks/BeaconChainOracleMock.t.sol";
27- import "test/integration/mocks/BeaconChainOracleMock.t.sol " ;
2825
2926// Middleware contracts
3027import "src/RegistryCoordinator.sol " ;
@@ -57,9 +54,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
5754 Slasher slasher;
5855 IBeacon eigenPodBeacon;
5956 EigenPod pod;
60- DelayedWithdrawalRouter delayedWithdrawalRouter;
6157 ETHPOSDepositMock ethPOSDeposit;
62- BeaconChainOracleMock beaconChainOracle;
6358
6459 // Base strategy implementation in case we want to create more strategies later
6560 StrategyBase baseStrategyImplementation;
@@ -92,7 +87,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
9287 address rewardsUpdater = address (uint160 (uint256 (keccak256 ("rewardsUpdater " ))));
9388
9489 // Constants/Defaults
95- uint64 constant MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR = 32e9 ;
90+ uint64 constant GENESIS_TIME_LOCAL = 1 hours * 12 ;
9691 uint256 constant MIN_BALANCE = 1e6 ;
9792 uint256 constant MAX_BALANCE = 5e6 ;
9893 uint256 constant MAX_STRATEGY_COUNT = 32 ; // From StakeRegistry.MAX_WEIGHING_FUNCTION_LENGTH
@@ -121,7 +116,6 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
121116 // Deploy mocks
122117 EmptyContract emptyContract = new EmptyContract ();
123118 ethPOSDeposit = new ETHPOSDepositMock ();
124- beaconChainOracle = new BeaconChainOracleMock ();
125119
126120 /**
127121 * First, deploy upgradeable proxy contracts that **will point** to the implementations. Since the implementation contracts are
@@ -147,11 +141,6 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
147141 new TransparentUpgradeableProxy (address (emptyContract), address (proxyAdmin), "" )
148142 )
149143 );
150- delayedWithdrawalRouter = DelayedWithdrawalRouter (
151- address (
152- new TransparentUpgradeableProxy (address (emptyContract), address (proxyAdmin), "" )
153- )
154- );
155144 avsDirectory = AVSDirectory (
156145 address (
157146 new TransparentUpgradeableProxy (address (emptyContract), address (proxyAdmin), "" )
@@ -164,10 +153,8 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
164153 // Deploy EigenPod Contracts
165154 pod = new EigenPod (
166155 ethPOSDeposit,
167- delayedWithdrawalRouter,
168156 eigenPodManager,
169- MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR,
170- 0
157+ GENESIS_TIME_LOCAL
171158 );
172159
173160 eigenPodBeacon = new UpgradeableBeacon (address (pod));
@@ -181,8 +168,6 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
181168 EigenPodManager eigenPodManagerImplementation = new EigenPodManager (
182169 ethPOSDeposit, eigenPodBeacon, strategyManager, slasher, delegationManager
183170 );
184- DelayedWithdrawalRouter delayedWithdrawalRouterImplementation =
185- new DelayedWithdrawalRouter (eigenPodManager);
186171 AVSDirectory avsDirectoryImplemntation = new AVSDirectory (delegationManager);
187172 // RewardsCoordinator rewardsCoordinatorImplementation = new RewardsCoordinator(
188173 // delegationManager,
@@ -240,24 +225,11 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
240225 address (eigenPodManagerImplementation),
241226 abi.encodeWithSelector (
242227 EigenPodManager.initialize.selector ,
243- address (beaconChainOracle),
244228 eigenLayerReputedMultisig, // initialOwner
245229 pauserRegistry,
246230 0 // initialPausedStatus
247231 )
248232 );
249- // Delayed Withdrawal Router
250- proxyAdmin.upgradeAndCall (
251- TransparentUpgradeableProxy (payable (address (delayedWithdrawalRouter))),
252- address (delayedWithdrawalRouterImplementation),
253- abi.encodeWithSelector (
254- DelayedWithdrawalRouter.initialize.selector ,
255- eigenLayerReputedMultisig, // initialOwner
256- pauserRegistry,
257- 0 , // initialPausedStatus
258- minWithdrawalDelayBlocks
259- )
260- );
261233 // AVSDirectory
262234 proxyAdmin.upgradeAndCall (
263235 TransparentUpgradeableProxy (payable (address (avsDirectory))),
0 commit comments