@metamask/assets-controllers 73.0.2 → 73.2.0

package/dist/rpc-service/rpc-balance-fetcher.mjs

@@ -0,0 +1,184 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _RpcBalanceFetcher_instances, _RpcBalanceFetcher_getProvider, _RpcBalanceFetcher_getNetworkClient, _RpcBalanceFetcher_getTokensState, _RpcBalanceFetcher_getStakingContractAddress, _RpcBalanceFetcher_ensureFreshBlockData;
+function $importDefault(module) {
+    if (module?.__esModule) {
+        return module.default;
+    }
+    return module;
+}
+import { toChecksumHexAddress } from "@metamask/controller-utils";
+import $BN from "bn.js";
+const BN = $importDefault($BN);
+import { STAKING_CONTRACT_ADDRESS_BY_CHAINID } from "../AssetsContractController.mjs";
+import { getTokenBalancesForMultipleAddresses } from "../multicall.mjs";
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+const checksum = (addr) => toChecksumHexAddress(addr);
+export class RpcBalanceFetcher {
+    constructor(getProvider, getNetworkClient, getTokensState) {
+        _RpcBalanceFetcher_instances.add(this);
+        _RpcBalanceFetcher_getProvider.set(this, void 0);
+        _RpcBalanceFetcher_getNetworkClient.set(this, void 0);
+        _RpcBalanceFetcher_getTokensState.set(this, void 0);
+        __classPrivateFieldSet(this, _RpcBalanceFetcher_getProvider, getProvider, "f");
+        __classPrivateFieldSet(this, _RpcBalanceFetcher_getNetworkClient, getNetworkClient, "f");
+        __classPrivateFieldSet(this, _RpcBalanceFetcher_getTokensState, getTokensState, "f");
+    }
+    supports() {
+        return true; // fallback – supports every chain
+    }
+    async fetch({ chainIds, queryAllAccounts, selectedAccount, allAccounts, }) {
+        const results = [];
+        for (const chainId of chainIds) {
+            const tokensState = __classPrivateFieldGet(this, _RpcBalanceFetcher_getTokensState, "f").call(this);
+            const accountTokenGroups = buildAccountTokenGroupsStatic(chainId, queryAllAccounts, selectedAccount, allAccounts, tokensState.allTokens, tokensState.allDetectedTokens);
+            if (!accountTokenGroups.length) {
+                continue;
+            }
+            const provider = __classPrivateFieldGet(this, _RpcBalanceFetcher_getProvider, "f").call(this, chainId);
+            await __classPrivateFieldGet(this, _RpcBalanceFetcher_instances, "m", _RpcBalanceFetcher_ensureFreshBlockData).call(this, chainId);
+            const { tokenBalances, stakedBalances } = await getTokenBalancesForMultipleAddresses(accountTokenGroups, chainId, provider, true, // include native
+            true);
+            // Add native token entries for all addresses being processed
+            const allAddressesForNative = new Set();
+            accountTokenGroups.forEach((group) => {
+                allAddressesForNative.add(group.accountAddress);
+            });
+            // Ensure native token entries exist for all addresses
+            allAddressesForNative.forEach((address) => {
+                const nativeBalance = tokenBalances[ZERO_ADDRESS]?.[address] || null;
+                results.push({
+                    success: true,
+                    value: nativeBalance ? nativeBalance : new BN('0'),
+                    account: address,
+                    token: ZERO_ADDRESS,
+                    chainId,
+                });
+            });
+            // Add other token balances
+            Object.entries(tokenBalances).forEach(([tokenAddr, balances]) => {
+                // Skip native token since we handled it explicitly above
+                if (tokenAddr === ZERO_ADDRESS) {
+                    return;
+                }
+                Object.entries(balances).forEach(([acct, bn]) => {
+                    results.push({
+                        success: bn !== null,
+                        value: bn,
+                        account: acct,
+                        token: checksum(tokenAddr),
+                        chainId,
+                    });
+                });
+            });
+            // Add staked balances for all addresses being processed
+            const stakingContractAddress = __classPrivateFieldGet(this, _RpcBalanceFetcher_instances, "m", _RpcBalanceFetcher_getStakingContractAddress).call(this, chainId);
+            if (stakingContractAddress) {
+                // Get all unique addresses being processed for this chain
+                const allAddresses = new Set();
+                accountTokenGroups.forEach((group) => {
+                    allAddresses.add(group.accountAddress);
+                });
+                // Add staked balance entry for each address
+                const checksummedStakingAddress = checksum(stakingContractAddress);
+                allAddresses.forEach((address) => {
+                    const stakedBalance = stakedBalances?.[address] || null;
+                    results.push({
+                        success: true,
+                        value: stakedBalance ? stakedBalance : new BN('0'),
+                        account: address,
+                        token: checksummedStakingAddress,
+                        chainId,
+                    });
+                });
+            }
+        }
+        return results;
+    }
+}
+_RpcBalanceFetcher_getProvider = new WeakMap(), _RpcBalanceFetcher_getNetworkClient = new WeakMap(), _RpcBalanceFetcher_getTokensState = new WeakMap(), _RpcBalanceFetcher_instances = new WeakSet(), _RpcBalanceFetcher_getStakingContractAddress = function _RpcBalanceFetcher_getStakingContractAddress(chainId) {
+    return STAKING_CONTRACT_ADDRESS_BY_CHAINID[chainId];
+}, _RpcBalanceFetcher_ensureFreshBlockData = 
+/**
+ * Ensures that the block tracker has the latest block data before performing multicall operations.
+ * This is a temporary fix to ensure that the block number is up to date.
+ *
+ * @param chainId - The chain id to update block data for.
+ */
+async function _RpcBalanceFetcher_ensureFreshBlockData(chainId) {
+    // Force fresh block data before multicall
+    // TODO: This is a temporary fix to ensure that the block number is up to date.
+    // We should remove this once we have a better solution for this on the block tracker controller.
+    const networkClient = __classPrivateFieldGet(this, _RpcBalanceFetcher_getNetworkClient, "f").call(this, chainId);
+    await networkClient.blockTracker?.checkForLatestBlock?.();
+};
+/**
+ * Merges imported & detected tokens for the requested chain and returns a list
+ * of `{ accountAddress, tokenAddresses[] }` suitable for getTokenBalancesForMultipleAddresses.
+ *
+ * @param chainId - The chain ID to build account token groups for
+ * @param queryAllAccounts - Whether to query all accounts or just the selected one
+ * @param selectedAccount - The currently selected account
+ * @param allAccounts - All available accounts
+ * @param allTokens - All tokens from TokensController
+ * @param allDetectedTokens - All detected tokens from TokensController
+ * @returns Array of account/token groups for multicall
+ */
+function buildAccountTokenGroupsStatic(chainId, queryAllAccounts, selectedAccount, allAccounts, allTokens, allDetectedTokens) {
+    const pairs = [];
+    const add = ([account, tokens]) => {
+        const shouldInclude = queryAllAccounts || checksum(account) === checksum(selectedAccount);
+        if (!shouldInclude) {
+            return;
+        }
+        tokens.forEach((t) => pairs.push({
+            accountAddress: account,
+            tokenAddress: checksum(t.address),
+        }));
+    };
+    Object.entries(allTokens[chainId] ?? {}).forEach(add);
+    Object.entries(allDetectedTokens[chainId] ?? {}).forEach(add);
+    // Always include native token for relevant accounts
+    if (queryAllAccounts) {
+        allAccounts.forEach((a) => {
+            pairs.push({
+                accountAddress: a.address,
+                tokenAddress: ZERO_ADDRESS,
+            });
+        });
+    }
+    else {
+        pairs.push({
+            accountAddress: selectedAccount,
+            tokenAddress: ZERO_ADDRESS,
+        });
+    }
+    if (!pairs.length) {
+        return [];
+    }
+    // group by account
+    const map = new Map();
+    pairs.forEach(({ accountAddress, tokenAddress }) => {
+        if (!map.has(accountAddress)) {
+            map.set(accountAddress, []);
+        }
+        const tokens = map.get(accountAddress);
+        if (tokens) {
+            tokens.push(tokenAddress);
+        }
+    });
+    return Array.from(map.entries()).map(([accountAddress, tokenAddresses]) => ({
+        accountAddress,
+        tokenAddresses,
+    }));
+}
+//# sourceMappingURL=rpc-balance-fetcher.mjs.map

package/dist/rpc-service/rpc-balance-fetcher.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-balance-fetcher.mjs","sourceRoot":"","sources":["../../src/rpc-service/rpc-balance-fetcher.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Web3Provider } from '@ethersproject/providers';\nimport { toChecksumHexAddress } from '@metamask/controller-utils';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { NetworkClient } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\nimport BN from 'bn.js';\n\nimport { STAKING_CONTRACT_ADDRESS_BY_CHAINID } from '../AssetsContractController';\nimport { getTokenBalancesForMultipleAddresses } from '../multicall';\nimport type { TokensControllerState } from '../TokensController';\n\nexport type ChainIdHex = Hex;\nexport type ChecksumAddress = Hex;\n\nexport type ProcessedBalance = {\n  success: boolean;\n  value?: BN;\n  account: ChecksumAddress;\n  token: ChecksumAddress;\n  chainId: ChainIdHex;\n};\n\nexport type BalanceFetcher = {\n  supports(chainId: ChainIdHex): boolean;\n  fetch(input: {\n    chainIds: ChainIdHex[];\n    queryAllAccounts: boolean;\n    selectedAccount: ChecksumAddress;\n    allAccounts: InternalAccount[];\n  }): Promise<ProcessedBalance[]>;\n};\n\nconst ZERO_ADDRESS =\n  '0x0000000000000000000000000000000000000000' as ChecksumAddress;\n\nconst checksum = (addr: string): ChecksumAddress =>\n  toChecksumHexAddress(addr) as ChecksumAddress;\n\nexport class RpcBalanceFetcher implements BalanceFetcher {\n  readonly #getProvider: (chainId: ChainIdHex) => Web3Provider;\n\n  readonly #getNetworkClient: (chainId: ChainIdHex) => NetworkClient;\n\n  readonly #getTokensState: () => {\n    allTokens: TokensControllerState['allTokens'];\n    allDetectedTokens: TokensControllerState['allDetectedTokens'];\n  };\n\n  constructor(\n    getProvider: (chainId: ChainIdHex) => Web3Provider,\n    getNetworkClient: (chainId: ChainIdHex) => NetworkClient,\n    getTokensState: () => {\n      allTokens: TokensControllerState['allTokens'];\n      allDetectedTokens: TokensControllerState['allDetectedTokens'];\n    },\n  ) {\n    this.#getProvider = getProvider;\n    this.#getNetworkClient = getNetworkClient;\n    this.#getTokensState = getTokensState;\n  }\n\n  supports(): boolean {\n    return true; // fallback – supports every chain\n  }\n\n  #getStakingContractAddress(chainId: ChainIdHex): string | undefined {\n    return STAKING_CONTRACT_ADDRESS_BY_CHAINID[\n      chainId as keyof typeof STAKING_CONTRACT_ADDRESS_BY_CHAINID\n    ];\n  }\n\n  async fetch({\n    chainIds,\n    queryAllAccounts,\n    selectedAccount,\n    allAccounts,\n  }: Parameters<BalanceFetcher['fetch']>[0]): Promise<ProcessedBalance[]> {\n    const results: ProcessedBalance[] = [];\n\n    for (const chainId of chainIds) {\n      const tokensState = this.#getTokensState();\n      const accountTokenGroups = buildAccountTokenGroupsStatic(\n        chainId,\n        queryAllAccounts,\n        selectedAccount,\n        allAccounts,\n        tokensState.allTokens,\n        tokensState.allDetectedTokens,\n      );\n      if (!accountTokenGroups.length) {\n        continue;\n      }\n\n      const provider = this.#getProvider(chainId);\n      await this.#ensureFreshBlockData(chainId);\n\n      const { tokenBalances, stakedBalances } =\n        await getTokenBalancesForMultipleAddresses(\n          accountTokenGroups,\n          chainId,\n          provider,\n          true, // include native\n          true, // include staked\n        );\n\n      // Add native token entries for all addresses being processed\n      const allAddressesForNative = new Set<string>();\n      accountTokenGroups.forEach((group) => {\n        allAddressesForNative.add(group.accountAddress);\n      });\n\n      // Ensure native token entries exist for all addresses\n      allAddressesForNative.forEach((address) => {\n        const nativeBalance = tokenBalances[ZERO_ADDRESS]?.[address] || null;\n        results.push({\n          success: true,\n          value: nativeBalance ? (nativeBalance as BN) : new BN('0'),\n          account: address as ChecksumAddress,\n          token: ZERO_ADDRESS,\n          chainId,\n        });\n      });\n\n      // Add other token balances\n      Object.entries(tokenBalances).forEach(([tokenAddr, balances]) => {\n        // Skip native token since we handled it explicitly above\n        if (tokenAddr === ZERO_ADDRESS) {\n          return;\n        }\n        Object.entries(balances).forEach(([acct, bn]) => {\n          results.push({\n            success: bn !== null,\n            value: bn as BN,\n            account: acct as ChecksumAddress,\n            token: checksum(tokenAddr),\n            chainId,\n          });\n        });\n      });\n\n      // Add staked balances for all addresses being processed\n      const stakingContractAddress = this.#getStakingContractAddress(chainId);\n      if (stakingContractAddress) {\n        // Get all unique addresses being processed for this chain\n        const allAddresses = new Set<string>();\n        accountTokenGroups.forEach((group) => {\n          allAddresses.add(group.accountAddress);\n        });\n\n        // Add staked balance entry for each address\n        const checksummedStakingAddress = checksum(stakingContractAddress);\n        allAddresses.forEach((address) => {\n          const stakedBalance = stakedBalances?.[address] || null;\n          results.push({\n            success: true,\n            value: stakedBalance ? (stakedBalance as BN) : new BN('0'),\n            account: address as ChecksumAddress,\n            token: checksummedStakingAddress,\n            chainId,\n          });\n        });\n      }\n    }\n\n    return results;\n  }\n\n  /**\n   * Ensures that the block tracker has the latest block data before performing multicall operations.\n   * This is a temporary fix to ensure that the block number is up to date.\n   *\n   * @param chainId - The chain id to update block data for.\n   */\n  async #ensureFreshBlockData(chainId: Hex): Promise<void> {\n    // Force fresh block data before multicall\n    // TODO: This is a temporary fix to ensure that the block number is up to date.\n    // We should remove this once we have a better solution for this on the block tracker controller.\n    const networkClient = this.#getNetworkClient(chainId);\n    await networkClient.blockTracker?.checkForLatestBlock?.();\n  }\n}\n\n/**\n * Merges imported & detected tokens for the requested chain and returns a list\n * of `{ accountAddress, tokenAddresses[] }` suitable for getTokenBalancesForMultipleAddresses.\n *\n * @param chainId - The chain ID to build account token groups for\n * @param queryAllAccounts - Whether to query all accounts or just the selected one\n * @param selectedAccount - The currently selected account\n * @param allAccounts - All available accounts\n * @param allTokens - All tokens from TokensController\n * @param allDetectedTokens - All detected tokens from TokensController\n * @returns Array of account/token groups for multicall\n */\nfunction buildAccountTokenGroupsStatic(\n  chainId: ChainIdHex,\n  queryAllAccounts: boolean,\n  selectedAccount: ChecksumAddress,\n  allAccounts: InternalAccount[],\n  allTokens: TokensControllerState['allTokens'],\n  allDetectedTokens: TokensControllerState['allDetectedTokens'],\n): { accountAddress: ChecksumAddress; tokenAddresses: ChecksumAddress[] }[] {\n  const pairs: {\n    accountAddress: ChecksumAddress;\n    tokenAddress: ChecksumAddress;\n  }[] = [];\n\n  const add = ([account, tokens]: [string, unknown[]]) => {\n    const shouldInclude =\n      queryAllAccounts || checksum(account) === checksum(selectedAccount);\n    if (!shouldInclude) {\n      return;\n    }\n    (tokens as unknown[]).forEach((t: unknown) =>\n      pairs.push({\n        accountAddress: account as ChecksumAddress,\n        tokenAddress: checksum((t as { address: string }).address),\n      }),\n    );\n  };\n\n  Object.entries(allTokens[chainId] ?? {}).forEach(\n    add as (entry: [string, unknown]) => void,\n  );\n  Object.entries(allDetectedTokens[chainId] ?? {}).forEach(\n    add as (entry: [string, unknown]) => void,\n  );\n\n  // Always include native token for relevant accounts\n  if (queryAllAccounts) {\n    allAccounts.forEach((a) => {\n      pairs.push({\n        accountAddress: a.address as ChecksumAddress,\n        tokenAddress: ZERO_ADDRESS,\n      });\n    });\n  } else {\n    pairs.push({\n      accountAddress: selectedAccount,\n      tokenAddress: ZERO_ADDRESS,\n    });\n  }\n\n  if (!pairs.length) {\n    return [];\n  }\n\n  // group by account\n  const map = new Map<ChecksumAddress, ChecksumAddress[]>();\n  pairs.forEach(({ accountAddress, tokenAddress }) => {\n    if (!map.has(accountAddress)) {\n      map.set(accountAddress, []);\n    }\n    const tokens = map.get(accountAddress);\n    if (tokens) {\n      tokens.push(tokenAddress);\n    }\n  });\n\n  return Array.from(map.entries()).map(([accountAddress, tokenAddresses]) => ({\n    accountAddress,\n    tokenAddresses,\n  }));\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "73.0.2",
+  "version": "73.2.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
@@ -54,11 +54,11 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/abi-utils": "^2.0.3",
-    "@metamask/base-controller": "^8.0.1",
+    "@metamask/base-controller": "^8.1.0",
     "@metamask/contract-metadata": "^2.4.0",
-    "@metamask/controller-utils": "^11.11.0",
+    "@metamask/controller-utils": "^11.12.0",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/keyring-api": "^19.0.0",
+    "@metamask/keyring-api": "^20.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/polling-controller": "^14.0.0",
     "@metamask/rpc-errors": "^7.0.2",
@@ -73,25 +73,29 @@
     "immer": "^9.0.6",
     "lodash": "^4.17.21",
     "multiformats": "^13.1.0",
+    "reselect": "^5.1.1",
     "single-call-balance-checker-abi": "^1.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
-    "@metamask/accounts-controller": "^32.0.1",
+    "@metamask/account-api": "^0.9.0",
+    "@metamask/account-tree-controller": "^0.8.0",
+    "@metamask/accounts-controller": "^32.0.2",
     "@metamask/approval-controller": "^7.1.3",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/ethjs-provider-http": "^0.3.0",
-    "@metamask/keyring-controller": "^22.1.0",
-    "@metamask/keyring-internal-api": "^7.0.0",
-    "@metamask/keyring-snap-client": "^6.0.0",
-    "@metamask/network-controller": "^24.0.1",
+    "@metamask/keyring-controller": "^22.1.1",
+    "@metamask/keyring-internal-api": "^8.0.0",
+    "@metamask/keyring-snap-client": "^7.0.0",
+    "@metamask/multichain-account-service": "^0.4.0",
+    "@metamask/network-controller": "^24.1.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/phishing-controller": "^13.1.0",
     "@metamask/preferences-controller": "^18.4.1",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
-    "@metamask/transaction-controller": "^59.1.0",
+    "@metamask/transaction-controller": "^59.2.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",
@@ -107,6 +111,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
+    "@metamask/account-tree-controller": "^0.7.0",
     "@metamask/accounts-controller": "^32.0.0",
     "@metamask/approval-controller": "^7.0.0",
     "@metamask/keyring-controller": "^22.0.0",