@metamask-previews/assets-controllers 30.0.0-preview-4a95e5f → 32.0.0-preview-8e708969

package/CHANGELOG.md

@@ -7,6 +7,99 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [32.0.0]
+
+### Changed
+
+- **BREAKING:** Bump minimum Node version to 18.18 ([#3611](https://github.com/MetaMask/core/pull/3611))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/accounts-controller` to `^16.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/approval-controller` to `^7.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/keyring-controller` to `^17.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/network-controller` to `^19.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/preferences-controller` to `^13.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- Bump `@metamask/base-controller` to `^6.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- Bump `@metamask/controller-utils` to `^11.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+- Bump `@metamask/polling-controller` to `^8.0.0` ([#4352](https://github.com/MetaMask/core/pull/4352))
+
+## [31.0.0]
+
+### Added
+
+- **BREAKING:** The `NftDetectionController` now takes a `messenger`, which can be used for communication ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - This messenger must allow the following actions `ApprovalController:addRequest`, `NetworkController:getState`, `NetworkController:getNetworkClientById`, and `PreferencesController:getState`, and must allow the events `PreferencesController:stateChange` and `NetworkController:stateChange`
+- Add `NftDetectionControllerMessenger` type ([#4312](https://github.com/MetaMask/core/pull/4312))
+- Add `NftControllerGetStateAction`, `NftControllerActions`, `NftControllerStateChangeEvent`, and `NftControllerEvents` types ([#4310](https://github.com/MetaMask/core/pull/4310))
+- Add `NftController:getState` and `NftController:stateChange` as an available action and event to the `NftController` messenger ([#4310](https://github.com/MetaMask/core/pull/4310))
+
+### Changed
+
+- **BREAKING:** Change `TokensController` to inherit from `BaseController` rather than `BaseControllerV1` ([#4304](https://github.com/MetaMask/core/pull/4304))
+  - The constructor now takes a single options object rather than three arguments, and all properties in `config` are now part of options.
+- **BREAKING:** Rename `TokensState` type to `TokensControllerState` ([#4304](https://github.com/MetaMask/core/pull/4304))
+- **BREAKING:** Make all `TokensController` methods and properties starting with `_` private ([#4304](https://github.com/MetaMask/core/pull/4304))
+- **BREAKING:** Convert `Token` from `interface` to `type` ([#4304](https://github.com/MetaMask/core/pull/4304))
+- **BREAKING:** Replace `balanceError` property in `Token` with `hasBalanceError`; update `TokenBalancesController` so that it no longer captures the error resulting from getting the balance of an ERC-20 token ([#4304](https://github.com/MetaMask/core/pull/4304))
+- **BREAKING:** Change `NftDetectionController` to inherit from `StaticIntervalPollingController` rather than `StaticIntervalPollingControllerV1` ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - The constructor now takes a single options object rather than three arguments, and all properties in `config` are now part of options.
+- **BREAKING:** Convert `ApiNft`, `ApiNftContract`, `ApiNftLastSale`, and `ApiNftCreator` from `interface` to `type` ([#4312](https://github.com/MetaMask/core/pull/4312))
+- **BREAKING:** Change `NftController` to inherit from `BaseController` rather than `BaseControllerV1` ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - The constructor now takes a single options object rather than three arguments, and all properties in `config` are now part of options.
+- **BREAKING:** Convert `Nft`, `NftContract`, and `NftMetadata` from `interface` to `type` ([#4310](https://github.com/MetaMask/core/pull/4310))
+- **BREAKING:** Rename `NftState` to `NftControllerState`, and convert to `type` ([#4310](https://github.com/MetaMask/core/pull/4310))
+- **BREAKING:** Rename `getDefaultNftState` to `getDefaultNftControllerState` ([#4310](https://github.com/MetaMask/core/pull/4310))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/accounts-controller` to `^15.0.0` ([#4342](https://github.com/MetaMask/core/pull/4342))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/approval-controller` to `^6.0.2` ([#4342](https://github.com/MetaMask/core/pull/4342))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/keyring-controller` to `^16.1.0` ([#4342](https://github.com/MetaMask/core/pull/4342))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/network-controller` to `^18.1.3` ([#4342](https://github.com/MetaMask/core/pull/4342))
+- **BREAKING:** Bump dependency and peer dependency `@metamask/preferences-controller` to `^12.0.0` ([#4342](https://github.com/MetaMask/core/pull/4342))
+- Change `NftDetectionController` method `detectNfts` so that `userAddress` option is optional ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - This will default to the currently selected address as kept by PreferencesController.
+- Bump `async-mutex` to `^0.5.0` ([#4335](https://github.com/MetaMask/core/pull/4335))
+- Bump `@metamask/polling-controller` to `^7.0.0` ([#4342](https://github.com/MetaMask/core/pull/4342))
+
+### Removed
+
+- **BREAKING:** Remove `config` property and `configure` method from `TokensController` ([#4304](https://github.com/MetaMask/core/pull/4304))
+  - The `TokensController` now takes a single options object which can be used for configuration, and configuration is now kept internally.
+- **BREAKING:** Remove `notify`, `subscribe`, and `unsubscribe` methods from `TokensController` ([#4304](https://github.com/MetaMask/core/pull/4304))
+  - Use the controller messenger for subscribing to and publishing events instead.
+- **BREAKING:** Remove `TokensConfig` type ([#4304](https://github.com/MetaMask/core/pull/4304))
+  - These properties have been merged into the options that `TokensController` takes.
+- **BREAKING:** Remove `config` property and `configure` method from `TokensController` ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - `TokensController` now takes a single options object which can be used for configuration, and configuration is now kept internally.
+- **BREAKING:** Remove `notify`, `subscribe`, and `unsubscribe` methods from `NftDetectionController` ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - Use the controller messenger for subscribing to and publishing events instead.
+- **BREAKING:** Remove `chainId` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - The controller will now read the `networkClientId` from the NetworkController state through the messenger when needed.
+- **BREAKING:** Remove `getNetworkClientById` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - The controller will now call `NetworkController:getNetworkClientId` through the messenger object.
+- **BREAKING:** Remove `onPreferencesStateChange` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - The controller will now call `PreferencesController:stateChange` through the messenger object.
+- **BREAKING:** Remove `onNetworkStateChange` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - The controller will now read the `networkClientId` from the NetworkController state through the messenger when needed.
+- **BREAKING:** Remove `getOpenSeaApiKey` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - This was never used.
+- **BREAKING:** Remove `getNftApi` as a `NftDetectionController` constructor argument ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - This was never used.
+- **BREAKING:** Remove `NftDetectionConfig` type ([#4312](https://github.com/MetaMask/core/pull/4312))
+  - These properties have been merged into the options that `NftDetectionController` takes.
+- **BREAKING:** Remove `config` property and `configure` method from `NftController` ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - `NftController` now takes a single options object which can be used for configuration, and configuration is now kept internally.
+- **BREAKING:** Remove `notify`, `subscribe`, and `unsubscribe` methods from `NftController` ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - Use the controller messenger for subscribing to and publishing events instead.
+- **BREAKING:** Remove `onPreferencesStateChange` as a `NftController` constructor argument ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - The controller will now call `PreferencesController:stateChange` through the messenger object.
+- **BREAKING:** Remove `onNetworkStateChange` as a `NftController` constructor argument ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - The controller will now call `NetworkController:stateChange` through the messenger object.
+- **BREAKING:** Remove `NftConfig` type ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - These properties have been merged into the options that `NftController` takes.
+- **BREAKING:** Remove `config` property and `configure` method from `NftController` ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - `NftController` now takes a single options object which can be used for configuration, and configuration is now kept internally.
+- **BREAKING:** Remove `hub` property from `NftController` ([#4310](https://github.com/MetaMask/core/pull/4310))
+  - Use the controller messenger for subscribing to and publishing events instead.
+- **BREAKING:** Modify `TokenListController` so that tokens fetched from the API and stored in state will no longer have `storage` and `erc20` properties ([#4235](https://github.com/MetaMask/core/pull/4235))
+  - These properties were never officially supported, but they were present in state anyway.
+
 ## [30.0.0]
 
 ### Added
@@ -796,7 +889,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@30.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@32.0.0...HEAD
+[32.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@31.0.0...@metamask/assets-controllers@32.0.0
+[31.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@30.0.0...@metamask/assets-controllers@31.0.0
 [30.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@29.0.0...@metamask/assets-controllers@30.0.0
 [29.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@28.0.0...@metamask/assets-controllers@29.0.0
 [28.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@27.2.0...@metamask/assets-controllers@28.0.0

package/dist/AccountTrackerController.js

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

package/dist/AccountTrackerController.mjs

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

package/dist/NftController.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkE4SQFGKOjs = require('./chunk-E4SQFGKO.js');
+var _chunkNRF4D6U7js = require('./chunk-NRF4D6U7.js');
 require('./chunk-RGHTNZQ6.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
@@ -10,5 +10,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.NftController = _chunkE4SQFGKOjs.NftController; exports.default = _chunkE4SQFGKOjs.NftController_default; exports.getDefaultNftState = _chunkE4SQFGKOjs.getDefaultNftState;
+exports.NftController = _chunkNRF4D6U7js.NftController; exports.default = _chunkNRF4D6U7js.NftController_default; exports.getDefaultNftControllerState = _chunkNRF4D6U7js.getDefaultNftControllerState;
 //# sourceMappingURL=NftController.js.map

package/dist/NftController.mjs

@@ -1,14 +1,14 @@
 import {
   NftController,
   NftController_default,
-  getDefaultNftState
-} from "./chunk-YAVESKOE.mjs";
+  getDefaultNftControllerState
+} from "./chunk-ZA6274LX.mjs";
 import "./chunk-CP3HC7AQ.mjs";
 import "./chunk-Q5JRBGWO.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {
   NftController,
   NftController_default as default,
-  getDefaultNftState
+  getDefaultNftControllerState
 };
 //# sourceMappingURL=NftController.mjs.map

package/dist/NftDetectionController.js

@@ -2,12 +2,12 @@
 
 
 
-var _chunk5OC3ZKSEjs = require('./chunk-5OC3ZKSE.js');
+var _chunkG5EBZP3Wjs = require('./chunk-G5EBZP3W.js');
 require('./chunk-RGHTNZQ6.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.BlockaidResultType = _chunk5OC3ZKSEjs.BlockaidResultType; exports.NftDetectionController = _chunk5OC3ZKSEjs.NftDetectionController; exports.default = _chunk5OC3ZKSEjs.NftDetectionController_default;
+exports.BlockaidResultType = _chunkG5EBZP3Wjs.BlockaidResultType; exports.NftDetectionController = _chunkG5EBZP3Wjs.NftDetectionController; exports.default = _chunkG5EBZP3Wjs.NftDetectionController_default;
 //# sourceMappingURL=NftDetectionController.js.map

package/dist/NftDetectionController.mjs

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

package/dist/TokenBalancesController.js

@@ -2,11 +2,11 @@
 
 
 
-var _chunkIBK6AXPPjs = require('./chunk-IBK6AXPP.js');
+var _chunkDT5FQKVTjs = require('./chunk-DT5FQKVT.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokenBalancesController = _chunkIBK6AXPPjs.TokenBalancesController; exports.default = _chunkIBK6AXPPjs.TokenBalancesController_default; exports.getDefaultTokenBalancesState = _chunkIBK6AXPPjs.getDefaultTokenBalancesState;
+exports.TokenBalancesController = _chunkDT5FQKVTjs.TokenBalancesController; exports.default = _chunkDT5FQKVTjs.TokenBalancesController_default; exports.getDefaultTokenBalancesState = _chunkDT5FQKVTjs.getDefaultTokenBalancesState;
 //# sourceMappingURL=TokenBalancesController.js.map

package/dist/TokenBalancesController.mjs

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

package/dist/TokenDetectionController.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunkHDI4L2DDjs = require('./chunk-HDI4L2DD.js');
+var _chunkTUT6IDDPjs = require('./chunk-TUT6IDDP.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
 
@@ -13,5 +13,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-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;
+exports.STATIC_MAINNET_TOKEN_LIST = _chunkTUT6IDDPjs.STATIC_MAINNET_TOKEN_LIST; exports.TokenDetectionController = _chunkTUT6IDDPjs.TokenDetectionController; exports.controllerName = _chunkTUT6IDDPjs.controllerName; exports.default = _chunkTUT6IDDPjs.TokenDetectionController_default; exports.isEqualCaseInsensitive = _chunkTUT6IDDPjs.isEqualCaseInsensitive;
 //# sourceMappingURL=TokenDetectionController.js.map

package/dist/TokenDetectionController.mjs

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

package/dist/TokenListController.js

@@ -2,13 +2,13 @@
 
 
 
-var _chunk5F5EQAX5js = require('./chunk-5F5EQAX5.js');
-require('./chunk-3R43XIIX.js');
+var _chunkJUI3XNEFjs = require('./chunk-JUI3XNEF.js');
+require('./chunk-PYMUBJQX.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokenListController = _chunk5F5EQAX5js.TokenListController; exports.default = _chunk5F5EQAX5js.TokenListController_default; exports.getDefaultTokenListState = _chunk5F5EQAX5js.getDefaultTokenListState;
+exports.TokenListController = _chunkJUI3XNEFjs.TokenListController; exports.default = _chunkJUI3XNEFjs.TokenListController_default; exports.getDefaultTokenListState = _chunkJUI3XNEFjs.getDefaultTokenListState;
 //# sourceMappingURL=TokenListController.js.map

package/dist/TokenListController.mjs

@@ -2,8 +2,8 @@ import {
   TokenListController,
   TokenListController_default,
   getDefaultTokenListState
-} from "./chunk-XHMM35YT.mjs";
-import "./chunk-Z3OQU4XW.mjs";
+} from "./chunk-A2DDWXMS.mjs";
+import "./chunk-5W5OO2Q5.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 _chunkUEDNQBJNjs = require('./chunk-UEDNQBJN.js');
+var _chunkOG5NUJW5js = require('./chunk-OG5NUJW5.js');
 require('./chunk-Z6TBQQE5.js');
 require('./chunk-7K6PSEAA.js');
 require('./chunk-WB6KJX4N.js');
@@ -10,5 +10,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.TokenRatesController = _chunkUEDNQBJNjs.TokenRatesController; exports.default = _chunkUEDNQBJNjs.TokenRatesController_default;
+exports.TokenRatesController = _chunkOG5NUJW5js.TokenRatesController; exports.default = _chunkOG5NUJW5js.TokenRatesController_default;
 //# sourceMappingURL=TokenRatesController.js.map

package/dist/TokenRatesController.mjs

@@ -1,7 +1,7 @@
 import {
   TokenRatesController,
   TokenRatesController_default
-} from "./chunk-E4ECCGJV.mjs";
+} from "./chunk-KSHMWJT7.mjs";
 import "./chunk-Y35SM7TO.mjs";
 import "./chunk-TTH3ES66.mjs";
 import "./chunk-CNKVITJO.mjs";

package/dist/TokensController.js

@@ -2,15 +2,15 @@
 
 
 
-var _chunkKCFBEGDVjs = require('./chunk-KCFBEGDV.js');
+var _chunk2AYWB7FUjs = require('./chunk-2AYWB7FU.js');
 require('./chunk-B5YY22QQ.js');
 require('./chunk-BOTVAG4A.js');
-require('./chunk-3R43XIIX.js');
+require('./chunk-PYMUBJQX.js');
 require('./chunk-NEXY7SE2.js');
 require('./chunk-Z4BLTVTB.js');
 
 
 
 
-exports.TokensController = _chunkKCFBEGDVjs.TokensController; exports.default = _chunkKCFBEGDVjs.TokensController_default; exports.getDefaultTokensState = _chunkKCFBEGDVjs.getDefaultTokensState;
+exports.TokensController = _chunk2AYWB7FUjs.TokensController; exports.default = _chunk2AYWB7FUjs.TokensController_default; exports.getDefaultTokensState = _chunk2AYWB7FUjs.getDefaultTokensState;
 //# sourceMappingURL=TokensController.js.map

package/dist/TokensController.mjs

@@ -2,10 +2,10 @@ import {
   TokensController,
   TokensController_default,
   getDefaultTokensState
-} from "./chunk-76IWVCR7.mjs";
+} from "./chunk-YAEVDJIZ.mjs";
 import "./chunk-D3K5MPMW.mjs";
 import "./chunk-LZ5ZGQEX.mjs";
-import "./chunk-Z3OQU4XW.mjs";
+import "./chunk-5W5OO2Q5.mjs";
 import "./chunk-Q5JRBGWO.mjs";
 import "./chunk-XUI43LEZ.mjs";
 export {

package/dist/{chunk-KCFBEGDV.js → chunk-2AYWB7FU.js}

@@ -7,7 +7,7 @@ var _chunkBOTVAG4Ajs = require('./chunk-BOTVAG4A.js');
 
 
 
-var _chunk3R43XIIXjs = require('./chunk-3R43XIIX.js');
+var _chunkPYMUBJQXjs = require('./chunk-PYMUBJQX.js');
 
 
 
@@ -76,20 +76,20 @@ 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, _requestApproval, requestApproval_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.selectedAccountId - Vault selected account id
    * @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,
+    selectedAccountId,
     provider,
     state,
     messenger
@@ -111,11 +111,10 @@ var TokensController = class extends _basecontroller.BaseController {
      */
     _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.
      *
@@ -158,20 +157,20 @@ var TokensController = class extends _basecontroller.BaseController {
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _requestApproval);
     _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, selectedAccountId);
     _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 +209,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 +218,12 @@ var TokensController = class extends _basecontroller.BaseController {
         networkClientId
       ).configuration.chainId;
     }
-    const accountAddress = interactingAddress || selectedAddress;
-    const isInteractingWithWalletAccount = accountAddress === selectedAddress;
+    const internalAccount = this.messagingSystem.call(
+      "AccountsController:getAccount",
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+    );
+    const accountAddress = interactingAddress || internalAccount?.address || "";
+    const isInteractingWithWalletAccount = accountAddress === internalAccount?.address;
     try {
       address = _controllerutils.toChecksumHexAddress.call(void 0, address);
       const tokens = allTokens[currentChainId]?.[accountAddress] || [];
@@ -399,8 +401,12 @@ var TokensController = class extends _basecontroller.BaseController {
    */
   async addDetectedTokens(incomingDetectedTokens, detectionDetails) {
     const releaseLock = await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _mutex).acquire();
+    const internalAccount = this.messagingSystem.call(
+      "AccountsController:getAccount",
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+    );
     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 ?? internalAccount?.address ?? "";
     const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state;
     let newTokens = [...allTokens?.[chainId]?.[accountAddress] ?? []];
     let newDetectedTokens = [
@@ -452,8 +458,13 @@ 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 currentInternalAccount = this.messagingSystem.call(
+        "AccountsController:getAccount",
+        _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+      );
+      const currentAddress = currentInternalAccount?.address || "";
+      newTokens = newAllTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[currentAddress] || [];
+      newDetectedTokens = newAllDetectedTokens?.[_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId)]?.[currentAddress] || [];
       this.update((state) => {
         state.tokens = newTokens;
         state.allTokens = newAllTokens;
@@ -510,6 +521,10 @@ var TokensController = class extends _basecontroller.BaseController {
     if (!_controllerutils.isValidHexAddress.call(void 0, asset.address)) {
       throw _rpcerrors.rpcErrors.invalidParams(`Invalid address "${asset.address}"`);
     }
+    const selectedAccount = this.messagingSystem.call(
+      "AccountsController:getAccount",
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+    );
     if (await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _detectIsERC721, detectIsERC721_fn).call(this, asset.address, networkClientId)) {
       throw _rpcerrors.rpcErrors.invalidParams(
         `Contract ${asset.address} must match type ${type}, but was detected as ${_controllerutils.ERC721}`
@@ -575,7 +590,8 @@ 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)
+      // Previously selectedAddress could be an empty string. This is to preserve the behaviour
+      interactingAddress: interactingAddress || selectedAccount?.address || ""
     };
     await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _requestApproval, requestApproval_fn).call(this, suggestedAssetMeta);
     const { address, symbol, decimals, name, image } = asset;
@@ -601,7 +617,7 @@ 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();
@@ -611,33 +627,37 @@ onNetworkDidChange_fn = function({ providerConfig }) {
   _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 selectedAccount = this.messagingSystem.call(
+    "AccountsController:getAccount",
+    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+  );
   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]?.[selectedAccount?.address || ""] || [];
+    state.ignoredTokens = allIgnoredTokens[chainId]?.[selectedAccount?.address || ""] || [];
+    state.detectedTokens = allDetectedTokens[chainId]?.[selectedAccount?.address || ""] || [];
   });
 };
-_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 _chunk3R43XIIXjs.fetchTokenMetadata.call(void 0, 
+    const token = await _chunkPYMUBJQXjs.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(_chunk3R43XIIXjs.TOKEN_METADATA_NO_SUPPORT_ERROR)) {
+    if (error instanceof Error && error.message.includes(_chunkPYMUBJQXjs.TOKEN_METADATA_NO_SUPPORT_ERROR)) {
       return void 0;
     }
     throw error;
@@ -699,7 +719,11 @@ getNewAllTokensState_fn = function(params) {
     interactingChainId
   } = params;
   const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
-  const userAddressToAddTokens = interactingAddress ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAddress);
+  const selectedInternalAccount = this.messagingSystem.call(
+    "AccountsController:getAccount",
+    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _selectedAccountId)
+  );
+  const userAddressToAddTokens = interactingAddress ?? selectedInternalAccount?.address ?? "";
   const chainIdToAddTokens = interactingChainId ?? _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _chainId);
   let newAllTokens = allTokens;
   if (newTokens?.length || newTokens && allTokens && allTokens[chainIdToAddTokens] && allTokens[chainIdToAddTokens][userAddressToAddTokens]) {
@@ -768,4 +792,4 @@ var TokensController_default = TokensController;
 
 
 exports.getDefaultTokensState = getDefaultTokensState; exports.TokensController = TokensController; exports.TokensController_default = TokensController_default;
-//# sourceMappingURL=chunk-KCFBEGDV.js.map
+//# sourceMappingURL=chunk-2AYWB7FU.js.map