Skip to content

Commit d1653bf

Browse files
committed
fix: update initialDeployment status in test upgrade
1 parent 327a6f9 commit d1653bf

File tree

2 files changed

+37
-35
lines changed

2 files changed

+37
-35
lines changed

script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ contract Queue_M2_Upgrade is M2_Mainnet_Upgrade, TimelockEncoding {
289289
// Check correctness after upgrade
290290
_verifyContractPointers();
291291
_verifyImplementations();
292-
_verifyContractsInitialized({isInitialDeployment: true});
292+
_verifyContractsInitialized({isInitialDeployment: false});
293293
_verifyInitializationParams();
294294
}
295295

script/utils/ExistingDeploymentParser.sol

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -381,40 +381,42 @@ contract ExistingDeploymentParser is Script, Test {
381381
* @param isInitialDeployment True if this is the first deployment of contracts from scratch
382382
*/
383383
function _verifyContractsInitialized(bool isInitialDeployment) internal virtual{
384-
// AVSDirectory
385-
vm.expectRevert(bytes("Initializable: contract is already initialized"));
386-
avsDirectory.initialize(address(0), eigenLayerPauserReg, AVS_DIRECTORY_INIT_PAUSED_STATUS);
387-
// DelegationManager
388-
vm.expectRevert(bytes("Initializable: contract is already initialized"));
389-
IStrategy[] memory initializeStrategiesToSetDelayBlocks = new IStrategy[](0);
390-
uint256[] memory initializeWithdrawalDelayBlocks = new uint256[](0);
391-
delegationManager.initialize(
392-
address(0),
393-
eigenLayerPauserReg,
394-
0,
395-
0, // minWithdrawalDelayBLocks
396-
initializeStrategiesToSetDelayBlocks,
397-
initializeWithdrawalDelayBlocks
398-
);
399-
// StrategyManager
400-
vm.expectRevert(bytes("Initializable: contract is already initialized"));
401-
strategyManager.initialize(address(0), address(0), eigenLayerPauserReg, STRATEGY_MANAGER_INIT_PAUSED_STATUS);
402-
// EigenPodManager
403-
vm.expectRevert(bytes("Initializable: contract is already initialized"));
404-
eigenPodManager.initialize(
405-
beaconOracle,
406-
address(0),
407-
eigenLayerPauserReg,
408-
EIGENPOD_MANAGER_INIT_PAUSED_STATUS
409-
);
410-
// DelayedWithdrawalRouter
411-
vm.expectRevert(bytes("Initializable: contract is already initialized"));
412-
delayedWithdrawalRouter.initialize(
413-
address(0),
414-
eigenLayerPauserReg,
415-
DELAYED_WITHDRAWAL_ROUTER_INIT_PAUSED_STATUS,
416-
DELAYED_WITHDRAWAL_ROUTER_INIT_WITHDRAWAL_DELAY_BLOCKS
417-
);
384+
if (isInitialDeployment) {
385+
// AVSDirectory
386+
vm.expectRevert(bytes("Initializable: contract is already initialized"));
387+
avsDirectory.initialize(address(0), eigenLayerPauserReg, AVS_DIRECTORY_INIT_PAUSED_STATUS);
388+
// DelegationManager
389+
vm.expectRevert(bytes("Initializable: contract is already initialized"));
390+
IStrategy[] memory initializeStrategiesToSetDelayBlocks = new IStrategy[](0);
391+
uint256[] memory initializeWithdrawalDelayBlocks = new uint256[](0);
392+
delegationManager.initialize(
393+
address(0),
394+
eigenLayerPauserReg,
395+
0,
396+
0, // minWithdrawalDelayBLocks
397+
initializeStrategiesToSetDelayBlocks,
398+
initializeWithdrawalDelayBlocks
399+
);
400+
// StrategyManager
401+
vm.expectRevert(bytes("Initializable: contract is already initialized"));
402+
strategyManager.initialize(address(0), address(0), eigenLayerPauserReg, STRATEGY_MANAGER_INIT_PAUSED_STATUS);
403+
// EigenPodManager
404+
vm.expectRevert(bytes("Initializable: contract is already initialized"));
405+
eigenPodManager.initialize(
406+
beaconOracle,
407+
address(0),
408+
eigenLayerPauserReg,
409+
EIGENPOD_MANAGER_INIT_PAUSED_STATUS
410+
);
411+
// DelayedWithdrawalRouter
412+
vm.expectRevert(bytes("Initializable: contract is already initialized"));
413+
delayedWithdrawalRouter.initialize(
414+
address(0),
415+
eigenLayerPauserReg,
416+
DELAYED_WITHDRAWAL_ROUTER_INIT_PAUSED_STATUS,
417+
DELAYED_WITHDRAWAL_ROUTER_INIT_WITHDRAWAL_DELAY_BLOCKS
418+
);
419+
}
418420
// Strategies
419421
for (uint256 i = 0; i < deployedStrategyArray.length; ++i) {
420422
vm.expectRevert(bytes("Initializable: contract is already initialized"));

0 commit comments

Comments
 (0)