fix: fix paymaster override for multisig plugin #676

Zer0dot · 2024-05-21T11:39:14Z

Pull Request Checklist

Did you add new tests and confirm existing tests pass? (yarn test)
Did you update relevant docs? (docs are found in the site folder, and guidelines for updating/adding docs can be found in the contribution guide)
Do your commits follow the Conventional Commits standard?
Does your PR title also follow the Conventional Commits standard?
If you have a breaking change, is it correctly reflected in your commit message? (e.g. feat!: breaking change)
Did you run lint (yarn lint:check) and fix any issues? (yarn lint:write)
Did you follow the contribution guidelines?

This PR loosens the restrictions on the paymaster middleware to allow overriding with nonzero paymaster-related fields. This allows accounts with the multisig plugin to sign over the correctly built userOp.

TODO

Adjust the Alchemy GasManager to handle the case where the override is nonzero

Let me know if there's anything missing to get this over the line.

PR-Codex overview

This PR updates the middleware logic for bypassing paymaster and paymaster data handling, adds new utility methods, and refactors multisig account execution flow.

Detailed summary

Added bypassPaymasterAndDataEmptyHex utility method
Updated middleware logic in alchemyGasManagerMiddleware
Refactored multisig account execution flow in multisig-account.e2e.test.ts

✨ Ask PR-Codex anything about this PR by commenting with /codex {your question}

packages/core/src/actions/smartAccount/internal/runMiddlewareStack.ts

packages/core/src/types.ts

…verride

packages/core/src/types.ts

…paying for its own gas

moldy530

nice! yea LGTM as long as all of the multi-sig e2e tests pass.

Zer0dot · 2024-05-27T11:54:50Z

nice! yea LGTM as long as all of the multi-sig e2e tests pass.

One's still failing with AA23 or OOG, debugging that and we'll see if it's connected to this change!

…ter test

Zer0dot · 2024-06-03T14:02:29Z

Update wrt the error-- adding the first signature generated when the userOp is first built to the signatures array fixes it. I modified the test to run both as a normal 3/3, and then as a 3/3 with paymaster.

Should be good to go!

rthomare · 2024-06-04T01:44:52Z

Nice work!

vercel · 2024-06-04T09:22:40Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
aa-sdk-site	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 4, 2024 3:36pm

* fix: allow nonzero paymaster override * refactor: update to use Hex type for paymasterAndData/paymasterData override * fix: add checks for paymasterData and paymaster field nonzero overrides * fix: add paymaster address override type * feat: gas manager only bypasses paymaster middleware when the UserOp paying for its own gas * fix: add signatures and overrides to fix 3/3 msig test and add paymaster test

* docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: adds streamlined quick start * docs: drops the file extension on local quick start links * docs: fix relative routes across quick start * feat: run store hydration on window focus (#695) * run store hydration on window focus * remove logs * feat: update button colors (#696) * feat: update button colors * fix: update test * fix: plugins were missing mainnet config (#692) * fix: account hydration was missing state (#693) * chore: enable version syncing when publishing (#694) * chore(release): publish v3.18.0 [skip-ci] * fix: fix paymaster override for multisig plugin (#676) * fix: allow nonzero paymaster override * refactor: update to use Hex type for paymasterAndData/paymasterData override * fix: add checks for paymasterData and paymaster field nonzero overrides * fix: add paymaster address override type * feat: gas manager only bypasses paymaster middleware when the UserOp paying for its own gas * fix: add signatures and overrides to fix 3/3 msig test and add paymaster test * chore: rename button "type" to "variant" (#699) * feat: switch type => variant and use type submit * fix: add custom focus state * fix: update the version of the store so that we don't have clashes (#703) * chore(release): publish v3.18.1 [skip-ci] * chore(release): publish v3.18.2 [skip-ci] * feat: add updated error UI + custom error rendering (#705) * feat: add error boundary by id * fix: remove unused classnames * feat: use error from hook * fix: remove unused variables * fix: remove console log * fix: add new colors to test * feat: rename to useAuthError * docs: add vercel json (#700) * docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: add vercel json * docs: add build script * docs: add rewrites for .html` * docs: try cleanUrls * docs: remove rewrites --------- Co-authored-by: moldy <michael.moldoveanu@alchemy.com> * chore: remove the docs publishing github action * docs: run locally meets dashboard quickstart * chore: update the gh actions to checkout submodules * chore: add embedded accounts submodule --------- Co-authored-by: moldy <michael.moldoveanu@alchemy.com> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Alchemy Bot <alchemy-bot@alchemy.com> Co-authored-by: Zer0dot <zer0dot.dev@gmail.com> Co-authored-by: Cody McCabe <cmccabe524@gmail.com>

* docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: add vercel json (#700) * docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: add vercel json * docs: add build script * docs: add rewrites for .html` * docs: try cleanUrls * docs: remove rewrites --------- Co-authored-by: moldy <michael.moldoveanu@alchemy.com> * chore: remove the docs publishing github action * docs: adds streamlined quick start (#697) * docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: adds streamlined quick start * docs: drops the file extension on local quick start links * docs: fix relative routes across quick start * feat: run store hydration on window focus (#695) * run store hydration on window focus * remove logs * feat: update button colors (#696) * feat: update button colors * fix: update test * fix: plugins were missing mainnet config (#692) * fix: account hydration was missing state (#693) * chore: enable version syncing when publishing (#694) * chore(release): publish v3.18.0 [skip-ci] * fix: fix paymaster override for multisig plugin (#676) * fix: allow nonzero paymaster override * refactor: update to use Hex type for paymasterAndData/paymasterData override * fix: add checks for paymasterData and paymaster field nonzero overrides * fix: add paymaster address override type * feat: gas manager only bypasses paymaster middleware when the UserOp paying for its own gas * fix: add signatures and overrides to fix 3/3 msig test and add paymaster test * chore: rename button "type" to "variant" (#699) * feat: switch type => variant and use type submit * fix: add custom focus state * fix: update the version of the store so that we don't have clashes (#703) * chore(release): publish v3.18.1 [skip-ci] * chore(release): publish v3.18.2 [skip-ci] * feat: add updated error UI + custom error rendering (#705) * feat: add error boundary by id * fix: remove unused classnames * feat: use error from hook * fix: remove unused variables * fix: remove console log * fix: add new colors to test * feat: rename to useAuthError * docs: add vercel json (#700) * docs: revert revert to use vocs for docs * docs: address some of the broken things on the site (#689) * docs: update the logos for AK * docs: add vercel json * docs: add build script * docs: add rewrites for .html` * docs: try cleanUrls * docs: remove rewrites --------- Co-authored-by: moldy <michael.moldoveanu@alchemy.com> * chore: remove the docs publishing github action * docs: run locally meets dashboard quickstart * chore: update the gh actions to checkout submodules * chore: add embedded accounts submodule --------- Co-authored-by: moldy <michael.moldoveanu@alchemy.com> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Alchemy Bot <alchemy-bot@alchemy.com> Co-authored-by: Zer0dot <zer0dot.dev@gmail.com> Co-authored-by: Cody McCabe <cmccabe524@gmail.com> --------- Co-authored-by: Cody McCabe <cmccabe524@gmail.com> Co-authored-by: Dan Nolan <dan.nolan@alchemy.com> Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com> Co-authored-by: Alchemy Bot <alchemy-bot@alchemy.com> Co-authored-by: Zer0dot <zer0dot.dev@gmail.com>

fix: allow nonzero paymaster override

7e024ea

moldy530 reviewed May 21, 2024

View reviewed changes

packages/core/src/actions/smartAccount/internal/runMiddlewareStack.ts Show resolved Hide resolved

packages/core/src/types.ts Outdated Show resolved Hide resolved

Zer0dot added 2 commits May 23, 2024 23:35

refactor: update to use Hex type for paymasterAndData/paymasterData o…

3b4e14b

…verride

fix: add checks for paymasterData and paymaster field nonzero overrides

f571aa7

moldy530 reviewed May 23, 2024

View reviewed changes

packages/core/src/types.ts Show resolved Hide resolved

Zer0dot added 2 commits May 24, 2024 19:47

fix: add paymaster address override type

0de5cae

feat: gas manager only bypasses paymaster middleware when the UserOp …

8d78ab1

…paying for its own gas

moldy530 previously approved these changes May 24, 2024

View reviewed changes

fix: add signatures and overrides to fix 3/3 msig test and add paymas…

62ae523

…ter test

Zer0dot dismissed moldy530’s stale review via 62ae523 June 3, 2024 14:00

Zer0dot marked this pull request as ready for review June 3, 2024 14:00

Zer0dot requested review from rthomare, dancoombs, mokok123 and dphilipson as code owners June 3, 2024 14:00

Zer0dot requested a review from moldy530 June 3, 2024 16:14

rthomare approved these changes Jun 4, 2024

View reviewed changes

Merge branch 'main' into fix/msig-paymaster

e3a74ed

vercel bot deployed to Preview June 4, 2024 09:25 View deployment

moldy530 approved these changes Jun 4, 2024

View reviewed changes

Merge branch 'main' into fix/msig-paymaster

7afd1a5

vercel bot deployed to Preview June 4, 2024 15:28 View deployment

Merge branch 'main' into fix/msig-paymaster

5752ae7

vercel bot deployed to Preview June 4, 2024 15:36 View deployment

Zer0dot merged commit 6db5bfc into main Jun 4, 2024
5 checks passed

Zer0dot deleted the fix/msig-paymaster branch June 4, 2024 15:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: fix paymaster override for multisig plugin #676

fix: fix paymaster override for multisig plugin #676

Zer0dot commented May 21, 2024 •

edited by pr-codex bot

Loading

moldy530 left a comment

Zer0dot commented May 27, 2024

Zer0dot commented Jun 3, 2024

rthomare commented Jun 4, 2024 •

edited

Loading

vercel bot commented Jun 4, 2024 •

edited

Loading

fix: fix paymaster override for multisig plugin #676

fix: fix paymaster override for multisig plugin #676

Conversation

Zer0dot commented May 21, 2024 • edited by pr-codex bot Loading

Pull Request Checklist

TODO

PR-Codex overview

Detailed summary

moldy530 left a comment

Choose a reason for hiding this comment

Zer0dot commented May 27, 2024

Zer0dot commented Jun 3, 2024

rthomare commented Jun 4, 2024 • edited Loading

vercel bot commented Jun 4, 2024 • edited Loading

Zer0dot commented May 21, 2024 •

edited by pr-codex bot

Loading

rthomare commented Jun 4, 2024 •

edited

Loading

vercel bot commented Jun 4, 2024 •

edited

Loading