@metamask-previews/assets-controller 14.0.3-preview-e12b5ece6 → 14.0.3-preview-fe4b3be11

package/dist/data-sources/RpcDataSource.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _RpcDataSource_instances, _RpcDataSource_messenger, _RpcDataSource_onActiveChainsUpdated, _RpcDataSource_getNativeAssetForChain, _RpcDataSource_timeout, _RpcDataSource_tokenDetectionEnabled, _RpcDataSource_useExternalService, _RpcDataSource_isOnboarded, _RpcDataSource_activeChains, _RpcDataSource_chainStatuses, _RpcDataSource_providerCache, _RpcDataSource_activeSubscriptions, _RpcDataSource_unsubscribeTransactionConfirmed, _RpcDataSource_multicallClient, _RpcDataSource_balanceFetcher, _RpcDataSource_tokenDetector, _RpcDataSource_getAssetType, _RpcDataSource_convertToHumanReadable, _RpcDataSource_collectMetadataForBalances, _RpcDataSource_hasValidDecimals, _RpcDataSource_pickValidDecimals, _RpcDataSource_handleBalanceUpdate, _RpcDataSource_handleDetectionUpdate, _RpcDataSource_subscribeToNetworkController, _RpcDataSource_subscribeToTransactionEvents, _RpcDataSource_onTransactionConfirmed, _RpcDataSource_refreshBalanceForChains, _RpcDataSource_initializeFromNetworkController, _RpcDataSource_updateFromNetworkState, _RpcDataSource_getProvider, _RpcDataSource_getMulticallProvider, _RpcDataSource_clearProviderCache, _RpcDataSource_fetchDecimalsViaRpc, _RpcDataSource_getExistingAssetsMetadata;
+var _RpcDataSource_instances, _RpcDataSource_messenger, _RpcDataSource_onActiveChainsUpdated, _RpcDataSource_getNativeAssetForChain, _RpcDataSource_timeout, _RpcDataSource_tokenDetectionEnabled, _RpcDataSource_useExternalService, _RpcDataSource_isOnboarded, _RpcDataSource_isBalanceV6Enabled, _RpcDataSource_activeChains, _RpcDataSource_chainStatuses, _RpcDataSource_providerCache, _RpcDataSource_activeSubscriptions, _RpcDataSource_unsubscribeTransactionConfirmed, _RpcDataSource_multicallClient, _RpcDataSource_balanceFetcher, _RpcDataSource_tokenDetector, _RpcDataSource_getAssetType, _RpcDataSource_convertToHumanReadable, _RpcDataSource_collectMetadataForBalances, _RpcDataSource_hasValidDecimals, _RpcDataSource_pickValidDecimals, _RpcDataSource_handleBalanceUpdate, _RpcDataSource_handleDetectionUpdate, _RpcDataSource_subscribeToNetworkController, _RpcDataSource_subscribeToTransactionEvents, _RpcDataSource_onTransactionConfirmed, _RpcDataSource_refreshBalanceForChains, _RpcDataSource_initializeFromNetworkController, _RpcDataSource_updateFromNetworkState, _RpcDataSource_getProvider, _RpcDataSource_getMulticallProvider, _RpcDataSource_clearProviderCache, _RpcDataSource_fetchDecimalsViaRpc, _RpcDataSource_getSupplementalCustomAssetChains, _RpcDataSource_appendRequestCustomErc20sV5, _RpcDataSource_appendRequestCustomErc20sV6, _RpcDataSource_getCustomAssetsByAccount, _RpcDataSource_getExistingAssetsMetadata;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRpcDataSource = exports.RpcDataSource = exports.caipChainIdToHex = void 0;
 const providers_1 = require("@ethersproject/providers");
@@ -75,6 +75,7 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
         _RpcDataSource_tokenDetectionEnabled.set(this, void 0);
         _RpcDataSource_useExternalService.set(this, void 0);
         _RpcDataSource_isOnboarded.set(this, void 0);
+        _RpcDataSource_isBalanceV6Enabled.set(this, void 0);
         /** Currently active chains */
         _RpcDataSource_activeChains.set(this, []);
         /** Network status for each active chain */
@@ -97,6 +98,7 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
         __classPrivateFieldSet(this, _RpcDataSource_tokenDetectionEnabled, options.tokenDetectionEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _RpcDataSource_useExternalService, options.useExternalService ?? (() => true), "f");
         __classPrivateFieldSet(this, _RpcDataSource_isOnboarded, options.isOnboarded ?? (() => true), "f");
+        __classPrivateFieldSet(this, _RpcDataSource_isBalanceV6Enabled, options.isBalanceV6Enabled ?? (() => false), "f");
         const balanceInterval = options.balanceInterval ?? DEFAULT_BALANCE_INTERVAL;
         const detectionInterval = options.detectionInterval ?? DEFAULT_DETECTION_INTERVAL;
         log('Initializing RpcDataSource', {
@@ -253,6 +255,11 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
         const assetsBalance = {};
         const assetsInfo = {};
         const failedChains = [];
+        // request.customAssets is flat. v6 resolves pin ownership from state so
+        // each account only fetches its own pins; v5 applies the flat list as on main.
+        const customAssetsByAccount = request.customAssets
+            ? __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getCustomAssetsByAccount).call(this)
+            : {};
         // Fetch balances for each account and its supported chains (pre-computed in request)
         for (const { account, supportedChains, } of request.accountsWithSupportedChains) {
             const chainsForAccount = chainsToFetch.filter((chain) => supportedChains.includes(chain));
@@ -271,25 +278,11 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
                 }
                 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 &&
-                                __classPrivateFieldGet(this, _RpcDataSource_getAssetType, "f").call(this, assetId) === 'erc20') {
-                                const tokenAddress = parsed.assetReference.toLowerCase();
-                                const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
-                                const decimals = existingMetadata[normalizedId]?.decimals;
-                                assetsToFetch.push({
-                                    assetId,
-                                    address: tokenAddress,
-                                    decimals,
-                                });
-                            }
-                        }
-                        catch {
-                            // Skip unparseable asset IDs
-                        }
+                    if (__classPrivateFieldGet(this, _RpcDataSource_isBalanceV6Enabled, "f").call(this)) {
+                        __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_appendRequestCustomErc20sV6).call(this, assetsToFetch, request.customAssets, chainId, existingMetadata, new Set((customAssetsByAccount[accountId] ?? []).map(index_js_1.normalizeAssetId)));
+                    }
+                    else {
+                        __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_appendRequestCustomErc20sV5).call(this, assetsToFetch, request.customAssets, chainId, existingMetadata);
                     }
                 }
                 try {
@@ -513,6 +506,30 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
             return next(context);
         };
     }
+    /**
+     * RPC is the terminal claimer on the asset axis: it claims every EVM pin it
+     * has a provider for, even on chains claimed by higher-priority sources.
+     * Pins outside the regular RPC assignment get an asset-scoped poll (see
+     * `subscribe`).
+     *
+     * @param customAssets - Candidate CAIP-19 asset IDs still unclaimed.
+     * @param assignedChains - Chains assigned to RPC; availability fallback
+     * before network state is applied.
+     * @returns The claimed subset of `customAssets`.
+     */
+    claimCustomAssets(customAssets, assignedChains) {
+        const available = new Set(__classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").length > 0 ? __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f") : assignedChains);
+        return customAssets.filter((assetId) => {
+            try {
+                const parsed = (0, utils_1.parseCaipAssetType)(assetId);
+                return (parsed.chain.namespace === utils_1.KnownCaipNamespace.Eip155 &&
+                    available.has(parsed.chainId));
+            }
+            catch {
+                return false;
+            }
+        });
+    }
     /**
      * Subscribe to updates for the given request.
      * Starts polling through BalanceFetcher and TokenDetector.
@@ -530,14 +547,18 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
         const chainsToSubscribe = __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").length > 0
             ? request.chainIds.filter((chainId) => __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").includes(chainId))
             : request.chainIds;
+        // Pins claimed on chains outside the regular RPC assignment get an
+        // asset-scoped poll below.
+        const supplementalChains = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getSupplementalCustomAssetChains).call(this, request, chainsToSubscribe);
         log('Subscribe requested', {
             subscriptionId,
             isUpdate,
             accounts: request.accountsWithSupportedChains.map((a) => a.account.id),
             chainsToSubscribe,
+            supplementalChains,
             activeChainsFallback: __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").length === 0,
         });
-        if (chainsToSubscribe.length === 0) {
+        if (chainsToSubscribe.length === 0 && supplementalChains.length === 0) {
             log('No active chains to subscribe');
             return;
         }
@@ -577,8 +598,6 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
                 };
                 const balanceToken = __classPrivateFieldGet(this, _RpcDataSource_balanceFetcher, "f").startPolling(balanceInput);
                 balancePollingTokens.push(balanceToken);
-                // Token detection is only relevant for "regular" subscriptions —
-                // a customAssetsOnly subscription should never run detection.
                 if (request.customAssetsOnly !== true &&
                     __classPrivateFieldGet(this, _RpcDataSource_tokenDetectionEnabled, "f").call(this) &&
                     __classPrivateFieldGet(this, _RpcDataSource_useExternalService, "f").call(this)) {
@@ -592,6 +611,51 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
                 }
             }
         }
+        // Asset-scoped polls on chains another source claimed: poll ONLY the
+        // claimed pins to avoid double-polling tracked balances. Pin changes
+        // re-run the subscription pass, which rebuilds these polls.
+        // Asset-scoped polls on chains another source claimed (v6 only).
+        if (__classPrivateFieldGet(this, _RpcDataSource_isBalanceV6Enabled, "f").call(this) && supplementalChains.length > 0) {
+            const supplemental = new Set(supplementalChains);
+            const claimedAssetsByChain = new Map();
+            for (const assetId of request.customAssets ?? []) {
+                try {
+                    const { chainId } = (0, utils_1.parseCaipAssetType)(assetId);
+                    if (supplemental.has(chainId)) {
+                        const chainAssets = claimedAssetsByChain.get(chainId) ?? [];
+                        chainAssets.push(assetId);
+                        claimedAssetsByChain.set(chainId, chainAssets);
+                    }
+                }
+                catch {
+                    // Skip unparseable asset IDs
+                }
+            }
+            // request.customAssets is flat; ownership comes from controller state.
+            const customAssetsByAccount = __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_getCustomAssetsByAccount).call(this);
+            for (const { account } of request.accountsWithSupportedChains) {
+                const pinned = new Set(customAssetsByAccount[account.id] ?? []);
+                if (pinned.size === 0) {
+                    continue;
+                }
+                for (const [chainId, chainAssets] of claimedAssetsByChain) {
+                    // Sorted so the polling input (the dedupe key) is deterministic.
+                    const assetIds = chainAssets
+                        .filter((assetId) => pinned.has(assetId))
+                        .sort();
+                    if (assetIds.length === 0) {
+                        continue;
+                    }
+                    const balanceInput = {
+                        chainId: (0, exports.caipChainIdToHex)(chainId),
+                        accountId: account.id,
+                        accountAddress: account.address,
+                        assetIds,
+                    };
+                    balancePollingTokens.push(__classPrivateFieldGet(this, _RpcDataSource_balanceFetcher, "f").startPolling(balanceInput));
+                }
+            }
+        }
         // Store subscription data
         const accounts = request.accountsWithSupportedChains.map((entry) => entry.account);
         __classPrivateFieldGet(this, _RpcDataSource_activeSubscriptions, "f").set(subscriptionId, {
@@ -644,7 +708,7 @@ class RpcDataSource extends AbstractDataSource_js_1.AbstractDataSource {
     }
 }
 exports.RpcDataSource = RpcDataSource;
-_RpcDataSource_messenger = new WeakMap(), _RpcDataSource_onActiveChainsUpdated = new WeakMap(), _RpcDataSource_getNativeAssetForChain = new WeakMap(), _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = new WeakMap(), _RpcDataSource_useExternalService = new WeakMap(), _RpcDataSource_isOnboarded = new WeakMap(), _RpcDataSource_activeChains = new WeakMap(), _RpcDataSource_chainStatuses = new WeakMap(), _RpcDataSource_providerCache = new WeakMap(), _RpcDataSource_activeSubscriptions = new WeakMap(), _RpcDataSource_unsubscribeTransactionConfirmed = new WeakMap(), _RpcDataSource_multicallClient = new WeakMap(), _RpcDataSource_balanceFetcher = new WeakMap(), _RpcDataSource_tokenDetector = new WeakMap(), _RpcDataSource_getAssetType = new WeakMap(), _RpcDataSource_instances = new WeakSet(), _RpcDataSource_convertToHumanReadable = function _RpcDataSource_convertToHumanReadable(rawBalance, decimals) {
+_RpcDataSource_messenger = new WeakMap(), _RpcDataSource_onActiveChainsUpdated = new WeakMap(), _RpcDataSource_getNativeAssetForChain = new WeakMap(), _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = new WeakMap(), _RpcDataSource_useExternalService = new WeakMap(), _RpcDataSource_isOnboarded = new WeakMap(), _RpcDataSource_isBalanceV6Enabled = new WeakMap(), _RpcDataSource_activeChains = new WeakMap(), _RpcDataSource_chainStatuses = new WeakMap(), _RpcDataSource_providerCache = new WeakMap(), _RpcDataSource_activeSubscriptions = new WeakMap(), _RpcDataSource_unsubscribeTransactionConfirmed = new WeakMap(), _RpcDataSource_multicallClient = new WeakMap(), _RpcDataSource_balanceFetcher = new WeakMap(), _RpcDataSource_tokenDetector = new WeakMap(), _RpcDataSource_getAssetType = new WeakMap(), _RpcDataSource_instances = new WeakSet(), _RpcDataSource_convertToHumanReadable = function _RpcDataSource_convertToHumanReadable(rawBalance, decimals) {
     if (!Number.isFinite(decimals) || decimals < 0) {
         log('Invalid decimals — defaulting balance to "0"', {
             rawBalance,
@@ -1013,6 +1077,81 @@ async function _RpcDataSource_fetchDecimalsViaRpc(chainId, tokenAddress) {
     catch {
         return undefined;
     }
+}, _RpcDataSource_getSupplementalCustomAssetChains = function _RpcDataSource_getSupplementalCustomAssetChains(request, chainsToSubscribe) {
+    if (!request.customAssets || request.customAssets.length === 0) {
+        return [];
+    }
+    const covered = new Set(chainsToSubscribe);
+    const chains = new Set();
+    for (const assetId of request.customAssets) {
+        let parsed;
+        try {
+            parsed = (0, utils_1.parseCaipAssetType)(assetId);
+        }
+        catch {
+            continue;
+        }
+        const { chainId } = parsed;
+        if (parsed.chain.namespace === utils_1.KnownCaipNamespace.Eip155 &&
+            !covered.has(chainId) &&
+            (__classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").length === 0 ||
+                __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").includes(chainId))) {
+            chains.add(chainId);
+        }
+    }
+    return [...chains];
+}, _RpcDataSource_appendRequestCustomErc20sV5 = function _RpcDataSource_appendRequestCustomErc20sV5(assetsToFetch, customAssets, chainId, existingMetadata) {
+    for (const assetId of customAssets) {
+        try {
+            const parsed = (0, utils_1.parseCaipAssetType)(assetId);
+            const assetChainId = `${parsed.chain.namespace}:${parsed.chain.reference}`;
+            if (assetChainId === chainId &&
+                __classPrivateFieldGet(this, _RpcDataSource_getAssetType, "f").call(this, assetId) === 'erc20') {
+                const tokenAddress = parsed.assetReference.toLowerCase();
+                const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
+                const decimals = existingMetadata[normalizedId]?.decimals;
+                assetsToFetch.push({
+                    assetId,
+                    address: tokenAddress,
+                    decimals,
+                });
+            }
+        }
+        catch {
+            // Skip unparseable asset IDs
+        }
+    }
+}, _RpcDataSource_appendRequestCustomErc20sV6 = function _RpcDataSource_appendRequestCustomErc20sV6(assetsToFetch, customAssets, chainId, existingMetadata, pinnedByAccount) {
+    for (const assetId of customAssets) {
+        try {
+            const parsed = (0, utils_1.parseCaipAssetType)(assetId);
+            const assetChainId = `${parsed.chain.namespace}:${parsed.chain.reference}`;
+            const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
+            if (assetChainId === chainId &&
+                pinnedByAccount.has(normalizedId) &&
+                __classPrivateFieldGet(this, _RpcDataSource_getAssetType, "f").call(this, assetId) === 'erc20') {
+                const tokenAddress = parsed.assetReference.toLowerCase();
+                const decimals = existingMetadata[normalizedId]?.decimals;
+                assetsToFetch.push({
+                    assetId,
+                    address: tokenAddress,
+                    decimals,
+                });
+            }
+        }
+        catch {
+            // Skip unparseable asset IDs
+        }
+    }
+}, _RpcDataSource_getCustomAssetsByAccount = function _RpcDataSource_getCustomAssetsByAccount() {
+    try {
+        const state = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('AssetsController:getState');
+        return (state.customAssets ?? {});
+    }
+    catch (error) {
+        log('Failed to get customAssets from state', { error });
+        return {};
+    }
 }, _RpcDataSource_getExistingAssetsMetadata = function _RpcDataSource_getExistingAssetsMetadata() {
     try {
         const state = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('AssetsController:getState');