feat: add ERC7739 compatibility #241
Merged
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: a205db3 |
|
Contract sizes: | Contract | Size (B) | Margin (B) |
|-------------------------------|----------|------------|
| AccountFactory | 4,814 | 19,762 |
| AllowlistModule | 9,230 | 15,346 |
| ModularAccount | 25,167 | -591 |
| NativeTokenLimitModule | 4,714 | 19,862 |
| PaymasterGuardModule | 1,797 | 22,779 |
-| SemiModularAccountBytecode | 27,124 | -2,548 |
-| SemiModularAccountStorageOnly | 27,642 | -3,066 |
-| SingleSignerValidationModule | 3,646 | 20,930 |
+| SemiModularAccountBytecode | 27,775 | -3,199 |
+| SemiModularAccountStorageOnly | 28,293 | -3,717 |
+| SingleSignerValidationModule | 4,300 | 20,276 |
| TimeRangeModule | 2,000 | 22,576 |
| WebAuthnValidationModule | 7,854 | 16,722 |Code coverage:
|
OverviewOctane AI analysis has finished. No vulnerabilities were found. Cheers! 🎉🎉🎉 🔗 Commit Hash: a205db3 |
howydev
commented
Oct 14, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
adamegyed
reviewed
Oct 15, 2024
howydev
commented
Oct 15, 2024
Zer0dot
reviewed
Oct 15, 2024
howydev
force-pushed
the
howy/7739-compatibility
branch
from
5d62bcf to
aa4f20f
Compare
Zer0dot
reviewed
Oct 15, 2024
jaypaik
reviewed
Oct 15, 2024
jaypaik
reviewed
Oct 15, 2024
howydev
commented
Oct 16, 2024
| @@ -47,6 +47,7 @@ contract ModularAccountTest is AccountTestBase { | |||
| event ReceivedCall(bytes msgData, uint256 msgValue); | |||
|
|
|||
| function setUp() public override { | |||
| _revertSnapshot = vm.snapshot(); | |||
There was a problem hiding this comment.
more context on why this is here - in the repo, to do tests on MA + SMA we take a snapshot in the test constructor in AccountTestBase and this saves a copy of the chain state. The withSMATest modifier causes tests to run once on MAs, then does a revert to the snapshotted state and runs tests on SMAs
However, because it happens during the constructor, when the state is resetted, the test contract ends up having 0 bytecode. For some reason this causes external calls to revert which we rely on here as an easy way to convert bytes memory into bytes calldata
This PR moves the snapshot into setUp(), so when reverting to the snapshot, the test contract address will contain the bytecode with the required external helper functions
adamegyed
reviewed
Oct 16, 2024
howydev
force-pushed
the
howy/7739-compatibility
branch
2 times, most recently
from
7a697f3 to
7e14d10
Compare
chore: improve comments and dedupe constants Co-authored-by: Adam Egyed <[email protected]> Update src/helpers/ERC7739ReplaySafeWrapper.sol Update src/helpers/ERC7739ReplaySafeWrapper.sol Co-authored-by: Zer0dot <[email protected]> Update src/helpers/ERC7739ReplaySafeWrapper.sol Co-authored-by: Zer0dot <[email protected]> Co-authored-by: Adam Egyed <[email protected]> chore: gas bad chore: fix test name Co-authored-by: Adam Egyed <[email protected]>
howydev
force-pushed
the
howy/7739-compatibility
branch
from
7e14d10 to
1148b11
Compare
howydev
commented
Oct 16, 2024
| signingKey, | ||
| bytes memory deferredValidationSig; | ||
| bytes memory deferredValidationDatas; | ||
| { |
adamegyed
reviewed
Oct 16, 2024
Co-authored-by: Adam Egyed <[email protected]>
Co-authored-by: Adam Egyed <[email protected]>
jaypaik
reviewed
Oct 16, 2024
adamegyed
approved these changes
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.
Switch the current
ReplaySafeHashscheme to use an ERC7739 compatible signature scheme insteadImplementation uses pieces from, and/or is inspired by Solady and ERC7579's ERC7739 validator implementation