@metamask-previews/assets-controller 0.2.0-preview-c3cd77f → 0.2.0-preview-d01b2f93d

package/dist/data-sources/RpcDataSource.mjs

@@ -9,12 +9,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _RpcDataSource_instances, _RpcDataSource_timeout, _RpcDataSource_tokenDetectionEnabled, _RpcDataSource_activeChains, _RpcDataSource_chainStatuses, _RpcDataSource_providerCache, _RpcDataSource_activeSubscriptions, _RpcDataSource_multicallClient, _RpcDataSource_balanceFetcher, _RpcDataSource_tokenDetector, _RpcDataSource_convertToHumanReadable, _RpcDataSource_collectMetadataForBalances, _RpcDataSource_handleBalanceUpdate, _RpcDataSource_handleDetectionUpdate, _RpcDataSource_registerActionHandlers, _RpcDataSource_subscribeToNetworkController, _RpcDataSource_initializeFromNetworkController, _RpcDataSource_updateFromNetworkState, _RpcDataSource_getProvider, _RpcDataSource_getMulticallProvider, _RpcDataSource_clearProviderCache, _RpcDataSource_accountSupportsChain, _RpcDataSource_buildNativeAssetId, _RpcDataSource_getExistingAssetsMetadata, _RpcDataSource_getTokenMetadataFromTokenList;
+var _RpcDataSource_instances, _RpcDataSource_messenger, _RpcDataSource_onActiveChainsUpdated, _RpcDataSource_timeout, _RpcDataSource_tokenDetectionEnabled, _RpcDataSource_activeChains, _RpcDataSource_chainStatuses, _RpcDataSource_providerCache, _RpcDataSource_activeSubscriptions, _RpcDataSource_multicallClient, _RpcDataSource_balanceFetcher, _RpcDataSource_tokenDetector, _RpcDataSource_convertToHumanReadable, _RpcDataSource_collectMetadataForBalances, _RpcDataSource_handleBalanceUpdate, _RpcDataSource_handleDetectionUpdate, _RpcDataSource_subscribeToNetworkController, _RpcDataSource_initializeFromNetworkController, _RpcDataSource_updateFromNetworkState, _RpcDataSource_getProvider, _RpcDataSource_getMulticallProvider, _RpcDataSource_clearProviderCache, _RpcDataSource_buildNativeAssetId, _RpcDataSource_getExistingAssetsMetadata, _RpcDataSource_getTokenMetadataFromTokenList;
 import { Web3Provider } from "@ethersproject/providers";
-import { BaseController } from "@metamask/base-controller";
 import { toHex } from "@metamask/controller-utils";
 import { isStrictHexString, isCaipChainId, parseCaipChainId } from "@metamask/utils";
 import BigNumberJS from "bignumber.js";
+import { AbstractDataSource } from "./AbstractDataSource.mjs";
 import { BalanceFetcher, MulticallClient, TokenDetector } from "./evm-rpc-services/index.mjs";
 import { projectLogger, createModuleLogger } from "../logger.mjs";
 const CONTROLLER_NAME = 'RpcDataSource';
@@ -54,15 +54,12 @@ export const caipChainIdToHex = (chainId) => {
  * - RpcDataSource:activeChainsUpdated
  * - RpcDataSource:assetsUpdated
  */
-export class RpcDataSource extends BaseController {
+export class RpcDataSource extends AbstractDataSource {
     constructor(options) {
-        super({
-            name: CONTROLLER_NAME,
-            metadata: {},
-            state: {},
-            messenger: options.messenger,
-        });
+        super(CONTROLLER_NAME, { activeChains: [] });
         _RpcDataSource_instances.add(this);
+        _RpcDataSource_messenger.set(this, void 0);
+        _RpcDataSource_onActiveChainsUpdated.set(this, void 0);
         _RpcDataSource_timeout.set(this, void 0);
         _RpcDataSource_tokenDetectionEnabled.set(this, void 0);
         /** Currently active chains */
@@ -77,6 +74,8 @@ export class RpcDataSource extends BaseController {
         _RpcDataSource_multicallClient.set(this, void 0);
         _RpcDataSource_balanceFetcher.set(this, void 0);
         _RpcDataSource_tokenDetector.set(this, void 0);
+        __classPrivateFieldSet(this, _RpcDataSource_messenger, options.messenger, "f");
+        __classPrivateFieldSet(this, _RpcDataSource_onActiveChainsUpdated, options.onActiveChainsUpdated, "f");
         __classPrivateFieldSet(this, _RpcDataSource_timeout, options.timeout ?? 10000, "f");
         __classPrivateFieldSet(this, _RpcDataSource_tokenDetectionEnabled, options.tokenDetectionEnabled ?? false, "f");
         const balanceInterval = options.balanceInterval ?? DEFAULT_BALANCE_INTERVAL;
@@ -94,7 +93,7 @@ export class RpcDataSource extends BaseController {
         // Create messenger adapters for BalanceFetcher and TokenDetector
         const balanceFetcherMessenger = {
             call: (_action) => {
-                const state = this.messenger.call('AssetsController:getState');
+                const state = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('AssetsController:getState');
                 return {
                     assetsBalance: (state.assetsBalance ?? {}),
                 };
@@ -102,7 +101,7 @@ export class RpcDataSource extends BaseController {
         };
         const tokenDetectorMessenger = {
             call: (_action) => {
-                return this.messenger.call('TokenListController:getState');
+                return __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('TokenListController:getState');
             },
         };
         // Initialize BalanceFetcher with polling interval
@@ -111,7 +110,6 @@ export class RpcDataSource extends BaseController {
         // Initialize TokenDetector with polling interval
         __classPrivateFieldSet(this, _RpcDataSource_tokenDetector, new TokenDetector(__classPrivateFieldGet(this, _RpcDataSource_multicallClient, "f"), tokenDetectorMessenger, { pollingInterval: detectionInterval }), "f");
         __classPrivateFieldGet(this, _RpcDataSource_tokenDetector, "f").setOnDetectionUpdate(__classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_handleDetectionUpdate).bind(this));
-        __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_registerActionHandlers).call(this);
         __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_subscribeToNetworkController).call(this);
         __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_initializeFromNetworkController).call(this);
     }
@@ -120,17 +118,6 @@ export class RpcDataSource extends BaseController {
      *
      * @returns The name of this data source.
      */
-    getName() {
-        return this.name;
-    }
-    /**
-     * Get currently active chains.
-     *
-     * @returns Promise resolving to array of active chain IDs.
-     */
-    async getActiveChains() {
-        return __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f");
-    }
     /**
      * Get the status of all configured chains.
      *
@@ -186,7 +173,7 @@ export class RpcDataSource extends BaseController {
         const response = {};
         const chainsToFetch = request.chainIds.filter((chainId) => __classPrivateFieldGet(this, _RpcDataSource_activeChains, "f").includes(chainId));
         log('Fetch requested', {
-            accounts: request.accounts.map((a) => a.id),
+            accounts: request.accountsWithSupportedChains.map((a) => a.account.id),
             requestedChains: request.chainIds,
             chainsToFetch,
         });
@@ -197,14 +184,15 @@ export class RpcDataSource extends BaseController {
         const assetsBalance = {};
         const assetsMetadata = {};
         const failedChains = [];
-        // Fetch balances for each chain using BalanceFetcher
-        for (const chainId of chainsToFetch) {
-            const hexChainId = caipChainIdToHex(chainId);
-            for (const account of request.accounts) {
-                if (!__classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_accountSupportsChain).call(this, account, chainId)) {
-                    continue;
-                }
-                const { address, id: accountId } = account;
+        // 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));
+            if (chainsForAccount.length === 0) {
+                continue;
+            }
+            const { address, id: accountId } = account;
+            for (const chainId of chainsForAccount) {
+                const hexChainId = caipChainIdToHex(chainId);
                 try {
                     // Use BalanceFetcher for batched balance fetching
                     const result = await __classPrivateFieldGet(this, _RpcDataSource_balanceFetcher, "f").fetchBalancesForTokens(hexChainId, accountId, address, [], // Empty array means just native token
@@ -352,7 +340,7 @@ export class RpcDataSource extends BaseController {
             let successfullyHandledChains = [];
             log('Middleware fetching', {
                 chains: supportedChains,
-                accounts: request.accounts.map((a) => a.id),
+                accounts: request.accountsWithSupportedChains.map((a) => a.account.id),
             });
             const response = await this.fetch({
                 ...request,
@@ -402,7 +390,7 @@ export class RpcDataSource extends BaseController {
         log('Subscribe requested', {
             subscriptionId,
             isUpdate,
-            accounts: request.accounts.map((a) => a.id),
+            accounts: request.accountsWithSupportedChains.map((a) => a.account.id),
             chainsToSubscribe,
         });
         if (chainsToSubscribe.length === 0) {
@@ -423,16 +411,17 @@ export class RpcDataSource extends BaseController {
         }
         // Clean up existing subscription (stops old polling)
         await this.unsubscribe(subscriptionId);
-        // Start polling through BalanceFetcher and TokenDetector
+        // Start polling through BalanceFetcher and TokenDetector (use pre-computed supportedChains per account)
         const balancePollingTokens = [];
         const detectionPollingTokens = [];
-        for (const chainId of chainsToSubscribe) {
-            const hexChainId = caipChainIdToHex(chainId);
-            for (const account of request.accounts) {
-                if (!__classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_accountSupportsChain).call(this, account, chainId)) {
-                    continue;
-                }
-                const { address, id: accountId } = account;
+        for (const { account, supportedChains, } of request.accountsWithSupportedChains) {
+            const chainsForAccount = chainsToSubscribe.filter((chain) => supportedChains.includes(chain));
+            if (chainsForAccount.length === 0) {
+                continue;
+            }
+            const { address, id: accountId } = account;
+            for (const chainId of chainsForAccount) {
+                const hexChainId = caipChainIdToHex(chainId);
                 // Start balance polling
                 const balanceInput = {
                     chainId: hexChainId,
@@ -454,11 +443,13 @@ export class RpcDataSource extends BaseController {
             }
         }
         // Store subscription data
+        const accounts = request.accountsWithSupportedChains.map((entry) => entry.account);
         __classPrivateFieldGet(this, _RpcDataSource_activeSubscriptions, "f").set(subscriptionId, {
             balancePollingTokens,
             detectionPollingTokens,
             chains: chainsToSubscribe,
-            accounts: request.accounts,
+            accounts,
+            onAssetsUpdate: subscriptionRequest.onAssetsUpdate,
         });
         log('Subscription SUCCESS', {
             subscriptionId,
@@ -501,7 +492,7 @@ export class RpcDataSource extends BaseController {
         __classPrivateFieldGet(this, _RpcDataSource_providerCache, "f").clear();
     }
 }
-_RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = new WeakMap(), _RpcDataSource_activeChains = new WeakMap(), _RpcDataSource_chainStatuses = new WeakMap(), _RpcDataSource_providerCache = new WeakMap(), _RpcDataSource_activeSubscriptions = 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) {
+_RpcDataSource_messenger = new WeakMap(), _RpcDataSource_onActiveChainsUpdated = new WeakMap(), _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = new WeakMap(), _RpcDataSource_activeChains = new WeakMap(), _RpcDataSource_chainStatuses = new WeakMap(), _RpcDataSource_providerCache = new WeakMap(), _RpcDataSource_activeSubscriptions = 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 BigNumberJS(rawBalance);
     const divisor = new BigNumberJS(10).pow(decimals);
     return rawAmount.dividedBy(divisor).toString();
@@ -577,11 +568,11 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
         accountId: result.accountId,
         newBalanceCount: Object.keys(newBalances).length,
     });
-    this.messenger
-        .call('AssetsController:assetsUpdate', response, CONTROLLER_NAME)
-        .catch((error) => {
-        log('Failed to update assets', { error });
-    });
+    for (const subscription of __classPrivateFieldGet(this, _RpcDataSource_activeSubscriptions, "f").values()) {
+        subscription.onAssetsUpdate(response)?.catch((error) => {
+            log('Failed to update assets', { error });
+        });
+    }
 }, _RpcDataSource_handleDetectionUpdate = function _RpcDataSource_handleDetectionUpdate(result) {
     log('Detected new tokens', {
         count: result.detectedAssets.length,
@@ -627,24 +618,13 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
             [result.accountId]: newBalances,
         },
     };
-    this.messenger
-        .call('AssetsController:assetsUpdate', response, CONTROLLER_NAME)
-        .catch((error) => {
-        log('Failed to update detected assets', { error });
-    });
-}, _RpcDataSource_registerActionHandlers = function _RpcDataSource_registerActionHandlers() {
-    const getAssetsMiddlewareHandler = () => this.assetsMiddleware;
-    const getActiveChainsHandler = async () => this.getActiveChains();
-    const fetchHandler = async (request) => this.fetch(request);
-    const subscribeHandler = async (request) => this.subscribe(request);
-    const unsubscribeHandler = async (subscriptionId) => this.unsubscribe(subscriptionId);
-    this.messenger.registerActionHandler('RpcDataSource:getAssetsMiddleware', getAssetsMiddlewareHandler);
-    this.messenger.registerActionHandler('RpcDataSource:getActiveChains', getActiveChainsHandler);
-    this.messenger.registerActionHandler('RpcDataSource:fetch', fetchHandler);
-    this.messenger.registerActionHandler('RpcDataSource:subscribe', subscribeHandler);
-    this.messenger.registerActionHandler('RpcDataSource:unsubscribe', unsubscribeHandler);
+    for (const subscription of __classPrivateFieldGet(this, _RpcDataSource_activeSubscriptions, "f").values()) {
+        subscription.onAssetsUpdate(response)?.catch((error) => {
+            log('Failed to update detected assets', { error });
+        });
+    }
 }, _RpcDataSource_subscribeToNetworkController = function _RpcDataSource_subscribeToNetworkController() {
-    this.messenger.subscribe('NetworkController:stateChange', (networkState) => {
+    __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").subscribe('NetworkController:stateChange', (networkState) => {
         log('NetworkController state changed');
         __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_clearProviderCache).call(this);
         __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_updateFromNetworkState).call(this, networkState);
@@ -652,7 +632,7 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
 }, _RpcDataSource_initializeFromNetworkController = function _RpcDataSource_initializeFromNetworkController() {
     log('Initializing from NetworkController');
     try {
-        const networkState = this.messenger.call('NetworkController:getState');
+        const networkState = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('NetworkController:getState');
         __classPrivateFieldGet(this, _RpcDataSource_instances, "m", _RpcDataSource_updateFromNetworkState).call(this, networkState);
     }
     catch (error) {
@@ -695,8 +675,9 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
     __classPrivateFieldSet(this, _RpcDataSource_chainStatuses, chainStatuses, "f");
     __classPrivateFieldSet(this, _RpcDataSource_activeChains, activeChains, "f");
     if (hasChanges) {
-        this.messenger.call('AssetsController:activeChainsUpdate', CONTROLLER_NAME, activeChains);
+        __classPrivateFieldGet(this, _RpcDataSource_onActiveChainsUpdated, "f").call(this, activeChains);
     }
+    this.state.activeChains = activeChains;
 }, _RpcDataSource_getProvider = function _RpcDataSource_getProvider(chainId) {
     const cached = __classPrivateFieldGet(this, _RpcDataSource_providerCache, "f").get(chainId);
     if (cached) {
@@ -707,7 +688,10 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
         return undefined;
     }
     try {
-        const networkClient = this.messenger.call('NetworkController:getNetworkClientById', chainStatus.networkClientId);
+        const networkClient = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('NetworkController:getNetworkClientById', chainStatus.networkClientId);
+        if (!networkClient?.provider) {
+            return undefined;
+        }
         const web3Provider = new Web3Provider(networkClient.provider);
         __classPrivateFieldGet(this, _RpcDataSource_providerCache, "f").set(chainId, web3Provider);
         return web3Provider;
@@ -737,38 +721,13 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
     };
 }, _RpcDataSource_clearProviderCache = function _RpcDataSource_clearProviderCache() {
     __classPrivateFieldGet(this, _RpcDataSource_providerCache, "f").clear();
-}, _RpcDataSource_accountSupportsChain = function _RpcDataSource_accountSupportsChain(account, chainId) {
-    const scopes = account.scopes ?? [];
-    if (scopes.length === 0) {
-        return true;
-    }
-    const [chainNamespace, chainReference] = chainId.split(':');
-    for (const scope of scopes) {
-        const [scopeNamespace, scopeReference] = scope.split(':');
-        if (scopeNamespace !== chainNamespace) {
-            continue;
-        }
-        // Wildcard scope (e.g., eip155:0) matches all chains in the namespace
-        if (scopeReference === '0') {
-            return true;
-        }
-        // RpcDataSource only handles eip155 (EVM) chains
-        // Normalize hex chain references (e.g., 0x1 -> 1) for comparison
-        const normalizedScopeRef = scopeReference?.startsWith('0x')
-            ? parseInt(scopeReference, 16).toString()
-            : scopeReference;
-        if (normalizedScopeRef === chainReference) {
-            return true;
-        }
-    }
-    return false;
 }, _RpcDataSource_buildNativeAssetId = function _RpcDataSource_buildNativeAssetId(chainId) {
-    const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
+    const { nativeAssetIdentifiers } = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('NetworkEnablementController:getState');
     return (nativeAssetIdentifiers[chainId] ??
         `${chainId}/slip44:60`);
 }, _RpcDataSource_getExistingAssetsMetadata = function _RpcDataSource_getExistingAssetsMetadata() {
     try {
-        const state = this.messenger.call('AssetsController:getState');
+        const state = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('AssetsController:getState');
         return (state.assetsMetadata ?? {});
     }
     catch {
@@ -786,8 +745,8 @@ _RpcDataSource_timeout = new WeakMap(), _RpcDataSource_tokenDetectionEnabled = n
         const tokenAddress = assetPart.slice(6); // Remove 'erc20:' prefix
         const chainIdDecimal = chainPart.split(':')[1];
         const hexChainId = `0x${parseInt(chainIdDecimal, 10).toString(16)}`;
-        const tokenListState = this.messenger.call('TokenListController:getState');
-        const chainCacheEntry = tokenListState.tokensChainsCache[hexChainId];
+        const tokenListState = __classPrivateFieldGet(this, _RpcDataSource_messenger, "f").call('TokenListController:getState');
+        const chainCacheEntry = tokenListState?.tokensChainsCache?.[hexChainId];
         const chainTokenList = chainCacheEntry?.data;
         if (!chainTokenList) {
             return undefined;