@metamask/assets-controller 1.0.0 → 2.0.1

package/CHANGELOG.md

@@ -7,6 +7,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.1]
+
+### Changed
+
+- Refactor data source tests to use shared `MockAssetControllerMessenger` fixture ([#7958](https://github.com/MetaMask/core/pull/7958))
+  - Export `STAKING_INTERFACE` from the staked balance fetcher for use with the staking contract ABI.
+  - `StakedBalanceDataSource` teardown now uses the messenger's `clearEventSubscriptions`; custom messenger implementations must support it for correct cleanup.
+- Bump `@metamask/network-enablement-controller` from `^4.1.0` to `^4.1.1` ([#7984](https://github.com/MetaMask/core/pull/7984))
+- Bump `@metamask/core-backend` from `^5.1.1` to `^6.0.0` ([#7993](https://github.com/MetaMask/core/pull/7993))
+- Bump `@metamask/assets-controllers` from `^99.4.0` to `^100.0.0` ([#7995](https://github.com/MetaMask/core/pull/7995))
+- Bump `@metamask/controller-utils` from `^11.18.0` to `^11.19.0` ([#7995](https://github.com/MetaMask/core/pull/7995))
+
+## [2.0.0]
+
+### Added
+
+- Add `StakedBalanceDataSource` that polls supported staking contracts on enabled chains and merges staked balances into `assetsBalance`. Configurable via `stakedBalanceDataSourceConfig` (`enabled`, `pollInterval`); the controller subscribes to it when enabled and cleans up on destroy ([#7936](https://github.com/MetaMask/core/pull/7936))
+- Add optional `trackMetaMetricsEvent` callback to measure and report first init/fetch historical time (duration in ms) to MetaMetrics when the initial asset fetch completes after unlock or app open ([#7871](https://github.com/MetaMask/core/pull/7871))
+- Add `AccountsApiDataSourceConfig` and `PriceDataSourceConfig` types; add `accountsApiDataSourceConfig` and `priceDataSourceConfig` options to `AssetsControllerOptions` for per-data-source configuration (pollInterval, tokenDetectionEnabled, etc.). When `tokenDetectionEnabled` is false, `AccountsApiDataSource` only returns balances for tokens already in state and does not add new tokens ([#7926](https://github.com/MetaMask/core/pull/7926))
+- Add `useExternalService` option to `TokenDetector`, `TokenDetectionOptions`, `RpcDataSourceConfig`, and `RpcDataSourceOptions`. Token detection runs only when both `tokenDetectionEnabled` and `useExternalService` are true and stops when either is false ([#7924](https://github.com/MetaMask/core/pull/7924))
+- Add basic functionality toggle: `isBasicFunctionality` (getter `() => boolean`); no value is stored in the controller. When the getter returns true (matches UI "Basic functionality" ON), token and price APIs are used; when false, only RPC is used. Optional `subscribeToBasicFunctionalityChange(onChange)` lets the consumer register for toggle changes (e.g. extension subscribes to PreferencesController:stateChange, mobile uses its own mechanism); may return an unsubscribe function for controller destroy ([#7904](https://github.com/MetaMask/core/pull/7904))
+
+### Changed
+
+- Refactor `AssetsControllerMessenger` type safety: remove `as unknown as` casts, import types instead of locally defining them, and add missing allowed actions/events ([#7952](https://github.com/MetaMask/core/pull/7952))
+- **BREAKING:** `AccountsApiDataSourceConfig.tokenDetectionEnabled` is now a getter `() => boolean` (was `boolean`) so the Accounts API data source reacts when the user toggles token detection at runtime, consistent with `RpcDataSourceConfig.tokenDetectionEnabled`. Pass a function, e.g. `tokenDetectionEnabled: () => preferenceController.state.useTokenDetection`.
+- **BREAKING:** Rename state and `DataResponse` property from `assetsMetadata` to `assetsInfo`. Update consumers that read `state.assetsMetadata` or set `response.assetsMetadata` to use `assetsInfo` instead ([#7902](https://github.com/MetaMask/core/pull/7902))
+- Bump `@metamask/keyring-api` from `^21.0.0` to `^21.5.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+- Bump `@metamask/keyring-internal-api` from `^9.0.0` to `^10.0.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+- Bump `@metamask/keyring-snap-client` from `^8.0.0` to `^8.2.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+- Bump `@metamask/account-tree-controller` from `4.1.0` to `4.1.1` ([#7897](https://github.com/MetaMask/core/pull/7897))
+- Bump `@metamask/core-backend` from `5.1.0` to `5.1.1` ([#7897](https://github.com/MetaMask/core/pull/7897))
+
 ## [1.0.0]
 
 ### Added
@@ -59,7 +92,9 @@ 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@1.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.1...HEAD
+[2.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.0...@metamask/assets-controller@2.0.1
+[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@1.0.0...@metamask/assets-controller@2.0.0
 [1.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@0.2.0...@metamask/assets-controller@1.0.0
 [0.2.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@0.1.0...@metamask/assets-controller@0.2.0
 [0.1.0]: https://github.com/MetaMask/core/releases/tag/@metamask/assets-controller@0.1.0

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_defaultUpdateInterval, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_subscriptionBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_registerActionHandlers, _AssetsController_executeMiddlewares, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trackMetaMetricsEvent, _AssetsController_firstInitFetchReported, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_registerActionHandlers, _AssetsController_executeMiddlewares, _AssetsController_updateState, _AssetsController_getAssetsFromState, _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;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -26,6 +26,7 @@ const BackendWebsocketDataSource_1 = require("./data-sources/BackendWebsocketDat
 const PriceDataSource_1 = require("./data-sources/PriceDataSource.cjs");
 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 logger_1 = require("./logger.cjs");
 const DetectionMiddleware_1 = require("./middlewares/DetectionMiddleware.cjs");
@@ -56,7 +57,7 @@ const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, CONTROLLER_
  */
 function getDefaultAssetsControllerState() {
     return {
-        assetsMetadata: {},
+        assetsInfo: {},
         assetsBalance: {},
         assetsPrice: {},
         customAssets: {},
@@ -68,7 +69,7 @@ exports.getDefaultAssetsControllerState = getDefaultAssetsControllerState;
 // STATE METADATA
 // ============================================================================
 const stateMetadata = {
-    assetsMetadata: {
+    assetsInfo: {
         persist: true,
         includeInStateLogs: false,
         includeInDebugSnapshot: false,
@@ -116,11 +117,11 @@ function extractChainId(assetId) {
  */
 function normalizeResponse(response) {
     const normalized = {};
-    if (response.assetsMetadata) {
-        normalized.assetsMetadata = {};
-        for (const [assetId, metadata] of Object.entries(response.assetsMetadata)) {
+    if (response.assetsInfo) {
+        normalized.assetsInfo = {};
+        for (const [assetId, metadata] of Object.entries(response.assetsInfo)) {
             const normalizedId = (0, utils_2.normalizeAssetId)(assetId);
-            normalized.assetsMetadata[normalizedId] = metadata;
+            normalized.assetsInfo[normalizedId] = metadata;
         }
     }
     if (response.assetsPrice) {
@@ -182,7 +183,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, queryApiClient, rpcDataSourceConfig, }) {
+    constructor({ messenger, state = {}, defaultUpdateInterval = DEFAULT_POLLING_INTERVAL_MS, isEnabled = () => true, isBasicFunctionality, subscribeToBasicFunctionalityChange, queryApiClient, rpcDataSourceConfig, trackMetaMetricsEvent, accountsApiDataSourceConfig, priceDataSourceConfig, stakedBalanceDataSourceConfig, }) {
         super({
             name: CONTROLLER_NAME,
             messenger,
@@ -195,8 +196,14 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_instances.add(this);
         /** Whether the controller is enabled */
         _AssetsController_isEnabled.set(this, void 0);
+        /** Getter for basic functionality (only balance fetch/subscribe use RPC; token/price API not used). No attribute stored. */
+        _AssetsController_isBasicFunctionality.set(this, void 0);
         /** Default update interval hint passed to data sources */
         _AssetsController_defaultUpdateInterval.set(this, void 0);
+        /** Optional callback for first init/fetch MetaMetrics (duration). */
+        _AssetsController_trackMetaMetricsEvent.set(this, void 0);
+        /** Whether we have already reported first init fetch for this session (reset on #stop). */
+        _AssetsController_firstInitFetchReported.set(this, false);
         _AssetsController_controllerMutex.set(this, new async_mutex_1.Mutex());
         /**
          * Active balance subscriptions keyed by account ID.
@@ -211,13 +218,19 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_accountsApiDataSource.set(this, void 0);
         _AssetsController_snapDataSource.set(this, void 0);
         _AssetsController_rpcDataSource.set(this, void 0);
+        _AssetsController_stakedBalanceDataSource.set(this, void 0);
         _AssetsController_priceDataSource.set(this, void 0);
         _AssetsController_detectionMiddleware.set(this, void 0);
         _AssetsController_tokenDataSource.set(this, void 0);
+        _AssetsController_unsubscribeBasicFunctionality.set(this, null);
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
+        __classPrivateFieldSet(this, _AssetsController_isBasicFunctionality, isBasicFunctionality ?? (() => true), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
+        __classPrivateFieldSet(this, _AssetsController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
         const rpcConfig = rpcDataSourceConfig ?? {};
-        const onActiveChainsUpdated = (dataSourceName, chains, previousChains) => this.handleActiveChainsUpdate(dataSourceName, chains, previousChains);
+        const onActiveChainsUpdated = (dataSourceName, chains, previousChains) => {
+            this.handleActiveChainsUpdate(dataSourceName, chains, previousChains);
+        };
         __classPrivateFieldSet(this, _AssetsController_backendWebsocketDataSource, new BackendWebsocketDataSource_1.BackendWebsocketDataSource({
             messenger: this.messenger,
             queryApiClient,
@@ -226,6 +239,7 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource_1.AccountsApiDataSource({
             queryApiClient,
             onActiveChainsUpdated,
+            ...accountsApiDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource_1.SnapDataSource({
             messenger: this.messenger,
@@ -236,11 +250,17 @@ class AssetsController extends base_controller_1.BaseController {
             onActiveChainsUpdated,
             ...rpcConfig,
         }), "f");
+        __classPrivateFieldSet(this, _AssetsController_stakedBalanceDataSource, new StakedBalanceDataSource_1.StakedBalanceDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated,
+            ...stakedBalanceDataSourceConfig,
+        }), "f");
         __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource_1.TokenDataSource({
             queryApiClient,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_priceDataSource, new PriceDataSource_1.PriceDataSource({
             queryApiClient,
+            ...priceDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware_1.DetectionMiddleware(), "f");
         if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
@@ -253,6 +273,15 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_initializeState).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToEvents).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_registerActionHandlers).call(this);
+        // Subscriptions start only on KeyringController:unlock -> #start(), not here.
+        // Subscribe to basic-functionality changes after construction so a synchronous
+        // onChange during subscribe cannot run before data sources are initialized.
+        if (subscribeToBasicFunctionalityChange) {
+            const unsubscribe = subscribeToBasicFunctionalityChange((isBasic) => this.handleBasicFunctionalityChange(isBasic));
+            if (typeof unsubscribe === 'function') {
+                __classPrivateFieldSet(this, _AssetsController_unsubscribeBasicFunctionality, unsubscribe, "f");
+            }
+        }
     }
     // ============================================================================
     // DATA SOURCE CHAIN MANAGEMENT
@@ -271,6 +300,9 @@ class AssetsController extends base_controller_1.BaseController {
      * @param previousChains - Previous chains; used to compute added/removed.
      */
     handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
+        if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
+            return;
+        }
         log('Data source active chains changed', {
             dataSourceId,
             chainCount: activeChains.length,
@@ -312,21 +344,39 @@ class AssetsController extends base_controller_1.BaseController {
             customAssets.push(...accountCustomAssets);
         }
         if (options?.forceUpdate) {
+            const startTime = Date.now();
             const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 assetTypes,
                 dataTypes,
                 customAssets: customAssets.length > 0 ? customAssets : undefined,
                 forceUpdate: true,
             });
-            const response = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-                __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f").assetsMiddleware,
-                __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f").assetsMiddleware,
-                __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").assetsMiddleware,
-                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f").assetsMiddleware,
-                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").assetsMiddleware,
-                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").assetsMiddleware,
-            ], request);
+            const sources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                ? [
+                    __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                ]
+                : [
+                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                ];
+            const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, sources, request);
             await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, response);
+            if (__classPrivateFieldGet(this, _AssetsController_trackMetaMetricsEvent, "f") && !__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
+                __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+                const durationMs = Date.now() - startTime;
+                __classPrivateFieldGet(this, _AssetsController_trackMetaMetricsEvent, "f").call(this, {
+                    durationMs,
+                    chainIds,
+                    durationByDataSource,
+                });
+            }
         }
         return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
     }
@@ -351,7 +401,7 @@ class AssetsController extends base_controller_1.BaseController {
         return result;
     }
     getAssetMetadata(assetId) {
-        return this.state.assetsMetadata[assetId];
+        return this.state.assetsInfo[assetId];
     }
     async getAssetsPrice(accounts, options) {
         const assets = await this.getAssets(accounts, {
@@ -488,18 +538,17 @@ class AssetsController extends base_controller_1.BaseController {
      *
      * @param accounts - Accounts to subscribe price updates for.
      * @param chainIds - Chain IDs to filter prices for.
-     * @param options - Subscription options.
-     * @param options.updateInterval - Polling interval in ms.
      */
-    subscribeAssetsPrice(accounts, chainIds, options = {}) {
-        const { updateInterval = __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f") } = options;
+    subscribeAssetsPrice(accounts, chainIds) {
+        if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+            return;
+        }
         const subscriptionKey = 'ds:PriceDataSource';
         const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
         const isUpdate = existingSubscription !== undefined;
         const subscribeReq = {
             request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 dataTypes: ['price'],
-                updateInterval,
             }),
             subscriptionId: subscriptionKey,
             isUpdate,
@@ -531,6 +580,18 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").unsubscribe(subscriptionKey).catch(console.error);
         existingSubscription.unsubscribe();
     }
+    /**
+     * Handle basic functionality toggle change. Call this from the consumer (extension or mobile)
+     * when the user changes the "Basic functionality" setting. Refreshes subscriptions so the
+     * current {@link AssetsControllerOptions.isBasicFunctionality} getter is used (true = APIs on,
+     * false = RPC only).
+     *
+     * @param _isBasic - The new value (for call-site clarity; the getter is the source of truth).
+     */
+    handleBasicFunctionalityChange(_isBasic) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    }
     /**
      * Handle assets updated from a data source.
      * Called via the onAssetsUpdate callback passed in SubscriptionRequest when the controller subscribes to a data source.
@@ -548,11 +609,7 @@ class AssetsController extends base_controller_1.BaseController {
         });
         // Run through enrichment middlewares (Event Stack: Detection → Token → Price)
         // Include 'metadata' in dataTypes so TokenDataSource runs to enrich detected assets
-        const enrichedResponse = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f").assetsMiddleware,
-            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").assetsMiddleware,
-            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").assetsMiddleware,
-        ], request ?? {
+        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"), __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f")], request ?? {
             accountsWithSupportedChains: [],
             chainIds: [],
             dataTypes: ['balance', 'metadata', 'price'],
@@ -564,21 +621,21 @@ class AssetsController extends base_controller_1.BaseController {
     // ============================================================================
     destroy() {
         log('Destroying AssetsController', {
-            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get).length,
+            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get).length,
             subscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         });
         // Destroy instantiated data sources
         __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f")?.destroy?.();
         __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f")?.destroy?.();
         __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f")?.destroy?.();
-        if (__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f") &&
-            'destroy' in __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f") &&
-            typeof __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").destroy ===
-                'function') {
-            __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").destroy();
-        }
+        __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f")?.destroy?.();
         // Stop all active subscriptions
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
+        if (__classPrivateFieldGet(this, _AssetsController_unsubscribeBasicFunctionality, "f")) {
+            __classPrivateFieldGet(this, _AssetsController_unsubscribeBasicFunctionality, "f").call(this);
+            __classPrivateFieldSet(this, _AssetsController_unsubscribeBasicFunctionality, null, "f");
+        }
         // Unregister action handlers
         this.messenger.unregisterActionHandler('AssetsController:getAssets');
         this.messenger.unregisterActionHandler('AssetsController:getAssetsBalance');
@@ -592,9 +649,9 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trackMetaMetricsEvent = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = 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_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
     return this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
-}, _AssetsController_subscriptionBalanceDataSources_get = function _AssetsController_subscriptionBalanceDataSources_get() {
+}, _AssetsController_allBalanceDataSources_get = function _AssetsController_allBalanceDataSources_get() {
     return [
         __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f"),
         __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
@@ -628,7 +685,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInte
     }
     return chains;
 }, _AssetsController_normalizeChainReference = function _AssetsController_normalizeChainReference(namespace, reference) {
-    if (namespace === 'eip155' && reference.startsWith('0x')) {
+    if (namespace === 'eip155' && (0, utils_1.isStrictHexString)(reference)) {
         // Convert hex to decimal for EIP155 chains
         return parseInt(reference, 16).toString();
     }
@@ -653,14 +710,27 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInte
 // ============================================================================
 /**
  * Execute middlewares with request/response context.
+ * Returns response and exclusive duration per source (sum ≈ wall time).
  *
- * @param middlewares - Middlewares to execute in order.
+ * @param sources - Data sources or middlewares with getName() and assetsMiddleware (executed in order).
  * @param request - The data request.
  * @param initialResponse - Optional initial response (for enriching existing data).
- * @returns The final DataResponse after all middlewares have processed.
+ * @returns Response and durationByDataSource (exclusive ms per source name).
  */
-async function _AssetsController_executeMiddlewares(middlewares, request, initialResponse = {}) {
-    const chain = middlewares.reduceRight((next, middleware) => async (ctx) => {
+async function _AssetsController_executeMiddlewares(sources, request, initialResponse = {}) {
+    const names = sources.map((source) => source.getName());
+    const middlewares = sources.map((source) => source.assetsMiddleware);
+    const inclusive = [];
+    const wrapped = middlewares.map((middleware, i) => (async (ctx, next) => {
+        const start = Date.now();
+        try {
+            return await middleware(ctx, next);
+        }
+        finally {
+            inclusive[i] = Date.now() - start;
+        }
+    }));
+    const chain = wrapped.reduceRight((next, middleware) => async (ctx) => {
         try {
             return await middleware(ctx, next);
         }
@@ -674,7 +744,16 @@ async function _AssetsController_executeMiddlewares(middlewares, request, initia
         response: initialResponse,
         getAssetsState: () => this.state,
     });
-    return result.response;
+    const durationByDataSource = {};
+    for (let i = 0; i < inclusive.length; i++) {
+        const nextInc = i + 1 < inclusive.length ? (inclusive[i + 1] ?? 0) : 0;
+        const exclusive = Math.max(0, (inclusive[i] ?? 0) - nextInc);
+        const name = names[i];
+        if (name !== undefined) {
+            durationByDataSource[name] = exclusive;
+        }
+    }
+    return { response: result.response, durationByDataSource };
 }, _AssetsController_updateState = 
 // ============================================================================
 // STATE MANAGEMENT
@@ -693,12 +772,12 @@ async function _AssetsController_updateState(response) {
         const changedMetadata = [];
         this.update((state) => {
             // Use type assertions to avoid deep type instantiation issues with Immer Draft types
-            const metadata = state.assetsMetadata;
+            const metadata = state.assetsInfo;
             const balances = state.assetsBalance;
             const prices = state.assetsPrice;
-            if (normalizedResponse.assetsMetadata) {
-                for (const [key, value] of Object.entries(normalizedResponse.assetsMetadata)) {
-                    if (!(0, lodash_1.isEqual)(previousState.assetsMetadata[key], value)) {
+            if (normalizedResponse.assetsInfo) {
+                for (const [key, value] of Object.entries(normalizedResponse.assetsInfo)) {
+                    if (!(0, lodash_1.isEqual)(previousState.assetsInfo[key], value)) {
                         changedMetadata.push(key);
                     }
                     metadata[key] = value;
@@ -803,7 +882,7 @@ async function _AssetsController_updateState(response) {
         const accountBalances = this.state.assetsBalance[account.id] ?? {};
         for (const [assetId, balance] of Object.entries(accountBalances)) {
             const typedAssetId = assetId;
-            const metadataRaw = this.state.assetsMetadata[typedAssetId];
+            const metadataRaw = this.state.assetsInfo[typedAssetId];
             // Skip assets without metadata
             if (!metadataRaw) {
                 continue;
@@ -869,29 +948,33 @@ async function _AssetsController_updateState(response) {
         enabledChainCount: __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size,
     });
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
-    if (__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
-        this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
-            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-            forceUpdate: true,
-        }).catch((error) => {
-            log('Failed to fetch assets', error);
-        });
-    }
+    this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
+        chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
+        forceUpdate: true,
+    }).catch((error) => {
+        log('Failed to fetch assets', error);
+    });
 }, _AssetsController_stop = function _AssetsController_stop() {
     log('Stopping asset tracking', {
         activeSubscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         hasPriceSubscription: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").has('ds:PriceDataSource'),
     });
+    __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, false, "f");
     // Stop price subscription first (uses direct messenger call)
     this.unsubscribeAssetsPrice();
     // Stop balance subscriptions by properly notifying data sources via messenger
-    // This ensures data sources stop their polling timers
-    // Convert to array first to avoid modifying map during iteration
+    // This ensures data sources stop their polling timers.
+    // Use #allBalanceDataSources + staked balance source so we unsubscribe from
+    // every source that may have been subscribed.
+    const allSources = [
+        ...__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get),
+        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+    ];
     const subscriptionKeys = [...__classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").keys()];
     for (const subscriptionKey of subscriptionKeys) {
         if (subscriptionKey.startsWith('ds:')) {
             const sourceId = subscriptionKey.slice(3);
-            const source = __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get).find((ds) => ds.getName() === sourceId);
+            const source = allSources.find((ds) => ds.getName() === sourceId);
             if (source) {
                 __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
             }
@@ -906,12 +989,20 @@ async function _AssetsController_updateState(response) {
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssetsBalance).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [
         ...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f"),
     ]);
+    // Subscribe to staked balance updates (separate from regular balance chain-claiming)
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeStakedBalance).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [
+        ...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f"),
+    ]);
     // Subscribe to price updates for all assets held by selected accounts
     this.subscribeAssetsPrice(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")]);
 }, _AssetsController_subscribeAssetsBalance = function _AssetsController_subscribeAssetsBalance(accounts, chainIds) {
     const chainToAccounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildChainToAccountsMap).call(this, accounts, new Set(chainIds));
     const remainingChains = new Set(chainToAccounts.keys());
-    for (const source of __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get)) {
+    // When basic functionality is on (getter true), use all balance data sources; when off (getter false), RPC only.
+    const balanceDataSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+        ? __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get)
+        : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+    for (const source of balanceDataSources) {
         const availableChains = new Set(source.getActiveChainsSync());
         const assignedChains = [];
         for (const chainId of remainingChains) {
@@ -932,6 +1023,18 @@ async function _AssetsController_updateState(response) {
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains);
         }
     }
+}, _AssetsController_subscribeStakedBalance = function _AssetsController_subscribeStakedBalance(accounts, chainIds) {
+    const source = __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f");
+    if (!source) {
+        return;
+    }
+    const availableChains = new Set(source.getActiveChainsSync());
+    const assignedChains = chainIds.filter((chainId) => availableChains.has(chainId));
+    if (assignedChains.length === 0) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accounts, assignedChains);
 }, _AssetsController_buildChainToAccountsMap = function _AssetsController_buildChainToAccountsMap(accounts, chainsToSubscribe) {
     const chainToAccounts = new Map();
     for (const account of accounts) {
@@ -1008,16 +1111,24 @@ async function _AssetsController_updateState(response) {
     const scopes = account.scopes ?? [];
     const result = [];
     for (const scope of scopes) {
-        const [namespace, reference] = scope.split(':');
+        const scopeStr = scope;
+        if (!(0, utils_1.isCaipChainId)(scopeStr)) {
+            result.push(scope);
+            continue;
+        }
+        const { namespace, reference } = (0, utils_1.parseCaipChainId)(scopeStr);
         // Wildcard scope (e.g., "eip155:0" means all enabled chains in that namespace)
         if (reference === '0') {
             for (const chain of __classPrivateFieldGet(this, _AssetsController_enabledChains, "f")) {
-                if (chain.startsWith(`${namespace}:`)) {
-                    result.push(chain);
+                if ((0, utils_1.isCaipChainId)(chain)) {
+                    const chainParsed = (0, utils_1.parseCaipChainId)(chain);
+                    if (chainParsed.namespace === namespace) {
+                        result.push(chain);
+                    }
                 }
             }
         }
-        else if (namespace === 'eip155' && reference?.startsWith('0x')) {
+        else if (namespace === 'eip155' && (0, utils_1.isStrictHexString)(reference)) {
             // Normalize hex to decimal for EIP155
             result.push(`eip155:${parseInt(reference, 16)}`);
         }