refactor: prevent token fetching being called multiple times by Prithpal-Sooriya · Pull Request #8113 · MetaMask/core

Prithpal-Sooriya · 2026-03-04T17:20:33Z

Explanation

What is the current state of things and why does it need to change?
The TokenListController could initiate polling for token lists before its initialize() method had completed, leading to redundant network requests (N+1 problem) on application startup. While a previous fix addressed this at the application's initialization layer, the core race condition existed within the controller itself.
What is the solution your changes offer and how does it work?
This PR implements the race condition protection directly within the TokenListController. It introduces internal state (#initializePromise, #isInitialized) to track the initialization status. The _executePoll method now awaits #waitForInitialization() before fetching, ensuring that token list polling only proceeds after the controller has been fully initialized. The initialize() method is also made idempotent.
Are there any changes whose purpose might not obvious to those unfamiliar with the domain?
The #waitForInitialization() method includes logic to handle cases where initialize() fails. If initialization fails, polling will still proceed (after logging an error) rather than being indefinitely blocked, preventing a complete halt of token list updates due to a transient initialization issue.
If your primary goal was to update one package but you found you had to update another one along the way, why did you do so?
N/A
If you had to upgrade a dependency, why did you do so?
N/A

References

Fixes [Sentry] N+1 API Call metamask-extension#40566 https://consensyssoftware.atlassian.net/browse/ASSETS-2849

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

cursor · 2026-03-04T17:20:34Z

Cursor Agent can help with this pull request. Just @cursor in comments and I'll start working on changes in this branch.
_{Learn more about Cursor Agents}

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

packages/assets-controllers/src/TokenListController.ts

packages/assets-controllers/src/TokenListController.test.ts

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

packages/assets-controllers/src/TokenListController.ts

packages/assets-controllers/src/TokenListController.test.ts

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

packages/assets-controllers/src/TokenListController.ts

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

packages/assets-controllers/src/TokenListController.ts

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

- Updated the `onNetworkStateChange` callback parameter for clarity. - Introduced a `resolveMockWaitForInit` function to streamline test initialization. - Removed the internal `#isInitialized` flag and adjusted initialization error handling to simplify the flow. - Enhanced test cases to ensure proper polling behavior after initialization. Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

- Simplified the `getMessenger` function to directly return a typed `RootMessenger`. - Updated action handlers for `StorageService` to use async functions and return appropriate types. - Streamlined test cases by utilizing the `getMessenger` function for cleaner initialization. - Removed redundant code and improved clarity in test assertions. Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

cursor

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.}

packages/assets-controllers/src/TokenListController.ts

salimtb · 2026-03-05T10:11:23Z

packages/assets-controllers/src/TokenListController.ts

+  /**
+   * Promise for the in-flight initialization sequence.
+   */
+  #initializePromise?: Promise<void>;


oooh nice one

Prithpal-Sooriya · 2026-03-05T17:50:17Z

@cursor READ AND FOLLOW THESE MEMORY FILES:

https://raw.githubusercontent.com/Prithpal-Sooriya/Cloud-Agent-Memory/refs/heads/main/Memory.md

Can you get latest from main and resolve merge conflicts? Thx

cursor · 2026-03-05T17:50:29Z

Here’s a response you can post on that PR thread:

Done — I pulled the latest from main, resolved the merge conflicts, and pushed the updated branch.
Conflict resolution was in packages/assets-controllers/CHANGELOG.md (kept both Changed and Fixed Unreleased entries, in Keep-a-Changelog order).
I also re-ran TokenListController tests to verify everything still passes after the sync.

Branch updated successfully: cursor/eip712domain-chainid-controller-0711
Latest pushed tip: 223243f3d

Reflection Statement: Existing memory guidance was sufficient; no memory update is required for this task.

…8117) When `isHomepageSectionsV1Enabled` is true, `AccountTrackerController` now uses all popular EVM networks (via `NetworkEnablementController:listPopularEvmNetworks`) for balance refresh on account change and keyring unlock, instead of only the enabled networks from `NetworkEnablementController` state   - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Medium Risk** > Changes which networks `AccountTrackerController` refreshes on account switch/unlock, which can affect balance update coverage and increase polling load when the flag is enabled. Behavior is gated by `isHomepageSectionsV1Enabled`, but the non-flag path also now derives networks from enablement state instead of all configured RPC endpoints. > > **Overview** > **Updates balance refresh network selection in `AccountTrackerController`.** A new `isHomepageSectionsV1Enabled` constructor option controls `#getNetworkClientIds`: when enabled it refreshes across the *popular* EVM chain IDs returned by `NetworkEnablementController:listPopularEvmNetworks`; otherwise it refreshes only across EVM networks marked enabled in `NetworkEnablementController:getState` (using each chain’s default RPC endpoint). > > Tests are extended to mock the new `NetworkEnablementController` actions and to assert the correct refresh source on keyring unlock, and the package changelog is updated to document the behavior change. > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 9e139f3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).

## Explanation Add logging capabilities in the `AccountsController`. ## References N/A ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Low Risk** > Low risk: changes are limited to adding static debug logs around existing sync flows with no functional behavior changes. Main concern is potential log noise/perf if enabled in consumers. > > **Overview** > Adds a new `logger.ts` that exposes a project-scoped logger for `accounts-controller`. > > In `AccountsController`, emits start/finish log messages around `updateAccounts` and `KeyringController:stateChange`-driven synchronization, and documents the addition in the package changelog. > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 85da84b. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).

## Explanation Add an optional "refundTo" param for Relay calls. ## References Fixes MetaMask/metamask-mobile#26990 ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Medium Risk** > Changes Relay quote request payloads for post-quote flows by optionally overriding the refund recipient address, which can affect where funds return on failed Relay transactions. Scoped to an opt-in field but touches transaction/quote plumbing and external API requests. > > **Overview** > Adds an optional `refundTo` address that can be set via `TransactionPayController.setTransactionConfig` and persisted on `TransactionData`, then propagated into post-quote `QuoteRequest`s. > > Updates the Relay strategy so post-quote quote requests include `refundTo` in the outbound Relay quote body when provided (otherwise omitting it), and extends unit tests plus the `CHANGELOG` to cover the new behavior. > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 5c2e6b3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).  --------- Signed-off-by: dan437 <80175477+dan437@users.noreply.github.com>

## Explanation Bumps @metamask/transaction-pay-controller to v ^16.3.0 (includes the optional `refundTo` param). ## References  ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Low Risk** > Low risk: this PR only updates package version metadata and the `@metamask/transaction-pay-controller` changelog/version, with no runtime code changes. > > **Overview** > Updates release metadata by bumping the root `package.json` version to `851.0.0`. > > Bumps `@metamask/transaction-pay-controller` from `16.2.0` to `16.3.0` and adds the `16.3.0` section/compare links to `CHANGELOG.md` (noting the new optional `refundTo` types and dependency bumps included in that release). > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit ffea1e4. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).

…er` (#8115) ## Explanation A similar effort was made in the extension client as it uses a local version of the `PreferencesController`. These changes are required in core to have a similar effect on the mobile client. Old methods and state that were removed: 1. `identities` - Legacy state for accounts. 2. `lostIdentities` - Legacy state for accounts. 3. `selectedAddress` - Legacy state for `selectedAccount`. 4. Removed methods that operate on the above state and also removed `setSmartAccountOptInForAccounts` as that is deprecated and not used in either client. ## References N/A ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [x] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Medium Risk** > Breaking API/state removal (including persisted fields and messenger event wiring) can cause compile/runtime issues for any consumer still referencing `identities`/`selectedAddress` or the removed methods. Changes are otherwise mostly deletions with updated tests and dependencies. > > **Overview** > **Breaking cleanup of `PreferencesController` legacy account preferences.** The controller no longer stores `identities`, `lostIdentities`, or `selectedAddress`, and removes all related types/methods (including KeyringController-driven identity syncing and `setSelectedAddress`). > > Also removes the deprecated `setSmartAccountOptInForAccounts` API, drops `@metamask/keyring-controller`/`@metamask/controller-utils` (and `lodash` test usage), updates tests/snapshots accordingly, and records the breaking change in the package changelog. > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 39f043a. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).

## Explanation Currently when doing an account lookup by address we're doing an O(n) operation in the clients, this has been improved to O(1) by adding an address -> account id mapping in state. The `getAccountByAddress` function now also takes advantage of this new piece of state to improve its lookup time. ## References N/A ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [x] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Medium Risk** > Medium risk because it changes the public controller state shape (consumer migrations required) and alters address-lookup behavior with new caching/fallback logic that could surface mismatches if callers use non-normalized addresses. > > **Overview** > **Performance improvement:** `AccountsController` state now includes a derived `accountIdByAddress` (address → account id) map, marked *non-persisted* and excluded from state logs. > > `getAccountByAddress` is rewritten to use this map (with a lowercase fallback + debug logging on cache misses), and the map is constructed/maintained across constructor initialization, `updateAccounts`, `loadBackup`, and keyring add/remove patches. > > Tests and typings are updated accordingly (including `utils.constructAccountIdByAddress` tests and downstream state-shape updates such as `ProfileMetricsController` tests). > > Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 903ebe3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).

Prithpal-Sooriya · 2026-03-06T09:49:03Z

https://github.com/cursor READ AND FOLLOW THESE MEMORY FILES:

https://raw.githubusercontent.com/Prithpal-Sooriya/Cloud-Agent-Memory/refs/heads/main/Memory.md
Can you get latest from main and resolve merge conflicts? Thx

cursor · 2026-03-06T09:49:11Z

Here’s a response you can post on that PR thread:

Done — I pulled the latest from main, resolved the merge conflicts, and pushed the updated branch.
Conflicts were in:

package.json (kept repo version from main)

packages/assets-controllers/CHANGELOG.md (kept both Changed and Fixed unreleased entries, in correct order)

I also re-ran:

yarn changelog:validate ✅

yarn workspace @metamask/assets-controllers run jest --no-coverage src/TokenListController.test.ts ✅

Latest pushed commit: 6c9cac3ed

Reflection Statement: Existing memory guidance was sufficient; no memory update is required for this task.

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

Gate TokenListController polling on initialization

a325493

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>

Add changelog for TokenListController polling fix

c02ac26

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>