@metamask/assets-controllers 32.0.0 → 34.0.0

package/dist/chunk-2IIQTSLV.mjs

@@ -0,0 +1,236 @@
+import {
+  __privateAdd,
+  __privateGet,
+  __privateMethod,
+  __privateSet
+} from "./chunk-XUI43LEZ.mjs";
+
+// src/NftDetectionController.ts
+import { BaseController } from "@metamask/base-controller";
+import {
+  toChecksumHexAddress,
+  ChainId,
+  NFT_API_BASE_URL,
+  NFT_API_VERSION,
+  convertHexToDecimal,
+  handleFetch
+} from "@metamask/controller-utils";
+import { createDeferredPromise } from "@metamask/utils";
+var controllerName = "NftDetectionController";
+var supportedNftDetectionNetworks = [ChainId.mainnet];
+var BlockaidResultType = /* @__PURE__ */ ((BlockaidResultType2) => {
+  BlockaidResultType2["Benign"] = "Benign";
+  BlockaidResultType2["Spam"] = "Spam";
+  BlockaidResultType2["Warning"] = "Warning";
+  BlockaidResultType2["Malicious"] = "Malicious";
+  return BlockaidResultType2;
+})(BlockaidResultType || {});
+var _disabled, _addNft, _getNftState, _inProcessNftFetchingUpdates, _onPreferencesControllerStateChange, onPreferencesControllerStateChange_fn, _getOwnerNftApi, getOwnerNftApi_fn, _getOwnerNfts, getOwnerNfts_fn;
+var NftDetectionController = class extends BaseController {
+  /**
+   * The controller options
+   *
+   * @param options - The controller options.
+   * @param options.messenger - A reference to the messaging system.
+   * @param options.disabled - Represents previous value of useNftDetection. Used to detect changes of useNftDetection. Default value is true.
+   * @param options.addNft - Add an NFT.
+   * @param options.getNftState - Gets the current state of the Assets controller.
+   */
+  constructor({
+    messenger,
+    disabled = false,
+    addNft,
+    getNftState
+  }) {
+    super({
+      name: controllerName,
+      messenger,
+      metadata: {},
+      state: {}
+    });
+    /**
+     * Handles the state change of the preference controller.
+     * @param preferencesState - The new state of the preference controller.
+     * @param preferencesState.useNftDetection - Boolean indicating user preference on NFT detection.
+     */
+    __privateAdd(this, _onPreferencesControllerStateChange);
+    __privateAdd(this, _getOwnerNftApi);
+    __privateAdd(this, _getOwnerNfts);
+    __privateAdd(this, _disabled, void 0);
+    __privateAdd(this, _addNft, void 0);
+    __privateAdd(this, _getNftState, void 0);
+    __privateAdd(this, _inProcessNftFetchingUpdates, void 0);
+    __privateSet(this, _disabled, disabled);
+    __privateSet(this, _inProcessNftFetchingUpdates, {});
+    __privateSet(this, _getNftState, getNftState);
+    __privateSet(this, _addNft, addNft);
+    this.messagingSystem.subscribe(
+      "PreferencesController:stateChange",
+      __privateMethod(this, _onPreferencesControllerStateChange, onPreferencesControllerStateChange_fn).bind(this)
+    );
+  }
+  /**
+   * Checks whether network is mainnet or not.
+   *
+   * @returns Whether current network is mainnet.
+   */
+  isMainnet() {
+    const { selectedNetworkClientId } = this.messagingSystem.call(
+      "NetworkController:getState"
+    );
+    const {
+      configuration: { chainId }
+    } = this.messagingSystem.call(
+      "NetworkController:getNetworkClientById",
+      selectedNetworkClientId
+    );
+    return chainId === ChainId.mainnet;
+  }
+  isMainnetByNetworkClientId(networkClient) {
+    return networkClient.configuration.chainId === ChainId.mainnet;
+  }
+  /**
+   * Triggers asset ERC721 token auto detection on mainnet. Any newly detected NFTs are
+   * added.
+   *
+   * @param options - Options bag.
+   * @param options.networkClientId - The network client ID to detect NFTs on.
+   * @param options.userAddress - The address to detect NFTs for.
+   */
+  async detectNfts(options) {
+    const userAddress = options?.userAddress ?? this.messagingSystem.call("AccountsController:getSelectedAccount").address;
+    const { selectedNetworkClientId } = this.messagingSystem.call(
+      "NetworkController:getState"
+    );
+    const {
+      configuration: { chainId }
+    } = this.messagingSystem.call(
+      "NetworkController:getNetworkClientById",
+      selectedNetworkClientId
+    );
+    if (!supportedNftDetectionNetworks.includes(chainId) || __privateGet(this, _disabled)) {
+      return;
+    }
+    if (!userAddress) {
+      return;
+    }
+    const updateKey = `${chainId}:${userAddress}`;
+    if (updateKey in __privateGet(this, _inProcessNftFetchingUpdates)) {
+      await __privateGet(this, _inProcessNftFetchingUpdates)[updateKey];
+      return;
+    }
+    const {
+      promise: inProgressUpdate,
+      resolve: updateSucceeded,
+      reject: updateFailed
+    } = createDeferredPromise({ suppressUnhandledRejection: true });
+    __privateGet(this, _inProcessNftFetchingUpdates)[updateKey] = inProgressUpdate;
+    let next;
+    let apiNfts = [];
+    let resultNftApi;
+    try {
+      do {
+        resultNftApi = await __privateMethod(this, _getOwnerNfts, getOwnerNfts_fn).call(this, userAddress, chainId, next);
+        apiNfts = resultNftApi.tokens.filter(
+          (elm) => elm.token.isSpam === false && (elm.blockaidResult?.result_type ? elm.blockaidResult?.result_type === "Benign" /* Benign */ : true)
+        );
+        const addNftPromises = apiNfts.map(async (nft) => {
+          const {
+            tokenId,
+            contract,
+            kind,
+            image: imageUrl,
+            imageSmall: imageThumbnailUrl,
+            metadata: { imageOriginal: imageOriginalUrl } = {},
+            name,
+            description,
+            attributes,
+            topBid,
+            lastSale,
+            rarityRank,
+            rarityScore,
+            collection
+          } = nft.token;
+          let ignored;
+          const { ignoredNfts } = __privateGet(this, _getNftState).call(this);
+          if (ignoredNfts.length) {
+            ignored = ignoredNfts.find((c) => {
+              return c.address === toChecksumHexAddress(contract) && c.tokenId === tokenId;
+            });
+          }
+          if (!ignored) {
+            const nftMetadata = Object.assign(
+              {},
+              { name },
+              description && { description },
+              imageUrl && { image: imageUrl },
+              imageThumbnailUrl && { imageThumbnail: imageThumbnailUrl },
+              imageOriginalUrl && { imageOriginal: imageOriginalUrl },
+              kind && { standard: kind.toUpperCase() },
+              lastSale && { lastSale },
+              attributes && { attributes },
+              topBid && { topBid },
+              rarityRank && { rarityRank },
+              rarityScore && { rarityScore },
+              collection && { collection }
+            );
+            await __privateGet(this, _addNft).call(this, contract, tokenId, {
+              nftMetadata,
+              userAddress,
+              source: "detected" /* Detected */,
+              networkClientId: options?.networkClientId
+            });
+          }
+        });
+        await Promise.all(addNftPromises);
+      } while (next = resultNftApi.continuation);
+      updateSucceeded();
+    } catch (error) {
+      updateFailed(error);
+      throw error;
+    } finally {
+      delete __privateGet(this, _inProcessNftFetchingUpdates)[updateKey];
+    }
+  }
+};
+_disabled = new WeakMap();
+_addNft = new WeakMap();
+_getNftState = new WeakMap();
+_inProcessNftFetchingUpdates = new WeakMap();
+_onPreferencesControllerStateChange = new WeakSet();
+onPreferencesControllerStateChange_fn = function({ useNftDetection }) {
+  if (!useNftDetection !== __privateGet(this, _disabled)) {
+    __privateSet(this, _disabled, !useNftDetection);
+  }
+};
+_getOwnerNftApi = new WeakSet();
+getOwnerNftApi_fn = function({
+  chainId,
+  address,
+  next
+}) {
+  return `${NFT_API_BASE_URL}/users/${address}/tokens?chainIds=${chainId}&limit=50&includeTopBid=true&continuation=${next ?? ""}`;
+};
+_getOwnerNfts = new WeakSet();
+getOwnerNfts_fn = async function(address, chainId, cursor) {
+  const convertedChainId = convertHexToDecimal(chainId).toString();
+  const url = __privateMethod(this, _getOwnerNftApi, getOwnerNftApi_fn).call(this, {
+    chainId: convertedChainId,
+    address,
+    next: cursor
+  });
+  const nftApiResponse = await handleFetch(url, {
+    headers: {
+      Version: NFT_API_VERSION
+    }
+  });
+  return nftApiResponse;
+};
+var NftDetectionController_default = NftDetectionController;
+
+export {
+  BlockaidResultType,
+  NftDetectionController,
+  NftDetectionController_default
+};
+//# sourceMappingURL=chunk-2IIQTSLV.mjs.map

package/dist/chunk-2IIQTSLV.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/NftDetectionController.ts"],"sourcesContent":["import type { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';\nimport type { AddApprovalRequest } from '@metamask/approval-controller';\nimport type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport {\n  toChecksumHexAddress,\n  ChainId,\n  NFT_API_BASE_URL,\n  NFT_API_VERSION,\n  convertHexToDecimal,\n  handleFetch,\n} from '@metamask/controller-utils';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerStateChangeEvent,\n  NetworkControllerGetStateAction,\n} from '@metamask/network-controller';\nimport type {\n  PreferencesControllerGetStateAction,\n  PreferencesControllerStateChangeEvent,\n  PreferencesState,\n} from '@metamask/preferences-controller';\nimport { createDeferredPromise, type Hex } from '@metamask/utils';\n\nimport { Source } from './constants';\nimport {\n  type NftController,\n  type NftControllerState,\n  type NftMetadata,\n} from './NftController';\n\nconst controllerName = 'NftDetectionController';\n\nexport type NFTDetectionControllerState = Record<never, never>;\n\nexport type AllowedActions =\n  | AddApprovalRequest\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | PreferencesControllerGetStateAction\n  | AccountsControllerGetSelectedAccountAction;\n\nexport type AllowedEvents =\n  | PreferencesControllerStateChangeEvent\n  | NetworkControllerStateChangeEvent;\n\nexport type NftDetectionControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  AllowedActions,\n  AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\nconst supportedNftDetectionNetworks: Hex[] = [ChainId.mainnet];\n\n/**\n * @type ApiNft\n *\n * NFT object coming from OpenSea api\n * @property token_id - The NFT identifier\n * @property num_sales - Number of sales\n * @property background_color - The background color to be displayed with the item\n * @property image_url - URI of an image associated with this NFT\n * @property image_preview_url - URI of a smaller image associated with this NFT\n * @property image_thumbnail_url - URI of a thumbnail image associated with this NFT\n * @property image_original_url - URI of the original image associated with this NFT\n * @property animation_url - URI of a animation associated with this NFT\n * @property animation_original_url - URI of the original animation associated with this NFT\n * @property name - The NFT name\n * @property description - The NFT description\n * @property external_link - External link containing additional information\n * @property assetContract - The NFT contract information object\n * @property creator - The NFT owner information object\n * @property lastSale - When this item was last sold\n */\nexport type ApiNft = {\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  token_id: string;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  num_sales: number | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  background_color: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  image_url: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  image_preview_url: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  image_thumbnail_url: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  image_original_url: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  animation_url: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  animation_original_url: string | null;\n  name: string | null;\n  description: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  external_link: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  asset_contract: ApiNftContract;\n  creator: ApiNftCreator;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  last_sale: ApiNftLastSale | null;\n};\n\n/**\n * @type ApiNftContract\n *\n * NFT contract object coming from OpenSea api\n * @property address - Address of the NFT contract\n * @property asset_contract_type - The NFT type, it could be `semi-fungible` or `non-fungible`\n * @property created_date - Creation date\n * @property collection - Object containing the contract name and URI of an image associated\n * @property schema_name - The schema followed by the contract, it could be `ERC721` or `ERC1155`\n * @property symbol - The NFT contract symbol\n * @property total_supply - Total supply of NFTs\n * @property description - The NFT contract description\n * @property external_link - External link containing additional information\n */\nexport type ApiNftContract = {\n  address: string;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  asset_contract_type: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  created_date: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  schema_name: string | null;\n  symbol: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  total_supply: string | null;\n  description: string | null;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  external_link: string | null;\n  collection: {\n    name: string | null;\n    // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    image_url?: string | null;\n    tokenCount?: string | null;\n  };\n};\n\n/**\n * @type ApiNftLastSale\n *\n * NFT sale object coming from OpenSea api\n * @property event_timestamp - Object containing a `username`\n * @property total_price - URI of NFT image associated with this owner\n * @property transaction - Object containing transaction_hash and block_hash\n */\nexport type ApiNftLastSale = {\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  event_timestamp: string;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  total_price: string;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  transaction: { transaction_hash: string; block_hash: string };\n};\n\n/**\n * @type ApiNftCreator\n *\n * NFT creator object coming from OpenSea api\n * @property user - Object containing a `username`\n * @property profile_img_url - URI of NFT image associated with this owner\n * @property address - The owner address\n */\nexport type ApiNftCreator = {\n  user: { username: string };\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  profile_img_url: string;\n  address: string;\n};\n\nexport type ReservoirResponse = {\n  tokens: TokensResponse[];\n  continuation?: string;\n};\n\nexport type TokensResponse = {\n  token: TokenResponse;\n  ownership: Ownership;\n  market?: Market;\n  blockaidResult?: Blockaid;\n};\n\nexport enum BlockaidResultType {\n  Benign = 'Benign',\n  Spam = 'Spam',\n  Warning = 'Warning',\n  Malicious = 'Malicious',\n}\n\nexport type Blockaid = {\n  contract: string;\n  chainId: number;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  result_type: BlockaidResultType;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  malicious_score: string;\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  attack_types: object;\n};\n\nexport type Market = {\n  floorAsk?: FloorAsk;\n  topBid?: TopBid;\n};\n\nexport type TokenResponse = {\n  chainId: number;\n  contract: string;\n  tokenId: string;\n  kind?: string;\n  name?: string;\n  image?: string;\n  imageSmall?: string;\n  imageLarge?: string;\n  metadata?: Metadata;\n  description?: string;\n  supply?: number;\n  remainingSupply?: number;\n  rarityScore?: number;\n  rarity?: number;\n  rarityRank?: number;\n  media?: string;\n  isFlagged?: boolean;\n  isSpam?: boolean;\n  isNsfw?: boolean;\n  metadataDisabled?: boolean;\n  lastFlagUpdate?: string;\n  lastFlagChange?: string;\n  collection?: Collection;\n  lastSale?: LastSale;\n  topBid?: TopBid;\n  lastAppraisalValue?: number;\n  attributes?: Attributes[];\n};\n\nexport type TopBid = {\n  id?: string;\n  price?: Price;\n  source?: {\n    id?: string;\n    domain?: string;\n    name?: string;\n    icon?: string;\n    url?: string;\n  };\n};\n\nexport type LastSale = {\n  saleId?: string;\n  token?: {\n    contract?: string;\n    tokenId?: string;\n    name?: string;\n    image?: string;\n    collection?: {\n      id?: string;\n      name?: string;\n    };\n  };\n  orderSource?: string;\n  orderSide?: 'ask' | 'bid';\n  orderKind?: string;\n  orderId?: string;\n  from?: string;\n  to?: string;\n  amount?: string;\n  fillSource?: string;\n  block?: number;\n  txHash?: string;\n  logIndex?: number;\n  batchIndex?: number;\n  timestamp?: number;\n  price?: Price;\n  washTradingScore?: number;\n  royaltyFeeBps?: number;\n  marketplaceFeeBps?: number;\n  paidFullRoyalty?: boolean;\n  feeBreakdown?: FeeBreakdown[];\n  isDeleted?: boolean;\n  createdAt?: string;\n  updatedAt?: string;\n};\n\nexport type FeeBreakdown = {\n  kind?: string;\n  bps?: number;\n  recipient?: string;\n  source?: string;\n  rawAmount?: string;\n};\n\nexport type Attributes = {\n  key?: string;\n  kind?: string;\n  value: string;\n  tokenCount?: number;\n  onSaleCount?: number;\n  floorAskPrice?: Price | null;\n  topBidValue?: number | null;\n  createdAt?: string;\n};\n\nexport type Collection = {\n  id?: string;\n  name?: string;\n  slug?: string;\n  symbol?: string;\n  imageUrl?: string;\n  image?: string;\n  isSpam?: boolean;\n  isNsfw?: boolean;\n  creator?: string;\n  tokenCount?: string;\n  metadataDisabled?: boolean;\n  openseaVerificationStatus?: string;\n  floorAskPrice?: Price;\n  royaltiesBps?: number;\n  royalties?: Royalties[];\n};\n\nexport type Royalties = {\n  bps?: number;\n  recipient?: string;\n};\n\nexport type Ownership = {\n  tokenCount?: string;\n  onSaleCount?: string;\n  floorAsk?: FloorAsk;\n  acquiredAt?: string;\n};\n\nexport type FloorAsk = {\n  id?: string;\n  price?: Price;\n  maker?: string;\n  kind?: string;\n  validFrom?: number;\n  validUntil?: number;\n  source?: Source;\n  rawData?: Metadata;\n  isNativeOffChainCancellable?: boolean;\n};\n\nexport type Price = {\n  currency?: {\n    contract?: string;\n    name?: string;\n    symbol?: string;\n    decimals?: number;\n    chainId?: number;\n  };\n  amount?: {\n    raw?: string;\n    decimal?: number;\n    usd?: number;\n    native?: number;\n  };\n  netAmount?: {\n    raw?: string;\n    decimal?: number;\n    usd?: number;\n    native?: number;\n  };\n};\n\nexport type Metadata = {\n  imageOriginal?: string;\n  tokenURI?: string;\n};\n\n/**\n * Controller that passively detects nfts for a user address\n */\nexport class NftDetectionController extends BaseController<\n  typeof controllerName,\n  NFTDetectionControllerState,\n  NftDetectionControllerMessenger\n> {\n  #disabled: boolean;\n\n  readonly #addNft: NftController['addNft'];\n\n  readonly #getNftState: () => NftControllerState;\n\n  #inProcessNftFetchingUpdates: Record<`${Hex}:${string}`, Promise<void>>;\n\n  /**\n   * The controller options\n   *\n   * @param options - The controller options.\n   * @param options.messenger - A reference to the messaging system.\n   * @param options.disabled - Represents previous value of useNftDetection. Used to detect changes of useNftDetection. Default value is true.\n   * @param options.addNft - Add an NFT.\n   * @param options.getNftState - Gets the current state of the Assets controller.\n   */\n  constructor({\n    messenger,\n    disabled = false,\n    addNft,\n    getNftState,\n  }: {\n    messenger: NftDetectionControllerMessenger;\n    disabled: boolean;\n    addNft: NftController['addNft'];\n    getNftState: () => NftControllerState;\n  }) {\n    super({\n      name: controllerName,\n      messenger,\n      metadata: {},\n      state: {},\n    });\n    this.#disabled = disabled;\n    this.#inProcessNftFetchingUpdates = {};\n\n    this.#getNftState = getNftState;\n    this.#addNft = addNft;\n\n    this.messagingSystem.subscribe(\n      'PreferencesController:stateChange',\n      this.#onPreferencesControllerStateChange.bind(this),\n    );\n  }\n\n  /**\n   * Checks whether network is mainnet or not.\n   *\n   * @returns Whether current network is mainnet.\n   */\n  isMainnet(): boolean {\n    const { selectedNetworkClientId } = this.messagingSystem.call(\n      'NetworkController:getState',\n    );\n    const {\n      configuration: { chainId },\n    } = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      selectedNetworkClientId,\n    );\n    return chainId === ChainId.mainnet;\n  }\n\n  isMainnetByNetworkClientId(networkClient: NetworkClient): boolean {\n    return networkClient.configuration.chainId === ChainId.mainnet;\n  }\n\n  /**\n   * Handles the state change of the preference controller.\n   * @param preferencesState - The new state of the preference controller.\n   * @param preferencesState.useNftDetection - Boolean indicating user preference on NFT detection.\n   */\n  #onPreferencesControllerStateChange({ useNftDetection }: PreferencesState) {\n    if (!useNftDetection !== this.#disabled) {\n      this.#disabled = !useNftDetection;\n    }\n  }\n\n  #getOwnerNftApi({\n    chainId,\n    address,\n    next,\n  }: {\n    chainId: string;\n    address: string;\n    next?: string;\n  }) {\n    return `${\n      NFT_API_BASE_URL as string\n    }/users/${address}/tokens?chainIds=${chainId}&limit=50&includeTopBid=true&continuation=${\n      next ?? ''\n    }`;\n  }\n\n  async #getOwnerNfts(\n    address: string,\n    chainId: Hex,\n    cursor: string | undefined,\n  ) {\n    // Convert hex chainId to number\n    const convertedChainId = convertHexToDecimal(chainId).toString();\n    const url = this.#getOwnerNftApi({\n      chainId: convertedChainId,\n      address,\n      next: cursor,\n    });\n    const nftApiResponse: ReservoirResponse = await handleFetch(url, {\n      headers: {\n        Version: NFT_API_VERSION,\n      },\n    });\n    return nftApiResponse;\n  }\n\n  /**\n   * Triggers asset ERC721 token auto detection on mainnet. Any newly detected NFTs are\n   * added.\n   *\n   * @param options - Options bag.\n   * @param options.networkClientId - The network client ID to detect NFTs on.\n   * @param options.userAddress - The address to detect NFTs for.\n   */\n  async detectNfts(options?: {\n    networkClientId?: NetworkClientId;\n    userAddress?: string;\n  }) {\n    const userAddress =\n      options?.userAddress ??\n      this.messagingSystem.call('AccountsController:getSelectedAccount')\n        .address;\n\n    const { selectedNetworkClientId } = this.messagingSystem.call(\n      'NetworkController:getState',\n    );\n    const {\n      configuration: { chainId },\n    } = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      selectedNetworkClientId,\n    );\n\n    /* istanbul ignore if */\n    if (!supportedNftDetectionNetworks.includes(chainId) || this.#disabled) {\n      return;\n    }\n    /* istanbul ignore else */\n    if (!userAddress) {\n      return;\n    }\n\n    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n    const updateKey: `${Hex}:${string}` = `${chainId}:${userAddress}`;\n    if (updateKey in this.#inProcessNftFetchingUpdates) {\n      // This prevents redundant updates\n      // This promise is resolved after the in-progress update has finished,\n      // and state has been updated.\n      await this.#inProcessNftFetchingUpdates[updateKey];\n      return;\n    }\n\n    const {\n      promise: inProgressUpdate,\n      resolve: updateSucceeded,\n      reject: updateFailed,\n    } = createDeferredPromise({ suppressUnhandledRejection: true });\n    this.#inProcessNftFetchingUpdates[updateKey] = inProgressUpdate;\n\n    let next;\n    let apiNfts: TokensResponse[] = [];\n    let resultNftApi: ReservoirResponse;\n    try {\n      do {\n        resultNftApi = await this.#getOwnerNfts(userAddress, chainId, next);\n        apiNfts = resultNftApi.tokens.filter(\n          (elm) =>\n            elm.token.isSpam === false &&\n            (elm.blockaidResult?.result_type\n              ? elm.blockaidResult?.result_type === BlockaidResultType.Benign\n              : true),\n        );\n        const addNftPromises = apiNfts.map(async (nft) => {\n          const {\n            tokenId,\n            contract,\n            kind,\n            image: imageUrl,\n            imageSmall: imageThumbnailUrl,\n            metadata: { imageOriginal: imageOriginalUrl } = {},\n            name,\n            description,\n            attributes,\n            topBid,\n            lastSale,\n            rarityRank,\n            rarityScore,\n            collection,\n          } = nft.token;\n\n          let ignored;\n          /* istanbul ignore else */\n          const { ignoredNfts } = this.#getNftState();\n          if (ignoredNfts.length) {\n            ignored = ignoredNfts.find((c) => {\n              /* istanbul ignore next */\n              return (\n                c.address === toChecksumHexAddress(contract) &&\n                c.tokenId === tokenId\n              );\n            });\n          }\n\n          /* istanbul ignore else */\n          if (!ignored) {\n            /* istanbul ignore next */\n            const nftMetadata: NftMetadata = Object.assign(\n              {},\n              { name },\n              description && { description },\n              imageUrl && { image: imageUrl },\n              imageThumbnailUrl && { imageThumbnail: imageThumbnailUrl },\n              imageOriginalUrl && { imageOriginal: imageOriginalUrl },\n              kind && { standard: kind.toUpperCase() },\n              lastSale && { lastSale },\n              attributes && { attributes },\n              topBid && { topBid },\n              rarityRank && { rarityRank },\n              rarityScore && { rarityScore },\n              collection && { collection },\n            );\n\n            await this.#addNft(contract, tokenId, {\n              nftMetadata,\n              userAddress,\n              source: Source.Detected,\n              networkClientId: options?.networkClientId,\n            });\n          }\n        });\n        await Promise.all(addNftPromises);\n      } while ((next = resultNftApi.continuation));\n      updateSucceeded();\n    } catch (error) {\n      updateFailed(error);\n      throw error;\n    } finally {\n      delete this.#inProcessNftFetchingUpdates[updateKey];\n    }\n  }\n}\n\nexport default NftDetectionController;\n"],"mappings":"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","names":["BlockaidResultType"]}

package/dist/{chunk-4AC3X2U5.js → chunk-2NQRWANM.js}

@@ -1,17 +1,17 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkB5YY22QQjs = require('./chunk-B5YY22QQ.js');
+var _chunk6PPM4ETZjs = require('./chunk-6PPM4ETZ.js');
 
 
-var _chunkBOTVAG4Ajs = require('./chunk-BOTVAG4A.js');
+var _chunkJBF4XEGRjs = require('./chunk-JBF4XEGR.js');
 
 
 
-var _chunkPYMUBJQXjs = require('./chunk-PYMUBJQX.js');
+var _chunkX4RMS365js = require('./chunk-X4RMS365.js');
 
 
 
-var _chunkNEXY7SE2js = require('./chunk-NEXY7SE2.js');
+var _chunkNYVA7ZTQjs = require('./chunk-NYVA7ZTQ.js');
 
 
 
@@ -76,20 +76,18 @@ var getDefaultTokensState = () => {
     allDetectedTokens: {}
   };
 };
-var _mutex, _chainId, _selectedAddress, _provider, _abortController, _onNetworkDidChange, onNetworkDidChange_fn, _onPreferenceControllerStateChange, onPreferenceControllerStateChange_fn, _fetchTokenMetadata, fetchTokenMetadata_fn, _updateTokensAttribute, updateTokensAttribute_fn, _detectIsERC721, detectIsERC721_fn, _getProvider, getProvider_fn, _createEthersContract, createEthersContract_fn, _generateRandomId, generateRandomId_fn, _getNewAllTokensState, getNewAllTokensState_fn, _requestApproval, requestApproval_fn;
+var _mutex, _chainId, _selectedAccountId, _provider, _abortController, _onNetworkDidChange, onNetworkDidChange_fn, _onSelectedAccountChange, onSelectedAccountChange_fn, _fetchTokenMetadata, fetchTokenMetadata_fn, _updateTokensAttribute, updateTokensAttribute_fn, _detectIsERC721, detectIsERC721_fn, _getProvider, getProvider_fn, _createEthersContract, createEthersContract_fn, _generateRandomId, generateRandomId_fn, _getNewAllTokensState, getNewAllTokensState_fn, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn, _isInteractingWithWallet, isInteractingWithWallet_fn, _requestApproval, requestApproval_fn, _getSelectedAccount, getSelectedAccount_fn, _getSelectedAddress, getSelectedAddress_fn;
 var TokensController = class extends _basecontroller.BaseController {
   /**
    * Tokens controller options
    * @param options - Constructor options.
    * @param options.chainId - The chain ID of the current network.
-   * @param options.selectedAddress - Vault selected address
    * @param options.provider - Network provider.
    * @param options.state - Initial state to set on this controller.
    * @param options.messenger - The controller messenger.
    */
   constructor({
     chainId: initialChainId,
-    selectedAddress,
     provider,
     state,
     messenger
@@ -107,15 +105,15 @@ var TokensController = class extends _basecontroller.BaseController {
      * Handles the event when the network changes.
      *
      * @param networkState - The changed network state.
-     * @param networkState.providerConfig - RPC URL and network name provider settings of the currently connected network
+     * @param networkState.selectedNetworkClientId - The ID of the currently
+     * selected network client.
      */
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onNetworkDidChange);
     /**
-     * Handles the state change of the preference controller.
-     * @param preferencesState - The new state of the preference controller.
-     * @param preferencesState.selectedAddress - The current selected address of the preference controller.
+     * Handles the selected account change in the accounts controller.
+     * @param selectedAccount - The new selected account
      */
-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onPreferenceControllerStateChange);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _onSelectedAccountChange);
     /**
      * Fetch metadata for a token.
      *
@@ -155,23 +153,27 @@ var TokensController = class extends _basecontroller.BaseController {
      * @returns The updated `allTokens` and `allIgnoredTokens` state.
      */
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getNewAllTokensState);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getAddressOrSelectedAddress);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _isInteractingWithWallet);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _requestApproval);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getSelectedAccount);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getSelectedAddress);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _mutex, new (0, _asyncmutex.Mutex)());
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _chainId, void 0);
-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _selectedAddress, void 0);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _selectedAccountId, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _provider, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _abortController, void 0);
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _chainId, initialChainId);
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _provider, provider);
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _selectedAddress, selectedAddress);
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _selectedAccountId, _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAccount, getSelectedAccount_fn).call(this).id);
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _abortController, new AbortController());
     this.messagingSystem.registerActionHandler(
       `${controllerName}:addDetectedTokens`,
       this.addDetectedTokens.bind(this)
     );
     this.messagingSystem.subscribe(
-      "PreferencesController:stateChange",
-      _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onPreferenceControllerStateChange, onPreferenceControllerStateChange_fn).bind(this)
+      "AccountsController:selectedEvmAccountChange",
+      _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onSelectedAccountChange, onSelectedAccountChange_fn).bind(this)
     );
     this.messagingSystem.subscribe(
       "NetworkController:networkDidChange",
@@ -210,7 +212,6 @@ var TokensController = class extends _basecontroller.BaseController {
     networkClientId
   }) {
     const chainId = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId);
-    const selectedAddress = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress);
     const releaseLock = await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _mutex).acquire();
     const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
     let currentChainId = chainId;
@@ -220,8 +221,8 @@ var TokensController = class extends _basecontroller.BaseController {
         networkClientId
       ).configuration.chainId;
     }
-    const accountAddress = interactingAddress || selectedAddress;
-    const isInteractingWithWalletAccount = accountAddress === selectedAddress;
+    const accountAddress = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, interactingAddress);
+    const isInteractingWithWalletAccount = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _isInteractingWithWallet, isInteractingWithWallet_fn).call(this, accountAddress);
     try {
       address = _controllerutils.toChecksumHexAddress.call(void 0, address);
       const tokens = allTokens[currentChainId]?.[accountAddress] || [];
@@ -242,12 +243,12 @@ var TokensController = class extends _basecontroller.BaseController {
         address,
         symbol,
         decimals,
-        image: image || _chunkNEXY7SE2js.formatIconUrlWithProxy.call(void 0, {
+        image: image || _chunkNYVA7ZTQjs.formatIconUrlWithProxy.call(void 0, {
           chainId: currentChainId,
           tokenAddress: address
         }),
         isERC721,
-        aggregators: _chunkNEXY7SE2js.formatAggregatorNames.call(void 0, tokenMetadata?.aggregators || []),
+        aggregators: _chunkNYVA7ZTQjs.formatAggregatorNames.call(void 0, tokenMetadata?.aggregators || []),
         name
       };
       const previousIndex = newTokens.findIndex(
@@ -400,7 +401,7 @@ var TokensController = class extends _basecontroller.BaseController {
   async addDetectedTokens(incomingDetectedTokens, detectionDetails) {
     const releaseLock = await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _mutex).acquire();
     const chainId = detectionDetails?.chainId ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId);
-    const accountAddress = detectionDetails?.selectedAddress ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress);
+    const accountAddress = detectionDetails?.selectedAddress ?? _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAddress, getSelectedAddress_fn).call(this);
     const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state;
     let newTokens = [...allTokens?.[chainId]?.[accountAddress] ?? []];
     let newDetectedTokens = [
@@ -452,8 +453,9 @@ var TokensController = class extends _basecontroller.BaseController {
         interactingAddress: accountAddress,
         interactingChainId: chainId
       });
-      newTokens = newAllTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)] || [];
-      newDetectedTokens = newAllDetectedTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)] || [];
+      const selectedAddress = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAddress, getSelectedAddress_fn).call(this);
+      newTokens = newAllTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAddress] || [];
+      newDetectedTokens = newAllDetectedTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAddress] || [];
       this.update((state) => {
         state.tokens = newTokens;
         state.allTokens = newAllTokens;
@@ -510,23 +512,28 @@ var TokensController = class extends _basecontroller.BaseController {
     if (!_controllerutils.isValidHexAddress.call(void 0, asset.address)) {
       throw _rpcerrors.rpcErrors.invalidParams(`Invalid address "${asset.address}"`);
     }
+    const selectedAddress = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, interactingAddress);
     if (await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _detectIsERC721, detectIsERC721_fn).call(this, asset.address, networkClientId)) {
       throw _rpcerrors.rpcErrors.invalidParams(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `Contract ${asset.address} must match type ${type}, but was detected as ${_controllerutils.ERC721}`
       );
     }
     const provider = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getProvider, getProvider_fn).call(this, networkClientId);
     const isErc1155 = await _controllerutils.safelyExecute.call(void 0, 
-      () => new (0, _chunkBOTVAG4Ajs.ERC1155Standard)(provider).contractSupportsBase1155Interface(
+      () => new (0, _chunkJBF4XEGRjs.ERC1155Standard)(provider).contractSupportsBase1155Interface(
         asset.address
       )
     );
     if (isErc1155) {
       throw _rpcerrors.rpcErrors.invalidParams(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `Contract ${asset.address} must match type ${type}, but was detected as ${_controllerutils.ERC1155}`
       );
     }
-    const erc20 = new (0, _chunkB5YY22QQjs.ERC20Standard)(provider);
+    const erc20 = new (0, _chunk6PPM4ETZjs.ERC20Standard)(provider);
     const [contractName, contractSymbol, contractDecimals] = await Promise.all([
       _controllerutils.safelyExecute.call(void 0, () => erc20.getTokenName(asset.address)),
       _controllerutils.safelyExecute.call(void 0, () => erc20.getTokenSymbol(asset.address)),
@@ -540,6 +547,8 @@ var TokensController = class extends _basecontroller.BaseController {
     }
     if (contractSymbol !== void 0 && asset.symbol !== void 0 && asset.symbol.toUpperCase() !== contractSymbol.toUpperCase()) {
       throw _rpcerrors.rpcErrors.invalidParams(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `The symbol in the request (${asset.symbol}) does not match the symbol in the contract (${contractSymbol})`
       );
     }
@@ -559,6 +568,8 @@ var TokensController = class extends _basecontroller.BaseController {
     }
     if (contractDecimals !== void 0 && asset.decimals !== void 0 && String(asset.decimals) !== contractDecimals) {
       throw _rpcerrors.rpcErrors.invalidParams(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `The decimals in the request (${asset.decimals}) do not match the decimals in the contract (${contractDecimals})`
       );
     }
@@ -566,6 +577,8 @@ var TokensController = class extends _basecontroller.BaseController {
     const decimalsNum = parseInt(decimalsStr, 10);
     if (!Number.isInteger(decimalsNum) || decimalsNum > 36 || decimalsNum < 0) {
       throw _rpcerrors.rpcErrors.invalidParams(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `Invalid decimals "${decimalsStr}": must be an integer 0 <= 36`
       );
     }
@@ -575,7 +588,7 @@ var TokensController = class extends _basecontroller.BaseController {
       id: _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _generateRandomId, generateRandomId_fn).call(this),
       time: Date.now(),
       type,
-      interactingAddress: interactingAddress || _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)
+      interactingAddress: selectedAddress
     };
     await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _requestApproval, requestApproval_fn).call(this, suggestedAssetMeta);
     const { address, symbol, decimals, name, image } = asset;
@@ -601,43 +614,48 @@ var TokensController = class extends _basecontroller.BaseController {
 };
 _mutex = new WeakMap();
 _chainId = new WeakMap();
-_selectedAddress = new WeakMap();
+_selectedAccountId = new WeakMap();
 _provider = new WeakMap();
 _abortController = new WeakMap();
 _onNetworkDidChange = new WeakSet();
-onNetworkDidChange_fn = function({ providerConfig }) {
+onNetworkDidChange_fn = function({ selectedNetworkClientId }) {
+  const selectedNetworkClient = this.messagingSystem.call(
+    "NetworkController:getNetworkClientById",
+    selectedNetworkClientId
+  );
   const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
-  const { chainId } = providerConfig;
+  const { chainId } = selectedNetworkClient.configuration;
   _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _abortController).abort();
   _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _abortController, new AbortController());
   _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _chainId, chainId);
+  const selectedAddress = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAddress, getSelectedAddress_fn).call(this);
   this.update((state) => {
-    state.tokens = allTokens[chainId]?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)] || [];
-    state.ignoredTokens = allIgnoredTokens[chainId]?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)] || [];
-    state.detectedTokens = allDetectedTokens[chainId]?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress)] || [];
+    state.tokens = allTokens[chainId]?.[selectedAddress] || [];
+    state.ignoredTokens = allIgnoredTokens[chainId]?.[selectedAddress] || [];
+    state.detectedTokens = allDetectedTokens[chainId]?.[selectedAddress] || [];
   });
 };
-_onPreferenceControllerStateChange = new WeakSet();
-onPreferenceControllerStateChange_fn = function({ selectedAddress }) {
+_onSelectedAccountChange = new WeakSet();
+onSelectedAccountChange_fn = function(selectedAccount) {
   const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
-  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _selectedAddress, selectedAddress);
+  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _selectedAccountId, selectedAccount.id);
   this.update((state) => {
-    state.tokens = allTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAddress] ?? [];
-    state.ignoredTokens = allIgnoredTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAddress] ?? [];
-    state.detectedTokens = allDetectedTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAddress] ?? [];
+    state.tokens = allTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAccount.address] ?? [];
+    state.ignoredTokens = allIgnoredTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAccount.address] ?? [];
+    state.detectedTokens = allDetectedTokens[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[selectedAccount.address] ?? [];
   });
 };
 _fetchTokenMetadata = new WeakSet();
 fetchTokenMetadata_fn = async function(tokenAddress) {
   try {
-    const token = await _chunkPYMUBJQXjs.fetchTokenMetadata.call(void 0, 
+    const token = await _chunkX4RMS365js.fetchTokenMetadata.call(void 0, 
       _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId),
       tokenAddress,
       _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _abortController).signal
     );
     return token;
   } catch (error) {
-    if (error instanceof Error && error.message.includes(_chunkPYMUBJQXjs.TOKEN_METADATA_NO_SUPPORT_ERROR)) {
+    if (error instanceof Error && error.message.includes(_chunkX4RMS365js.TOKEN_METADATA_NO_SUPPORT_ERROR)) {
       return void 0;
     }
     throw error;
@@ -699,7 +717,7 @@ getNewAllTokensState_fn = function(params) {
     interactingChainId
   } = params;
   const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
-  const userAddressToAddTokens = interactingAddress ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress);
+  const userAddressToAddTokens = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getAddressOrSelectedAddress, getAddressOrSelectedAddress_fn).call(this, interactingAddress);
   const chainIdToAddTokens = interactingChainId ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId);
   let newAllTokens = allTokens;
   if (newTokens?.length || newTokens && allTokens && allTokens[chainIdToAddTokens] && allTokens[chainIdToAddTokens][userAddressToAddTokens]) {
@@ -739,6 +757,18 @@ getNewAllTokensState_fn = function(params) {
   }
   return { newAllTokens, newAllIgnoredTokens, newAllDetectedTokens };
 };
+_getAddressOrSelectedAddress = new WeakSet();
+getAddressOrSelectedAddress_fn = function(address) {
+  if (address) {
+    return address;
+  }
+  return _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAddress, getSelectedAddress_fn).call(this);
+};
+_isInteractingWithWallet = new WeakSet();
+isInteractingWithWallet_fn = function(address) {
+  const selectedAddress = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getSelectedAddress, getSelectedAddress_fn).call(this);
+  return selectedAddress === address;
+};
 _requestApproval = new WeakSet();
 requestApproval_fn = async function(suggestedAssetMeta) {
   return this.messagingSystem.call(
@@ -761,6 +791,18 @@ requestApproval_fn = async function(suggestedAssetMeta) {
     true
   );
 };
+_getSelectedAccount = new WeakSet();
+getSelectedAccount_fn = function() {
+  return this.messagingSystem.call("AccountsController:getSelectedAccount");
+};
+_getSelectedAddress = new WeakSet();
+getSelectedAddress_fn = function() {
+  const account = this.messagingSystem.call(
+    "AccountsController:getAccount",
+    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+  );
+  return account?.address || "";
+};
 var TokensController_default = TokensController;
 
 
@@ -768,4 +810,4 @@ var TokensController_default = TokensController;
 
 
 exports.getDefaultTokensState = getDefaultTokensState; exports.TokensController = TokensController; exports.TokensController_default = TokensController_default;
-//# sourceMappingURL=chunk-4AC3X2U5.js.map
+//# sourceMappingURL=chunk-2NQRWANM.js.map