Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates timelock delay #306

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Once the proposal has gone through each of these delays, it is then directed to
```mermaid
graph TD;
D["<a href='#phase-3-on-chain-dao-vote' style='text-decoration:none;'><b>On-chain DAO vote</b></a><br/><span style='font-size:smaller'>(14 days, extendable by 2 days)</span>"];
D -->|"<span style='padding: 3px;'>Passes, Constitutional AIP</span>"| E["<a href='#phase-4-l2-waiting-period' style='text-decoration:none;'><b>L2 waiting period</b></a><br/><span style='font-size:smaller'>(3 days)</span>"];
D -->|"<span style='padding: 3px;'>Passes, Constitutional AIP</span>"| E["<a href='#phase-4-l2-waiting-period' style='text-decoration:none;'><b>L2 waiting period</b></a><br/><span style='font-size:smaller'>(8 days)</span>"];
E --> F["<a href='#phase-5-l2-to-l1-message' style='text-decoration:none;'><b>L2-to-L1 message</b></a><br/><span style='font-size:smaller'>(~ 1 week)</span>"];
F --> G["<a href='#phase-6-l1-waiting-period' style='text-decoration:none;'><b>L1 waiting period</b></a><br/><span style='font-size:smaller'>(3 days)</span>"];
G --> H["<a href='#phase-7-implementation' style='text-decoration:none;'><b>Execution target</b></a>"];
Expand Down
Binary file modified docs/roundtrip-governance.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/security-council-election-flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ graph TD
A["Nominee selection (7 days)"] --> B["Compliance check by foundation (14 days)"]
B --> C["Member election (21 days)"]
C --> D["Security council manager (0 days)"]
D --> E["L2 Timelock (3 days)\nWithdrawal period (~1 week)\nL1 Timelock (3 days)"]
D --> E["L2 Timelock (8 days)\nWithdrawal period (~1 week)\nL1 Timelock (3 days)"]
E --> F["Individual council updates (0 days)"]
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"actionChainIds": [
42161
],
"actionAddresses": [
"0x5B947D8bF197467be7ef381b7cAfEE0A7B35737A"
],
"arbSysSendTxToL1Args": {
"l1Timelock": "0xE6841D92B0C345144506576eC13ECf5103aC7f49",
"calldata": "0x8f2a0bb000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000da537a8813f50264f91f9a2f8abcd15373495e15278e7fe7cfa90e0892f8c300000000000000000000000000000000000000000000000000000000000003f4800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd0000000000000000000000005b947d8bf197467be7ef381b7cafee0a7b35737a00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

# CoreGovTimelockUpdateDelayEightDayAction 0x5B947D8bF197467be7ef381b7cAfEE0A7B35737A

yarn gen:proposalData \
--govChainProviderRPC https://arb1.arbitrum.io/rpc \
--actionChainIds 42161 \
--actionAddresses 0x5B947D8bF197467be7ef381b7cAfEE0A7B35737A \
--writeToJsonPath ./scripts/proposals/CoreGovTimelockUpdateDelayEightDay/CoreGovTimelockUpdateDelayEightDay.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity 0.8.16;

import "../address-registries/L2AddressRegistryInterfaces.sol";

/// @notice Updates the delay of the core gov timelock to 8 days
/// and sets the new constitution hash
contract CoreGovTimelockUpdateDelayEightDayAction {
IL2AddressRegistry public constant govAddressRegistry = IL2AddressRegistry(0x56C4E9Eb6c63aCDD19AeC2b1a00e4f0d7aBda9d3);
uint256 public constant delay = 86400 * 8;
bytes32 public constant newConstitutionHash =
0x28faf2acba9b3ff80ec484e3d5646931eeef40568b1b7c38dbe52b890bfd7938;

function perform() external {
govAddressRegistry.coreGovTimelock().updateDelay(delay);
require(
govAddressRegistry.coreGovTimelock().getMinDelay() == delay,
"CoreGovTimelockUpdateDelayAction: Timelock delay"
);

IArbitrumDAOConstitution arbitrumDaoConstitution =
govAddressRegistry.arbitrumDAOConstitution();
arbitrumDaoConstitution.setConstitutionHash(newConstitutionHash);
require(
arbitrumDaoConstitution.constitutionHash() == newConstitutionHash,
"CoreGovTimelockUpdateDelayAction: new constitution hash not set"
);
}
}
Loading