fix: ModularAccountBase cleanup, coverage, custom error types #257
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 Contracts
Updated Contracts
🔗 Commit Hash: 2530de6 |
|
Contract sizes: | Contract | Size (B) | Margin (B) |
|-------------------------------|----------|------------|
| AccountFactory | 4,814 | 19,762 |
| AllowlistModule | 9,230 | 15,346 |
-| ModularAccount | 25,167 | -591 |
+| ModularAccount | 25,293 | -717 |
| NativeTokenLimitModule | 4,714 | 19,862 |
| PaymasterGuardModule | 1,797 | 22,779 |
-| SemiModularAccountBytecode | 27,775 | -3,199 |
-| SemiModularAccountStorageOnly | 28,293 | -3,717 |
+| SemiModularAccountBytecode | 27,912 | -3,336 |
+| SemiModularAccountStorageOnly | 28,430 | -3,854 |
| SingleSignerValidationModule | 4,300 | 20,276 |
| TimeRangeModule | 2,000 | 22,576 |
| WebAuthnValidationModule | 7,854 | 16,722 |Code coverage:
|
jaypaik
reviewed
Oct 16, 2024
Comment on lines
+92
to
+101
| error SignatureValidationInvalid(ModuleEntity validationFunction); | ||
| error UserOpValidationInvalid(ModuleEntity validationFunction); | ||
| error UnexpectedAggregator(ModuleEntity validationFunction, address aggregator); |
There was a problem hiding this comment.
Why are theseModuleEntity while the execution lib errors below are unpacked?
Also nit: Mind sorting this entire block of errors? (see CreateFailed at the bottom)
There was a problem hiding this comment.
Last I tested, this was both cheaper and smaller in codesize, but let me re-test to be sure.
There was a problem hiding this comment.
Ok it is actually ever so slightly less codesize - updated!
This comment was marked as resolved.
This comment was marked as resolved.
Zer0dot
reviewed
Oct 16, 2024
| uint32 errorSelector; | ||
|
|
||
| assembly ("memory-safe") { | ||
| selectorUsed := and(mload(add(buffer, 0x4)), 0xffffffff) |
There was a problem hiding this comment.
clever way to load the first 4 bytes of 0x20!
jaypaik
approved these changes
Oct 16, 2024
Zer0dot
reviewed
Oct 16, 2024
| // - entity Id | ||
| // - revert data | ||
|
|
||
| assembly ("memory-safe") { |
There was a problem hiding this comment.
Is it possible to do
revert(abi.encodeWithselector(this.error.selector, ...)
If so, are we sure it'd be cheaper to do this?
There was a problem hiding this comment.
If we do that, then we'd have to call the high-level function collectRevertData first, and the abi.encode... expression would copy that memory over to the new memory with the data for the revert. I believe this saves on both gas and codesize due to that added copy.
adamegyed
force-pushed
the
adam/mabase-cleanup
branch
from
e6933ab to
1987ab5
Compare
test: expand test coverage for MABase refactor: remove duplicate error definitions refactor: simplify error types in MABase feat: custom errors for all module functions feat: change error param to moduleentity fix: reorder errors style: fix import formatting
adamegyed
force-pushed
the
adam/mabase-cleanup
branch
from
1987ab5 to
2530de6
Compare
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
ModularAccountBase.sol.During this pass, discovered that we lack custom errors for UO and Sig validation module functions.
Solution