@metamask-previews/assets-controllers 29.0.0-preview-4f42b747 → 29.0.0-preview-9668d77

package/dist/AccountTrackerController.js

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkIBVBMCBCjs = require('./chunk-IBVBMCBC.js');
+var _chunkV4ZO3F2Sjs = require('./chunk-V4ZO3F2S.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.AccountTrackerController = _chunkIBVBMCBCjs.AccountTrackerController; exports.default = _chunkIBVBMCBCjs.AccountTrackerController_default;
+exports.AccountTrackerController = _chunkV4ZO3F2Sjs.AccountTrackerController; exports.default = _chunkV4ZO3F2Sjs.AccountTrackerController_default;
 //# sourceMappingURL=AccountTrackerController.js.map

package/dist/AccountTrackerController.mjs

@@ -1,7 +1,7 @@
 import {
   AccountTrackerController,
   AccountTrackerController_default
-} from "./chunk-Z6ZA6Y2D.mjs";
+} from "./chunk-PAJTKWEC.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   AccountTrackerController,

package/dist/NftController.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkBJPNGBHLjs = require('./chunk-BJPNGBHL.js');
+var _chunkLAU6ZDZRjs = require('./chunk-LAU6ZDZR.js');
 require('./chunk-RGHTNZQ6.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
@@ -10,5 +10,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.NftController = _chunkBJPNGBHLjs.NftController; exports.default = _chunkBJPNGBHLjs.NftController_default; exports.getDefaultNftState = _chunkBJPNGBHLjs.getDefaultNftState;
+exports.NftController = _chunkLAU6ZDZRjs.NftController; exports.default = _chunkLAU6ZDZRjs.NftController_default; exports.getDefaultNftState = _chunkLAU6ZDZRjs.getDefaultNftState;
 //# sourceMappingURL=NftController.js.map

package/dist/NftController.mjs

@@ -2,7 +2,7 @@ import {
   NftController,
   NftController_default,
   getDefaultNftState
-} from "./chunk-RACML7LZ.mjs";
+} from "./chunk-46UZDIXW.mjs";
 import "./chunk-CP3HC7AQ.mjs";
 import "./chunk-Q5JRBGWO.mjs";
 import "./chunk-XUI43LEZ.mjs";

package/dist/NftDetectionController.js

@@ -2,12 +2,12 @@
 
 
 
-var _chunk5I3VJR3Wjs = require('./chunk-5I3VJR3W.js');
+var _chunkFMZML3V5js = require('./chunk-FMZML3V5.js');
 require('./chunk-RGHTNZQ6.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.BlockaidResultType = _chunk5I3VJR3Wjs.BlockaidResultType; exports.NftDetectionController = _chunk5I3VJR3Wjs.NftDetectionController; exports.default = _chunk5I3VJR3Wjs.NftDetectionController_default;
+exports.BlockaidResultType = _chunkFMZML3V5js.BlockaidResultType; exports.NftDetectionController = _chunkFMZML3V5js.NftDetectionController; exports.default = _chunkFMZML3V5js.NftDetectionController_default;
 //# sourceMappingURL=NftDetectionController.js.map

package/dist/NftDetectionController.mjs

@@ -2,7 +2,7 @@ import {
   BlockaidResultType,
   NftDetectionController,
   NftDetectionController_default
-} from "./chunk-GI5HUKV3.mjs";
+} from "./chunk-KOKB6U4Z.mjs";
 import "./chunk-CP3HC7AQ.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {

package/dist/TokenBalancesController.js

@@ -2,11 +2,11 @@
 
 
 
-var _chunkYCDWCM4Pjs = require('./chunk-YCDWCM4P.js');
+var _chunkLD4GC7ORjs = require('./chunk-LD4GC7OR.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokenBalancesController = _chunkYCDWCM4Pjs.TokenBalancesController; exports.default = _chunkYCDWCM4Pjs.TokenBalancesController_default; exports.getDefaultTokenBalancesState = _chunkYCDWCM4Pjs.getDefaultTokenBalancesState;
+exports.TokenBalancesController = _chunkLD4GC7ORjs.TokenBalancesController; exports.default = _chunkLD4GC7ORjs.TokenBalancesController_default; exports.getDefaultTokenBalancesState = _chunkLD4GC7ORjs.getDefaultTokenBalancesState;
 //# sourceMappingURL=TokenBalancesController.js.map

package/dist/TokenBalancesController.mjs

@@ -2,7 +2,7 @@ import {
   TokenBalancesController,
   TokenBalancesController_default,
   getDefaultTokenBalancesState
-} from "./chunk-K2GBXL67.mjs";
+} from "./chunk-4LY47RPI.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   TokenBalancesController,

package/dist/TokenDetectionController.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunkABKOMHQ3js = require('./chunk-ABKOMHQ3.js');
+var _chunkHDI4L2DDjs = require('./chunk-HDI4L2DD.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
 
@@ -13,5 +13,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.STATIC_MAINNET_TOKEN_LIST = _chunkABKOMHQ3js.STATIC_MAINNET_TOKEN_LIST; exports.TokenDetectionController = _chunkABKOMHQ3js.TokenDetectionController; exports.controllerName = _chunkABKOMHQ3js.controllerName; exports.default = _chunkABKOMHQ3js.TokenDetectionController_default; exports.isEqualCaseInsensitive = _chunkABKOMHQ3js.isEqualCaseInsensitive;
+exports.STATIC_MAINNET_TOKEN_LIST = _chunkHDI4L2DDjs.STATIC_MAINNET_TOKEN_LIST; exports.TokenDetectionController = _chunkHDI4L2DDjs.TokenDetectionController; exports.controllerName = _chunkHDI4L2DDjs.controllerName; exports.default = _chunkHDI4L2DDjs.TokenDetectionController_default; exports.isEqualCaseInsensitive = _chunkHDI4L2DDjs.isEqualCaseInsensitive;
 //# sourceMappingURL=TokenDetectionController.js.map

package/dist/TokenDetectionController.mjs

@@ -4,7 +4,7 @@ import {
   TokenDetectionController_default,
   controllerName,
   isEqualCaseInsensitive
-} from "./chunk-MSG22JIL.mjs";
+} from "./chunk-MR6EF4B7.mjs";
 import "./chunk-Q5JRBGWO.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {

package/dist/TokenRatesController.js

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkLNARUJIFjs = require('./chunk-LNARUJIF.js');
+var _chunkWZO3LJEJjs = require('./chunk-WZO3LJEJ.js');
 require('./chunk-7K6PSEAA.js');
 require('./chunk-WB6KJX4N.js');
 require('./chunk-NEXY7SE2.js');
@@ -9,5 +9,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.TokenRatesController = _chunkLNARUJIFjs.TokenRatesController; exports.default = _chunkLNARUJIFjs.TokenRatesController_default;
+exports.TokenRatesController = _chunkWZO3LJEJjs.TokenRatesController; exports.default = _chunkWZO3LJEJjs.TokenRatesController_default;
 //# sourceMappingURL=TokenRatesController.js.map

package/dist/TokenRatesController.mjs

@@ -1,7 +1,7 @@
 import {
   TokenRatesController,
   TokenRatesController_default
-} from "./chunk-WBB76JFP.mjs";
+} from "./chunk-ISI2OCTD.mjs";
 import "./chunk-TTH3ES66.mjs";
 import "./chunk-CNKVITJO.mjs";
 import "./chunk-Q5JRBGWO.mjs";

package/dist/TokensController.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunk6N3O4INTjs = require('./chunk-6N3O4INT.js');
+var _chunkMBCN3MNXjs = require('./chunk-MBCN3MNX.js');
 require('./chunk-B5YY22QQ.js');
 require('./chunk-BOTVAG4A.js');
 require('./chunk-3R43XIIX.js');
@@ -12,5 +12,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.TokensController = _chunk6N3O4INTjs.TokensController; exports.default = _chunk6N3O4INTjs.TokensController_default; exports.getDefaultTokensState = _chunk6N3O4INTjs.getDefaultTokensState;
+exports.TokensController = _chunkMBCN3MNXjs.TokensController; exports.default = _chunkMBCN3MNXjs.TokensController_default; exports.getDefaultTokensState = _chunkMBCN3MNXjs.getDefaultTokensState;
 //# sourceMappingURL=TokensController.js.map

package/dist/TokensController.mjs

@@ -2,7 +2,7 @@ import {
   TokensController,
   TokensController_default,
   getDefaultTokensState
-} from "./chunk-QM4XFEAL.mjs";
+} from "./chunk-7MMEHAKG.mjs";
 import "./chunk-D3K5MPMW.mjs";
 import "./chunk-LZ5ZGQEX.mjs";
 import "./chunk-Z3OQU4XW.mjs";

package/dist/{chunk-RACML7LZ.mjs → chunk-46UZDIXW.mjs}

@@ -79,7 +79,7 @@ var NftController = class extends BaseControllerV1 {
      */
     this.name = "NftController";
     this.defaultConfig = {
-      selectedAccountId: "",
+      selectedAddress: "",
       chainId: initialChainId,
       ipfsGateway: IPFS_DEFAULT_GATEWAY_URL,
       openSeaEnabled: false,
@@ -97,34 +97,30 @@ var NftController = class extends BaseControllerV1 {
     this.getNetworkClientById = getNetworkClientById;
     this.onNftAdded = onNftAdded;
     this.messagingSystem = messenger;
-    this.messagingSystem.subscribe(
-      "AccountsController:selectedEvmAccountChange",
-      (newSelectedAccount) => {
-        this.configure({ selectedAccountId: newSelectedAccount.id });
-      }
-    );
     onPreferencesStateChange(
-      async ({ ipfsGateway, openSeaEnabled, isIpfsGatewayEnabled }) => {
-        const newSelectedAccount = this.messagingSystem.call(
-          "AccountsController:getSelectedAccount"
-        );
+      async ({
+        selectedAddress,
+        ipfsGateway,
+        openSeaEnabled,
+        isIpfsGatewayEnabled
+      }) => {
         this.configure({
+          selectedAddress,
           ipfsGateway,
           openSeaEnabled,
-          isIpfsGatewayEnabled,
-          selectedAccountId: newSelectedAccount.id
+          isIpfsGatewayEnabled
         });
         const needsUpdateNftMetadata = isIpfsGatewayEnabled && ipfsGateway !== "" || openSeaEnabled;
         if (needsUpdateNftMetadata) {
           const { chainId } = this.config;
-          const nfts = this.state.allNfts[newSelectedAccount.address]?.[chainId] ?? [];
+          const nfts = this.state.allNfts[selectedAddress]?.[chainId] ?? [];
           const nftsToUpdate = nfts.filter(
             (singleNft) => !singleNft.name && !singleNft.description && !singleNft.image
           );
           if (nftsToUpdate.length !== 0) {
             await this.updateNftMetadata({
               nfts: nftsToUpdate,
-              userAddress: newSelectedAccount.address
+              userAddress: selectedAddress
             });
           }
         }
@@ -700,14 +696,10 @@ var NftController = class extends BaseControllerV1 {
    */
   async watchNft(asset, type, origin, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    userAddress = userAddress || selectedAccount?.address || "";
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     await this.validateWatchNft(asset, type, userAddress);
     const nftMetadata = await this.getNftInformation(
       asset.address,
@@ -798,16 +790,12 @@ var NftController = class extends BaseControllerV1 {
    * @param options.source - Whether the NFT was detected, added manually or suggested by a dapp.
    */
   async addNftVerifyOwnership(address, tokenId, {
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId,
     source
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    userAddress = userAddress ?? selectedAccount?.address ?? "";
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     if (!await this.isNftOwner(userAddress, address, tokenId, {
       networkClientId
     })) {
@@ -833,16 +821,10 @@ var NftController = class extends BaseControllerV1 {
    */
   async addNft(tokenAddress, tokenId, {
     nftMetadata,
-    userAddress,
+    userAddress = this.config.selectedAddress,
     source = "custom" /* Custom */,
     networkClientId
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    userAddress = userAddress ?? selectedAccount?.address ?? "";
+  } = { userAddress: this.config.selectedAddress }) {
     tokenAddress = toChecksumHexAddress(tokenAddress);
     const chainId = this.getCorrectChainId({ networkClientId });
     nftMetadata = nftMetadata || await this.getNftInformation(tokenAddress, tokenId, networkClientId);
@@ -878,14 +860,9 @@ var NftController = class extends BaseControllerV1 {
    */
   async updateNftMetadata({
     nfts,
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId
   }) {
-    const userAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      this.config.selectedAccountId
-    );
-    const addressToSearch = userAddress || userAccount?.address || "";
     const chainId = this.getCorrectChainId({ networkClientId });
     const nftsWithChecksumAdr = nfts.map((nft) => {
       return {
@@ -911,7 +888,7 @@ var NftController = class extends BaseControllerV1 {
     );
     const nftsWithDifferentMetadata = [];
     const { allNfts } = this.state;
-    const stateNfts = allNfts[addressToSearch]?.[chainId] || [];
+    const stateNfts = allNfts[userAddress]?.[chainId] || [];
     successfulNewFetchedNfts.forEach((singleNft) => {
       const existingEntry = stateNfts.find(
         (nft) => nft.address.toLowerCase() === singleNft.value.nft.address.toLowerCase() && nft.tokenId === singleNft.value.nft.tokenId
@@ -931,7 +908,7 @@ var NftController = class extends BaseControllerV1 {
         (elm) => this.updateNft(
           elm.value.nft,
           elm.value.newMetadata,
-          addressToSearch,
+          userAddress,
           chainId
         )
       );
@@ -948,30 +925,20 @@ var NftController = class extends BaseControllerV1 {
    */
   removeNft(address, tokenId, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const userAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    const addressToSearch = userAddress || userAccount?.address || "";
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     address = toChecksumHexAddress(address);
-    this.removeIndividualNft(address, tokenId, {
-      chainId,
-      userAddress: addressToSearch
-    });
+    this.removeIndividualNft(address, tokenId, { chainId, userAddress });
     const { allNfts } = this.state;
-    const nfts = allNfts[addressToSearch]?.[chainId] || [];
+    const nfts = allNfts[userAddress]?.[chainId] || [];
     const remainingNft = nfts.find(
       (nft) => nft.address.toLowerCase() === address.toLowerCase()
     );
     if (!remainingNft) {
-      this.removeNftContract(address, {
-        chainId,
-        userAddress: addressToSearch
-      });
+      this.removeNftContract(address, { chainId, userAddress });
     }
   }
   /**
@@ -985,30 +952,23 @@ var NftController = class extends BaseControllerV1 {
    */
   removeAndIgnoreNft(address, tokenId, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    const addressToSearch = userAddress || selectedAccount?.address || "";
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     address = toChecksumHexAddress(address);
     this.removeAndIgnoreIndividualNft(address, tokenId, {
       chainId,
-      userAddress: addressToSearch
+      userAddress
     });
     const { allNfts } = this.state;
-    const nfts = allNfts[addressToSearch]?.[chainId] || [];
+    const nfts = allNfts[userAddress]?.[chainId] || [];
     const remainingNft = nfts.find(
       (nft) => nft.address.toLowerCase() === address.toLowerCase()
     );
     if (!remainingNft) {
-      this.removeNftContract(address, {
-        chainId,
-        userAddress: addressToSearch
-      });
+      this.removeNftContract(address, { chainId, userAddress });
     }
   }
   /**
@@ -1029,20 +989,16 @@ var NftController = class extends BaseControllerV1 {
    * @returns the NFT with the updated isCurrentlyOwned value
    */
   async checkAndUpdateSingleNftOwnershipStatus(nft, batch, {
-    userAddress,
+    userAddress = this.config.selectedAddress,
     networkClientId
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    const addressToSearch = userAddress || selectedAccount?.address || "";
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { address, tokenId } = nft;
     let isOwned = nft.isCurrentlyOwned;
     try {
-      isOwned = await this.isNftOwner(addressToSearch, address, tokenId, {
+      isOwned = await this.isNftOwner(userAddress, address, tokenId, {
         networkClientId
       });
     } catch {
@@ -1052,14 +1008,14 @@ var NftController = class extends BaseControllerV1 {
       return nft;
     }
     const { allNfts } = this.state;
-    const nfts = allNfts[addressToSearch]?.[chainId] || [];
+    const nfts = allNfts[userAddress]?.[chainId] || [];
     const nftToUpdate = nfts.find(
       (item) => item.tokenId === tokenId && item.address.toLowerCase() === address.toLowerCase()
     );
     if (nftToUpdate) {
       nftToUpdate.isCurrentlyOwned = isOwned;
       this.updateNestedNftState(nfts, ALL_NFTS_STATE_KEY, {
-        userAddress: addressToSearch,
+        userAddress,
         chainId
       });
     }
@@ -1074,17 +1030,13 @@ var NftController = class extends BaseControllerV1 {
    */
   async checkAndUpdateAllNftsOwnershipStatus({
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    const addressToSearch = userAddress || selectedAccount?.address || "";
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { allNfts } = this.state;
-    const nfts = allNfts[addressToSearch]?.[chainId] || [];
+    const nfts = allNfts[userAddress]?.[chainId] || [];
     const updatedNfts = await Promise.all(
       nfts.map(async (nft) => {
         return await this.checkAndUpdateSingleNftOwnershipStatus(nft, true, {
@@ -1094,7 +1046,7 @@ var NftController = class extends BaseControllerV1 {
       })
     );
     this.updateNestedNftState(updatedNfts, ALL_NFTS_STATE_KEY, {
-      userAddress: addressToSearch,
+      userAddress,
       chainId
     });
   }
@@ -1110,17 +1062,13 @@ var NftController = class extends BaseControllerV1 {
    */
   updateNftFavoriteStatus(address, tokenId, favorite, {
     networkClientId,
-    userAddress
-  } = {}) {
-    const { selectedAccountId } = this.config;
-    const selectedAccount = this.messagingSystem.call(
-      "AccountsController:getAccount",
-      selectedAccountId
-    );
-    const addressToSearch = userAddress || selectedAccount?.address || "";
+    userAddress = this.config.selectedAddress
+  } = {
+    userAddress: this.config.selectedAddress
+  }) {
     const chainId = this.getCorrectChainId({ networkClientId });
     const { allNfts } = this.state;
-    const nfts = allNfts[addressToSearch]?.[chainId] || [];
+    const nfts = allNfts[userAddress]?.[chainId] || [];
     const index = nfts.findIndex(
       (nft) => nft.address === address && nft.tokenId === tokenId
     );
@@ -1134,7 +1082,7 @@ var NftController = class extends BaseControllerV1 {
     nfts[index] = updatedNft;
     this.updateNestedNftState(nfts, ALL_NFTS_STATE_KEY, {
       chainId,
-      userAddress: addressToSearch
+      userAddress
     });
   }
   /**
@@ -1254,4 +1202,4 @@ export {
   NftController,
   NftController_default
 };
-//# sourceMappingURL=chunk-RACML7LZ.mjs.map
+//# sourceMappingURL=chunk-46UZDIXW.mjs.map