Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: optimize Base module a bit #261

Merged
merged 3 commits into from
Oct 16, 2024
Merged

chore: optimize Base module a bit #261

merged 3 commits into from
Oct 16, 2024

Conversation

fangting-alchemy
Copy link
Collaborator

Small optimization

Copy link

octane-security-app bot commented Oct 16, 2024

Summary by Octane

New Contracts

No new contracts were added in this PR.

Updated Contracts

  • BaseModule.sol: The smart contract improved memory safety and optimized data handling when extracting selectors and calldata for user operations.

🔗 Commit Hash: 09048d0

Copy link

github-actions bot commented Oct 16, 2024

Contract sizes:

 | Contract                      | Size (B) | Margin (B) |
 |-------------------------------|----------|------------|
 | AccountFactory                |    4,814 |     19,762 |
-| AllowlistModule               |    9,230 |     15,346 |
+| AllowlistModule               |    8,889 |     15,687 |
 | ModularAccount                |   25,284 |       -708 |
-| NativeTokenLimitModule        |    4,714 |     19,862 |
+| NativeTokenLimitModule        |    4,310 |     20,266 |
 | PaymasterGuardModule          |    1,797 |     22,779 |
 | SemiModularAccountBytecode    |   27,903 |     -3,327 |
 | SemiModularAccountStorageOnly |   28,421 |     -3,845 |
 | SingleSignerValidationModule  |    4,300 |     20,276 |
 | TimeRangeModule               |    2,000 |     22,576 |
 | WebAuthnValidationModule      |    7,854 |     16,722 |

Code coverage:

File % Lines % Statements % Branches % Funcs
src/account/AccountStorageInitializable.sol 100.00% (19/19) 100.00% (26/26) 100.00% (5/5) 100.00% (2/2)
src/account/BaseAccount.sol 100.00% (8/8) 100.00% (7/7) 100.00% (2/2) 100.00% (4/4)
src/account/ModularAccount.sol 100.00% (1/1) 100.00% (1/1) 100.00% (0/0) 100.00% (2/2)
src/account/ModularAccountBase.sol 99.00% (298/301) 96.31% (365/379) 77.97% (46/59) 100.00% (38/38)
src/account/ModularAccountView.sol 100.00% (22/22) 100.00% (25/25) 100.00% (2/2) 100.00% (2/2)
src/account/ModuleManagerInternals.sol 89.15% (115/129) 88.24% (150/170) 52.94% (9/17) 100.00% (12/12)
src/account/SemiModularAccountBase.sol 86.89% (53/61) 90.70% (78/86) 66.67% (10/15) 94.12% (16/17)
src/account/SemiModularAccountBytecode.sol 100.00% (5/5) 100.00% (6/6) 100.00% (1/1) 50.00% (1/2)
src/account/SemiModularAccountStorageOnly.sol 100.00% (4/4) 100.00% (5/5) 100.00% (0/0) 100.00% (2/2)
src/account/TokenReceiver.sol 33.33% (1/3) 33.33% (1/3) 100.00% (0/0) 33.33% (1/3)
src/factory/AccountFactory.sol 70.59% (24/34) 76.09% (35/46) 40.00% (2/5) 58.33% (7/12)
src/libraries/ERC7739ReplaySafeWrapperLib.sol 85.88% (73/85) 85.87% (79/92) 66.67% (2/3) 87.50% (7/8)
src/libraries/ExecutionLib.sol 98.89% (267/270) 98.11% (259/264) 84.38% (27/32) 100.00% (23/23)
src/libraries/KnownSelectorsLib.sol 100.00% (29/29) 100.00% (64/64) 100.00% (0/0) 100.00% (3/3)
src/libraries/LinkedListSetLib.sol 94.00% (47/50) 96.25% (77/80) 66.67% (4/6) 100.00% (8/8)
src/libraries/MemManagementLib.sol 100.00% (54/54) 100.00% (70/70) 100.00% (0/0) 100.00% (12/12)
src/libraries/SemiModularKnownSelectorsLib.sol 100.00% (5/5) 100.00% (10/10) 100.00% (0/0) 100.00% (1/1)
src/modules/BaseModule.sol 100.00% (13/13) 94.12% (16/17) 100.00% (2/2) 100.00% (3/3)
src/modules/permissions/AllowlistModule.sol 86.05% (74/86) 85.71% (96/112) 78.26% (18/23) 50.00% (9/18)
src/modules/permissions/NativeTokenLimitModule.sol 87.80% (36/41) 89.66% (52/58) 88.89% (8/9) 54.55% (6/11)
src/modules/permissions/PaymasterGuardModule.sol 90.00% (9/10) 86.67% (13/15) 100.00% (2/2) 71.43% (5/7)
src/modules/permissions/TimeRangeModule.sol 83.33% (10/12) 80.00% (16/20) 100.00% (1/1) 75.00% (6/8)
src/modules/validation/SingleSignerValidationModule.sol 92.00% (23/25) 81.08% (30/37) 62.50% (5/8) 90.00% (9/10)
src/modules/validation/WebAuthnValidationModule.sol 61.11% (11/18) 66.67% (18/27) 100.00% (3/3) 60.00% (6/10)
Total 93.46% (1201/1285) 92.53% (1499/1620) 76.41% (149/195) 84.86% (185/218)

assembly {
selector := mload(add(callData, 36))
// Copy actualSelector into a new var
selector := mload(add(finalCalldata, 36))
Copy link
Contributor

@adamegyed adamegyed Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should clean the lower 28 bytes

Suggested change
selector := mload(add(finalCalldata, 36))
selector := shl(224, mload(add(finalCalldata, 8)))

// Bytes arr representation: [bytes32(len), bytes4(executeUserOp.selector), bytes4(actualSelector),
// bytes(actualCallData)]
// 1. Copy actualSelector into a new var
// 2. Shorten bytes arry by 8 by: store length - 8 into the new pointer location
// 3. Move the callData pointer by 8
assembly {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assembly {
assembly ("memory-safe") {

This comment was marked as off-topic.

@fangting-alchemy fangting-alchemy merged commit 7342b19 into develop Oct 16, 2024
6 checks passed
@fangting-alchemy fangting-alchemy deleted the base branch October 16, 2024 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants