feat: add support to automatically upgrade account #37571
Conversation
This file contains hidden or 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
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
Collaborator
✨ Files requiring CODEOWNER review ✨✅ @MetaMask/confirmations (5 files, +41 -89)
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Collaborator
Builds ready [a7fe899]
UI Startup Metrics (1285 ± 92 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
matthewwalsh0
requested changes
Nov 6, 2025
| const { from, nonce: txNonce } = txParams; | ||
| const nextNonce = await this.#getNextNonce(from, networkClientId); | ||
|
|
||
| const nonce = txNonce ?? nextNonce; |
Member
There was a problem hiding this comment.
In what scenario is the nonce from the transaction missing?
Contributor
Author
There was a problem hiding this comment.
We don't have the nonce because we set isExternalSign to true which skips it, but in the scenario where we are upgrading the account we need to pass to Sentinel the nonce.
| #decodeAuthorizationSignature(signature: Hex) { | ||
| const r = signature.slice(0, 66) as Hex; | ||
| const s = `0x${signature.slice(66, 130)}` as Hex; | ||
| const r = stripSingleLeadingZero(signature.slice(0, 66)) as Hex; |
Contributor
Author
There was a problem hiding this comment.
Here, Nick mentioned that Go doesn't handle cases properly when the underlying type is an integer, and suggested using a function to strip the leading zero. It’s a bit odd, though, because we have similar logic in the Transaction Controller — it retrieves the signature from the Keyring Controller, splits it into r, s, and v, and that flow works without issues.
| (result) => result.chainId.toLowerCase() === chainId.toLowerCase(), | ||
| ); | ||
|
|
||
| // Currently requires upgraded account, can also support no `delegationAddress` in future. |
Collaborator
Builds ready [b330b88]
UI Startup Metrics (1165 ± 108 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [a380b69]
UI Startup Metrics (1153 ± 93 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
OGPoyraz
approved these changes
Nov 7, 2025
Battambang
approved these changes
Nov 7, 2025
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.
Description
This PR enables automatic account upgrades when Smart Transactions (STX) are turned off.
It removes the UI condition that previously blocked the flow from initiating and refines the EIP-7702 authorization handling, signature normalization, and gasless eligibility logic.
Changelog
CHANGELOG entry: Added automatic account upgrade support
Related issues
Fixes: #35590
Manual testing steps
Screenshots/Recordings
arbitrum.auto.upgrade.webm
bnb_aut.upgrade.webm
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Improves 7702 publish flow with nonce locking and signature normalization, simplifies gasless eligibility to relay-based check, adds hex normalization util, and updates tests.
getNextNonceusingTransactionController.getNonceLock(address, networkClientId)and pass intoDelegation7702PublishHook.toHex/NetworkClientIdin init; wire hook viapublishHook.delegation-7702-publish.ts):getNextNonceand usetransactionMeta.networkClientId; derive authorization nonce fromtxParams.nonceor next nonce.r/s, computeyParitywithtoHex.stripSingleLeadingZero.useIsGaslessSupported: remove atomic-batch checks; gate 7702 byisRelaySupported(chainId)and non-deploy tx; retain smart-transaction + sendBundle path.stripSingleLeadingZero(hex)helper.delegation-7702-publishto mockgetNextNonce; assert auth list/relay behavior.stripSingleLeadingZero.useIsGaslessSupportedtests to reflect relay-only 7702 gating.Written by Cursor Bugbot for commit a380b69. This will update automatically on new commits. Configure here.