fix: accountstorage coverage, natspec, storage root derivation #246
Conversation
This file contains 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
Summary by OctaneNew ContractsNo new contracts were added in this PR. Updated Contracts
🔗 Commit Hash: b9a7366 |
|
Contract sizes: | Contract | Size (B) | Margin (B) |
|-------------------------------|----------|------------|
| AccountFactory | 4,814 | 19,762 |
| AllowlistModule | 9,230 | 15,346 |
| ECDSAValidationModule | 3,646 | 20,930 |
| ModularAccount | 25,655 | -1,079 |
| NativeTokenLimitModule | 4,714 | 19,862 |
| PaymasterGuardModule | 1,797 | 22,779 |
| SemiModularAccountBytecode | 27,553 | -2,977 |
| SemiModularAccountStorageOnly | 28,071 | -3,495 |
| TimeRangeModule | 2,000 | 22,576 |
| WebauthnValidationModule | 7,854 | 16,722 |Code coverage:
|
jaypaik
reviewed
Oct 15, 2024
src/account/AccountStorage.sol
Outdated
| bytes32 constant _ACCOUNT_STORAGE_SLOT = 0xc531f081ecdb5a90f38c197521797881a6e5c752a7d451780f325a95f8b91f45; | ||
| // ERC-7201 derived storage slot. | ||
| // keccak256(abi.encode(uint256(keccak256("Alchemy.ModularAccount.Storage_V2")) - 1)) & ~bytes32(uint256(0xff)) | ||
| bytes32 constant _ACCOUNT_STORAGE_SLOT = 0x596912a710dec01bac203cb0ed2c7e56a2ce6b2a68276967fff6dd57561bdd00; | ||
|
|
||
| // Represents data associated with a specifc function selector. |
There was a problem hiding this comment.
Should we natspec this? I think foundry picks it up
There was a problem hiding this comment.
Oh I meant this line (also a typo)
Suggested change
| // Represents data associated with a specifc function selector. | |
| /// @dev Represents data associated with a specific function selector. |
jaypaik
approved these changes
Oct 15, 2024
OverviewOctane AI analysis has finished. No vulnerabilities were found. Cheers! 🎉🎉🎉 🔗 Commit Hash: b9a7366 |
adamegyed
force-pushed
the
adam/accountstorage-fixes
branch
from
4225666 to
b9a7366
Compare
howydev
pushed a commit
that referenced
this pull request
Oct 16, 2024
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.
Motivation
Cleanup pass on
AccountStorage.solandAccountStorageInitializable.sol.Solution
Expand and clarify natspec.
Test an edge case for the disableInitializers logic (impossible to reach in MA/SMA code).
Update the derivation of the storage root. Previously, we were not actually using ERC-7201, and the hash calculation was wrong. Both of those are now corrected, and the derivation matches the pattern used in MAv1, but with the major version number increased to 2.