@metamask/assets-controller 3.0.0 → 3.1.1

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.1]
+
+### Fixed
+
+- Refactored `BalanceFetcher` and `RpcDataSource` to ensure the correct `assetId` is used for EVM native assets that are not ETH ([#8284](https://github.com/MetaMask/core/pull/8284))
+
+## [3.1.0]
+
+### Changed
+
+- EVM RPC balance pipeline (`RpcDataSource`, `BalanceFetcher`, `TokenDetector`) no longer falls back to 18 decimals for ERC-20 when decimals are unknown; human-readable balances and `detectedBalances` entries are omitted until decimals are available from state, token list metadata, or on-chain `decimals()` (native token handling unchanged) ([#8267](https://github.com/MetaMask/core/pull/8267))
+- Bump `@metamask/keyring-api` from `^21.5.0` to `^21.6.0` ([#8259](https://github.com/MetaMask/core/pull/8259))
+- Bump `@metamask/transaction-controller` from `^63.0.0` to `^63.1.0` ([#8272](https://github.com/MetaMask/core/pull/8272))
+
+### Fixed
+
+- fix: move `selectedAccountGroup` to top-level persisted state ([#8245](https://github.com/MetaMask/core/pull/8245))
+
 ## [3.0.0]
 
 ### Added
@@ -190,7 +208,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@3.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@3.1.1...HEAD
+[3.1.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@3.1.0...@metamask/assets-controller@3.1.1
+[3.1.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@3.0.0...@metamask/assets-controller@3.1.0
 [3.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.4.0...@metamask/assets-controller@3.0.0
 [2.4.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.3.0...@metamask/assets-controller@2.4.0
 [2.3.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.2.0...@metamask/assets-controller@2.3.0

package/dist/AssetsController-method-action-types.cjs

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/AssetsController-method-action-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AssetsController-method-action-types.cjs","sourceRoot":"","sources":["../src/AssetsController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AssetsController } from './AssetsController';\n\nexport type AssetsControllerGetAssetsAction = {\n  type: `AssetsController:getAssets`;\n  handler: AssetsController['getAssets'];\n};\n\nexport type AssetsControllerGetAssetsBalanceAction = {\n  type: `AssetsController:getAssetsBalance`;\n  handler: AssetsController['getAssetsBalance'];\n};\n\nexport type AssetsControllerGetAssetMetadataAction = {\n  type: `AssetsController:getAssetMetadata`;\n  handler: AssetsController['getAssetMetadata'];\n};\n\nexport type AssetsControllerGetAssetsPriceAction = {\n  type: `AssetsController:getAssetsPrice`;\n  handler: AssetsController['getAssetsPrice'];\n};\n\n/**\n * Returns exchange rates in the format expected by the bridge controller\n * (conversionRates, currencyRates, marketData, currentCurrency) so that\n * when useAssetsControllerForRates is true the bridge can use a single\n * action instead of MultichainAssetsRatesController, TokenRatesController,\n * and CurrencyRateController.\n *\n * @returns Bridge-compatible exchange rate state derived from assetsPrice and selectedCurrency.\n */\nexport type AssetsControllerGetExchangeRatesForBridgeAction = {\n  type: `AssetsController:getExchangeRatesForBridge`;\n  handler: AssetsController['getExchangeRatesForBridge'];\n};\n\n/**\n * Returns state in the legacy format expected by transaction-pay-controller\n * (TokenBalancesController, AccountTrackerController, TokensController,\n * TokenRatesController, CurrencyRateController shapes) so that when\n * useAssetsController is true the transaction-pay-controller can use a\n * single action instead of five separate getState calls.\n *\n * @returns Legacy-compatible state for transaction-pay-controller.\n */\nexport type AssetsControllerGetStateForTransactionPayAction = {\n  type: `AssetsController:getStateForTransactionPay`;\n  handler: AssetsController['getStateForTransactionPay'];\n};\n\n/**\n * Add a custom asset for an account.\n * Custom assets are included in subscription and fetch operations.\n * Adding a custom asset also unhides it if it was previously hidden.\n *\n * When `pendingMetadata` is provided (e.g. from the extension's pending-tokens\n * flow), the token metadata is persisted immediately into `assetsInfo` so the\n * UI can render it without waiting for the next pipeline fetch.\n *\n * @param accountId - The account ID to add the custom asset for.\n * @param assetId - The CAIP-19 asset ID to add.\n * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).\n */\nexport type AssetsControllerAddCustomAssetAction = {\n  type: `AssetsController:addCustomAsset`;\n  handler: AssetsController['addCustomAsset'];\n};\n\n/**\n * Remove a custom asset from an account.\n *\n * @param accountId - The account ID to remove the custom asset from.\n * @param assetId - The CAIP-19 asset ID to remove.\n */\nexport type AssetsControllerRemoveCustomAssetAction = {\n  type: `AssetsController:removeCustomAsset`;\n  handler: AssetsController['removeCustomAsset'];\n};\n\n/**\n * Get all custom assets for an account.\n *\n * @param accountId - The account ID to get custom assets for.\n * @returns Array of CAIP-19 asset IDs for the account's custom assets.\n */\nexport type AssetsControllerGetCustomAssetsAction = {\n  type: `AssetsController:getCustomAssets`;\n  handler: AssetsController['getCustomAssets'];\n};\n\n/**\n * Hide an asset globally.\n * Hidden assets are excluded from the asset list returned by getAssets.\n * The hidden state is stored in assetPreferences.\n *\n * @param assetId - The CAIP-19 asset ID to hide.\n */\nexport type AssetsControllerHideAssetAction = {\n  type: `AssetsController:hideAsset`;\n  handler: AssetsController['hideAsset'];\n};\n\n/**\n * Unhide an asset globally.\n *\n * @param assetId - The CAIP-19 asset ID to unhide.\n */\nexport type AssetsControllerUnhideAssetAction = {\n  type: `AssetsController:unhideAsset`;\n  handler: AssetsController['unhideAsset'];\n};\n\n/**\n * Union of all AssetsController action types.\n */\nexport type AssetsControllerMethodActions =\n  | AssetsControllerGetAssetsAction\n  | AssetsControllerGetAssetsBalanceAction\n  | AssetsControllerGetAssetMetadataAction\n  | AssetsControllerGetAssetsPriceAction\n  | AssetsControllerGetExchangeRatesForBridgeAction\n  | AssetsControllerGetStateForTransactionPayAction\n  | AssetsControllerAddCustomAssetAction\n  | AssetsControllerRemoveCustomAssetAction\n  | AssetsControllerGetCustomAssetsAction\n  | AssetsControllerHideAssetAction\n  | AssetsControllerUnhideAssetAction;\n"]}
+{"version":3,"file":"AssetsController-method-action-types.cjs","sourceRoot":"","sources":["../src/AssetsController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { AssetsController } from './AssetsController';\n\nexport type AssetsControllerGetAssetsAction = {\n  type: `AssetsController:getAssets`;\n  handler: AssetsController['getAssets'];\n};\n\nexport type AssetsControllerGetAssetsBalanceAction = {\n  type: `AssetsController:getAssetsBalance`;\n  handler: AssetsController['getAssetsBalance'];\n};\n\nexport type AssetsControllerGetAssetMetadataAction = {\n  type: `AssetsController:getAssetMetadata`;\n  handler: AssetsController['getAssetMetadata'];\n};\n\nexport type AssetsControllerGetAssetsPriceAction = {\n  type: `AssetsController:getAssetsPrice`;\n  handler: AssetsController['getAssetsPrice'];\n};\n\n/**\n * Returns exchange rates in the format expected by the bridge controller\n * (conversionRates, currencyRates, marketData, currentCurrency) so that\n * when useAssetsControllerForRates is true the bridge can use a single\n * action instead of MultichainAssetsRatesController, TokenRatesController,\n * and CurrencyRateController.\n *\n * @returns Bridge-compatible exchange rate state derived from assetsPrice and selectedCurrency.\n */\nexport type AssetsControllerGetExchangeRatesForBridgeAction = {\n  type: `AssetsController:getExchangeRatesForBridge`;\n  handler: AssetsController['getExchangeRatesForBridge'];\n};\n\n/**\n * Returns state in the legacy format expected by transaction-pay-controller\n * (TokenBalancesController, AccountTrackerController, TokensController,\n * TokenRatesController, CurrencyRateController shapes) so that when\n * useAssetsController is true the transaction-pay-controller can use a\n * single action instead of five separate getState calls.\n *\n * @returns Legacy-compatible state for transaction-pay-controller.\n */\nexport type AssetsControllerGetStateForTransactionPayAction = {\n  type: `AssetsController:getStateForTransactionPay`;\n  handler: AssetsController['getStateForTransactionPay'];\n};\n\n/**\n * Add a custom asset for an account.\n * Custom assets are included in subscription and fetch operations.\n * Adding a custom asset also unhides it if it was previously hidden.\n *\n * When `pendingMetadata` is provided (e.g. from the extension's pending-tokens\n * flow), the token metadata is persisted immediately into `assetsInfo` so the\n * UI can render it without waiting for the next pipeline fetch.\n *\n * @param accountId - The account ID to add the custom asset for.\n * @param assetId - The CAIP-19 asset ID to add.\n * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).\n */\nexport type AssetsControllerAddCustomAssetAction = {\n  type: `AssetsController:addCustomAsset`;\n  handler: AssetsController['addCustomAsset'];\n};\n\n/**\n * Remove a custom asset from an account.\n *\n * @param accountId - The account ID to remove the custom asset from.\n * @param assetId - The CAIP-19 asset ID to remove.\n */\nexport type AssetsControllerRemoveCustomAssetAction = {\n  type: `AssetsController:removeCustomAsset`;\n  handler: AssetsController['removeCustomAsset'];\n};\n\n/**\n * Get all custom assets for an account.\n *\n * @param accountId - The account ID to get custom assets for.\n * @returns Array of CAIP-19 asset IDs for the account's custom assets.\n */\nexport type AssetsControllerGetCustomAssetsAction = {\n  type: `AssetsController:getCustomAssets`;\n  handler: AssetsController['getCustomAssets'];\n};\n\n/**\n * Hide an asset globally.\n * Hidden assets are excluded from the asset list returned by getAssets.\n * The hidden state is stored in assetPreferences.\n *\n * @param assetId - The CAIP-19 asset ID to hide.\n */\nexport type AssetsControllerHideAssetAction = {\n  type: `AssetsController:hideAsset`;\n  handler: AssetsController['hideAsset'];\n};\n\n/**\n * Unhide an asset globally.\n *\n * @param assetId - The CAIP-19 asset ID to unhide.\n */\nexport type AssetsControllerUnhideAssetAction = {\n  type: `AssetsController:unhideAsset`;\n  handler: AssetsController['unhideAsset'];\n};\n\n/**\n * Union of all AssetsController action types.\n */\nexport type AssetsControllerMethodActions =\n  | AssetsControllerGetAssetsAction\n  | AssetsControllerGetAssetsBalanceAction\n  | AssetsControllerGetAssetMetadataAction\n  | AssetsControllerGetAssetsPriceAction\n  | AssetsControllerGetExchangeRatesForBridgeAction\n  | AssetsControllerGetStateForTransactionPayAction\n  | AssetsControllerAddCustomAssetAction\n  | AssetsControllerRemoveCustomAssetAction\n  | AssetsControllerGetCustomAssetsAction\n  | AssetsControllerHideAssetAction\n  | AssetsControllerUnhideAssetAction;\n"]}

package/dist/AssetsController-method-action-types.d.cts

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 import type { AssetsController } from "./AssetsController.cjs";

package/dist/AssetsController-method-action-types.d.mts

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 import type { AssetsController } from "./AssetsController.mjs";

package/dist/AssetsController-method-action-types.mjs

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 export {};

package/dist/AssetsController-method-action-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AssetsController-method-action-types.mjs","sourceRoot":"","sources":["../src/AssetsController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AssetsController } from './AssetsController';\n\nexport type AssetsControllerGetAssetsAction = {\n  type: `AssetsController:getAssets`;\n  handler: AssetsController['getAssets'];\n};\n\nexport type AssetsControllerGetAssetsBalanceAction = {\n  type: `AssetsController:getAssetsBalance`;\n  handler: AssetsController['getAssetsBalance'];\n};\n\nexport type AssetsControllerGetAssetMetadataAction = {\n  type: `AssetsController:getAssetMetadata`;\n  handler: AssetsController['getAssetMetadata'];\n};\n\nexport type AssetsControllerGetAssetsPriceAction = {\n  type: `AssetsController:getAssetsPrice`;\n  handler: AssetsController['getAssetsPrice'];\n};\n\n/**\n * Returns exchange rates in the format expected by the bridge controller\n * (conversionRates, currencyRates, marketData, currentCurrency) so that\n * when useAssetsControllerForRates is true the bridge can use a single\n * action instead of MultichainAssetsRatesController, TokenRatesController,\n * and CurrencyRateController.\n *\n * @returns Bridge-compatible exchange rate state derived from assetsPrice and selectedCurrency.\n */\nexport type AssetsControllerGetExchangeRatesForBridgeAction = {\n  type: `AssetsController:getExchangeRatesForBridge`;\n  handler: AssetsController['getExchangeRatesForBridge'];\n};\n\n/**\n * Returns state in the legacy format expected by transaction-pay-controller\n * (TokenBalancesController, AccountTrackerController, TokensController,\n * TokenRatesController, CurrencyRateController shapes) so that when\n * useAssetsController is true the transaction-pay-controller can use a\n * single action instead of five separate getState calls.\n *\n * @returns Legacy-compatible state for transaction-pay-controller.\n */\nexport type AssetsControllerGetStateForTransactionPayAction = {\n  type: `AssetsController:getStateForTransactionPay`;\n  handler: AssetsController['getStateForTransactionPay'];\n};\n\n/**\n * Add a custom asset for an account.\n * Custom assets are included in subscription and fetch operations.\n * Adding a custom asset also unhides it if it was previously hidden.\n *\n * When `pendingMetadata` is provided (e.g. from the extension's pending-tokens\n * flow), the token metadata is persisted immediately into `assetsInfo` so the\n * UI can render it without waiting for the next pipeline fetch.\n *\n * @param accountId - The account ID to add the custom asset for.\n * @param assetId - The CAIP-19 asset ID to add.\n * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).\n */\nexport type AssetsControllerAddCustomAssetAction = {\n  type: `AssetsController:addCustomAsset`;\n  handler: AssetsController['addCustomAsset'];\n};\n\n/**\n * Remove a custom asset from an account.\n *\n * @param accountId - The account ID to remove the custom asset from.\n * @param assetId - The CAIP-19 asset ID to remove.\n */\nexport type AssetsControllerRemoveCustomAssetAction = {\n  type: `AssetsController:removeCustomAsset`;\n  handler: AssetsController['removeCustomAsset'];\n};\n\n/**\n * Get all custom assets for an account.\n *\n * @param accountId - The account ID to get custom assets for.\n * @returns Array of CAIP-19 asset IDs for the account's custom assets.\n */\nexport type AssetsControllerGetCustomAssetsAction = {\n  type: `AssetsController:getCustomAssets`;\n  handler: AssetsController['getCustomAssets'];\n};\n\n/**\n * Hide an asset globally.\n * Hidden assets are excluded from the asset list returned by getAssets.\n * The hidden state is stored in assetPreferences.\n *\n * @param assetId - The CAIP-19 asset ID to hide.\n */\nexport type AssetsControllerHideAssetAction = {\n  type: `AssetsController:hideAsset`;\n  handler: AssetsController['hideAsset'];\n};\n\n/**\n * Unhide an asset globally.\n *\n * @param assetId - The CAIP-19 asset ID to unhide.\n */\nexport type AssetsControllerUnhideAssetAction = {\n  type: `AssetsController:unhideAsset`;\n  handler: AssetsController['unhideAsset'];\n};\n\n/**\n * Union of all AssetsController action types.\n */\nexport type AssetsControllerMethodActions =\n  | AssetsControllerGetAssetsAction\n  | AssetsControllerGetAssetsBalanceAction\n  | AssetsControllerGetAssetMetadataAction\n  | AssetsControllerGetAssetsPriceAction\n  | AssetsControllerGetExchangeRatesForBridgeAction\n  | AssetsControllerGetStateForTransactionPayAction\n  | AssetsControllerAddCustomAssetAction\n  | AssetsControllerRemoveCustomAssetAction\n  | AssetsControllerGetCustomAssetsAction\n  | AssetsControllerHideAssetAction\n  | AssetsControllerUnhideAssetAction;\n"]}
+{"version":3,"file":"AssetsController-method-action-types.mjs","sourceRoot":"","sources":["../src/AssetsController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { AssetsController } from './AssetsController';\n\nexport type AssetsControllerGetAssetsAction = {\n  type: `AssetsController:getAssets`;\n  handler: AssetsController['getAssets'];\n};\n\nexport type AssetsControllerGetAssetsBalanceAction = {\n  type: `AssetsController:getAssetsBalance`;\n  handler: AssetsController['getAssetsBalance'];\n};\n\nexport type AssetsControllerGetAssetMetadataAction = {\n  type: `AssetsController:getAssetMetadata`;\n  handler: AssetsController['getAssetMetadata'];\n};\n\nexport type AssetsControllerGetAssetsPriceAction = {\n  type: `AssetsController:getAssetsPrice`;\n  handler: AssetsController['getAssetsPrice'];\n};\n\n/**\n * Returns exchange rates in the format expected by the bridge controller\n * (conversionRates, currencyRates, marketData, currentCurrency) so that\n * when useAssetsControllerForRates is true the bridge can use a single\n * action instead of MultichainAssetsRatesController, TokenRatesController,\n * and CurrencyRateController.\n *\n * @returns Bridge-compatible exchange rate state derived from assetsPrice and selectedCurrency.\n */\nexport type AssetsControllerGetExchangeRatesForBridgeAction = {\n  type: `AssetsController:getExchangeRatesForBridge`;\n  handler: AssetsController['getExchangeRatesForBridge'];\n};\n\n/**\n * Returns state in the legacy format expected by transaction-pay-controller\n * (TokenBalancesController, AccountTrackerController, TokensController,\n * TokenRatesController, CurrencyRateController shapes) so that when\n * useAssetsController is true the transaction-pay-controller can use a\n * single action instead of five separate getState calls.\n *\n * @returns Legacy-compatible state for transaction-pay-controller.\n */\nexport type AssetsControllerGetStateForTransactionPayAction = {\n  type: `AssetsController:getStateForTransactionPay`;\n  handler: AssetsController['getStateForTransactionPay'];\n};\n\n/**\n * Add a custom asset for an account.\n * Custom assets are included in subscription and fetch operations.\n * Adding a custom asset also unhides it if it was previously hidden.\n *\n * When `pendingMetadata` is provided (e.g. from the extension's pending-tokens\n * flow), the token metadata is persisted immediately into `assetsInfo` so the\n * UI can render it without waiting for the next pipeline fetch.\n *\n * @param accountId - The account ID to add the custom asset for.\n * @param assetId - The CAIP-19 asset ID to add.\n * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).\n */\nexport type AssetsControllerAddCustomAssetAction = {\n  type: `AssetsController:addCustomAsset`;\n  handler: AssetsController['addCustomAsset'];\n};\n\n/**\n * Remove a custom asset from an account.\n *\n * @param accountId - The account ID to remove the custom asset from.\n * @param assetId - The CAIP-19 asset ID to remove.\n */\nexport type AssetsControllerRemoveCustomAssetAction = {\n  type: `AssetsController:removeCustomAsset`;\n  handler: AssetsController['removeCustomAsset'];\n};\n\n/**\n * Get all custom assets for an account.\n *\n * @param accountId - The account ID to get custom assets for.\n * @returns Array of CAIP-19 asset IDs for the account's custom assets.\n */\nexport type AssetsControllerGetCustomAssetsAction = {\n  type: `AssetsController:getCustomAssets`;\n  handler: AssetsController['getCustomAssets'];\n};\n\n/**\n * Hide an asset globally.\n * Hidden assets are excluded from the asset list returned by getAssets.\n * The hidden state is stored in assetPreferences.\n *\n * @param assetId - The CAIP-19 asset ID to hide.\n */\nexport type AssetsControllerHideAssetAction = {\n  type: `AssetsController:hideAsset`;\n  handler: AssetsController['hideAsset'];\n};\n\n/**\n * Unhide an asset globally.\n *\n * @param assetId - The CAIP-19 asset ID to unhide.\n */\nexport type AssetsControllerUnhideAssetAction = {\n  type: `AssetsController:unhideAsset`;\n  handler: AssetsController['unhideAsset'];\n};\n\n/**\n * Union of all AssetsController action types.\n */\nexport type AssetsControllerMethodActions =\n  | AssetsControllerGetAssetsAction\n  | AssetsControllerGetAssetsBalanceAction\n  | AssetsControllerGetAssetMetadataAction\n  | AssetsControllerGetAssetsPriceAction\n  | AssetsControllerGetExchangeRatesForBridgeAction\n  | AssetsControllerGetStateForTransactionPayAction\n  | AssetsControllerAddCustomAssetAction\n  | AssetsControllerRemoveCustomAssetAction\n  | AssetsControllerGetCustomAssetsAction\n  | AssetsControllerHideAssetAction\n  | AssetsControllerUnhideAssetAction;\n"]}

package/dist/data-sources/RpcDataSource.cjs

@@ -24,6 +24,7 @@ const AbstractDataSource_1 = require("./AbstractDataSource.cjs");
 const evm_rpc_services_1 = require("./evm-rpc-services/index.cjs");
 const logger_1 = require("../logger.cjs");
 const utils_2 = require("../utils/index.cjs");
+const constants_1 = require("../utils/constants.cjs");
 const CONTROLLER_NAME = 'RpcDataSource';
 const DEFAULT_BALANCE_INTERVAL = 30000; // 30 seconds
 const DEFAULT_DETECTION_INTERVAL = 180000; // 3 minutes
@@ -211,16 +212,28 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
             const { address, id: accountId } = account;
             for (const chainId of chainsForAccount) {
                 const hexChainId = (0, exports.caipChainIdToHex)(chainId);
-                // Extract ERC20 token addresses from customAssets for this chain
-                const customTokenAddresses = [];
+                // Build a single AssetFetchEntry[] for native + custom ERC-20s
+                const nativeAssetId = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_buildNativeAssetId).call(this, chainId);
+                const assetsToFetch = [
+                    { assetId: nativeAssetId, address: constants_1.ZERO_ADDRESS },
+                ];
                 if (request.customAssets) {
+                    const existingMetadata = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getExistingAssetsMetadata).call(this);
                     for (const assetId of request.customAssets) {
                         try {
                             const parsed = (0, utils_1.parseCaipAssetType)(assetId);
                             const assetChainId = `${parsed.chain.namespace}:${parsed.chain.reference}`;
                             if (assetChainId === chainId &&
                                 parsed.assetNamespace === 'erc20') {
-                                customTokenAddresses.push(parsed.assetReference);
+                                const tokenAddress = parsed.assetReference.toLowerCase();
+                                const normalizedId = (0, utils_2.normalizeAssetId)(assetId);
+                                const decimals = existingMetadata[normalizedId]?.decimals ??
+                                    __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getTokenMetadataFromTokenList).call(this, normalizedId)?.decimals;
+                                assetsToFetch.push({
+                                    assetId,
+                                    address: tokenAddress,
+                                    decimals,
+                                });
                             }
                         }
                         catch {
@@ -229,8 +242,7 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
                     }
                 }
                 try {
-                    // Use BalanceFetcher for batched balance fetching
-                    const result = await __classPrivateFieldGet(this, _RpcDataSource_balanceFetcher, "f").fetchBalancesForTokens(hexChainId, accountId, address, customTokenAddresses, { includeNative: true });
+                    const result = await __classPrivateFieldGet(this, _RpcDataSource_balanceFetcher, "f").fetchBalancesForAssets(hexChainId, accountId, address, assetsToFetch);
                     if (!assetsBalance[accountId]) {
                         assetsBalance[accountId] = {};
                     }
@@ -245,7 +257,7 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
                     Object.assign(assetsInfo, balanceMetadata);
                     // Convert balances to human-readable format using decimals from
                     // assetsInfo state (which includes pendingMetadata from addCustomAsset).
-                    // Fallback chain: state → pipeline metadata → RPC call → 18.
+                    // Resolution: state → pipeline metadata → RPC `decimals()`; omit balance if still unknown.
                     const existingMetadata = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getExistingAssetsMetadata).call(this);
                     for (const balance of normalizedBalances) {
                         const stateMetadata = existingMetadata[balance.assetId];
@@ -257,8 +269,10 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
                                 decimals = await __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_fetchDecimalsViaRpc).call(this, chainId, parsed.assetReference);
                             }
                         }
-                        const resolvedDecimals = decimals ?? 18;
-                        const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, resolvedDecimals);
+                        if (decimals === undefined) {
+                            continue;
+                        }
+                        const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, decimals);
                         assetsBalance[accountId][balance.assetId] = {
                             amount: humanReadableAmount,
                         };
@@ -269,7 +283,6 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
                     if (!assetsBalance[accountId]) {
                         assetsBalance[accountId] = {};
                     }
-                    const nativeAssetId = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_buildNativeAssetId).call(this, chainId);
                     assetsBalance[accountId][nativeAssetId] = { amount: '0' };
                     // Even on error, include native token metadata
                     const chainStatus = __classPrivateFieldGet(this, _RpcDataSource_chainStatuses, "f")[chainId];
@@ -356,9 +369,10 @@ class RpcDataSource extends AbstractDataSource_1.AbstractDataSource {
             // Add balances for detected tokens (converted to human-readable format)
             for (const balance of result.detectedBalances) {
                 const detectedAsset = result.detectedAssets.find((asset) => asset.assetId === balance.assetId);
-                // Default to 18 decimals (ERC20 standard) for consistent human-readable format
-                const decimals = detectedAsset?.decimals ?? 18;
-                const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, decimals);
+                if (detectedAsset?.decimals === undefined) {
+                    continue;
+                }
+                const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, detectedAsset.decimals);
                 balances[balance.assetId] = {
                     amount: humanReadableAmount,
                 };
@@ -556,7 +570,7 @@ exports.RpcDataSource = RpcDataSource;
 _RpcDataSource_messenger = new WeakMap(), _RpcDataSource_onActiveChainsUpdated = new WeakMap(), _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = new WeakMap(), _RpcDataSource_useExternalService = new WeakMap(), _RpcDataSource_activeChains = new WeakMap(), _RpcDataSource_chainStatuses = new WeakMap(), _RpcDataSource_providerCache = new WeakMap(), _RpcDataSource_activeSubscriptions = new WeakMap(), _RpcDataSource_unsubscribeTransactionConfirmed = new WeakMap(), _RpcDataSource_unsubscribeIncomingTransactions = new WeakMap(), _RpcDataSource_multicallClient = new WeakMap(), _RpcDataSource_balanceFetcher = new WeakMap(), _RpcDataSource_tokenDetector = new WeakMap(), _RpcDataSource_instances = new WeakSet(), _RpcDataSource_convertToHumanReadable = function _RpcDataSource_convertToHumanReadable(rawBalance, decimals) {
     const rawAmount = new bignumber_js_1.default(rawBalance);
     const divisor = new bignumber_js_1.default(10).pow(decimals);
-    return rawAmount.dividedBy(divisor).toString();
+    return rawAmount.dividedBy(divisor).toFixed();
 }, _RpcDataSource_collectMetadataForBalances = function _RpcDataSource_collectMetadataForBalances(balances, chainId) {
     const assetsInfo = {};
     const existingMetadata = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getExistingAssetsMetadata).call(this);
@@ -585,17 +599,8 @@ _RpcDataSource_messenger = new WeakMap(), _RpcDataSource_onActiveChainsUpdated =
                 if (tokenListMeta) {
                     assetsInfo[balance.assetId] = tokenListMeta;
                 }
-                else {
-                    // Default metadata for unknown ERC20 tokens.
-                    // Use 18 decimals (the standard for most ERC20 tokens)
-                    // to ensure consistent human-readable balance format.
-                    assetsInfo[balance.assetId] = {
-                        type: 'erc20',
-                        symbol: '',
-                        name: '',
-                        decimals: 18,
-                    };
-                }
+                // Unknown ERC-20: omit from assetsInfo until decimals are known.
+                // #handleBalanceUpdate resolves decimals via RPC or omits the balance.
             }
         }
     }
@@ -619,20 +624,16 @@ async function _RpcDataSource_handleBalanceUpdate(result) {
     // Collect metadata for all balances
     const assetsInfo = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_collectMetadataForBalances).call(this, normalizedBalances, caipChainId);
     // Convert balances to human-readable format.
-    // Fallback chain: state → pipeline metadata → RPC call → 18.
+    // Resolution: state metadata → pipeline metadata; skip if decimals unknown.
     const existingMetadata = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getExistingAssetsMetadata).call(this);
     for (const balance of normalizedBalances) {
         const stateMetadata = existingMetadata[balance.assetId];
         const pipelineMetadata = assetsInfo[balance.assetId];
-        let decimals = stateMetadata?.decimals ?? pipelineMetadata?.decimals;
+        const decimals = stateMetadata?.decimals ?? pipelineMetadata?.decimals;
         if (decimals === undefined) {
-            const parsed = (0, utils_1.parseCaipAssetType)(balance.assetId);
-            if (parsed.assetNamespace === 'erc20') {
-                decimals = await __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_fetchDecimalsViaRpc).call(this, caipChainId, parsed.assetReference);
-            }
+            continue;
         }
-        const resolvedDecimals = decimals ?? 18;
-        const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, resolvedDecimals);
+        const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, decimals);
         newBalances[balance.assetId] = {
             amount: humanReadableAmount,
         };
@@ -686,9 +687,10 @@ async function _RpcDataSource_handleBalanceUpdate(result) {
         for (const balance of result.detectedBalances) {
             // Get decimals from the detected asset metadata
             const detectedAsset = result.detectedAssets.find((asset) => asset.assetId === balance.assetId);
-            // Default to 18 decimals (ERC20 standard) for consistent human-readable format
-            const decimals = detectedAsset?.decimals ?? 18;
-            const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, decimals);
+            if (detectedAsset?.decimals === undefined) {
+                continue;
+            }
+            const humanReadableAmount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_convertToHumanReadable).call(this, balance.balance, detectedAsset.decimals);
             newBalances[balance.assetId] = {
                 amount: humanReadableAmount,
             };