fix: add resync mechanism to sync Snap accounts states with client accounts cp-13.11.0 #37987
+59
−5
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
Builds ready [02a6c2a]
UI Startup Metrics (1200 ± 85 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
ccharly
changed the title
montelaidev
reviewed
Nov 21, 2025
app/scripts/metamask-controller.js
Outdated
| // There is is/was a bug with Snap accounts that can be desynchronized (Solana). To | ||
| // automatically "fix" this corrupted state, we run this method which will re-sync | ||
| // MetaMask accounts and Snap accounts upon login. | ||
| await this.multichainAccountService.resyncAccounts(); |
Contributor
There was a problem hiding this comment.
Do we need to init the AccountTreeController before syncing?
Contributor
Author
There was a problem hiding this comment.
Actually, let me rework this PR and see if we can do the same than on mobile (which is running all this "async"/non-awaited)
Contributor
Author
There was a problem hiding this comment.
I made it async now, so this will happen after all initialization!
montelaidev
reviewed
Nov 21, 2025
app/scripts/metamask-controller.js
Outdated
| ///: BEGIN:ONLY_INCLUDE_IF(multichain) | ||
| // Init multichain accounts after creating internal accounts. | ||
| await this.multichainAccountService.init(); | ||
| // READ THIS CAREFULLY: |
Contributor
There was a problem hiding this comment.
Can we add a reference to the bug in the comments
Contributor
Author
There was a problem hiding this comment.
I did add the reference now, even if this PR is more like a "mitigation" rather than a true fix, but still worth IMO!
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
|
|
||
| expect(mockResyncAccounts).toHaveBeenCalled(); | ||
| expect(mockAlignWallets).toHaveBeenCalled(); | ||
| }); |
There was a problem hiding this comment.
Bug: Race condition in async test verification
The test uses waitForAllPromises() which only waits for one process.nextTick, but the resyncAndAlignAccounts function contains two sequential await statements. This creates a race condition where the test assertions may execute before both resyncAccounts and alignWallets complete, causing intermittent test failures. The fire-and-forget pattern with void means the function execution isn't guaranteed to finish before the assertions run.
Contributor
Author
There was a problem hiding this comment.
That's ok for now, I'll keep this simple.
| // NOTE: We run this asynchronously on purpose, see FIXME^. | ||
| // eslint-disable-next-line no-void | ||
| void this.multichainAccountService.alignWallets(); | ||
| void resyncAndAlignAccounts(); |
There was a problem hiding this comment.
Bug: Unconditional multichain service calls cause runtime errors
The conditional compilation directives around multichainAccountService.init() were removed, but multichainAccountService is only defined in builds with the multichain flag enabled. This causes the code to attempt calling methods on undefined in non-multichain builds, resulting in runtime errors. The same issue affects the resyncAndAlignAccounts function which calls resyncAccounts() and alignWallets() on the potentially undefined service.
Contributor
Author
There was a problem hiding this comment.
I actually removed it cause we were already using the service without the codefence. Anyway, this code fence should be entirely remove at some point.
Collaborator
Builds ready [6771234]
UI Startup Metrics (1234 ± 100 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
montelaidev
previously approved these changes
Nov 21, 2025
mathieuartu
reviewed
Nov 24, 2025
Co-authored-by: Mathieu Artu <mathieu.artu@consensys.net>
mathieuartu
approved these changes
Nov 24, 2025
Collaborator
Builds ready [cfec6a9]
UI Startup Metrics (1205 ± 105 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
montelaidev
approved these changes
Nov 24, 2025
metamaskbot
added
the
release-13.12.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 will automatically fix corrupted states if users have desync'd accounts.
This should mitigate some errors that were spotted with the rewards system where some Solana address could not be registered.
Changelog
CHANGELOG entry: Automatically re-sync accounts between Snaps and MetaMask
Related issues
Fix for users that already encountered this bug (their "not found" accounts will automatically be re-created now, acting as a migration):
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
On unlock, asynchronously resync Snap and MetaMask accounts, then align wallets; adds tests to verify both are invoked.
app/scripts/metamask-controller.jssubmitPasswordOrEncryptionKey, after init and account-tree refresh, if multichain state2 is enabled, runmultichainAccountService.resyncAccounts()thenalignWallets()asynchronously via a helper.waitForAllPromisesutility.app/scripts/metamask-controller.test.jsassertsresyncAccountsandalignWalletsare called asynchronously aftersubmitPasswordOrEncryptionKey.Written by Cursor Bugbot for commit cfec6a9. This will update automatically on new commits. Configure here.