fix(assets-controller): consume account activity - #9517
Open
Kriys94 wants to merge 8 commits into
Open
Conversation
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
4 times, most recently
from
July 20, 2026 08:07
3ddda90 to
d937cef
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 22, 2026 14:15
90dafcd to
150e8b9
Compare
Kriys94
marked this pull request as ready for review
July 22, 2026 14:15
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
2 times, most recently
from
July 22, 2026 15:25
f9b8d3c to
a44a1c0
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 22, 2026 15:44
a44a1c0 to
d1c1b1e
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
3 times, most recently
from
July 24, 2026 19:03
c414460 to
fe3dbde
Compare
Kriys94
commented
Jul 27, 2026
| @@ -1,78 +0,0 @@ | |||
| import type { BalanceUpdate } from '@metamask/core-backend'; | |||
Contributor
Author
There was a problem hiding this comment.
This code is moved in AccountActivityDataSource
Kriys94
commented
Jul 27, 2026
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 28, 2026 15:10
fe3dbde to
c0f4c0e
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 28, 2026 18:05
f7b1edb to
defbccc
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 28, 2026 19:12
defbccc to
2dc3d26
Compare
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. Learn how to use preview builds in other projects. Expand for full list of packages and versions. |
Contributor
Author
|
Preview build passing the e2e tests MetaMask/metamask-extension#44962 |
Kriys94
commented
Jul 29, 2026
| (event) => { | ||
| this.#onAccountActivityBalanceUpdated(event); | ||
| }, | ||
| ); |
Contributor
Author
There was a problem hiding this comment.
Move this in AccountActivityDataSource
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
2 times, most recently
from
July 29, 2026 20:41
ec12296 to
400d769
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 30, 2026 09:46
400d769 to
19dfafb
Compare
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
2 times, most recently
from
July 30, 2026 10:16
a4cd551 to
87edd71
Compare
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 87edd71. Configure here.
Kriys94
force-pushed
the
fix/AssetsAccountActivity
branch
from
July 30, 2026 10:31
87edd71 to
8655802
Compare
salimtb
approved these changes
Jul 30, 2026
salimtb
left a comment
salimtb
left a comment
Contributor
There was a problem hiding this comment.
LGTM , i just tested some scenarios and all works as expected
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Explanation
Loom Video showing the whole flow and the real-time update: https://www.loom.com/share/1c7ea24a3d2d4653a9b94a5b8ab178a9
Preview build passing the e2e tests MetaMask/metamask-extension#44962
What is the current state of things and why does it need to change?
AssetsControllercurrently gets real-time balances and per-chain status through two overlapping paths:BackendWebsocketDataSource, which talks toBackendWebSocketServicedirectly and manages its own channel subscriptions — but may never receive callbacks whenAccountActivityServiceowns the server subscription.AccountActivityService:balanceUpdatedsubscription insideAssetsControlleritself, added as a workaround for exactly that gap.This split ownership caused duplicated logic (two websocket balance-decoding paths), race-prone subscription handoffs, and chain-status information (
up/down) that didn't participate in the controller's chain-claiming, so polling data sources could poll chains already covered by real-time websocket data.What is the solution and how does it work?
Consolidate all real-time consumption behind
AccountActivityService, which already owns the WebSocket connection and channel subscriptions, via a new thin data source:AccountActivityDataSource— subscribes to the two high-level events published byAccountActivityService:balanceUpdated— resolves the address against the wallet's selected accounts, converts the payload to aDataResponse(processAccountActivityBalanceUpdates, moved out ofAssetsControllerutils into the data source), and pushes it to the controller through an injectedonAssetsUpdatecallback bound toAssetsController.handleAssetsUpdate.statusChanged— chains reported"up"are claimed as active chains; chains reported"down"are released so polling sources take over. The service flushes all tracked chains as"down"on disconnect, soactiveChainsonly ever reflects live status.AccountActivityDataSourceis now the highest-priority balance data source (AccountActivity → AccountsApi → Snap → RPC), so chains covered by real-time websocket data are reserved first and not redundantly polled byAccountsApiDataSource/RpcDataSource.BackendWebsocketDataSourceand its factory/types, theBackendWebSocketServiceactions/events from the controller messenger, and the controller's directbalanceUpdatedsubscription/decoding path.AccountActivityDataSourceis event-driven and chain-agnostic:subscribe()is intentionally a no-op; it does not take part in the controller's subscribe/unsubscribe handoff. Debounce/jitter of chain-status bursts stays inAssetsControllerwhere re-subscription happens.AccountActivityDataSource(previouslyBackendWebsocketDataSource/ theAccountActivityServicesource id).Breaking changes
AssetsControllermessenger must now allow theAccountActivityService:statusChangedevent.BackendWebsocketDataSourceand its factory/types are removed (BackendWebsocketDataSource,createBackendWebsocketDataSource,BackendWebsocketDataSourceOptions,BackendWebsocketDataSourceState). Consumers no longer need to delegateBackendWebSocketServiceactions/events to theAssetsControllermessenger.References
AccountActivityService:balanceUpdatedsubscription this PR supersedes)2dc3d26a4, updates messenger delegations>Checklist
Note
High Risk
Breaking API removal and changes to balance/chain-claiming priority affect how real-time vs polled balances are merged across the wallet; incorrect messenger setup or status handling could cause stale balances or redundant polling.
Overview
BREAKING: Removes
BackendWebsocketDataSourceand allBackendWebSocketServicemessenger wiring; integrators must allowAccountActivityService:statusChangedon theAssetsControllermessenger.Real-time balances and per-chain availability now flow through a new
AccountActivityDataSource, which listens toAccountActivityService:balanceUpdatedandstatusChangedinstead of managing WebSocket channels itself. Balance payloads are decoded inside the data source and forwarded via an injectedonAssetsUpdatehook tohandleAssetsUpdate; chain up/down status drives chain-claiming so polling sources (AccountsApi, RPC) only cover chains not held by live activity.AssetsControllerdrops its duplicatebalanceUpdatedhandler and promotesAccountActivityDataSourceto first place in the balance source priority list.#handleActiveChainsUpdatenow no-ops unless the UI is open and the keyring is unlocked, andAccountsApiDataSourceimmediately fetches when subscription updates add newly handed-off chains.Reviewed by Cursor Bugbot for commit 8655802. Bugbot is set up for automated code reviews on this repo. Configure here.