From a425e91b7f27e93893e960993723069ff14602e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keszey=20D=C3=A1niel?= Date: Tue, 16 Apr 2024 16:50:02 +0200 Subject: [PATCH 1/4] Revoke timelock_admin role from msg.sender --- packages/protocol/script/DeployOnL1.s.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 37c77d66fdb..d61f2c83f61 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -158,6 +158,7 @@ contract DeployOnL1 is DeployCapability { console2.log("** rollupAddressManager ownership transferred to timelock:", timelock); _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), address(this)); + _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), msg.sender); _timelock.revokeRole(_timelock.PROPOSER_ROLE(), msg.sender); _timelock.revokeRole(_timelock.EXECUTOR_ROLE(), msg.sender); _timelock.transferOwnership(securityCouncil); From 0a6156964af3466a5b587ea4ae9c4fd991c69364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keszey=20D=C3=A1niel?= Date: Tue, 16 Apr 2024 16:51:41 +0200 Subject: [PATCH 2/4] order --- packages/protocol/script/DeployOnL1.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index d61f2c83f61..1bdea45bcec 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -158,10 +158,10 @@ contract DeployOnL1 is DeployCapability { console2.log("** rollupAddressManager ownership transferred to timelock:", timelock); _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), address(this)); - _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), msg.sender); _timelock.revokeRole(_timelock.PROPOSER_ROLE(), msg.sender); _timelock.revokeRole(_timelock.EXECUTOR_ROLE(), msg.sender); _timelock.transferOwnership(securityCouncil); + _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), msg.sender); } function deploySharedContracts() From 5041b08c640ab9df19daa32387b662a5c6c2c494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keszey=20D=C3=A1niel?= Date: Tue, 16 Apr 2024 16:54:12 +0200 Subject: [PATCH 3/4] rnounce role --- packages/protocol/script/DeployOnL1.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 1bdea45bcec..2e9a918e528 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -161,7 +161,7 @@ contract DeployOnL1 is DeployCapability { _timelock.revokeRole(_timelock.PROPOSER_ROLE(), msg.sender); _timelock.revokeRole(_timelock.EXECUTOR_ROLE(), msg.sender); _timelock.transferOwnership(securityCouncil); - _timelock.revokeRole(_timelock.TIMELOCK_ADMIN_ROLE(), msg.sender); + _timelock.renounceRole(_timelock.TIMELOCK_ADMIN_ROLE()); } function deploySharedContracts() From cdd43d2c1ffdf999a97ad73c24a11a733428b64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keszey=20D=C3=A1niel?= Date: Tue, 16 Apr 2024 16:59:04 +0200 Subject: [PATCH 4/4] self renounce --- packages/protocol/script/DeployOnL1.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 2e9a918e528..461e75aaa62 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -161,7 +161,7 @@ contract DeployOnL1 is DeployCapability { _timelock.revokeRole(_timelock.PROPOSER_ROLE(), msg.sender); _timelock.revokeRole(_timelock.EXECUTOR_ROLE(), msg.sender); _timelock.transferOwnership(securityCouncil); - _timelock.renounceRole(_timelock.TIMELOCK_ADMIN_ROLE()); + _timelock.renounceRole(_timelock.TIMELOCK_ADMIN_ROLE(), msg.sender); } function deploySharedContracts()