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

fix: [QS-ALC-2] add non zero address check for paymaster in modules #279

Merged
merged 4 commits into from
Nov 8, 2024

Conversation

fangting-alchemy
Copy link
Collaborator

@fangting-alchemy fangting-alchemy commented Nov 7, 2024

Address ALC 2 where 0 paymaster address was not checked in modules.

  • PaymasterGuardModule, zero address paymaster is not allowed to be installed.
  • NativeTokenLimitModule, zero address paymaster is not allowed preUserOpValidationHook.

Copy link

octane-security-app-dev bot commented Nov 7, 2024

Summary by Octane

New Contracts

No new contracts were added in this PR.

Updated Contracts

  • ModularAccountBase.sol: The "wrapNativeFunction" modifier no longer supports "performCreate2."
  • NativeTokenLimitModule.sol: The smart contract now includes an InvalidPaymaster error and consolidates limit decrease logic into a new function _decreaseLimit.
  • PaymasterGuardModule.sol: The smart contract now includes validation for a non-zero paymaster, with a new error for invalid paymaster addresses.

🔗 Commit Hash: 49bdbd8

Copy link

github-actions bot commented Nov 7, 2024

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,694 |             5,740 |             18,882 |              43,412 |
 | ModularAccount                |           21,971 |            28,654 |              2,605 |              20,498 |
 | NativeFunctionDelegate        |              434 |               461 |             24,142 |              48,691 |
-| NativeTokenLimitModule        |            4,258 |             4,285 |             20,318 |              44,867 |
-| PaymasterGuardModule          |            1,797 |             1,824 |             22,779 |              47,328 |
+| NativeTokenLimitModule        |            4,449 |             4,476 |             20,127 |              44,676 |
+| PaymasterGuardModule          |            1,845 |             1,872 |             22,731 |              47,280 |
 | SemiModularAccountBytecode    |           23,273 |            29,956 |              1,303 |              19,196 |
 | SemiModularAccountStorageOnly |           23,767 |            30,450 |                809 |              18,702 |
 | 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:

File % Lines % Statements % Branches % Funcs
src/account/AccountBase.sol 100.00% (8/8) 100.00% (7/7) 100.00% (2/2) 100.00% (4/4)
src/account/AccountStorageInitializable.sol 100.00% (19/19) 100.00% (26/26) 100.00% (5/5) 100.00% (2/2)
src/account/ModularAccount.sol 100.00% (2/2) 100.00% (2/2) 100.00% (0/0) 100.00% (3/3)
src/account/ModularAccountBase.sol 98.99% (294/297) 96.29% (363/377) 77.59% (45/58) 100.00% (36/36)
src/account/ModularAccountView.sol 100.00% (24/24) 100.00% (28/28) 100.00% (2/2) 100.00% (4/4)
src/account/ModuleManagerInternals.sol 95.08% (58/61) 96.20% (76/79) 62.50% (5/8) 100.00% (3/3)
src/account/SemiModularAccountBase.sol 88.71% (55/62) 92.13% (82/89) 66.67% (10/15) 100.00% (16/16)
src/account/SemiModularAccountBytecode.sol 100.00% (6/6) 100.00% (7/7) 100.00% (1/1) 66.67% (2/3)
src/account/SemiModularAccountStorageOnly.sol 80.00% (4/5) 83.33% (5/6) 100.00% (0/0) 66.67% (2/3)
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/helpers/ExecutionInstallDelegate.sol 92.59% (50/54) 92.96% (66/71) 40.00% (2/5) 100.00% (7/7)
src/helpers/NativeFunctionDelegate.sol 100.00% (16/16) 100.00% (30/30) 100.00% (0/0) 100.00% (1/1)
src/libraries/ExecutionLib.sol 98.92% (274/277) 98.15% (266/271) 84.85% (28/33) 100.00% (24/24)
src/libraries/KnownSelectorsLib.sol 100.00% (15/15) 100.00% (32/32) 100.00% (0/0) 100.00% (2/2)
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/ModuleInstallCommonsLib.sol 57.14% (8/14) 42.11% (8/19) 75.00% (3/4) 100.00% (3/3)
src/modules/ModuleBase.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 90.91% (40/44) 93.22% (55/59) 100.00% (13/13) 66.67% (8/12)
src/modules/permissions/PaymasterGuardModule.sol 83.33% (10/12) 82.35% (14/17) 66.67% (2/3) 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.58% (31/38) 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 94.14% (1140/1211) 93.09% (1427/1533) 77.66% (153/197) 85.51% (183/214)

Copy link

octane-security-app-dev bot commented Nov 7, 2024

Overview

Vulnerabilities found: 1                                                                                

Detailed findings

src/modules/permissions/NativeTokenLimitModule.sol


🔗 Commit Hash: bfa4766
🛡️ Octane Dashboard: All vulnerabilities

Copy link

octane-security-app-dev bot commented Nov 7, 2024

Overview

Vulnerabilities found: 1                                                                                

Detailed findings

src/modules/permissions/NativeTokenLimitModule.sol


🔗 Commit Hash: 49bdbd8
🛡️ Octane Dashboard: All vulnerabilities

@fangting-alchemy fangting-alchemy requested a review from a team November 7, 2024 21:59
uint256 cgl = UserOperationLib.unpackCallGasLimit(userOp);
uint256 pvgl;
uint256 ppogl;
if (userOp.paymasterAndData.length > 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

really small nit: since we're conditionally calling _decreaseLimit with the userOp.paymasterAndData.length condition check already, maybe we can refactor to:

  1. pass in a bool instead
  2. perform unpackPaymasterStaticFields in the top function and pass in pvgl + ppogl in the nonzero length case, or pass in 0 in the zero case

Copy link
Collaborator

@howydev howydev left a comment

Choose a reason for hiding this comment

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

thanks for creating this, it helped me better understand the issue. have 1 nit/optional suggestion but otherwise fix looks good

@fangting-alchemy fangting-alchemy merged commit 37cd0f1 into develop Nov 8, 2024
6 checks passed
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.

2 participants