Skip to content

fix: storage collision in RegistryCoordinatorStorage #452

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix: storage collision in RegistryCoordinatorStorage #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 13 additions & 31 deletions docs/storage-report/RegistryCoordinatorStorage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@

╭-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------╮
| Name | Type | Slot | Offset | Bytes | Contract |
+=============================================================================================================================================================================================+
| quorumCount | uint8 | 0 | 0 | 1 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| _quorumParams | mapping(uint8 => struct ISlashingRegistryCoordinatorTypes.OperatorSetParam) | 1 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| _operatorBitmapHistory | mapping(bytes32 => struct ISlashingRegistryCoordinatorTypes.QuorumBitmapUpdate[]) | 2 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| _operatorInfo | mapping(address => struct ISlashingRegistryCoordinatorTypes.OperatorInfo) | 3 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| isChurnApproverSaltUsed | mapping(bytes32 => bool) | 4 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| quorumUpdateBlockNumber | mapping(uint8 => uint256) | 5 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| registries | address[] | 6 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| churnApprover | address | 7 | 0 | 20 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| ejector | address | 8 | 0 | 20 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| lastEjectionTimestamp | mapping(address => uint256) | 9 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| ejectionCooldown | uint256 | 10 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| isOperatorSetAVS | bool | 11 | 0 | 1 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| isM2Quorum | mapping(uint8 => bool) | 12 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------|
| __GAP | uint256[37] | 13 | 0 | 1184 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
╰-------------------------+---------------------------------------------------------------------------+------+--------+-------+---------------------------------------------------------------╯
╭--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------╮
| Name | Type | Slot | Offset | Bytes | Contract |
+======================================================================================================================================+
| __USED | uint256[13] | 0 | 0 | 416 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------|
| operatorSetsEnabled | bool | 13 | 0 | 1 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------|
| isM2QuorumRegistrationDisabled | bool | 13 | 1 | 1 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------|
| _m2QuorumBitmap | uint256 | 14 | 0 | 32 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
|--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------|
| __GAP | uint256[35] | 15 | 0 | 1120 | src/RegistryCoordinatorStorage.sol:RegistryCoordinatorStorage |
╰--------------------------------+-------------+------+--------+-------+---------------------------------------------------------------╯

5 changes: 4 additions & 1 deletion src/RegistryCoordinatorStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ abstract contract RegistryCoordinatorStorage is IRegistryCoordinator {
*
*/

// Slots already used in this contract
uint256[13] private __USED;

/// @notice Whether this AVS allows operator sets for creation/registration
/// @dev If true, then operator sets may be created and operators may register to operator sets via the AllocationManager
bool public operatorSetsEnabled;
Expand All @@ -47,5 +50,5 @@ abstract contract RegistryCoordinatorStorage is IRegistryCoordinator {
serviceManager = _serviceManager;
}

uint256[48] private __GAP;
uint256[35] private __GAP;
}
Loading