From bb721924446210ce0d76c34249ee811eaad1e4ab Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Thu, 3 Oct 2024 14:26:39 +0200 Subject: [PATCH] Updated test.bash to include arb timelock --- test/storage/ArbitrumTimelock | 13 +++++++++++++ test/storage/SecurityCouncilManager | 25 ++++++++++++------------- test/storage/test.bash | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 test/storage/ArbitrumTimelock diff --git a/test/storage/ArbitrumTimelock b/test/storage/ArbitrumTimelock new file mode 100644 index 00000000..982aba98 --- /dev/null +++ b/test/storage/ArbitrumTimelock @@ -0,0 +1,13 @@ +| Name | Type | Slot | Offset | Bytes | Contract | +|---------------|--------------------------------------------------------------|------|--------|-------|-------------------------------------------| +| _initialized | uint8 | 0 | 0 | 1 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| _initializing | bool | 0 | 1 | 1 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| __gap | uint256[50] | 1 | 0 | 1600 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| __gap | uint256[50] | 51 | 0 | 1600 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| _roles | mapping(bytes32 => struct AccessControlUpgradeable.RoleData) | 101 | 0 | 32 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| __gap | uint256[49] | 102 | 0 | 1568 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| _timestamps | mapping(bytes32 => uint256) | 151 | 0 | 32 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| _minDelay | uint256 | 152 | 0 | 32 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| __gap | uint256[48] | 153 | 0 | 1536 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| _arbMinDelay | uint256 | 201 | 0 | 32 | src/ArbitrumTimelock.sol:ArbitrumTimelock | +| __gap | uint256[49] | 202 | 0 | 1568 | src/ArbitrumTimelock.sol:ArbitrumTimelock | diff --git a/test/storage/SecurityCouncilManager b/test/storage/SecurityCouncilManager index 1ed981c3..486474e7 100644 --- a/test/storage/SecurityCouncilManager +++ b/test/storage/SecurityCouncilManager @@ -6,16 +6,15 @@ | __gap | uint256[50] | 51 | 0 | 1600 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | | _roles | mapping(bytes32 => struct AccessControlUpgradeable.RoleData) | 101 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | | __gap | uint256[49] | 102 | 0 | 1568 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| _HASHED_NAME | bytes32 | 151 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| _HASHED_VERSION | bytes32 | 152 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| __gap | uint256[50] | 153 | 0 | 1600 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| firstCohort | address[] | 203 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| secondCohort | address[] | 204 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| l2CoreGovTimelock | address payable | 205 | 0 | 20 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| securityCouncils | struct SecurityCouncilData[] | 206 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| router | contract UpgradeExecRouteBuilder | 207 | 0 | 20 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| updateNonce | uint256 | 208 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| cohortSize | uint256 | 209 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| lastRotated | mapping(address => uint256) | 210 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| minRotationPeriod | uint256 | 211 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | -| __gap | uint256[43] | 212 | 0 | 1376 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| firstCohort | address[] | 151 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| secondCohort | address[] | 152 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| l2CoreGovTimelock | address payable | 153 | 0 | 20 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| securityCouncils | struct SecurityCouncilData[] | 154 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| router | contract UpgradeExecRouteBuilder | 155 | 0 | 20 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| updateNonce | uint256 | 156 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| cohortSize | uint256 | 157 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| lastRotated | mapping(address => uint256) | 158 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| minRotationPeriod | uint256 | 159 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| NAME_HASH | bytes32 | 160 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| VERSION_HASH | bytes32 | 161 | 0 | 32 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | +| __gap | uint256[43] | 162 | 0 | 1376 | src/security-council-mgmt/SecurityCouncilManager.sol:SecurityCouncilManager | diff --git a/test/storage/test.bash b/test/storage/test.bash index 463b8f87..f4457848 100755 --- a/test/storage/test.bash +++ b/test/storage/test.bash @@ -1,6 +1,6 @@ #!/bin/bash output_dir="./test/storage" -for CONTRACTNAME in SecurityCouncilManager L1ArbitrumTimelock L2ArbitrumTimelock L2ArbitrumGovernor L2ArbitrumToken L1ArbitrumToken FixedDelegateErc20Wallet UpgradeExecutor SecurityCouncilMemberElectionGovernor SecurityCouncilMemberRemovalGovernor SecurityCouncilNomineeElectionGovernor +for CONTRACTNAME in SecurityCouncilManager L1ArbitrumTimelock ArbitrumTimelock L2ArbitrumGovernor L2ArbitrumToken L1ArbitrumToken FixedDelegateErc20Wallet UpgradeExecutor SecurityCouncilMemberElectionGovernor SecurityCouncilMemberRemovalGovernor SecurityCouncilNomineeElectionGovernor do echo "Checking storage change of $CONTRACTNAME" [ -f "$output_dir/$CONTRACTNAME" ] && mv "$output_dir/$CONTRACTNAME" "$output_dir/$CONTRACTNAME-old"