fix: linting warnings and initializer logic #46
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
huaweigu
commented
Nov 15, 2024
| @@ -43,7 +43,23 @@ abstract contract WalletStorageInitializable { | |||
| * Emits an {WalletStorageInitialized} event. | |||
| */ | |||
| modifier walletStorageInitializer() { | |||
| bool isTopLevelCall = _setWalletStorageInitializing(); | |||
| bool isTopLevelCall = !WalletStorageV1Lib.getLayout().initializing; | |||
There was a problem hiding this comment.
The original logic expression !initialSetup || deploying was incorrect due to missing parentheses. The intended logic should have been !(initialSetup || deploying). This corrected expression is logically equivalent to !initialSetup && !deploying.
To break it down:
- The original (incorrect):
!initialSetup || deploying - The corrected version:
!(initialSetup || deploying) - The equivalent expression:
!initialSetup && !deploying
huaweigu
commented
Nov 15, 2024
| } | ||
|
|
||
| /// @inheritdoc IERC1271 | ||
| function isValidSignature(bytes32 hash, bytes memory signature) external view override returns (bytes4) { | ||
| address owner = WalletStorageV1Lib.getLayout().owner; | ||
| if (owner == address(0)) { | ||
| ExecutionDetail storage executionDetail = | ||
| WalletStorageV1Lib.getLayout().executionDetails[IERC1271.isValidSignature.selector]; | ||
| // this is a sanity check only, as using address(0) as a plugin is not permitted during installation |
There was a problem hiding this comment.
Minor fix to check plugin != address(0) even if it should not happen
huaweigu
commented
Nov 15, 2024
| @@ -99,10 +96,7 @@ contract SingleOwnerMSCA is BaseMSCA, DefaultCallbackHandler, UUPSUpgradeable, I | |||
|
|
|||
| constructor(IEntryPoint _newEntryPoint, PluginManager _newPluginManager) | |||
| BaseMSCA(_newEntryPoint, _newPluginManager) | |||
| { | |||
There was a problem hiding this comment.
Remove the redundant check as it's done in BaseMSCA
huaweigu
changed the title
dlim-circle
approved these changes
Nov 15, 2024
huaweigu
force-pushed
the
chore/sync
branch
2 times, most recently
from
1356bf3 to
616b1c1
Compare
ZhiyuCircle
approved these changes
Nov 15, 2024
huaweigu
changed the title
7 tasks
huaweigu
added a commit
that referenced
this pull request
Dec 6, 2024
## Summary Parallel PR of #46. This PR addresses the linting warnings and corrects the logic in `WalletStorageInitializable` for 6900 v0.7 and 6900 v0.8 accounts (both on entry point v0.7). ## Detail ### Changeset * Resolve all warnings (thanks to Ashutosh!) * Correct the logic in the unused code within `WalletStorageInitializable` * Eliminate redundant calls in `SingleOwnerMSCA` constructor * Add a sanity check `!= address(0)` in `SingleOwnerMSCA` ### Checklist - [x] Did you add new tests and confirm all tests pass? (`yarn test`) - [ ] Did you update relevant docs? (docs are found in the `docs` folder) - [x] Do your commits follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard? - [x] Does your PR title also follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard? - [ ] If you have a breaking change, is it [correctly reflected in your commit message](https://www.conventionalcommits.org/en/v1.0.0/#examples)? (e.g. `feat!: breaking change`) - [x] Did you run lint (`yarn lint`) and fix any issues? - [x] Did you run formatter (`yarn format:check`) and fix any issues (`yarn format:write`)? ## Testing * No new tests have been added for style changes. * New tests have been included for the fixes: * For the `walletStorageInitializer` fix, I have forked the OZ JavaScript tests and rewritten them using Foundry. * The remaining two changes are already covered by existing tests (we don't allow installing `address(0)` and `testInitializeSingleOwnerMSCAWithRuntimeValidation`). ## Documentation n/a
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.
Summary
This PR addresses the linting warnings and corrects the logic in
WalletStorageInitializable.Detail
Changeset
WalletStorageInitializableSingleOwnerMSCAconstructor!= address(0)inSingleOwnerMSCAChecklist
yarn test)docsfolder)feat!: breaking change)yarn lint) and fix any issues?yarn format:check) and fix any issues (yarn format:write)?Testing
walletStorageInitializerfix, I have forked the OZ JavaScript tests and rewritten them using Foundry.address(0)andtestInitializeSingleOwnerMSCAWithRuntimeValidation).Documentation
n/a