@metamask/assets-controller 6.4.0 → 7.0.1

package/dist/middlewares/CustomAssetGraduationMiddleware.cjs

@@ -21,15 +21,22 @@ const CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';
 const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, CONTROLLER_NAME);
 /**
  * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when
- * an upstream balance source (AccountsAPI / Websocket) reports a balance for
- * them. Once a detector sees the asset, it no longer needs to be tracked as
- * "custom" — the regular detection flow will keep it fresh.
+ * an upstream balance source (AccountsAPI / Websocket) reports a non-zero
+ * balance for them. Once a detector sees the asset with a real balance, it
+ * no longer needs to be tracked as "custom" — the regular detection flow
+ * will keep it fresh.
  *
  * Rules:
- * - Only the selected account's custom assets are considered.
+ * - Only the selected account's custom assets are considered. Switching the
+ *   selected account triggers a fresh fetch, which re-runs graduation
+ *   against the new account's balances.
  * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom
  *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left
  *   alone.
+ * - Only positive balances graduate. A zero balance from AccountsAPI means
+ *   the API knows about the token but the user does not currently hold it;
+ *   keeping it in `customAssets` ensures RPC keeps polling so a future
+ *   incoming transfer is reflected promptly.
  */
 class CustomAssetGraduationMiddleware {
     constructor(options) {
@@ -73,6 +80,9 @@ class CustomAssetGraduationMiddleware {
                 if (!isEvmAssetId(rawAssetId)) {
                     continue;
                 }
+                if (!hasPositiveBalance(returnedBalances[rawAssetId])) {
+                    continue;
+                }
                 const normalizedAssetId = safeNormalize(rawAssetId);
                 if (!customSet.has(normalizedAssetId)) {
                     continue;
@@ -118,4 +128,22 @@ function safeNormalize(assetId) {
         return assetId;
     }
 }
+/**
+ * Whether a balance entry reports a strictly positive amount. AccountsAPI
+ * may return zero for tokens it indexes but the user no longer holds; we
+ * treat those as non-graduating so RPC keeps polling and surfaces any
+ * future incoming transfer immediately.
+ *
+ * `AssetBalance.amount` is already a human-readable decimal string from
+ * both AccountsApi (e.g. "0.283549083429656057") and the websocket data
+ * source (which divides by `decimals` before emitting), so a `Number()`
+ * sign check is safe: `NaN`, `undefined`, empty strings, and zero all
+ * fail the comparison.
+ *
+ * @param balance - The balance entry from the response.
+ * @returns `true` when the balance amount represents a value greater than 0.
+ */
+function hasPositiveBalance(balance) {
+    return Number(balance?.amount) > 0;
+}
 //# sourceMappingURL=CustomAssetGraduationMiddleware.cjs.map

package/dist/middlewares/CustomAssetGraduationMiddleware.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAssetGraduationMiddleware.cjs","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"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","sourcesContent":["import { KnownCaipNamespace } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from '../logger';\nimport { forDataTypes } from '../types';\nimport type { AccountId, Caip19AssetId, Middleware } from '../types';\nimport { normalizeAssetId } from '../utils';\n\nconst CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';\n\nconst log = createModuleLogger(projectLogger, CONTROLLER_NAME);\n\nexport type CustomAssetGraduationMiddlewareOptions = {\n  getSelectedAccountId: () => AccountId | undefined;\n  removeCustomAsset: (accountId: AccountId, assetId: Caip19AssetId) => void;\n};\n\n/**\n * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when\n * an upstream balance source (AccountsAPI / Websocket) reports a balance for\n * them. Once a detector sees the asset, it no longer needs to be tracked as\n * \"custom\" — the regular detection flow will keep it fresh.\n *\n * Rules:\n * - Only the selected account's custom assets are considered.\n * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom\n *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left\n *   alone.\n */\nexport class CustomAssetGraduationMiddleware {\n  readonly name = CONTROLLER_NAME;\n\n  readonly #getSelectedAccountId: () => AccountId | undefined;\n\n  readonly #removeCustomAsset: (\n    accountId: AccountId,\n    assetId: Caip19AssetId,\n  ) => void;\n\n  constructor(options: CustomAssetGraduationMiddlewareOptions) {\n    this.#getSelectedAccountId = options.getSelectedAccountId;\n    this.#removeCustomAsset = options.removeCustomAsset;\n  }\n\n  getName(): string {\n    return this.name;\n  }\n\n  get assetsMiddleware(): Middleware {\n    return forDataTypes(['balance'], async (ctx, next) => {\n      // Inspect the response BEFORE calling next() so we only consider\n      // balances populated by upstream middleware (AccountsApi / Websocket /\n      // Staked). This middleware is positioned in the pipeline before the\n      // RPC fallback — RPC intentionally carries custom assets and must\n      // never trigger graduation.\n      const accountId = this.#getSelectedAccountId();\n      if (!accountId) {\n        return next(ctx);\n      }\n\n      const state = ctx.getAssetsState();\n      const customForAccount = state.customAssets?.[accountId] ?? [];\n      if (customForAccount.length === 0) {\n        return next(ctx);\n      }\n\n      const returnedBalances = ctx.response.assetsBalance?.[accountId] ?? {};\n      const returnedAssetIds = Object.keys(returnedBalances) as Caip19AssetId[];\n      if (returnedAssetIds.length === 0) {\n        return next(ctx);\n      }\n\n      // customAssets state is stored with checksummed/normalized asset IDs.\n      // AccountsApiDataSource normalizes its response IDs, but\n      // BackendWebsocketDataSource does not — so we normalize the response\n      // side here to make the comparison robust to lower-case addresses\n      // delivered over the websocket.\n      const customSet = new Set(customForAccount);\n      for (const rawAssetId of returnedAssetIds) {\n        if (!isEvmAssetId(rawAssetId)) {\n          continue;\n        }\n        const normalizedAssetId = safeNormalize(rawAssetId);\n        if (!customSet.has(normalizedAssetId)) {\n          continue;\n        }\n        log('Graduating custom asset', {\n          accountId,\n          assetId: normalizedAssetId,\n        });\n        this.#removeCustomAsset(accountId, normalizedAssetId);\n      }\n\n      return next(ctx);\n    });\n  }\n}\n\n/**\n * Check whether a CAIP-19 asset ID belongs to an EVM chain.\n *\n * @param assetId - The CAIP-19 asset ID to inspect.\n * @returns `true` when the asset's chain namespace is `eip155`.\n */\nfunction isEvmAssetId(assetId: Caip19AssetId): boolean {\n  // CAIP-19 format: <namespace>:<chainRef>/<assetNamespace>:<assetRef>\n  // The chain namespace is always the segment before the first colon.\n  const namespace = assetId.split(':')[0];\n  return namespace === KnownCaipNamespace.Eip155;\n}\n\n/**\n * Normalize a CAIP-19 asset ID, returning the original on failure. Some\n * malformed IDs (e.g. an asset reference that fails address checksumming)\n * make `normalizeAssetId` throw — in that case we fall back to the raw ID\n * so the graduation pass can still proceed for other assets.\n *\n * @param assetId - The CAIP-19 asset ID to normalize.\n * @returns The normalized ID, or the original on failure.\n */\nfunction safeNormalize(assetId: Caip19AssetId): Caip19AssetId {\n  try {\n    return normalizeAssetId(assetId);\n  } catch {\n    return assetId;\n  }\n}\n"]}
+{"version":3,"file":"CustomAssetGraduationMiddleware.cjs","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"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","sourcesContent":["import { KnownCaipNamespace } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from '../logger';\nimport { forDataTypes } from '../types';\nimport type {\n  AccountId,\n  AssetBalance,\n  Caip19AssetId,\n  Middleware,\n} from '../types';\nimport { normalizeAssetId } from '../utils';\n\nconst CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';\n\nconst log = createModuleLogger(projectLogger, CONTROLLER_NAME);\n\nexport type CustomAssetGraduationMiddlewareOptions = {\n  getSelectedAccountId: () => AccountId | undefined;\n  removeCustomAsset: (accountId: AccountId, assetId: Caip19AssetId) => void;\n};\n\n/**\n * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when\n * an upstream balance source (AccountsAPI / Websocket) reports a non-zero\n * balance for them. Once a detector sees the asset with a real balance, it\n * no longer needs to be tracked as \"custom\" — the regular detection flow\n * will keep it fresh.\n *\n * Rules:\n * - Only the selected account's custom assets are considered. Switching the\n *   selected account triggers a fresh fetch, which re-runs graduation\n *   against the new account's balances.\n * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom\n *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left\n *   alone.\n * - Only positive balances graduate. A zero balance from AccountsAPI means\n *   the API knows about the token but the user does not currently hold it;\n *   keeping it in `customAssets` ensures RPC keeps polling so a future\n *   incoming transfer is reflected promptly.\n */\nexport class CustomAssetGraduationMiddleware {\n  readonly name = CONTROLLER_NAME;\n\n  readonly #getSelectedAccountId: () => AccountId | undefined;\n\n  readonly #removeCustomAsset: (\n    accountId: AccountId,\n    assetId: Caip19AssetId,\n  ) => void;\n\n  constructor(options: CustomAssetGraduationMiddlewareOptions) {\n    this.#getSelectedAccountId = options.getSelectedAccountId;\n    this.#removeCustomAsset = options.removeCustomAsset;\n  }\n\n  getName(): string {\n    return this.name;\n  }\n\n  get assetsMiddleware(): Middleware {\n    return forDataTypes(['balance'], async (ctx, next) => {\n      // Inspect the response BEFORE calling next() so we only consider\n      // balances populated by upstream middleware (AccountsApi / Websocket /\n      // Staked). This middleware is positioned in the pipeline before the\n      // RPC fallback — RPC intentionally carries custom assets and must\n      // never trigger graduation.\n      const accountId = this.#getSelectedAccountId();\n      if (!accountId) {\n        return next(ctx);\n      }\n\n      const state = ctx.getAssetsState();\n      const customForAccount = state.customAssets?.[accountId] ?? [];\n      if (customForAccount.length === 0) {\n        return next(ctx);\n      }\n\n      const returnedBalances = ctx.response.assetsBalance?.[accountId] ?? {};\n      const returnedAssetIds = Object.keys(returnedBalances) as Caip19AssetId[];\n      if (returnedAssetIds.length === 0) {\n        return next(ctx);\n      }\n\n      // customAssets state is stored with checksummed/normalized asset IDs.\n      // AccountsApiDataSource normalizes its response IDs, but\n      // BackendWebsocketDataSource does not — so we normalize the response\n      // side here to make the comparison robust to lower-case addresses\n      // delivered over the websocket.\n      const customSet = new Set(customForAccount);\n      for (const rawAssetId of returnedAssetIds) {\n        if (!isEvmAssetId(rawAssetId)) {\n          continue;\n        }\n        if (!hasPositiveBalance(returnedBalances[rawAssetId])) {\n          continue;\n        }\n        const normalizedAssetId = safeNormalize(rawAssetId);\n        if (!customSet.has(normalizedAssetId)) {\n          continue;\n        }\n        log('Graduating custom asset', {\n          accountId,\n          assetId: normalizedAssetId,\n        });\n        this.#removeCustomAsset(accountId, normalizedAssetId);\n      }\n\n      return next(ctx);\n    });\n  }\n}\n\n/**\n * Check whether a CAIP-19 asset ID belongs to an EVM chain.\n *\n * @param assetId - The CAIP-19 asset ID to inspect.\n * @returns `true` when the asset's chain namespace is `eip155`.\n */\nfunction isEvmAssetId(assetId: Caip19AssetId): boolean {\n  // CAIP-19 format: <namespace>:<chainRef>/<assetNamespace>:<assetRef>\n  // The chain namespace is always the segment before the first colon.\n  const namespace = assetId.split(':')[0];\n  return namespace === KnownCaipNamespace.Eip155;\n}\n\n/**\n * Normalize a CAIP-19 asset ID, returning the original on failure. Some\n * malformed IDs (e.g. an asset reference that fails address checksumming)\n * make `normalizeAssetId` throw — in that case we fall back to the raw ID\n * so the graduation pass can still proceed for other assets.\n *\n * @param assetId - The CAIP-19 asset ID to normalize.\n * @returns The normalized ID, or the original on failure.\n */\nfunction safeNormalize(assetId: Caip19AssetId): Caip19AssetId {\n  try {\n    return normalizeAssetId(assetId);\n  } catch {\n    return assetId;\n  }\n}\n\n/**\n * Whether a balance entry reports a strictly positive amount. AccountsAPI\n * may return zero for tokens it indexes but the user no longer holds; we\n * treat those as non-graduating so RPC keeps polling and surfaces any\n * future incoming transfer immediately.\n *\n * `AssetBalance.amount` is already a human-readable decimal string from\n * both AccountsApi (e.g. \"0.283549083429656057\") and the websocket data\n * source (which divides by `decimals` before emitting), so a `Number()`\n * sign check is safe: `NaN`, `undefined`, empty strings, and zero all\n * fail the comparison.\n *\n * @param balance - The balance entry from the response.\n * @returns `true` when the balance amount represents a value greater than 0.\n */\nfunction hasPositiveBalance(balance: AssetBalance | undefined): boolean {\n  return Number(balance?.amount) > 0;\n}\n"]}

package/dist/middlewares/CustomAssetGraduationMiddleware.d.cts

@@ -5,15 +5,22 @@ export type CustomAssetGraduationMiddlewareOptions = {
 };
 /**
  * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when
- * an upstream balance source (AccountsAPI / Websocket) reports a balance for
- * them. Once a detector sees the asset, it no longer needs to be tracked as
- * "custom" — the regular detection flow will keep it fresh.
+ * an upstream balance source (AccountsAPI / Websocket) reports a non-zero
+ * balance for them. Once a detector sees the asset with a real balance, it
+ * no longer needs to be tracked as "custom" — the regular detection flow
+ * will keep it fresh.
  *
  * Rules:
- * - Only the selected account's custom assets are considered.
+ * - Only the selected account's custom assets are considered. Switching the
+ *   selected account triggers a fresh fetch, which re-runs graduation
+ *   against the new account's balances.
  * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom
  *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left
  *   alone.
+ * - Only positive balances graduate. A zero balance from AccountsAPI means
+ *   the API knows about the token but the user does not currently hold it;
+ *   keeping it in `customAssets` ensures RPC keeps polling so a future
+ *   incoming transfer is reflected promptly.
  */
 export declare class CustomAssetGraduationMiddleware {
     #private;

package/dist/middlewares/CustomAssetGraduationMiddleware.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAssetGraduationMiddleware.d.cts","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,qBAAiB;AAOrE,MAAM,MAAM,sCAAsC,GAAG;IACnD,oBAAoB,EAAE,MAAM,SAAS,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3E,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,qBAAa,+BAA+B;;IAC1C,QAAQ,CAAC,IAAI,qCAAmB;gBASpB,OAAO,EAAE,sCAAsC;IAK3D,OAAO,IAAI,MAAM;IAIjB,IAAI,gBAAgB,IAAI,UAAU,CA+CjC;CACF"}
+{"version":3,"file":"CustomAssetGraduationMiddleware.d.cts","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EAET,aAAa,EACb,UAAU,EACX,qBAAiB;AAOlB,MAAM,MAAM,sCAAsC,GAAG;IACnD,oBAAoB,EAAE,MAAM,SAAS,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3E,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,+BAA+B;;IAC1C,QAAQ,CAAC,IAAI,qCAAmB;gBASpB,OAAO,EAAE,sCAAsC;IAK3D,OAAO,IAAI,MAAM;IAIjB,IAAI,gBAAgB,IAAI,UAAU,CAkDjC;CACF"}

package/dist/middlewares/CustomAssetGraduationMiddleware.d.mts

@@ -5,15 +5,22 @@ export type CustomAssetGraduationMiddlewareOptions = {
 };
 /**
  * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when
- * an upstream balance source (AccountsAPI / Websocket) reports a balance for
- * them. Once a detector sees the asset, it no longer needs to be tracked as
- * "custom" — the regular detection flow will keep it fresh.
+ * an upstream balance source (AccountsAPI / Websocket) reports a non-zero
+ * balance for them. Once a detector sees the asset with a real balance, it
+ * no longer needs to be tracked as "custom" — the regular detection flow
+ * will keep it fresh.
  *
  * Rules:
- * - Only the selected account's custom assets are considered.
+ * - Only the selected account's custom assets are considered. Switching the
+ *   selected account triggers a fresh fetch, which re-runs graduation
+ *   against the new account's balances.
  * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom
  *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left
  *   alone.
+ * - Only positive balances graduate. A zero balance from AccountsAPI means
+ *   the API knows about the token but the user does not currently hold it;
+ *   keeping it in `customAssets` ensures RPC keeps polling so a future
+ *   incoming transfer is reflected promptly.
  */
 export declare class CustomAssetGraduationMiddleware {
     #private;

package/dist/middlewares/CustomAssetGraduationMiddleware.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAssetGraduationMiddleware.d.mts","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,qBAAiB;AAOrE,MAAM,MAAM,sCAAsC,GAAG;IACnD,oBAAoB,EAAE,MAAM,SAAS,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3E,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,qBAAa,+BAA+B;;IAC1C,QAAQ,CAAC,IAAI,qCAAmB;gBASpB,OAAO,EAAE,sCAAsC;IAK3D,OAAO,IAAI,MAAM;IAIjB,IAAI,gBAAgB,IAAI,UAAU,CA+CjC;CACF"}
+{"version":3,"file":"CustomAssetGraduationMiddleware.d.mts","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EAET,aAAa,EACb,UAAU,EACX,qBAAiB;AAOlB,MAAM,MAAM,sCAAsC,GAAG;IACnD,oBAAoB,EAAE,MAAM,SAAS,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3E,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,+BAA+B;;IAC1C,QAAQ,CAAC,IAAI,qCAAmB;gBASpB,OAAO,EAAE,sCAAsC;IAK3D,OAAO,IAAI,MAAM;IAIjB,IAAI,gBAAgB,IAAI,UAAU,CAkDjC;CACF"}

package/dist/middlewares/CustomAssetGraduationMiddleware.mjs

@@ -18,15 +18,22 @@ const CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';
 const log = createModuleLogger(projectLogger, CONTROLLER_NAME);
 /**
  * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when
- * an upstream balance source (AccountsAPI / Websocket) reports a balance for
- * them. Once a detector sees the asset, it no longer needs to be tracked as
- * "custom" — the regular detection flow will keep it fresh.
+ * an upstream balance source (AccountsAPI / Websocket) reports a non-zero
+ * balance for them. Once a detector sees the asset with a real balance, it
+ * no longer needs to be tracked as "custom" — the regular detection flow
+ * will keep it fresh.
  *
  * Rules:
- * - Only the selected account's custom assets are considered.
+ * - Only the selected account's custom assets are considered. Switching the
+ *   selected account triggers a fresh fetch, which re-runs graduation
+ *   against the new account's balances.
  * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom
  *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left
  *   alone.
+ * - Only positive balances graduate. A zero balance from AccountsAPI means
+ *   the API knows about the token but the user does not currently hold it;
+ *   keeping it in `customAssets` ensures RPC keeps polling so a future
+ *   incoming transfer is reflected promptly.
  */
 export class CustomAssetGraduationMiddleware {
     constructor(options) {
@@ -70,6 +77,9 @@ export class CustomAssetGraduationMiddleware {
                 if (!isEvmAssetId(rawAssetId)) {
                     continue;
                 }
+                if (!hasPositiveBalance(returnedBalances[rawAssetId])) {
+                    continue;
+                }
                 const normalizedAssetId = safeNormalize(rawAssetId);
                 if (!customSet.has(normalizedAssetId)) {
                     continue;
@@ -114,4 +124,22 @@ function safeNormalize(assetId) {
         return assetId;
     }
 }
+/**
+ * Whether a balance entry reports a strictly positive amount. AccountsAPI
+ * may return zero for tokens it indexes but the user no longer holds; we
+ * treat those as non-graduating so RPC keeps polling and surfaces any
+ * future incoming transfer immediately.
+ *
+ * `AssetBalance.amount` is already a human-readable decimal string from
+ * both AccountsApi (e.g. "0.283549083429656057") and the websocket data
+ * source (which divides by `decimals` before emitting), so a `Number()`
+ * sign check is safe: `NaN`, `undefined`, empty strings, and zero all
+ * fail the comparison.
+ *
+ * @param balance - The balance entry from the response.
+ * @returns `true` when the balance amount represents a value greater than 0.
+ */
+function hasPositiveBalance(balance) {
+    return Number(balance?.amount) > 0;
+}
 //# sourceMappingURL=CustomAssetGraduationMiddleware.mjs.map

package/dist/middlewares/CustomAssetGraduationMiddleware.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAssetGraduationMiddleware.mjs","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"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","sourcesContent":["import { KnownCaipNamespace } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from '../logger';\nimport { forDataTypes } from '../types';\nimport type { AccountId, Caip19AssetId, Middleware } from '../types';\nimport { normalizeAssetId } from '../utils';\n\nconst CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';\n\nconst log = createModuleLogger(projectLogger, CONTROLLER_NAME);\n\nexport type CustomAssetGraduationMiddlewareOptions = {\n  getSelectedAccountId: () => AccountId | undefined;\n  removeCustomAsset: (accountId: AccountId, assetId: Caip19AssetId) => void;\n};\n\n/**\n * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when\n * an upstream balance source (AccountsAPI / Websocket) reports a balance for\n * them. Once a detector sees the asset, it no longer needs to be tracked as\n * \"custom\" — the regular detection flow will keep it fresh.\n *\n * Rules:\n * - Only the selected account's custom assets are considered.\n * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom\n *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left\n *   alone.\n */\nexport class CustomAssetGraduationMiddleware {\n  readonly name = CONTROLLER_NAME;\n\n  readonly #getSelectedAccountId: () => AccountId | undefined;\n\n  readonly #removeCustomAsset: (\n    accountId: AccountId,\n    assetId: Caip19AssetId,\n  ) => void;\n\n  constructor(options: CustomAssetGraduationMiddlewareOptions) {\n    this.#getSelectedAccountId = options.getSelectedAccountId;\n    this.#removeCustomAsset = options.removeCustomAsset;\n  }\n\n  getName(): string {\n    return this.name;\n  }\n\n  get assetsMiddleware(): Middleware {\n    return forDataTypes(['balance'], async (ctx, next) => {\n      // Inspect the response BEFORE calling next() so we only consider\n      // balances populated by upstream middleware (AccountsApi / Websocket /\n      // Staked). This middleware is positioned in the pipeline before the\n      // RPC fallback — RPC intentionally carries custom assets and must\n      // never trigger graduation.\n      const accountId = this.#getSelectedAccountId();\n      if (!accountId) {\n        return next(ctx);\n      }\n\n      const state = ctx.getAssetsState();\n      const customForAccount = state.customAssets?.[accountId] ?? [];\n      if (customForAccount.length === 0) {\n        return next(ctx);\n      }\n\n      const returnedBalances = ctx.response.assetsBalance?.[accountId] ?? {};\n      const returnedAssetIds = Object.keys(returnedBalances) as Caip19AssetId[];\n      if (returnedAssetIds.length === 0) {\n        return next(ctx);\n      }\n\n      // customAssets state is stored with checksummed/normalized asset IDs.\n      // AccountsApiDataSource normalizes its response IDs, but\n      // BackendWebsocketDataSource does not — so we normalize the response\n      // side here to make the comparison robust to lower-case addresses\n      // delivered over the websocket.\n      const customSet = new Set(customForAccount);\n      for (const rawAssetId of returnedAssetIds) {\n        if (!isEvmAssetId(rawAssetId)) {\n          continue;\n        }\n        const normalizedAssetId = safeNormalize(rawAssetId);\n        if (!customSet.has(normalizedAssetId)) {\n          continue;\n        }\n        log('Graduating custom asset', {\n          accountId,\n          assetId: normalizedAssetId,\n        });\n        this.#removeCustomAsset(accountId, normalizedAssetId);\n      }\n\n      return next(ctx);\n    });\n  }\n}\n\n/**\n * Check whether a CAIP-19 asset ID belongs to an EVM chain.\n *\n * @param assetId - The CAIP-19 asset ID to inspect.\n * @returns `true` when the asset's chain namespace is `eip155`.\n */\nfunction isEvmAssetId(assetId: Caip19AssetId): boolean {\n  // CAIP-19 format: <namespace>:<chainRef>/<assetNamespace>:<assetRef>\n  // The chain namespace is always the segment before the first colon.\n  const namespace = assetId.split(':')[0];\n  return namespace === KnownCaipNamespace.Eip155;\n}\n\n/**\n * Normalize a CAIP-19 asset ID, returning the original on failure. Some\n * malformed IDs (e.g. an asset reference that fails address checksumming)\n * make `normalizeAssetId` throw — in that case we fall back to the raw ID\n * so the graduation pass can still proceed for other assets.\n *\n * @param assetId - The CAIP-19 asset ID to normalize.\n * @returns The normalized ID, or the original on failure.\n */\nfunction safeNormalize(assetId: Caip19AssetId): Caip19AssetId {\n  try {\n    return normalizeAssetId(assetId);\n  } catch {\n    return assetId;\n  }\n}\n"]}
+{"version":3,"file":"CustomAssetGraduationMiddleware.mjs","sourceRoot":"","sources":["../../src/middlewares/CustomAssetGraduationMiddleware.ts"],"names":[],"mappings":"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","sourcesContent":["import { KnownCaipNamespace } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from '../logger';\nimport { forDataTypes } from '../types';\nimport type {\n  AccountId,\n  AssetBalance,\n  Caip19AssetId,\n  Middleware,\n} from '../types';\nimport { normalizeAssetId } from '../utils';\n\nconst CONTROLLER_NAME = 'CustomAssetGraduationMiddleware';\n\nconst log = createModuleLogger(projectLogger, CONTROLLER_NAME);\n\nexport type CustomAssetGraduationMiddlewareOptions = {\n  getSelectedAccountId: () => AccountId | undefined;\n  removeCustomAsset: (accountId: AccountId, assetId: Caip19AssetId) => void;\n};\n\n/**\n * CustomAssetGraduationMiddleware removes EVM assets from `customAssets` when\n * an upstream balance source (AccountsAPI / Websocket) reports a non-zero\n * balance for them. Once a detector sees the asset with a real balance, it\n * no longer needs to be tracked as \"custom\" — the regular detection flow\n * will keep it fresh.\n *\n * Rules:\n * - Only the selected account's custom assets are considered. Switching the\n *   selected account triggers a fresh fetch, which re-runs graduation\n *   against the new account's balances.\n * - Only EVM (CAIP-2 namespace `eip155`) assets graduate. Non-EVM custom\n *   assets (Solana, BTC, Tron, etc. — served by Snap data sources) are left\n *   alone.\n * - Only positive balances graduate. A zero balance from AccountsAPI means\n *   the API knows about the token but the user does not currently hold it;\n *   keeping it in `customAssets` ensures RPC keeps polling so a future\n *   incoming transfer is reflected promptly.\n */\nexport class CustomAssetGraduationMiddleware {\n  readonly name = CONTROLLER_NAME;\n\n  readonly #getSelectedAccountId: () => AccountId | undefined;\n\n  readonly #removeCustomAsset: (\n    accountId: AccountId,\n    assetId: Caip19AssetId,\n  ) => void;\n\n  constructor(options: CustomAssetGraduationMiddlewareOptions) {\n    this.#getSelectedAccountId = options.getSelectedAccountId;\n    this.#removeCustomAsset = options.removeCustomAsset;\n  }\n\n  getName(): string {\n    return this.name;\n  }\n\n  get assetsMiddleware(): Middleware {\n    return forDataTypes(['balance'], async (ctx, next) => {\n      // Inspect the response BEFORE calling next() so we only consider\n      // balances populated by upstream middleware (AccountsApi / Websocket /\n      // Staked). This middleware is positioned in the pipeline before the\n      // RPC fallback — RPC intentionally carries custom assets and must\n      // never trigger graduation.\n      const accountId = this.#getSelectedAccountId();\n      if (!accountId) {\n        return next(ctx);\n      }\n\n      const state = ctx.getAssetsState();\n      const customForAccount = state.customAssets?.[accountId] ?? [];\n      if (customForAccount.length === 0) {\n        return next(ctx);\n      }\n\n      const returnedBalances = ctx.response.assetsBalance?.[accountId] ?? {};\n      const returnedAssetIds = Object.keys(returnedBalances) as Caip19AssetId[];\n      if (returnedAssetIds.length === 0) {\n        return next(ctx);\n      }\n\n      // customAssets state is stored with checksummed/normalized asset IDs.\n      // AccountsApiDataSource normalizes its response IDs, but\n      // BackendWebsocketDataSource does not — so we normalize the response\n      // side here to make the comparison robust to lower-case addresses\n      // delivered over the websocket.\n      const customSet = new Set(customForAccount);\n      for (const rawAssetId of returnedAssetIds) {\n        if (!isEvmAssetId(rawAssetId)) {\n          continue;\n        }\n        if (!hasPositiveBalance(returnedBalances[rawAssetId])) {\n          continue;\n        }\n        const normalizedAssetId = safeNormalize(rawAssetId);\n        if (!customSet.has(normalizedAssetId)) {\n          continue;\n        }\n        log('Graduating custom asset', {\n          accountId,\n          assetId: normalizedAssetId,\n        });\n        this.#removeCustomAsset(accountId, normalizedAssetId);\n      }\n\n      return next(ctx);\n    });\n  }\n}\n\n/**\n * Check whether a CAIP-19 asset ID belongs to an EVM chain.\n *\n * @param assetId - The CAIP-19 asset ID to inspect.\n * @returns `true` when the asset's chain namespace is `eip155`.\n */\nfunction isEvmAssetId(assetId: Caip19AssetId): boolean {\n  // CAIP-19 format: <namespace>:<chainRef>/<assetNamespace>:<assetRef>\n  // The chain namespace is always the segment before the first colon.\n  const namespace = assetId.split(':')[0];\n  return namespace === KnownCaipNamespace.Eip155;\n}\n\n/**\n * Normalize a CAIP-19 asset ID, returning the original on failure. Some\n * malformed IDs (e.g. an asset reference that fails address checksumming)\n * make `normalizeAssetId` throw — in that case we fall back to the raw ID\n * so the graduation pass can still proceed for other assets.\n *\n * @param assetId - The CAIP-19 asset ID to normalize.\n * @returns The normalized ID, or the original on failure.\n */\nfunction safeNormalize(assetId: Caip19AssetId): Caip19AssetId {\n  try {\n    return normalizeAssetId(assetId);\n  } catch {\n    return assetId;\n  }\n}\n\n/**\n * Whether a balance entry reports a strictly positive amount. AccountsAPI\n * may return zero for tokens it indexes but the user no longer holds; we\n * treat those as non-graduating so RPC keeps polling and surfaces any\n * future incoming transfer immediately.\n *\n * `AssetBalance.amount` is already a human-readable decimal string from\n * both AccountsApi (e.g. \"0.283549083429656057\") and the websocket data\n * source (which divides by `decimals` before emitting), so a `Number()`\n * sign check is safe: `NaN`, `undefined`, empty strings, and zero all\n * fail the comparison.\n *\n * @param balance - The balance entry from the response.\n * @returns `true` when the balance amount represents a value greater than 0.\n */\nfunction hasPositiveBalance(balance: AssetBalance | undefined): boolean {\n  return Number(balance?.amount) > 0;\n}\n"]}

package/dist/utils/customAssetsRpcSupplement.cjs

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pickRpcCustomAssetsSupplement = void 0;
+const utils_1 = require("@metamask/utils");
+/**
+ * Decide which chains require a supplemental `customAssetsOnly` RPC
+ * subscription so that user-imported customAssets are **always** polled by
+ * RPC — even when AccountsApi or the websocket data source has already
+ * claimed the chain in the regular handoff.
+ *
+ * RPC is the sole balance fetcher for customAssets:
+ * - AccountsApi indexes a curated token list and may return zero (or no
+ *   entry at all) for a user-imported token, even on supported chains.
+ * - The websocket data source is push-only: it relays balance deltas from
+ *   transactions, so a user who never transacts won't see balance updates.
+ *
+ * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on
+ * any chain that:
+ * 1. has at least one selected account with a customAsset there;
+ * 2. is supported by the RPC data source;
+ * 3. is **not** already covered by the regular RPC subscription
+ *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;
+ * 4. is currently enabled (in `chainToAccounts`); polling a disabled
+ *    chain wastes resources because the user can't see its balances.
+ *
+ * Malformed asset IDs are silently skipped — they can't be parsed into a
+ * chain anyway and shouldn't crash the subscription pipeline.
+ *
+ * @param input - Decision inputs.
+ * @returns Chains and account IDs that require supplemental subscription.
+ */
+function pickRpcCustomAssetsSupplement(input) {
+    const { accountIds, customAssetsByAccount, rpcAssignedChains, rpcAvailableChains, enabledChains, } = input;
+    const chains = new Set();
+    const supplementalAccountIds = new Set();
+    for (const accountId of accountIds) {
+        const customForAccount = customAssetsByAccount[accountId];
+        if (!customForAccount || customForAccount.length === 0) {
+            continue;
+        }
+        // Mirror the controller's prior behavior: an account with any customAsset
+        // (even if all are filtered out below) is added to the candidate set.
+        // The empty-chains early-return in the caller still prevents a useless
+        // subscription, so this preserves observable behavior.
+        supplementalAccountIds.add(accountId);
+        for (const assetId of customForAccount) {
+            let chainId;
+            try {
+                chainId = (0, utils_1.parseCaipAssetType)(assetId).chainId;
+            }
+            catch {
+                continue;
+            }
+            if (rpcAssignedChains.has(chainId)) {
+                continue;
+            }
+            if (!rpcAvailableChains.has(chainId)) {
+                continue;
+            }
+            if (!enabledChains.has(chainId)) {
+                continue;
+            }
+            chains.add(chainId);
+        }
+    }
+    return {
+        chains: [...chains],
+        accountIds: supplementalAccountIds,
+    };
+}
+exports.pickRpcCustomAssetsSupplement = pickRpcCustomAssetsSupplement;
+//# sourceMappingURL=customAssetsRpcSupplement.cjs.map

package/dist/utils/customAssetsRpcSupplement.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"customAssetsRpcSupplement.cjs","sourceRoot":"","sources":["../../src/utils/customAssetsRpcSupplement.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AAoCrD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,6BAA6B,CAC3C,KAAqC;IAErC,MAAM,EACJ,UAAU,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,GACd,GAAG,KAAK,CAAC;IAEV,MAAM,MAAM,GAAG,IAAI,GAAG,EAAW,CAAC;IAClC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,SAAS;QACX,CAAC;QACD,0EAA0E;QAC1E,sEAAsE;QACtE,uEAAuE;QACvE,uDAAuD;QACvD,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACvC,IAAI,OAAgB,CAAC;YACrB,IAAI,CAAC;gBACH,OAAO,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,SAAS;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC;QACnB,UAAU,EAAE,sBAAsB;KACnC,CAAC;AACJ,CAAC;AAhDD,sEAgDC","sourcesContent":["import { parseCaipAssetType } from '@metamask/utils';\n\nimport type { Caip19AssetId, ChainId } from '../types';\n\n/**\n * Inputs needed to decide whether `RpcDataSource` should run a supplemental\n * `customAssetsOnly` subscription. All inputs are pre-computed by the caller\n * (controller) so this helper is fully pure and deterministic.\n */\nexport type RpcCustomAssetsSupplementInput = {\n  /** Selected account IDs being considered for subscription. */\n  accountIds: string[];\n  /** `state.customAssets` slice — accountId → CAIP-19 asset IDs. */\n  customAssetsByAccount: Record<string, Caip19AssetId[]>;\n  /** Chains the regular RPC subscription already covers. */\n  rpcAssignedChains: Set<ChainId>;\n  /** Chains the RPC data source can serve (its current activeChains). */\n  rpcAvailableChains: Set<ChainId>;\n  /**\n   * Chains that are currently enabled for at least one selected account\n   * (i.e. keys of the controller's chainToAccounts map).\n   */\n  enabledChains: Set<ChainId>;\n};\n\n/**\n * The decision output: which chains and accounts need a supplemental\n * `customAssetsOnly` RPC subscription.\n */\nexport type RpcCustomAssetsSupplementResult = {\n  /** Chains that need a supplemental customAssetsOnly RPC subscription. */\n  chains: ChainId[];\n  /** Accounts that own at least one customAsset on a supplemental chain. */\n  accountIds: Set<string>;\n};\n\n/**\n * Decide which chains require a supplemental `customAssetsOnly` RPC\n * subscription so that user-imported customAssets are **always** polled by\n * RPC — even when AccountsApi or the websocket data source has already\n * claimed the chain in the regular handoff.\n *\n * RPC is the sole balance fetcher for customAssets:\n * - AccountsApi indexes a curated token list and may return zero (or no\n *   entry at all) for a user-imported token, even on supported chains.\n * - The websocket data source is push-only: it relays balance deltas from\n *   transactions, so a user who never transacts won't see balance updates.\n *\n * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on\n * any chain that:\n * 1. has at least one selected account with a customAsset there;\n * 2. is supported by the RPC data source;\n * 3. is **not** already covered by the regular RPC subscription\n *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;\n * 4. is currently enabled (in `chainToAccounts`); polling a disabled\n *    chain wastes resources because the user can't see its balances.\n *\n * Malformed asset IDs are silently skipped — they can't be parsed into a\n * chain anyway and shouldn't crash the subscription pipeline.\n *\n * @param input - Decision inputs.\n * @returns Chains and account IDs that require supplemental subscription.\n */\nexport function pickRpcCustomAssetsSupplement(\n  input: RpcCustomAssetsSupplementInput,\n): RpcCustomAssetsSupplementResult {\n  const {\n    accountIds,\n    customAssetsByAccount,\n    rpcAssignedChains,\n    rpcAvailableChains,\n    enabledChains,\n  } = input;\n\n  const chains = new Set<ChainId>();\n  const supplementalAccountIds = new Set<string>();\n\n  for (const accountId of accountIds) {\n    const customForAccount = customAssetsByAccount[accountId];\n    if (!customForAccount || customForAccount.length === 0) {\n      continue;\n    }\n    // Mirror the controller's prior behavior: an account with any customAsset\n    // (even if all are filtered out below) is added to the candidate set.\n    // The empty-chains early-return in the caller still prevents a useless\n    // subscription, so this preserves observable behavior.\n    supplementalAccountIds.add(accountId);\n    for (const assetId of customForAccount) {\n      let chainId: ChainId;\n      try {\n        chainId = parseCaipAssetType(assetId).chainId;\n      } catch {\n        continue;\n      }\n      if (rpcAssignedChains.has(chainId)) {\n        continue;\n      }\n      if (!rpcAvailableChains.has(chainId)) {\n        continue;\n      }\n      if (!enabledChains.has(chainId)) {\n        continue;\n      }\n      chains.add(chainId);\n    }\n  }\n\n  return {\n    chains: [...chains],\n    accountIds: supplementalAccountIds,\n  };\n}\n"]}

package/dist/utils/customAssetsRpcSupplement.d.cts

@@ -0,0 +1,60 @@
+import type { Caip19AssetId, ChainId } from "../types.cjs";
+/**
+ * Inputs needed to decide whether `RpcDataSource` should run a supplemental
+ * `customAssetsOnly` subscription. All inputs are pre-computed by the caller
+ * (controller) so this helper is fully pure and deterministic.
+ */
+export type RpcCustomAssetsSupplementInput = {
+    /** Selected account IDs being considered for subscription. */
+    accountIds: string[];
+    /** `state.customAssets` slice — accountId → CAIP-19 asset IDs. */
+    customAssetsByAccount: Record<string, Caip19AssetId[]>;
+    /** Chains the regular RPC subscription already covers. */
+    rpcAssignedChains: Set<ChainId>;
+    /** Chains the RPC data source can serve (its current activeChains). */
+    rpcAvailableChains: Set<ChainId>;
+    /**
+     * Chains that are currently enabled for at least one selected account
+     * (i.e. keys of the controller's chainToAccounts map).
+     */
+    enabledChains: Set<ChainId>;
+};
+/**
+ * The decision output: which chains and accounts need a supplemental
+ * `customAssetsOnly` RPC subscription.
+ */
+export type RpcCustomAssetsSupplementResult = {
+    /** Chains that need a supplemental customAssetsOnly RPC subscription. */
+    chains: ChainId[];
+    /** Accounts that own at least one customAsset on a supplemental chain. */
+    accountIds: Set<string>;
+};
+/**
+ * Decide which chains require a supplemental `customAssetsOnly` RPC
+ * subscription so that user-imported customAssets are **always** polled by
+ * RPC — even when AccountsApi or the websocket data source has already
+ * claimed the chain in the regular handoff.
+ *
+ * RPC is the sole balance fetcher for customAssets:
+ * - AccountsApi indexes a curated token list and may return zero (or no
+ *   entry at all) for a user-imported token, even on supported chains.
+ * - The websocket data source is push-only: it relays balance deltas from
+ *   transactions, so a user who never transacts won't see balance updates.
+ *
+ * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on
+ * any chain that:
+ * 1. has at least one selected account with a customAsset there;
+ * 2. is supported by the RPC data source;
+ * 3. is **not** already covered by the regular RPC subscription
+ *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;
+ * 4. is currently enabled (in `chainToAccounts`); polling a disabled
+ *    chain wastes resources because the user can't see its balances.
+ *
+ * Malformed asset IDs are silently skipped — they can't be parsed into a
+ * chain anyway and shouldn't crash the subscription pipeline.
+ *
+ * @param input - Decision inputs.
+ * @returns Chains and account IDs that require supplemental subscription.
+ */
+export declare function pickRpcCustomAssetsSupplement(input: RpcCustomAssetsSupplementInput): RpcCustomAssetsSupplementResult;
+//# sourceMappingURL=customAssetsRpcSupplement.d.cts.map

package/dist/utils/customAssetsRpcSupplement.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"customAssetsRpcSupplement.d.cts","sourceRoot":"","sources":["../../src/utils/customAssetsRpcSupplement.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,qBAAiB;AAEvD;;;;GAIG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,8DAA8D;IAC9D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kEAAkE;IAClE,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IACvD,0DAA0D;IAC1D,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,uEAAuE;IACvE,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC;;;OAGG;IACH,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,yEAAyE;IACzE,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,0EAA0E;IAC1E,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,8BAA8B,GACpC,+BAA+B,CA8CjC"}

package/dist/utils/customAssetsRpcSupplement.d.mts

@@ -0,0 +1,60 @@
+import type { Caip19AssetId, ChainId } from "../types.mjs";
+/**
+ * Inputs needed to decide whether `RpcDataSource` should run a supplemental
+ * `customAssetsOnly` subscription. All inputs are pre-computed by the caller
+ * (controller) so this helper is fully pure and deterministic.
+ */
+export type RpcCustomAssetsSupplementInput = {
+    /** Selected account IDs being considered for subscription. */
+    accountIds: string[];
+    /** `state.customAssets` slice — accountId → CAIP-19 asset IDs. */
+    customAssetsByAccount: Record<string, Caip19AssetId[]>;
+    /** Chains the regular RPC subscription already covers. */
+    rpcAssignedChains: Set<ChainId>;
+    /** Chains the RPC data source can serve (its current activeChains). */
+    rpcAvailableChains: Set<ChainId>;
+    /**
+     * Chains that are currently enabled for at least one selected account
+     * (i.e. keys of the controller's chainToAccounts map).
+     */
+    enabledChains: Set<ChainId>;
+};
+/**
+ * The decision output: which chains and accounts need a supplemental
+ * `customAssetsOnly` RPC subscription.
+ */
+export type RpcCustomAssetsSupplementResult = {
+    /** Chains that need a supplemental customAssetsOnly RPC subscription. */
+    chains: ChainId[];
+    /** Accounts that own at least one customAsset on a supplemental chain. */
+    accountIds: Set<string>;
+};
+/**
+ * Decide which chains require a supplemental `customAssetsOnly` RPC
+ * subscription so that user-imported customAssets are **always** polled by
+ * RPC — even when AccountsApi or the websocket data source has already
+ * claimed the chain in the regular handoff.
+ *
+ * RPC is the sole balance fetcher for customAssets:
+ * - AccountsApi indexes a curated token list and may return zero (or no
+ *   entry at all) for a user-imported token, even on supported chains.
+ * - The websocket data source is push-only: it relays balance deltas from
+ *   transactions, so a user who never transacts won't see balance updates.
+ *
+ * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on
+ * any chain that:
+ * 1. has at least one selected account with a customAsset there;
+ * 2. is supported by the RPC data source;
+ * 3. is **not** already covered by the regular RPC subscription
+ *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;
+ * 4. is currently enabled (in `chainToAccounts`); polling a disabled
+ *    chain wastes resources because the user can't see its balances.
+ *
+ * Malformed asset IDs are silently skipped — they can't be parsed into a
+ * chain anyway and shouldn't crash the subscription pipeline.
+ *
+ * @param input - Decision inputs.
+ * @returns Chains and account IDs that require supplemental subscription.
+ */
+export declare function pickRpcCustomAssetsSupplement(input: RpcCustomAssetsSupplementInput): RpcCustomAssetsSupplementResult;
+//# sourceMappingURL=customAssetsRpcSupplement.d.mts.map

package/dist/utils/customAssetsRpcSupplement.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"customAssetsRpcSupplement.d.mts","sourceRoot":"","sources":["../../src/utils/customAssetsRpcSupplement.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,qBAAiB;AAEvD;;;;GAIG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,8DAA8D;IAC9D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kEAAkE;IAClE,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IACvD,0DAA0D;IAC1D,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,uEAAuE;IACvE,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC;;;OAGG;IACH,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,yEAAyE;IACzE,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,0EAA0E;IAC1E,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,8BAA8B,GACpC,+BAA+B,CA8CjC"}

package/dist/utils/customAssetsRpcSupplement.mjs

@@ -0,0 +1,68 @@
+import { parseCaipAssetType } from "@metamask/utils";
+/**
+ * Decide which chains require a supplemental `customAssetsOnly` RPC
+ * subscription so that user-imported customAssets are **always** polled by
+ * RPC — even when AccountsApi or the websocket data source has already
+ * claimed the chain in the regular handoff.
+ *
+ * RPC is the sole balance fetcher for customAssets:
+ * - AccountsApi indexes a curated token list and may return zero (or no
+ *   entry at all) for a user-imported token, even on supported chains.
+ * - The websocket data source is push-only: it relays balance deltas from
+ *   transactions, so a user who never transacts won't see balance updates.
+ *
+ * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on
+ * any chain that:
+ * 1. has at least one selected account with a customAsset there;
+ * 2. is supported by the RPC data source;
+ * 3. is **not** already covered by the regular RPC subscription
+ *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;
+ * 4. is currently enabled (in `chainToAccounts`); polling a disabled
+ *    chain wastes resources because the user can't see its balances.
+ *
+ * Malformed asset IDs are silently skipped — they can't be parsed into a
+ * chain anyway and shouldn't crash the subscription pipeline.
+ *
+ * @param input - Decision inputs.
+ * @returns Chains and account IDs that require supplemental subscription.
+ */
+export function pickRpcCustomAssetsSupplement(input) {
+    const { accountIds, customAssetsByAccount, rpcAssignedChains, rpcAvailableChains, enabledChains, } = input;
+    const chains = new Set();
+    const supplementalAccountIds = new Set();
+    for (const accountId of accountIds) {
+        const customForAccount = customAssetsByAccount[accountId];
+        if (!customForAccount || customForAccount.length === 0) {
+            continue;
+        }
+        // Mirror the controller's prior behavior: an account with any customAsset
+        // (even if all are filtered out below) is added to the candidate set.
+        // The empty-chains early-return in the caller still prevents a useless
+        // subscription, so this preserves observable behavior.
+        supplementalAccountIds.add(accountId);
+        for (const assetId of customForAccount) {
+            let chainId;
+            try {
+                chainId = parseCaipAssetType(assetId).chainId;
+            }
+            catch {
+                continue;
+            }
+            if (rpcAssignedChains.has(chainId)) {
+                continue;
+            }
+            if (!rpcAvailableChains.has(chainId)) {
+                continue;
+            }
+            if (!enabledChains.has(chainId)) {
+                continue;
+            }
+            chains.add(chainId);
+        }
+    }
+    return {
+        chains: [...chains],
+        accountIds: supplementalAccountIds,
+    };
+}
+//# sourceMappingURL=customAssetsRpcSupplement.mjs.map

package/dist/utils/customAssetsRpcSupplement.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"customAssetsRpcSupplement.mjs","sourceRoot":"","sources":["../../src/utils/customAssetsRpcSupplement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB;AAoCrD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,6BAA6B,CAC3C,KAAqC;IAErC,MAAM,EACJ,UAAU,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,GACd,GAAG,KAAK,CAAC;IAEV,MAAM,MAAM,GAAG,IAAI,GAAG,EAAW,CAAC;IAClC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,SAAS;QACX,CAAC;QACD,0EAA0E;QAC1E,sEAAsE;QACtE,uEAAuE;QACvE,uDAAuD;QACvD,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACvC,IAAI,OAAgB,CAAC;YACrB,IAAI,CAAC;gBACH,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,SAAS;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC;QACnB,UAAU,EAAE,sBAAsB;KACnC,CAAC;AACJ,CAAC","sourcesContent":["import { parseCaipAssetType } from '@metamask/utils';\n\nimport type { Caip19AssetId, ChainId } from '../types';\n\n/**\n * Inputs needed to decide whether `RpcDataSource` should run a supplemental\n * `customAssetsOnly` subscription. All inputs are pre-computed by the caller\n * (controller) so this helper is fully pure and deterministic.\n */\nexport type RpcCustomAssetsSupplementInput = {\n  /** Selected account IDs being considered for subscription. */\n  accountIds: string[];\n  /** `state.customAssets` slice — accountId → CAIP-19 asset IDs. */\n  customAssetsByAccount: Record<string, Caip19AssetId[]>;\n  /** Chains the regular RPC subscription already covers. */\n  rpcAssignedChains: Set<ChainId>;\n  /** Chains the RPC data source can serve (its current activeChains). */\n  rpcAvailableChains: Set<ChainId>;\n  /**\n   * Chains that are currently enabled for at least one selected account\n   * (i.e. keys of the controller's chainToAccounts map).\n   */\n  enabledChains: Set<ChainId>;\n};\n\n/**\n * The decision output: which chains and accounts need a supplemental\n * `customAssetsOnly` RPC subscription.\n */\nexport type RpcCustomAssetsSupplementResult = {\n  /** Chains that need a supplemental customAssetsOnly RPC subscription. */\n  chains: ChainId[];\n  /** Accounts that own at least one customAsset on a supplemental chain. */\n  accountIds: Set<string>;\n};\n\n/**\n * Decide which chains require a supplemental `customAssetsOnly` RPC\n * subscription so that user-imported customAssets are **always** polled by\n * RPC — even when AccountsApi or the websocket data source has already\n * claimed the chain in the regular handoff.\n *\n * RPC is the sole balance fetcher for customAssets:\n * - AccountsApi indexes a curated token list and may return zero (or no\n *   entry at all) for a user-imported token, even on supported chains.\n * - The websocket data source is push-only: it relays balance deltas from\n *   transactions, so a user who never transacts won't see balance updates.\n *\n * To guarantee freshness, we subscribe RPC in `customAssetsOnly` mode on\n * any chain that:\n * 1. has at least one selected account with a customAsset there;\n * 2. is supported by the RPC data source;\n * 3. is **not** already covered by the regular RPC subscription\n *    (`rpcAssignedChains`) — otherwise customAssets are picked up there;\n * 4. is currently enabled (in `chainToAccounts`); polling a disabled\n *    chain wastes resources because the user can't see its balances.\n *\n * Malformed asset IDs are silently skipped — they can't be parsed into a\n * chain anyway and shouldn't crash the subscription pipeline.\n *\n * @param input - Decision inputs.\n * @returns Chains and account IDs that require supplemental subscription.\n */\nexport function pickRpcCustomAssetsSupplement(\n  input: RpcCustomAssetsSupplementInput,\n): RpcCustomAssetsSupplementResult {\n  const {\n    accountIds,\n    customAssetsByAccount,\n    rpcAssignedChains,\n    rpcAvailableChains,\n    enabledChains,\n  } = input;\n\n  const chains = new Set<ChainId>();\n  const supplementalAccountIds = new Set<string>();\n\n  for (const accountId of accountIds) {\n    const customForAccount = customAssetsByAccount[accountId];\n    if (!customForAccount || customForAccount.length === 0) {\n      continue;\n    }\n    // Mirror the controller's prior behavior: an account with any customAsset\n    // (even if all are filtered out below) is added to the candidate set.\n    // The empty-chains early-return in the caller still prevents a useless\n    // subscription, so this preserves observable behavior.\n    supplementalAccountIds.add(accountId);\n    for (const assetId of customForAccount) {\n      let chainId: ChainId;\n      try {\n        chainId = parseCaipAssetType(assetId).chainId;\n      } catch {\n        continue;\n      }\n      if (rpcAssignedChains.has(chainId)) {\n        continue;\n      }\n      if (!rpcAvailableChains.has(chainId)) {\n        continue;\n      }\n      if (!enabledChains.has(chainId)) {\n        continue;\n      }\n      chains.add(chainId);\n    }\n  }\n\n  return {\n    chains: [...chains],\n    accountIds: supplementalAccountIds,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controller",
-  "version": "6.4.0",
+  "version": "7.0.1",
   "description": "Tracks assets balances/prices and handles token detection across all digital assets",
   "keywords": [
     "Ethereum",
@@ -56,27 +56,27 @@
     "@ethereumjs/util": "^9.1.0",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
-    "@metamask/account-tree-controller": "^7.2.0",
-    "@metamask/accounts-controller": "^38.0.0",
-    "@metamask/assets-controllers": "^106.0.0",
+    "@metamask/account-tree-controller": "^7.3.0",
+    "@metamask/accounts-controller": "^38.1.0",
+    "@metamask/assets-controllers": "^106.0.1",
     "@metamask/base-controller": "^9.1.0",
     "@metamask/client-controller": "^1.0.1",
-    "@metamask/controller-utils": "^11.20.0",
-    "@metamask/core-backend": "^6.2.1",
+    "@metamask/controller-utils": "^12.0.0",
+    "@metamask/core-backend": "^6.2.2",
     "@metamask/keyring-api": "^23.1.0",
-    "@metamask/keyring-controller": "^25.4.0",
+    "@metamask/keyring-controller": "^25.5.0",
     "@metamask/keyring-internal-api": "^11.0.1",
     "@metamask/keyring-snap-client": "^9.0.2",
     "@metamask/messenger": "^1.2.0",
-    "@metamask/network-controller": "^30.1.0",
-    "@metamask/network-enablement-controller": "^5.1.0",
-    "@metamask/permission-controller": "^13.0.0",
-    "@metamask/phishing-controller": "^17.1.1",
-    "@metamask/polling-controller": "^16.0.4",
+    "@metamask/network-controller": "^31.0.0",
+    "@metamask/network-enablement-controller": "^5.1.1",
+    "@metamask/permission-controller": "^13.1.1",
+    "@metamask/phishing-controller": "^17.1.2",
+    "@metamask/polling-controller": "^16.0.5",
     "@metamask/preferences-controller": "^23.1.0",
     "@metamask/snaps-controllers": "^19.0.0",
     "@metamask/snaps-utils": "^12.1.2",
-    "@metamask/transaction-controller": "^65.1.0",
+    "@metamask/transaction-controller": "^65.3.0",
     "@metamask/utils": "^11.9.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.1.2",