fix: [QS-01] revert on presence of validation hooks in deferred validation, and run validation-associated execution hooks #287
+284
−49
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: 85a7a12 |
|
Contract sizes: | Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
|-------------------------------|------------------|-------------------|--------------------|---------------------|
| AccountFactory | 4,814 | 5,239 | 19,762 | 43,913 |
| AllowlistModule | 9,903 | 9,930 | 14,673 | 39,222 |
| ExecutionInstallDelegate | 5,714 | 5,760 | 18,862 | 43,392 |
-| ModularAccount | 21,973 | 28,676 | 2,603 | 20,476 |
+| ModularAccount | 22,270 | 28,973 | 2,306 | 20,179 |
| NativeFunctionDelegate | 434 | 461 | 24,142 | 48,691 |
| NativeTokenLimitModule | 4,449 | 4,476 | 20,127 | 44,676 |
| PaymasterGuardModule | 1,845 | 1,872 | 22,731 | 47,280 |
-| SemiModularAccountBytecode | 23,275 | 29,978 | 1,301 | 19,174 |
-| SemiModularAccountStorageOnly | 23,769 | 30,472 | 807 | 18,680 |
+| SemiModularAccountBytecode | 23,572 | 30,275 | 1,004 | 18,877 |
+| SemiModularAccountStorageOnly | 24,061 | 30,764 | 515 | 18,388 |
| SingleSignerValidationModule | 3,646 | 3,673 | 20,930 | 45,479 |
| TimeRangeModule | 2,000 | 2,027 | 22,576 | 47,125 |
| WebAuthnValidationModule | 7,854 | 7,881 | 16,722 | 41,271 |Code coverage:
|
Overview
Detailed findings
|
src/account/ModularAccountBase.sol
Outdated
| @@ -413,12 +414,18 @@ abstract contract ModularAccountBase is | |||
| /// [(33 + deferredActionSigLength + encodedDataLength):] : bytes, userOpSignature. This is the | |||
| /// signature passed to the inner validation. | |||
| if (hasDeferredAction) { | |||
| // Because this bypasses UO validation hooks, we require that the validation used does not include any | |||
| // validation hooks. | |||
| if (!getAccountStorage().validationStorage[validationFunction].validationHooks.isEmpty()) { | |||
There was a problem hiding this comment.
We should document this during validation installation.
If you want to use a validation to approve deferred actions in the future, it should not have validation hooks.
There was a problem hiding this comment.
Where do you think this fits? As a comment in installValidation()? Or perhaps in the documentation for integrators/SDK?
There was a problem hiding this comment.
In the documentation notion doc for now to later transfer to the doc site is enough probably.
Zer0dot
force-pushed
the
zer0dot/fix-qs-01
branch
from
4f42d88
to
85a7a12
Compare
Zer0dot
changed the base branch from
develop
to
adam/fix-execute-user-op-with-def-action
Zer0dot
force-pushed
the
zer0dot/fix-qs-01
branch
from
85a7a12
to
a317085
Compare
adamegyed
force-pushed
the
adam/fix-execute-user-op-with-def-action
branch
2 times, most recently
from
67305ea
to
3973328
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
Currently, it's possible to skip userOp validation hooks if the validation function being used is also a signature validation through deferred installation. Furthermore, we're not running userOp validation-associated execution hooks, when we could be.
Solution
Revert if the validation being used includes validation hooks, and run the validation-associated pre and post hooks tied to that validation.