fix: correct storage gap for ProtocolRegistryStorage #1673
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nadir-akhtar
force-pushed
the
nadir/protocol-registry-storage-gap
branch
from
15d6d26 to
b3021f0
Compare
ypatil12
approved these changes
Dec 2, 2025
ypatil12
merged commit 2eaee42
into
release-dev/slashing-ux-improvements
9 checks passed
ypatil12
added a commit
that referenced
this pull request
Dec 2, 2025
Storage gaps should add up to 50. As demonstrated by inspecting storage via `forge`: ```txt % forge inspect ProtocolRegistryStorage storage ╭--------------------+--------------------------------------------------------------------+------+--------+-------+--------------------------------------------------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | +==================================================================================================================================================================================================+ | _semanticVersion | ShortString | 0 | 0 | 32 | src/contracts/core/storage/ProtocolRegistryStorage.sol:ProtocolRegistryStorage | |--------------------+--------------------------------------------------------------------+------+--------+-------+--------------------------------------------------------------------------------| | _deployments | struct EnumerableMap.UintToAddressMap | 1 | 0 | 96 | src/contracts/core/storage/ProtocolRegistryStorage.sol:ProtocolRegistryStorage | |--------------------+--------------------------------------------------------------------+------+--------+-------+--------------------------------------------------------------------------------| | _deploymentConfigs | mapping(address => struct IProtocolRegistryTypes.DeploymentConfig) | 4 | 0 | 32 | src/contracts/core/storage/ProtocolRegistryStorage.sol:ProtocolRegistryStorage | |--------------------+--------------------------------------------------------------------+------+--------+-------+--------------------------------------------------------------------------------| | __gap | uint256[47] | 5 | 0 | 1504 | src/contracts/core/storage/ProtocolRegistryStorage.sol:ProtocolRegistryStorage | ╰--------------------+--------------------------------------------------------------------+------+--------+-------+--------------------------------------------------------------------------------╯ ``` The `__gap` begins at slot `5` -- however, the gap is of size `47`, which adds up to `52`. Though this is not an issue, it does defy convention, and can cause confusion later if a developer assumes the gap needs to be corrected to add up to 50. --------- Co-authored-by: Nadir Akhtar <[email protected]> Co-authored-by: Yash Patil <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Storage gaps should add up to 50. As demonstrated by inspecting storage via
forge:The
__gapbegins at slot5-- however, the gap is of size47, which adds up to52. Though this is not an issue, it does defy convention, and can cause confusion later if a developer assumes the gap needs to be corrected to add up to 50.