fix: [S7] don't return exec hooks in getExecutionData for native functions that don't execute msg.sig-based hooks #300
+246
−63
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: 48bb15a |
This stack of pull requests is managed by Graphite. Learn more about stacking. |
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
from
87e29e1 to
f62dbb5
Compare
|
Contract sizes: | Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
|-------------------------------|------------------|-------------------|--------------------|---------------------|
| AccountFactory | 6,121 | 6,595 | 18,455 | 42,557 |
| AllowlistModule | 9,602 | 9,629 | 14,974 | 39,523 |
| ExecutionInstallDelegate | 5,947 | 5,993 | 18,629 | 43,159 |
-| ModularAccount | 22,274 | 23,309 | 2,302 | 25,843 |
-| NativeFunctionDelegate | 539 | 566 | 24,037 | 48,586 |
+| ModularAccount | 22,022 | 23,078 | 2,554 | 26,074 |
+| NativeFunctionDelegate | 560 | 587 | 24,016 | 48,565 |
| NativeTokenLimitModule | 4,583 | 4,610 | 19,993 | 44,542 |
| PaymasterGuardModule | 1,845 | 1,872 | 22,731 | 47,280 |
-| SemiModularAccount7702 | 23,465 | 24,493 | 1,111 | 24,659 |
-| SemiModularAccountBytecode | 23,947 | 24,982 | 629 | 24,170 |
-| SemiModularAccountStorageOnly | 24,419 | 25,454 | 157 | 23,698 |
+| SemiModularAccount7702 | 23,120 | 24,169 | 1,456 | 24,983 |
+| SemiModularAccountBytecode | 23,602 | 24,658 | 974 | 24,494 |
+| SemiModularAccountStorageOnly | 24,095 | 25,151 | 481 | 24,001 |
| SingleSignerValidationModule | 3,646 | 3,673 | 20,930 | 45,479 |
| TimeRangeModule | 2,223 | 2,250 | 22,353 | 46,902 |
| WebAuthnValidationModule | 7,854 | 7,881 | 16,722 | 41,271 |Code coverage:
|
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
from
f62dbb5 to
16bd90f
Compare
Overview
Detailed findings
|
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
from
16bd90f to
1b418fa
Compare
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
2 times, most recently
from
362f2dc to
1956199
Compare
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
5 times, most recently
from
04119d0 to
fc1683a
Compare
Merged
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
from
fc1683a to
5fe65eb
Compare
…tions that don't execute msg.sig-based hooks
jaypaik
force-pushed
the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
from
5fe65eb to
48bb15a
Compare
jaypaik
deleted the
11-22-fix_s7_don_t_return_exec_hooks_in_getexecutiondata_for_native_functions_that_don_t_execute_msg.sig-based_hooks
branch
0xrubes
reviewed
Nov 29, 2024
There was a problem hiding this comment.
Overall lgtm. I do want to note that we can still technically install execution hooks that won't end up being invoked, so execution hooks on native functions with _isWrappedNativeFunction() == false. It might be worth adding as one additional check in installExecution(), but it might also not be worth the hassle/gas costs.
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.
Address potential inconsistencies in
ModularAccountView.getExecutionDataif a module with execution hooks on native functions that DO NOT use thewrapNativeFunctionmodifier is installed. Native functions withoutwrapNativeFunctiondo not runmsg.sig-based execution hooks. Since we allow installations of modules that clash with native function selectors, it is probably best to give a consistent view of what will actually be executed via our ModularAccountView functions.This PR also includes some refactoring to simplify things, as well as addresses some other consistency issues.
initializeWithValidationto the native function checks forModularAccount.initializeto the native function checks forSemiModularAccountStorageOnly.entryPoint()as a native function check.wrapNativeFunctionto include all native functions that have the modifier applied withinModularAccountBase._globalValidationAllowedwithinSemiModularAccountBase._isGlobalValidationAllowedNativeFunctionwhich is overridden there handles it._isGlobalValidationAllowedNativeFunctionto take uint32 instead of bytes4 for consistency and codesize.