@metamask-previews/assets-controller 6.1.0-preview-f3d7baae5 → 6.2.0-preview-495c91e

package/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.2.0]
+
+### Added
+
+- Add `CustomAssetGraduationMiddleware` that removes an EVM asset from `customAssets[selectedAccount]` when `AccountsApiDataSource` or `BackendWebsocketDataSource` reports a balance for it ([#8582](https://github.com/MetaMask/core/pull/8582))
+  - Non-EVM custom assets (Solana, BTC, Tron) are not affected.
+  - `RpcDataSource` continues to be the sole balance fetcher for assets still in `customAssets`.
+- Add `RpcFallbackMiddleware` to the fast pipeline so chains that error in `response.errors` (network error, `unprocessedNetworks`, timeout) fall back to `RpcDataSource` ([#8582](https://github.com/MetaMask/core/pull/8582))
+  - Successful RPC results are merged into the response and recovered chains are cleared from `response.errors`.
+- Add a configurable `fetchTimeoutMs` option (default `15000`) to `AccountsApiDataSource`, `PriceDataSource`, and `TokenDataSource` ([#8582](https://github.com/MetaMask/core/pull/8582))
+  - On timeout, AccountsAPI marks every requested chain as errored so `RpcFallbackMiddleware` picks them up; price and token enrichment degrade gracefully.
+- Add `fetchWithTimeout` utility that races an async task against a timeout ([#8582](https://github.com/MetaMask/core/pull/8582))
+
+### Changed
+
+- Bump `@metamask/transaction-controller` from `^64.3.0` to `^64.4.0` ([#8585](https://github.com/MetaMask/core/pull/8585))
+
+### Fixed
+
+- Handle trace callback returning `undefined` without throwing ([#8586](https://github.com/MetaMask/core/pull/8586))
+
 ## [6.1.0]
 
 ### Added
@@ -211,9 +232,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Bump `@metamask/assets-controllers` from `^100.0.3` to `^100.2.0` ([#8107](https://github.com/MetaMask/core/pull/8107)), ([#8140](https://github.com/MetaMask/core/pull/8140))
+- Bump `@metamask/assets-controllers` from `^100.0.3` to `^100.2.0`, ([#8107](https://github.com/MetaMask/core/pull/8107), [#8140](https://github.com/MetaMask/core/pull/8140))
 - Bump `@metamask/network-enablement-controller` from `^4.1.2` to `^4.2.0` ([#8107](https://github.com/MetaMask/core/pull/8107))
-- Bump `@metamask/transaction-controller` from `^62.19.0` to `^62.21.0` ([#8104](https://github.com/MetaMask/core/pull/8104)), ([#8140](https://github.com/MetaMask/core/pull/8140))
+- Bump `@metamask/transaction-controller` from `^62.19.0` to `^62.21.0`, ([#8104](https://github.com/MetaMask/core/pull/8104), [#8140](https://github.com/MetaMask/core/pull/8140))
 - Bump `@metamask/account-tree-controller` from `^4.1.1` to `^5.0.0` ([#8140](https://github.com/MetaMask/core/pull/8140))
 - Bump `@metamask/core-backend` from `^6.0.0` to `^6.1.0` ([#8140](https://github.com/MetaMask/core/pull/8140))
 - Bump `@metamask/preferences-controller` from `^22.1.0` to `^23.0.0` ([#8140](https://github.com/MetaMask/core/pull/8140))
@@ -326,7 +347,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Narrow `AssetsControllerState` types from `Json` to semantic types: `assetsMetadata` → `AssetMetadata`, `assetsBalance` → `AssetBalance`, `assetsPrice` → `AssetPrice`, `assetPreferences` → `AssetPreferences`, `customAssets` → `Caip19AssetId[]` ([#7777](https://github.com/MetaMask/core/pull/7777))
-
 - Replace `viem` dependency with `@ethersproject/abi` for ABI encoding/decoding in `MulticallClient` ([#7839](https://github.com/MetaMask/core/pull/7839))
 
 ## [0.1.0]
@@ -353,7 +373,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `RpcDataSource` to delegate polling to `BalanceFetcher` and `TokenDetector` services ([#7709](https://github.com/MetaMask/core/pull/7709))
 - Refactor `BalanceFetcher` and `TokenDetector` to extend `StaticIntervalPollingControllerOnly` for independent polling management ([#7709](https://github.com/MetaMask/core/pull/7709))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@6.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@6.2.0...HEAD
+[6.2.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@6.1.0...@metamask/assets-controller@6.2.0
 [6.1.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@6.0.0...@metamask/assets-controller@6.1.0
 [6.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@5.0.1...@metamask/assets-controller@6.0.0
 [5.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@5.0.0...@metamask/assets-controller@5.0.1

package/dist/AssetsController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -30,9 +30,12 @@ const RpcDataSource_1 = require("./data-sources/RpcDataSource.cjs");
 const SnapDataSource_1 = require("./data-sources/SnapDataSource.cjs");
 const StakedBalanceDataSource_1 = require("./data-sources/StakedBalanceDataSource.cjs");
 const TokenDataSource_1 = require("./data-sources/TokenDataSource.cjs");
+const errors_1 = require("./errors.cjs");
 const logger_1 = require("./logger.cjs");
+const CustomAssetGraduationMiddleware_1 = require("./middlewares/CustomAssetGraduationMiddleware.cjs");
 const DetectionMiddleware_1 = require("./middlewares/DetectionMiddleware.cjs");
 const ParallelMiddleware_1 = require("./middlewares/ParallelMiddleware.cjs");
+const RpcFallbackMiddleware_1 = require("./middlewares/RpcFallbackMiddleware.cjs");
 const utils_2 = require("./utils/index.cjs");
 const constants_1 = require("./utils/constants.cjs");
 const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
@@ -212,7 +215,7 @@ function normalizeResponse(response) {
  * - The controller does NOT manage polling - it simply receives pushed updates
  */
 class AssetsController extends base_controller_1.BaseController {
-    constructor({ messenger, state = {}, defaultUpdateInterval = DEFAULT_POLLING_INTERVAL_MS, isEnabled = () => true, isBasicFunctionality, subscribeToBasicFunctionalityChange, queryApiClient, rpcDataSourceConfig, trace, accountsApiDataSourceConfig, priceDataSourceConfig, stakedBalanceDataSourceConfig, isOnboarded, }) {
+    constructor({ messenger, state = {}, defaultUpdateInterval = DEFAULT_POLLING_INTERVAL_MS, isEnabled = () => true, isBasicFunctionality, subscribeToBasicFunctionalityChange, queryApiClient, rpcDataSourceConfig, trace, captureException, accountsApiDataSourceConfig, priceDataSourceConfig, stakedBalanceDataSourceConfig, isOnboarded, }) {
         super({
             name: CONTROLLER_NAME,
             messenger,
@@ -231,6 +234,8 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_defaultUpdateInterval.set(this, void 0);
         /** Optional trace callback for first init/fetch measurement (duration). */
         _AssetsController_trace.set(this, void 0);
+        /** Optional reporter for Issue-style errors (e.g. Sentry.captureException). */
+        _AssetsController_captureException.set(this, void 0);
         /** Whether we have already reported first init fetch for this session (reset on #stop). */
         _AssetsController_firstInitFetchReported.set(this, false);
         /** Whether we have already reported state size for this session (reset on #stop). */
@@ -262,6 +267,8 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_stakedBalanceDataSource.set(this, void 0);
         _AssetsController_priceDataSource.set(this, void 0);
         _AssetsController_detectionMiddleware.set(this, void 0);
+        _AssetsController_customAssetGraduationMiddleware.set(this, void 0);
+        _AssetsController_rpcFallbackMiddleware.set(this, void 0);
         _AssetsController_tokenDataSource.set(this, void 0);
         _AssetsController_unsubscribeBasicFunctionality.set(this, null);
         _AssetsController_queryApiClient.set(this, void 0);
@@ -270,6 +277,7 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_isBasicFunctionality, isBasicFunctionality ?? (() => true), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
         __classPrivateFieldSet(this, _AssetsController_trace, trace, "f");
+        __classPrivateFieldSet(this, _AssetsController_captureException, captureException, "f");
         __classPrivateFieldSet(this, _AssetsController_queryApiClient, queryApiClient, "f");
         const rpcConfig = rpcDataSourceConfig ?? {};
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_initializeNativeAssetsMap).call(this, queryApiClient);
@@ -324,6 +332,20 @@ class AssetsController extends base_controller_1.BaseController {
             ...priceDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware_1.DetectionMiddleware(), "f");
+        __classPrivateFieldSet(this, _AssetsController_customAssetGraduationMiddleware, new CustomAssetGraduationMiddleware_1.CustomAssetGraduationMiddleware({
+            getSelectedAccountId: () => {
+                try {
+                    return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this)[0]?.id;
+                }
+                catch {
+                    return undefined;
+                }
+            },
+            removeCustomAsset: (accountId, assetId) => this.removeCustomAsset(accountId, assetId),
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_rpcFallbackMiddleware, new RpcFallbackMiddleware_1.RpcFallbackMiddleware({
+            rpcDataSource: __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+        }), "f");
         if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
             log('AssetsController is disabled, skipping initialization');
             return;
@@ -392,6 +414,11 @@ class AssetsController extends base_controller_1.BaseController {
                         __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
                         __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
                     ]),
+                    // Graduation must run BEFORE the RPC fallback so it only sees
+                    // AccountsApi/Websocket balances. RPC intentionally carries
+                    // custom assets and must never trigger graduation.
+                    __classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"),
                     __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
                     (0, ParallelMiddleware_1.createParallelMiddleware)([
                         __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
@@ -603,6 +630,9 @@ class AssetsController extends base_controller_1.BaseController {
                 updateMode: 'merge',
             });
         }
+        // Re-evaluate subscriptions so the supplemental RPC poll picks up the
+        // new customAsset on chains another data source already owns.
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     /**
      * Remove a custom asset from an account.
@@ -622,6 +652,9 @@ class AssetsController extends base_controller_1.BaseController {
                 }
             }
         });
+        // Re-evaluate subscriptions so the supplemental RPC poll for that chain
+        // is torn down when no more customAssets remain there.
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     /**
      * Get all custom assets for an account.
@@ -795,7 +828,17 @@ class AssetsController extends base_controller_1.BaseController {
                 ...resolvedRequest,
                 dataTypes: resolvedRequest.dataTypes.filter((dt) => dt !== 'metadata' && dt !== 'price'),
             };
-        const enrichmentSources = [__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
+        // Graduate custom assets only when AccountsAPI / Websocket reports them.
+        // RPC already fetches custom assets on purpose, and Snap handles non-EVM
+        // chains the rule does not apply to, so skip the middleware for those.
+        const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
+            sourceId === 'BackendWebsocketDataSource';
+        const enrichmentSources = [
+            ...(shouldGraduateCustomAssets
+                ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
+                : []),
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+        ];
         if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
             enrichmentSources.push((0, ParallelMiddleware_1.createParallelMiddleware)([
                 __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
@@ -850,13 +893,13 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
     controller: 'AssetsController',
 }) {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f")) {
         return;
     }
-    __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags }, () => undefined).catch(() => {
+    __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags }, () => undefined)?.catch(() => {
         // Telemetry failure must not break.
     });
 }, _AssetsController_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
@@ -1160,12 +1203,28 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             account_count: request.accountsWithSupportedChains.length,
         });
     }
-    // Emit error traces for failed middlewares
+    // Failed middlewares: Issues (optional) + perf/Dashboard spans
     if (middlewareErrors.length > 0) {
+        const failedSources = middlewareErrors.join(',');
+        const assetsError = new errors_1.AssetsDataSourceError({
+            failedSources,
+            errorCount: middlewareErrors.length,
+            chainCount: request.chainIds.length,
+        });
+        try {
+            __classPrivateFieldGet(this, _AssetsController_captureException, "f")?.call(this, assetsError);
+        }
+        catch {
+            // Never let telemetry throw.
+        }
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_DATA_SOURCE_ERROR, {
-            failed_sources: middlewareErrors.join(','),
+            failed_sources: failedSources,
             error_count: middlewareErrors.length,
             chain_count: request.chainIds.length,
+        }, {
+            controller: 'AssetsController',
+            severity: 'error',
+            error_type: assetsError.name,
         });
     }
     return { response: result.response, durationByDataSource };
@@ -1507,12 +1566,20 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     ];
     const subscriptionKeys = [...__classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").keys()];
     for (const subscriptionKey of subscriptionKeys) {
-        if (subscriptionKey.startsWith('ds:')) {
-            const sourceId = subscriptionKey.slice(3);
-            const source = allSources.find((ds) => ds.getName() === sourceId);
-            if (source) {
-                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
-            }
+        if (!subscriptionKey.startsWith('ds:')) {
+            continue;
+        }
+        // Subscription keys take the form `ds:<SourceName>` for the regular
+        // subscription or `ds:<SourceName>:<suffix>` for supplemental
+        // subscriptions (e.g. `ds:RpcDataSource:custom`). Split on `:` and
+        // pick the source-name segment so both shapes resolve correctly.
+        const [, sourceId] = subscriptionKey.split(':');
+        const source = allSources.find((ds) => ds.getName() === sourceId);
+        if (source) {
+            // Unsubscribe by the actual key — `#unsubscribeDataSource` only
+            // knows the regular `ds:<SourceName>` shape and would miss
+            // supplemental subscriptions, leaking their polling timers.
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, source, subscriptionKey);
         }
     }
     __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").clear();
@@ -1535,6 +1602,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     const balanceDataSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
         ? __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get)
         : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+    let rpcAssignedChains = new Set();
     for (const source of balanceDataSources) {
         const availableChains = new Set(source.getActiveChainsSync());
         const assignedChains = [];
@@ -1548,6 +1616,9 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
             continue;
         }
+        if (source === __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")) {
+            rpcAssignedChains = new Set(assignedChains);
+        }
         const seenIds = new Set();
         const accountsForSource = assignedChains
             .flatMap((chainId) => chainToAccounts.get(chainId) ?? [])
@@ -1556,6 +1627,67 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains);
         }
     }
+    // Supplemental RPC subscription for customAssets on chains another data
+    // source claimed during regular handoff. RPC is the sole balance fetcher
+    // for customAssets, so we must always poll them — even when (e.g.)
+    // AccountsApi is already covering the chain for normal balances. The
+    // supplemental subscription runs in `customAssetsOnly` mode so it does
+    // NOT double-poll the regular tracked balances.
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeRpcCustomAssetsSupplement).call(this, accounts, chainToAccounts, rpcAssignedChains);
+}, _AssetsController_subscribeRpcCustomAssetsSupplement = function _AssetsController_subscribeRpcCustomAssetsSupplement(accounts, chainToAccounts, rpcAssignedChains) {
+    const rpc = __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f");
+    const rpcAvailableChains = new Set(rpc.getActiveChainsSync());
+    // Collect chains that have customAssets for at least one of the given
+    // accounts and are NOT already covered by the regular RPC subscription.
+    const supplementalChainSet = new Set();
+    const accountsWithCustomAssets = new Set();
+    for (const account of accounts) {
+        const customForAccount = this.state.customAssets[account.id] ?? [];
+        if (customForAccount.length === 0) {
+            continue;
+        }
+        accountsWithCustomAssets.add(account.id);
+        for (const assetId of customForAccount) {
+            let chainId;
+            try {
+                chainId = extractChainId(assetId);
+            }
+            catch {
+                continue;
+            }
+            if (rpcAssignedChains.has(chainId)) {
+                continue;
+            }
+            if (!rpcAvailableChains.has(chainId)) {
+                continue;
+            }
+            if (!chainToAccounts.has(chainId)) {
+                continue;
+            }
+            supplementalChainSet.add(chainId);
+        }
+    }
+    const supplementalKey = `ds:${rpc.getName()}:custom`;
+    if (supplementalChainSet.size === 0) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, rpc, supplementalKey);
+        return;
+    }
+    const supplementalChains = [...supplementalChainSet];
+    const supplementalAccounts = accounts.filter((account) => accountsWithCustomAssets.has(account.id));
+    if (supplementalAccounts.length === 0) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, rpc, supplementalKey);
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, rpc, supplementalAccounts, supplementalChains, {
+        subscriptionKey: supplementalKey,
+        customAssetsOnly: true,
+    });
+}, _AssetsController_unsubscribeBySubscriptionKey = function _AssetsController_unsubscribeBySubscriptionKey(source, subscriptionKey) {
+    const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
+    if (existingSubscription) {
+        source.unsubscribe(subscriptionKey).catch(() => undefined);
+        existingSubscription.unsubscribe();
+    }
 }, _AssetsController_subscribeStakedBalance = function _AssetsController_subscribeStakedBalance(accounts, chainIds) {
     const source = __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f");
     if (!source) {
@@ -1584,9 +1716,9 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         }
     }
     return chainToAccounts;
-}, _AssetsController_subscribeDataSource = function _AssetsController_subscribeDataSource(source, accounts, chains) {
+}, _AssetsController_subscribeDataSource = function _AssetsController_subscribeDataSource(source, accounts, chains, options = {}) {
     const sourceId = source.getName();
-    const subscriptionKey = `ds:${sourceId}`;
+    const subscriptionKey = options.subscriptionKey ?? `ds:${sourceId}`;
     const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
     const isUpdate = existingSubscription !== undefined;
     log('Subscribe to data source', {
@@ -1595,12 +1727,16 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         isUpdate,
         accountCount: accounts.length,
         chainCount: chains.length,
+        customAssetsOnly: options.customAssetsOnly === true,
     });
     const subscribeReq = {
         request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chains, {
             assetTypes: ['fungible'],
             dataTypes: ['balance'],
             updateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
+            ...(options.customAssetsOnly === true
+                ? { customAssetsOnly: true }
+                : {}),
         }),
         subscriptionId: subscriptionKey,
         isUpdate,