@metamask/accounts-controller 12.0.0 → 13.0.0

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.0.0]
+
+### Changed
+
+- Fix update setSelectedAccount to throw if the id is not found ([#4167](https://github.com/MetaMask/core/pull/4167))
+- Fix normal account indexing naming with index gap ([#4089](https://github.com/MetaMask/core/pull/4089))
+- **BREAKING** Bump peer dependency `@metamask/snaps-controllers` to `^6.0.3` and dependencies `@metamask/snaps-sdk` to `^3.1.1`, `@metamask/eth-snap-keyring` to `^3.0.0`([#4090](https://github.com/MetaMask/core/pull/4090))
+
+## [12.0.1]
+
+### Fixed
+
+- Fix `types` field in `package.json` ([#4047](https://github.com/MetaMask/core/pull/4047))
+
 ## [12.0.0]
 
 ### Added
@@ -149,7 +163,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@13.0.0...HEAD
+[13.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.1...@metamask/accounts-controller@13.0.0
+[12.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.0...@metamask/accounts-controller@12.0.1
 [12.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@11.0.0...@metamask/accounts-controller@12.0.0
 [11.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@10.0.0...@metamask/accounts-controller@11.0.0
 [10.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@9.0.0...@metamask/accounts-controller@10.0.0

package/dist/AccountsController.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk7FX4HSTVjs = require('./chunk-7FX4HSTV.js');
-require('./chunk-MF4BFCSU.js');
+var _chunkHS62N4JHjs = require('./chunk-HS62N4JH.js');
+require('./chunk-KCST55AQ.js');
 
 
-exports.AccountsController = _chunk7FX4HSTVjs.AccountsController;
+exports.AccountsController = _chunkHS62N4JHjs.AccountsController;
 //# sourceMappingURL=AccountsController.js.map

package/dist/AccountsController.mjs

@@ -1,7 +1,7 @@
 import {
   AccountsController
-} from "./chunk-GATPL76V.mjs";
-import "./chunk-HD5HN6GK.mjs";
+} from "./chunk-JNCGDLI7.mjs";
+import "./chunk-E7SBT5BV.mjs";
 export {
   AccountsController
 };

package/dist/{chunk-HD5HN6GK.mjs → chunk-E7SBT5BV.mjs}

@@ -48,17 +48,21 @@ function keyringTypeToName(keyringType) {
     }
   }
 }
-function getUUIDFromAddressOfNormalAccount(address) {
+function getUUIDOptionsFromAddressOfNormalAccount(address) {
   const v4options = {
     random: sha256(toBuffer(address)).slice(0, 16)
   };
-  return uuid(v4options);
+  return v4options;
+}
+function getUUIDFromAddressOfNormalAccount(address) {
+  return uuid(getUUIDOptionsFromAddressOfNormalAccount(address));
 }
 
 export {
   __privateAdd,
   __privateMethod,
   keyringTypeToName,
+  getUUIDOptionsFromAddressOfNormalAccount,
   getUUIDFromAddressOfNormalAccount
 };
-//# sourceMappingURL=chunk-HD5HN6GK.mjs.map
+//# sourceMappingURL=chunk-E7SBT5BV.mjs.map

package/dist/chunk-E7SBT5BV.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.ts"],"sourcesContent":["import { toBuffer } from '@ethereumjs/util';\nimport { isCustodyKeyring, KeyringTypes } from '@metamask/keyring-controller';\nimport { sha256 } from 'ethereum-cryptography/sha256';\nimport type { V4Options } from 'uuid';\nimport { v4 as uuid } from 'uuid';\n\n/**\n * Returns the name of the keyring type.\n *\n * @param keyringType - The type of the keyring.\n * @returns The name of the keyring type.\n */\nexport function keyringTypeToName(keyringType: string): string {\n  // Custody keyrings are a special case, as they are not a single type\n  // they just start with the prefix `Custody`\n  if (isCustodyKeyring(keyringType)) {\n    return 'Custody';\n  }\n\n  switch (keyringType) {\n    case KeyringTypes.simple: {\n      return 'Account';\n    }\n    case KeyringTypes.hd: {\n      return 'Account';\n    }\n    case KeyringTypes.trezor: {\n      return 'Trezor';\n    }\n    case KeyringTypes.ledger: {\n      return 'Ledger';\n    }\n    case KeyringTypes.lattice: {\n      return 'Lattice';\n    }\n    case KeyringTypes.qr: {\n      return 'QR';\n    }\n    case KeyringTypes.snap: {\n      return 'Snap Account';\n    }\n    default: {\n      throw new Error(`Unknown keyring ${keyringType}`);\n    }\n  }\n}\n\n/**\n * Generates a UUID v4 options from a given Ethereum address.\n * @param address - The Ethereum address to generate the UUID from.\n * @returns The UUID v4 options.\n */\nexport function getUUIDOptionsFromAddressOfNormalAccount(\n  address: string,\n): V4Options {\n  const v4options = {\n    random: sha256(toBuffer(address)).slice(0, 16),\n  };\n\n  return v4options;\n}\n\n/**\n * Generates a UUID from a given Ethereum address.\n * @param address - The Ethereum address to generate the UUID from.\n * @returns The generated UUID.\n */\nexport function getUUIDFromAddressOfNormalAccount(address: string): string {\n  return uuid(getUUIDOptionsFromAddressOfNormalAccount(address));\n}\n"],"mappings":";;;;;;;;;;;;;;;AAAA,SAAS,gBAAgB;AACzB,SAAS,kBAAkB,oBAAoB;AAC/C,SAAS,cAAc;AAEvB,SAAS,MAAM,YAAY;AAQpB,SAAS,kBAAkB,aAA6B;AAG7D,MAAI,iBAAiB,WAAW,GAAG;AACjC,WAAO;AAAA,EACT;AAEA,UAAQ,aAAa;AAAA,IACnB,KAAK,aAAa,QAAQ;AACxB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,IAAI;AACpB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,QAAQ;AACxB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,QAAQ;AACxB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,SAAS;AACzB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,IAAI;AACpB,aAAO;AAAA,IACT;AAAA,IACA,KAAK,aAAa,MAAM;AACtB,aAAO;AAAA,IACT;AAAA,IACA,SAAS;AACP,YAAM,IAAI,MAAM,mBAAmB,WAAW,EAAE;AAAA,IAClD;AAAA,EACF;AACF;AAOO,SAAS,yCACd,SACW;AACX,QAAM,YAAY;AAAA,IAChB,QAAQ,OAAO,SAAS,OAAO,CAAC,EAAE,MAAM,GAAG,EAAE;AAAA,EAC/C;AAEA,SAAO;AACT;AAOO,SAAS,kCAAkC,SAAyB;AACzE,SAAO,KAAK,yCAAyC,OAAO,CAAC;AAC/D;","names":[]}

package/dist/{chunk-7FX4HSTV.js → chunk-HS62N4JH.js}

@@ -3,16 +3,13 @@
 
 
 
-var _chunkMF4BFCSUjs = require('./chunk-MF4BFCSU.js');
+var _chunkKCST55AQjs = require('./chunk-KCST55AQ.js');
 
 // src/AccountsController.ts
-var _util = require('@ethereumjs/util');
 var _basecontroller = require('@metamask/base-controller');
 var _ethsnapkeyring = require('@metamask/eth-snap-keyring');
 var _keyringapi = require('@metamask/keyring-api');
 var _keyringcontroller = require('@metamask/keyring-controller');
-var _sha256 = require('ethereum-cryptography/sha256');
-var _uuid = require('uuid');
 var controllerName = "AccountsController";
 var accountsControllerMetadata = {
   internalAccounts: {
@@ -26,7 +23,7 @@ var defaultState = {
     selectedAccount: ""
   }
 };
-var _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn, _listSnapAccounts, listSnapAccounts_fn, _listNormalAccounts, listNormalAccounts_fn, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn, _handleOnSnapStateChange, handleOnSnapStateChange_fn, _getNextAccountNumber, getNextAccountNumber_fn, _handleNewAccountAdded, handleNewAccountAdded_fn, _handleAccountRemoved, handleAccountRemoved_fn, _registerMessageHandlers, registerMessageHandlers_fn;
+var _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn, _listSnapAccounts, listSnapAccounts_fn, _listNormalAccounts, listNormalAccounts_fn, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn, _handleOnSnapStateChange, handleOnSnapStateChange_fn, _getAccountsByKeyringType, getAccountsByKeyringType_fn, _getNextAccountNumber, getNextAccountNumber_fn, _handleNewAccountAdded, handleNewAccountAdded_fn, _handleAccountRemoved, handleAccountRemoved_fn, _registerMessageHandlers, registerMessageHandlers_fn;
 var AccountsController = class extends _basecontroller.BaseController {
   /**
    * Constructor for AccountsController.
@@ -54,13 +51,13 @@ var AccountsController = class extends _basecontroller.BaseController {
      * @param type - The type of the account.
      * @returns The generated internal account.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _generateInternalAccountForNonSnapAccount);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _generateInternalAccountForNonSnapAccount);
     /**
      * Returns a list of internal accounts created using the SnapKeyring.
      *
      * @returns A promise that resolves to an array of InternalAccount objects.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _listSnapAccounts);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _listSnapAccounts);
     /**
      * Returns a list of normal accounts.
      * Note: listNormalAccounts is a temporary method until the keyrings all implement the InternalAccount interface.
@@ -68,51 +65,57 @@ var AccountsController = class extends _basecontroller.BaseController {
      *
      * @returns A Promise that resolves to an array of InternalAccount objects.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _listNormalAccounts);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _listNormalAccounts);
     /**
      * Handles changes in the keyring state, specifically when new accounts are added or removed.
      *
      * @param keyringState - The new state of the keyring controller.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _handleOnKeyringStateChange);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _handleOnKeyringStateChange);
     /**
      * Handles the change in SnapControllerState by updating the metadata of accounts that have a snap enabled.
      *
      * @param snapState - The new SnapControllerState.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _handleOnSnapStateChange);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _handleOnSnapStateChange);
+    /**
+     * Returns the list of accounts for a given keyring type.
+     * @param keyringType - The type of keyring.
+     * @returns The list of accounts associcated with this keyring type.
+     */
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _getAccountsByKeyringType);
     /**
      * Returns the next account number for a given keyring type.
      * @param keyringType - The type of keyring.
      * @returns An object containing the account prefix and index to use.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _getNextAccountNumber);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _getNextAccountNumber);
     /**
      * Handles the addition of a new account to the controller.
      * If the account is not a Snap Keyring account, generates an internal account for it and adds it to the controller.
      * If the account is a Snap Keyring account, retrieves the account from the keyring and adds it to the controller.
      * @param account - The address and keyring type object of the new account.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _handleNewAccountAdded);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _handleNewAccountAdded);
     /**
      * Handles the removal of an account from the internal accounts list.
      * @param accountId - The ID of the account to be removed.
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _handleAccountRemoved);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _handleAccountRemoved);
     /**
      * Registers message handlers for the AccountsController.
      * @private
      */
-    _chunkMF4BFCSUjs.__privateAdd.call(void 0, this, _registerMessageHandlers);
+    _chunkKCST55AQjs.__privateAdd.call(void 0, this, _registerMessageHandlers);
     this.messagingSystem.subscribe(
       "SnapController:stateChange",
-      (snapStateState) => _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _handleOnSnapStateChange, handleOnSnapStateChange_fn).call(this, snapStateState)
+      (snapStateState) => _chunkKCST55AQjs.__privateMethod.call(void 0, this, _handleOnSnapStateChange, handleOnSnapStateChange_fn).call(this, snapStateState)
     );
     this.messagingSystem.subscribe(
       "KeyringController:stateChange",
-      (keyringState) => _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn).call(this, keyringState)
+      (keyringState) => _chunkKCST55AQjs.__privateMethod.call(void 0, this, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn).call(this, keyringState)
     );
-    _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+    _chunkKCST55AQjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
   }
   /**
    * Returns the internal account object for the given account ID, if it exists.
@@ -156,7 +159,7 @@ var AccountsController = class extends _basecontroller.BaseController {
     }
     const account = this.getAccount(accountId);
     if (account === void 0) {
-      throw new Error(`Account Id ${accountId} not found`);
+      throw new Error(`Account Id "${accountId}" not found`);
     }
     return account;
   }
@@ -185,21 +188,15 @@ var AccountsController = class extends _basecontroller.BaseController {
    * @param accountId - The ID of the account to be selected.
    */
   setSelectedAccount(accountId) {
-    const account = this.getAccount(accountId);
+    const account = this.getAccountExpect(accountId);
     this.update((currentState) => {
-      if (account) {
-        currentState.internalAccounts.accounts[account.id].metadata.lastSelected = Date.now();
-        currentState.internalAccounts.selectedAccount = account.id;
-      } else {
-        currentState.internalAccounts.selectedAccount = "";
-      }
+      currentState.internalAccounts.accounts[account.id].metadata.lastSelected = Date.now();
+      currentState.internalAccounts.selectedAccount = account.id;
     });
-    if (account) {
-      this.messagingSystem.publish(
-        "AccountsController:selectedAccountChange",
-        account
-      );
-    }
+    this.messagingSystem.publish(
+      "AccountsController:selectedAccountChange",
+      account
+    );
   }
   /**
    * Sets the name of the account with the given ID.
@@ -231,8 +228,8 @@ var AccountsController = class extends _basecontroller.BaseController {
    * @returns A Promise that resolves when the accounts have been updated.
    */
   async updateAccounts() {
-    const snapAccounts = await _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _listSnapAccounts, listSnapAccounts_fn).call(this);
-    const normalAccounts = (await _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _listNormalAccounts, listNormalAccounts_fn).call(this)).filter(
+    const snapAccounts = await _chunkKCST55AQjs.__privateMethod.call(void 0, this, _listSnapAccounts, listSnapAccounts_fn).call(this);
+    const normalAccounts = (await _chunkKCST55AQjs.__privateMethod.call(void 0, this, _listNormalAccounts, listNormalAccounts_fn).call(this)).filter(
       (account) => !snapAccounts.find(
         (snapAccount) => snapAccount.address === account.address
       )
@@ -243,7 +240,7 @@ var AccountsController = class extends _basecontroller.BaseController {
       ...normalAccounts,
       ...snapAccounts
     ].reduce((internalAccountMap, internalAccount) => {
-      const keyringTypeName = _chunkMF4BFCSUjs.keyringTypeToName.call(void 0, 
+      const keyringTypeName = _chunkKCST55AQjs.keyringTypeToName.call(void 0, 
         internalAccount.metadata.keyring.type
       );
       const keyringAccountIndex = keyringTypes.get(keyringTypeName) ?? 0;
@@ -283,7 +280,7 @@ var AccountsController = class extends _basecontroller.BaseController {
 _generateInternalAccountForNonSnapAccount = new WeakSet();
 generateInternalAccountForNonSnapAccount_fn = function(address, type) {
   return {
-    id: _chunkMF4BFCSUjs.getUUIDFromAddressOfNormalAccount.call(void 0, address),
+    id: _chunkKCST55AQjs.getUUIDFromAddressOfNormalAccount.call(void 0, address),
     address,
     options: {},
     methods: [
@@ -326,11 +323,8 @@ listNormalAccounts_fn = async function() {
       "KeyringController:getKeyringForAccount",
       address
     );
-    const v4options = {
-      random: _sha256.sha256.call(void 0, _util.toBuffer.call(void 0, address)).slice(0, 16)
-    };
     internalAccounts.push({
-      id: _uuid.v4.call(void 0, v4options),
+      id: _chunkKCST55AQjs.getUUIDFromAddressOfNormalAccount.call(void 0, address),
       address,
       options: {},
       methods: [
@@ -397,7 +391,7 @@ handleOnKeyringStateChange_fn = function(keyringState) {
     const addedAccounts = [];
     const deletedAccounts = [];
     for (const account of updatedNormalKeyringAddresses) {
-      if (!this.state.internalAccounts.accounts[_chunkMF4BFCSUjs.getUUIDFromAddressOfNormalAccount.call(void 0, account.address)]) {
+      if (!this.state.internalAccounts.accounts[_chunkKCST55AQjs.getUUIDFromAddressOfNormalAccount.call(void 0, account.address)]) {
         addedAccounts.push(account);
       }
     }
@@ -424,12 +418,12 @@ handleOnKeyringStateChange_fn = function(keyringState) {
     }
     if (deletedAccounts.length > 0) {
       for (const account of deletedAccounts) {
-        _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _handleAccountRemoved, handleAccountRemoved_fn).call(this, account.id);
+        _chunkKCST55AQjs.__privateMethod.call(void 0, this, _handleAccountRemoved, handleAccountRemoved_fn).call(this, account.id);
       }
     }
     if (addedAccounts.length > 0) {
       for (const account of addedAccounts) {
-        _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _handleNewAccountAdded, handleNewAccountAdded_fn).call(this, account);
+        _chunkKCST55AQjs.__privateMethod.call(void 0, this, _handleNewAccountAdded, handleNewAccountAdded_fn).call(this, account);
       }
     }
     if (!this.getAccount(this.state.internalAccounts.selectedAccount)) {
@@ -438,7 +432,13 @@ handleOnKeyringStateChange_fn = function(keyringState) {
           return (accountB.metadata.lastSelected ?? 0) - (accountA.metadata.lastSelected ?? 0);
         }
       );
-      this.setSelectedAccount(accountToSelect?.id);
+      if (!accountToSelect) {
+        this.update((currentState) => {
+          currentState.internalAccounts.selectedAccount = "";
+        });
+        return;
+      }
+      this.setSelectedAccount(accountToSelect.id);
     }
   }
 };
@@ -461,27 +461,34 @@ handleOnSnapStateChange_fn = function(snapState) {
     });
   });
 };
+_getAccountsByKeyringType = new WeakSet();
+getAccountsByKeyringType_fn = function(keyringType) {
+  return this.listAccounts().filter((internalAccount) => {
+    if (keyringType === _keyringcontroller.KeyringTypes.hd || keyringType === _keyringcontroller.KeyringTypes.simple) {
+      return internalAccount.metadata.keyring.type === _keyringcontroller.KeyringTypes.hd || internalAccount.metadata.keyring.type === _keyringcontroller.KeyringTypes.simple;
+    }
+    return internalAccount.metadata.keyring.type === keyringType;
+  });
+};
 _getNextAccountNumber = new WeakSet();
 getNextAccountNumber_fn = function(keyringType) {
-  const keyringName = _chunkMF4BFCSUjs.keyringTypeToName.call(void 0, keyringType);
-  const previousKeyringAccounts = this.listAccounts().filter(
-    (internalAccount) => {
-      if (keyringType === _keyringcontroller.KeyringTypes.hd || keyringType === _keyringcontroller.KeyringTypes.simple) {
-        return internalAccount.metadata.keyring.type === _keyringcontroller.KeyringTypes.hd || internalAccount.metadata.keyring.type === _keyringcontroller.KeyringTypes.simple;
+  const keyringName = _chunkKCST55AQjs.keyringTypeToName.call(void 0, keyringType);
+  const keyringAccounts = _chunkKCST55AQjs.__privateMethod.call(void 0, this, _getAccountsByKeyringType, getAccountsByKeyringType_fn).call(this, keyringType);
+  const lastDefaultIndexUsedForKeyringType = keyringAccounts.reduce(
+    (maxInternalAccountIndex, internalAccount) => {
+      const match = new RegExp(`${keyringName} ([0-9]+)$`, "u").exec(
+        internalAccount.metadata.name
+      );
+      if (match) {
+        const internalAccountIndex = parseInt(match[1], 10);
+        return Math.max(maxInternalAccountIndex, internalAccountIndex);
       }
-      return internalAccount.metadata.keyring.type === keyringType;
-    }
+      return maxInternalAccountIndex;
+    },
+    0
   );
-  const lastDefaultIndexUsedForKeyringType = previousKeyringAccounts.filter(
-    (internalAccount) => new RegExp(`${keyringName} \\d+$`, "u").test(
-      internalAccount.metadata.name
-    )
-  ).map((internalAccount) => {
-    const nameToWords = internalAccount.metadata.name.split(" ");
-    return parseInt(nameToWords[nameToWords.length], 10);
-  }).sort((a, b) => b - a)[0] || 0;
   const indexToUse = Math.max(
-    previousKeyringAccounts.length + 1,
+    keyringAccounts.length + 1,
     lastDefaultIndexUsedForKeyringType + 1
   );
   return { accountPrefix: keyringName, indexToUse };
@@ -490,7 +497,7 @@ _handleNewAccountAdded = new WeakSet();
 handleNewAccountAdded_fn = function(account) {
   let newAccount;
   if (account.type !== _keyringcontroller.KeyringTypes.snap) {
-    newAccount = _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn).call(this, account.address, account.type);
+    newAccount = _chunkKCST55AQjs.__privateMethod.call(void 0, this, _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn).call(this, account.address, account.type);
   } else {
     const [snapKeyring] = this.messagingSystem.call(
       "KeyringController:getKeyringsByType",
@@ -503,7 +510,7 @@ handleNewAccountAdded_fn = function(account) {
       return;
     }
   }
-  const { accountPrefix, indexToUse } = _chunkMF4BFCSUjs.__privateMethod.call(void 0, this, _getNextAccountNumber, getNextAccountNumber_fn).call(this, newAccount.metadata.keyring.type);
+  const { accountPrefix, indexToUse } = _chunkKCST55AQjs.__privateMethod.call(void 0, this, _getNextAccountNumber, getNextAccountNumber_fn).call(this, newAccount.metadata.keyring.type);
   const accountName = `${accountPrefix} ${indexToUse}`;
   this.update((currentState) => {
     currentState.internalAccounts.accounts[newAccount.id] = {
@@ -558,4 +565,4 @@ registerMessageHandlers_fn = function() {
 
 
 exports.AccountsController = AccountsController;
-//# sourceMappingURL=chunk-7FX4HSTV.js.map
+//# sourceMappingURL=chunk-HS62N4JH.js.map

package/dist/chunk-HS62N4JH.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/AccountsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { InternalAccount } from '@metamask/keyring-api';\nimport { EthAccountType, EthMethod } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  KeyringControllerState,\n  KeyringControllerGetKeyringForAccountAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetAccountsAction,\n  KeyringControllerStateChangeEvent,\n} from '@metamask/keyring-controller';\nimport type {\n  SnapControllerState,\n  SnapStateChange,\n} from '@metamask/snaps-controllers';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { Snap } from '@metamask/snaps-utils';\nimport type { Keyring, Json } from '@metamask/utils';\nimport type { Draft } from 'immer';\n\nimport { getUUIDFromAddressOfNormalAccount, keyringTypeToName } from './utils';\n\nconst controllerName = 'AccountsController';\n\nexport type AccountsControllerState = {\n  internalAccounts: {\n    accounts: Record<string, InternalAccount>;\n    selectedAccount: string; // id of the selected account\n  };\n};\n\nexport type AccountsControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  AccountsControllerState\n>;\n\nexport type AccountsControllerSetSelectedAccountAction = {\n  type: `${typeof controllerName}:setSelectedAccount`;\n  handler: AccountsController['setSelectedAccount'];\n};\n\nexport type AccountsControllerSetAccountNameAction = {\n  type: `${typeof controllerName}:setAccountName`;\n  handler: AccountsController['setAccountName'];\n};\n\nexport type AccountsControllerListAccountsAction = {\n  type: `${typeof controllerName}:listAccounts`;\n  handler: AccountsController['listAccounts'];\n};\n\nexport type AccountsControllerUpdateAccountsAction = {\n  type: `${typeof controllerName}:updateAccounts`;\n  handler: AccountsController['updateAccounts'];\n};\n\nexport type AccountsControllerGetSelectedAccountAction = {\n  type: `${typeof controllerName}:getSelectedAccount`;\n  handler: AccountsController['getSelectedAccount'];\n};\n\nexport type AccountsControllerGetAccountByAddressAction = {\n  type: `${typeof controllerName}:getAccountByAddress`;\n  handler: AccountsController['getAccountByAddress'];\n};\n\nexport type AccountsControllerGetAccountAction = {\n  type: `${typeof controllerName}:getAccount`;\n  handler: AccountsController['getAccount'];\n};\n\nexport type AllowedActions =\n  | KeyringControllerGetKeyringForAccountAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerGetAccountsAction;\n\nexport type AccountsControllerActions =\n  | AccountsControllerGetStateAction\n  | AccountsControllerSetSelectedAccountAction\n  | AccountsControllerListAccountsAction\n  | AccountsControllerSetAccountNameAction\n  | AccountsControllerUpdateAccountsAction\n  | AccountsControllerGetAccountByAddressAction\n  | AccountsControllerGetSelectedAccountAction\n  | AccountsControllerGetAccountAction;\n\nexport type AccountsControllerChangeEvent = ControllerStateChangeEvent<\n  typeof controllerName,\n  AccountsControllerState\n>;\n\nexport type AccountsControllerSelectedAccountChangeEvent = {\n  type: `${typeof controllerName}:selectedAccountChange`;\n  payload: [InternalAccount];\n};\n\nexport type AllowedEvents = SnapStateChange | KeyringControllerStateChangeEvent;\n\nexport type AccountsControllerEvents =\n  | AccountsControllerChangeEvent\n  | AccountsControllerSelectedAccountChangeEvent;\n\nexport type AccountsControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  AccountsControllerActions | AllowedActions,\n  AccountsControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\ntype AddressAndKeyringTypeObject = {\n  address: string;\n  type: string;\n};\n\nconst accountsControllerMetadata = {\n  internalAccounts: {\n    persist: true,\n    anonymous: false,\n  },\n};\n\nconst defaultState: AccountsControllerState = {\n  internalAccounts: {\n    accounts: {},\n    selectedAccount: '',\n  },\n};\n\n/**\n * Controller that manages internal accounts.\n * The accounts controller is responsible for creating and managing internal accounts.\n * It also provides convenience methods for accessing and updating the internal accounts.\n * The accounts controller also listens for keyring state changes and updates the internal accounts accordingly.\n * The accounts controller also listens for snap state changes and updates the internal accounts accordingly.\n *\n */\nexport class AccountsController extends BaseController<\n  typeof controllerName,\n  AccountsControllerState,\n  AccountsControllerMessenger\n> {\n  /**\n   * Constructor for AccountsController.\n   *\n   * @param options - The controller options.\n   * @param options.messenger - The messenger object.\n   * @param options.state - Initial state to set on this controller\n   */\n  constructor({\n    messenger,\n    state,\n  }: {\n    messenger: AccountsControllerMessenger;\n    state: AccountsControllerState;\n  }) {\n    super({\n      messenger,\n      name: controllerName,\n      metadata: accountsControllerMetadata,\n      state: {\n        ...defaultState,\n        ...state,\n      },\n    });\n\n    this.messagingSystem.subscribe(\n      'SnapController:stateChange',\n      (snapStateState) => this.#handleOnSnapStateChange(snapStateState),\n    );\n\n    this.messagingSystem.subscribe(\n      'KeyringController:stateChange',\n      (keyringState) => this.#handleOnKeyringStateChange(keyringState),\n    );\n\n    this.#registerMessageHandlers();\n  }\n\n  /**\n   * Returns the internal account object for the given account ID, if it exists.\n   *\n   * @param accountId - The ID of the account to retrieve.\n   * @returns The internal account object, or undefined if the account does not exist.\n   */\n  getAccount(accountId: string): InternalAccount | undefined {\n    return this.state.internalAccounts.accounts[accountId];\n  }\n\n  /**\n   * Returns an array of all internal accounts.\n   *\n   * @returns An array of InternalAccount objects.\n   */\n  listAccounts(): InternalAccount[] {\n    return Object.values(this.state.internalAccounts.accounts);\n  }\n\n  /**\n   * Returns the internal account object for the given account ID.\n   *\n   * @param accountId - The ID of the account to retrieve.\n   * @returns The internal account object.\n   * @throws An error if the account ID is not found.\n   */\n  getAccountExpect(accountId: string): InternalAccount {\n    // Edge case where the extension is setup but the srp is not yet created\n    // certain ui elements will query the selected address before any accounts are created.\n    if (!accountId) {\n      return {\n        id: '',\n        address: '',\n        options: {},\n        methods: [],\n        type: EthAccountType.Eoa,\n        metadata: {\n          name: '',\n          keyring: {\n            type: '',\n          },\n        },\n      };\n    }\n\n    const account = this.getAccount(accountId);\n    if (account === undefined) {\n      throw new Error(`Account Id \"${accountId}\" not found`);\n    }\n    return account;\n  }\n\n  /**\n   * Returns the selected internal account.\n   *\n   * @returns The selected internal account.\n   */\n  getSelectedAccount(): InternalAccount {\n    return this.getAccountExpect(this.state.internalAccounts.selectedAccount);\n  }\n\n  /**\n   * Returns the account with the specified address.\n   * ! This method will only return the first account that matches the address\n   * @param address - The address of the account to retrieve.\n   * @returns The account with the specified address, or undefined if not found.\n   */\n  getAccountByAddress(address: string): InternalAccount | undefined {\n    return this.listAccounts().find(\n      (account) => account.address.toLowerCase() === address.toLowerCase(),\n    );\n  }\n\n  /**\n   * Sets the selected account by its ID.\n   *\n   * @param accountId - The ID of the account to be selected.\n   */\n  setSelectedAccount(accountId: string): void {\n    const account = this.getAccountExpect(accountId);\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      currentState.internalAccounts.accounts[account.id].metadata.lastSelected =\n        Date.now();\n      currentState.internalAccounts.selectedAccount = account.id;\n    });\n\n    this.messagingSystem.publish(\n      'AccountsController:selectedAccountChange',\n      account,\n    );\n  }\n\n  /**\n   * Sets the name of the account with the given ID.\n   *\n   * @param accountId - The ID of the account to set the name for.\n   * @param accountName - The new name for the account.\n   * @throws An error if an account with the same name already exists.\n   */\n  setAccountName(accountId: string, accountName: string): void {\n    const account = this.getAccountExpect(accountId);\n\n    if (\n      this.listAccounts().find(\n        (internalAccount) =>\n          internalAccount.metadata.name === accountName &&\n          internalAccount.id !== accountId,\n      )\n    ) {\n      throw new Error('Account name already exists');\n    }\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      const internalAccount = {\n        ...account,\n        metadata: { ...account.metadata, name: accountName },\n      };\n      currentState.internalAccounts.accounts[accountId] =\n        // @ts-expect-error Assigning a complex type `T` to `Draft<T>` causes an excessive type instantiation depth error.\n        internalAccount as Draft<InternalAccount>;\n    });\n  }\n\n  /**\n   * Updates the internal accounts list by retrieving normal and snap accounts,\n   * removing duplicates, and updating the metadata of each account.\n   *\n   * @returns A Promise that resolves when the accounts have been updated.\n   */\n  async updateAccounts(): Promise<void> {\n    const snapAccounts: InternalAccount[] = await this.#listSnapAccounts();\n    const normalAccounts = (await this.#listNormalAccounts()).filter(\n      (account) =>\n        !snapAccounts.find(\n          (snapAccount) => snapAccount.address === account.address,\n        ),\n    );\n\n    // keyring type map.\n    const keyringTypes = new Map<string, number>();\n    const previousAccounts = this.state.internalAccounts.accounts;\n\n    const accounts: Record<string, InternalAccount> = [\n      ...normalAccounts,\n      ...snapAccounts,\n    ].reduce((internalAccountMap, internalAccount) => {\n      const keyringTypeName = keyringTypeToName(\n        internalAccount.metadata.keyring.type,\n      );\n      const keyringAccountIndex = keyringTypes.get(keyringTypeName) ?? 0;\n      if (keyringAccountIndex) {\n        keyringTypes.set(keyringTypeName, keyringAccountIndex + 1);\n      } else {\n        keyringTypes.set(keyringTypeName, 1);\n      }\n\n      const existingAccount = previousAccounts[internalAccount.id];\n\n      internalAccountMap[internalAccount.id] = {\n        ...internalAccount,\n\n        metadata: {\n          ...internalAccount.metadata,\n          name:\n            existingAccount && existingAccount.metadata.name !== ''\n              ? existingAccount.metadata.name\n              : `${keyringTypeName} ${keyringAccountIndex + 1}`,\n          lastSelected: existingAccount?.metadata?.lastSelected,\n        },\n      };\n\n      return internalAccountMap;\n    }, {} as Record<string, InternalAccount>);\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      (currentState as AccountsControllerState).internalAccounts.accounts =\n        accounts;\n    });\n  }\n\n  /**\n   * Loads the backup state of the accounts controller.\n   *\n   * @param backup - The backup state to load.\n   */\n  loadBackup(backup: AccountsControllerState): void {\n    if (backup.internalAccounts) {\n      this.update((currentState: Draft<AccountsControllerState>) => {\n        (currentState as AccountsControllerState).internalAccounts =\n          backup.internalAccounts;\n      });\n    }\n  }\n\n  /**\n   * Generates an internal account for a non-Snap account.\n   * @param address - The address of the account.\n   * @param type - The type of the account.\n   * @returns The generated internal account.\n   */\n  #generateInternalAccountForNonSnapAccount(\n    address: string,\n    type: string,\n  ): InternalAccount {\n    return {\n      id: getUUIDFromAddressOfNormalAccount(address),\n      address,\n      options: {},\n      methods: [\n        EthMethod.PersonalSign,\n        EthMethod.Sign,\n        EthMethod.SignTransaction,\n        EthMethod.SignTypedDataV1,\n        EthMethod.SignTypedDataV3,\n        EthMethod.SignTypedDataV4,\n      ],\n      type: EthAccountType.Eoa,\n      metadata: {\n        name: '',\n        keyring: {\n          type,\n        },\n      },\n    };\n  }\n\n  /**\n   * Returns a list of internal accounts created using the SnapKeyring.\n   *\n   * @returns A promise that resolves to an array of InternalAccount objects.\n   */\n  async #listSnapAccounts(): Promise<InternalAccount[]> {\n    const [snapKeyring] = this.messagingSystem.call(\n      'KeyringController:getKeyringsByType',\n      SnapKeyring.type,\n    );\n    // snap keyring is not available until the first account is created in the keyring controller\n    if (!snapKeyring) {\n      return [];\n    }\n\n    const snapAccounts = (snapKeyring as SnapKeyring).listAccounts();\n\n    return snapAccounts;\n  }\n\n  /**\n   * Returns a list of normal accounts.\n   * Note: listNormalAccounts is a temporary method until the keyrings all implement the InternalAccount interface.\n   * Once all keyrings implement the InternalAccount interface, this method can be removed and getAccounts can be used instead.\n   *\n   * @returns A Promise that resolves to an array of InternalAccount objects.\n   */\n  async #listNormalAccounts(): Promise<InternalAccount[]> {\n    const addresses = await this.messagingSystem.call(\n      'KeyringController:getAccounts',\n    );\n    const internalAccounts: InternalAccount[] = [];\n    for (const address of addresses) {\n      const keyring = await this.messagingSystem.call(\n        'KeyringController:getKeyringForAccount',\n        address,\n      );\n\n      internalAccounts.push({\n        id: getUUIDFromAddressOfNormalAccount(address),\n        address,\n        options: {},\n        methods: [\n          EthMethod.PersonalSign,\n          EthMethod.Sign,\n          EthMethod.SignTransaction,\n          EthMethod.SignTypedDataV1,\n          EthMethod.SignTypedDataV3,\n          EthMethod.SignTypedDataV4,\n        ],\n        type: EthAccountType.Eoa,\n        metadata: {\n          name: '',\n          keyring: {\n            type: (keyring as Keyring<Json>).type,\n          },\n        },\n      });\n    }\n\n    return internalAccounts.filter(\n      (account) => account.metadata.keyring.type !== KeyringTypes.snap,\n    );\n  }\n\n  /**\n   * Handles changes in the keyring state, specifically when new accounts are added or removed.\n   *\n   * @param keyringState - The new state of the keyring controller.\n   */\n  #handleOnKeyringStateChange(keyringState: KeyringControllerState): void {\n    // check if there are any new accounts added\n    // TODO: change when accountAdded event is added to the keyring controller\n\n    // We check for keyrings length to be greater than 0 because the extension client may try execute\n    // submit password twice and clear the keyring state.\n    // https://github.com/MetaMask/KeyringController/blob/2d73a4deed8d013913f6ef0c9f5c0bb7c614f7d3/src/KeyringController.ts#L910\n    if (keyringState.isUnlocked && keyringState.keyrings.length > 0) {\n      const updatedNormalKeyringAddresses: AddressAndKeyringTypeObject[] = [];\n      const updatedSnapKeyringAddresses: AddressAndKeyringTypeObject[] = [];\n\n      for (const keyring of keyringState.keyrings) {\n        if (keyring.type === KeyringTypes.snap) {\n          updatedSnapKeyringAddresses.push(\n            ...keyring.accounts.map((address) => {\n              return {\n                address,\n                type: keyring.type,\n              };\n            }),\n          );\n        } else {\n          updatedNormalKeyringAddresses.push(\n            ...keyring.accounts.map((address) => {\n              return {\n                address,\n                type: keyring.type,\n              };\n            }),\n          );\n        }\n      }\n\n      const { previousNormalInternalAccounts, previousSnapInternalAccounts } =\n        this.listAccounts().reduce(\n          (accumulator, account) => {\n            if (account.metadata.keyring.type === KeyringTypes.snap) {\n              accumulator.previousSnapInternalAccounts.push(account);\n            } else {\n              accumulator.previousNormalInternalAccounts.push(account);\n            }\n            return accumulator;\n          },\n          {\n            previousNormalInternalAccounts: [] as InternalAccount[],\n            previousSnapInternalAccounts: [] as InternalAccount[],\n          },\n        );\n\n      const addedAccounts: AddressAndKeyringTypeObject[] = [];\n      const deletedAccounts: InternalAccount[] = [];\n\n      // snap account ids are random uuid while normal accounts\n      // are determininistic based on the address\n\n      // ^NOTE: This will be removed when normal accounts also implement internal accounts\n      // finding all the normal accounts that were added\n      for (const account of updatedNormalKeyringAddresses) {\n        if (\n          !this.state.internalAccounts.accounts[\n            getUUIDFromAddressOfNormalAccount(account.address)\n          ]\n        ) {\n          addedAccounts.push(account);\n        }\n      }\n\n      // finding all the snap accounts that were added\n      for (const account of updatedSnapKeyringAddresses) {\n        if (\n          !previousSnapInternalAccounts.find(\n            (internalAccount) =>\n              internalAccount.address.toLowerCase() ===\n              account.address.toLowerCase(),\n          )\n        ) {\n          addedAccounts.push(account);\n        }\n      }\n\n      // finding all the normal accounts that were deleted\n      for (const account of previousNormalInternalAccounts) {\n        if (\n          !updatedNormalKeyringAddresses.find(\n            ({ address }) =>\n              address.toLowerCase() === account.address.toLowerCase(),\n          )\n        ) {\n          deletedAccounts.push(account);\n        }\n      }\n\n      // finding all the snap accounts that were deleted\n      for (const account of previousSnapInternalAccounts) {\n        if (\n          !updatedSnapKeyringAddresses.find(\n            ({ address }) =>\n              address.toLowerCase() === account.address.toLowerCase(),\n          )\n        ) {\n          deletedAccounts.push(account);\n        }\n      }\n\n      if (deletedAccounts.length > 0) {\n        for (const account of deletedAccounts) {\n          this.#handleAccountRemoved(account.id);\n        }\n      }\n\n      if (addedAccounts.length > 0) {\n        for (const account of addedAccounts) {\n          this.#handleNewAccountAdded(account);\n        }\n      }\n\n      // handle if the selected account was deleted\n      if (!this.getAccount(this.state.internalAccounts.selectedAccount)) {\n        const [accountToSelect] = this.listAccounts().sort(\n          (accountA, accountB) => {\n            // sort by lastSelected descending\n            return (\n              (accountB.metadata.lastSelected ?? 0) -\n              (accountA.metadata.lastSelected ?? 0)\n            );\n          },\n        );\n\n        // if the accountToSelect is undefined, then there are no accounts\n        // it mean the keyring was reinitialized.\n        if (!accountToSelect) {\n          this.update((currentState: Draft<AccountsControllerState>) => {\n            currentState.internalAccounts.selectedAccount = '';\n          });\n          return;\n        }\n\n        this.setSelectedAccount(accountToSelect.id);\n      }\n    }\n  }\n\n  /**\n   * Handles the change in SnapControllerState by updating the metadata of accounts that have a snap enabled.\n   *\n   * @param snapState - The new SnapControllerState.\n   */\n  #handleOnSnapStateChange(snapState: SnapControllerState) {\n    // only check if snaps changed in status\n    const { snaps } = snapState;\n    const accounts = this.listAccounts().filter(\n      (account) => account.metadata.snap,\n    );\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      accounts.forEach((account) => {\n        const currentAccount =\n          currentState.internalAccounts.accounts[account.id];\n        if (currentAccount.metadata.snap) {\n          const snapId = currentAccount.metadata.snap.id;\n          const storedSnap: Snap = snaps[snapId as SnapId];\n          if (storedSnap) {\n            currentAccount.metadata.snap.enabled =\n              storedSnap.enabled && !storedSnap.blocked;\n          }\n        }\n      });\n    });\n  }\n\n  /**\n   * Returns the list of accounts for a given keyring type.\n   * @param keyringType - The type of keyring.\n   * @returns The list of accounts associcated with this keyring type.\n   */\n  #getAccountsByKeyringType(keyringType: string) {\n    return this.listAccounts().filter((internalAccount) => {\n      // We do consider `hd` and `simple` keyrings to be of same type. So we check those 2 types\n      // to group those accounts together!\n      if (\n        keyringType === KeyringTypes.hd ||\n        keyringType === KeyringTypes.simple\n      ) {\n        return (\n          internalAccount.metadata.keyring.type === KeyringTypes.hd ||\n          internalAccount.metadata.keyring.type === KeyringTypes.simple\n        );\n      }\n\n      return internalAccount.metadata.keyring.type === keyringType;\n    });\n  }\n\n  /**\n   * Returns the next account number for a given keyring type.\n   * @param keyringType - The type of keyring.\n   * @returns An object containing the account prefix and index to use.\n   */\n  #getNextAccountNumber(keyringType: string): {\n    accountPrefix: string;\n    indexToUse: number;\n  } {\n    const keyringName = keyringTypeToName(keyringType);\n    const keyringAccounts = this.#getAccountsByKeyringType(keyringType);\n    const lastDefaultIndexUsedForKeyringType = keyringAccounts.reduce(\n      (maxInternalAccountIndex, internalAccount) => {\n        // We **DO NOT USE** `\\d+` here to only consider valid \"human\"\n        // number (rounded decimal number)\n        const match = new RegExp(`${keyringName} ([0-9]+)$`, 'u').exec(\n          internalAccount.metadata.name,\n        );\n\n        if (match) {\n          // Quoting `RegExp.exec` documentation:\n          // > The returned array has the matched text as the first item, and then one item for\n          // > each capturing group of the matched text.\n          // So use `match[1]` to get the captured value\n          const internalAccountIndex = parseInt(match[1], 10);\n          return Math.max(maxInternalAccountIndex, internalAccountIndex);\n        }\n\n        return maxInternalAccountIndex;\n      },\n      0,\n    );\n\n    const indexToUse = Math.max(\n      keyringAccounts.length + 1,\n      lastDefaultIndexUsedForKeyringType + 1,\n    );\n\n    return { accountPrefix: keyringName, indexToUse };\n  }\n\n  /**\n   * Handles the addition of a new account to the controller.\n   * If the account is not a Snap Keyring account, generates an internal account for it and adds it to the controller.\n   * If the account is a Snap Keyring account, retrieves the account from the keyring and adds it to the controller.\n   * @param account - The address and keyring type object of the new account.\n   */\n  #handleNewAccountAdded(account: AddressAndKeyringTypeObject) {\n    let newAccount: InternalAccount;\n    if (account.type !== KeyringTypes.snap) {\n      newAccount = this.#generateInternalAccountForNonSnapAccount(\n        account.address,\n        account.type,\n      );\n    } else {\n      const [snapKeyring] = this.messagingSystem.call(\n        'KeyringController:getKeyringsByType',\n        SnapKeyring.type,\n      );\n\n      newAccount = (snapKeyring as SnapKeyring).getAccountByAddress(\n        account.address,\n      ) as InternalAccount;\n\n      // The snap deleted the account before the keyring controller could add it\n      if (!newAccount) {\n        return;\n      }\n    }\n\n    // get next index number for the keyring type\n    const { accountPrefix, indexToUse } = this.#getNextAccountNumber(\n      newAccount.metadata.keyring.type,\n    );\n\n    const accountName = `${accountPrefix} ${indexToUse}`;\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      (currentState as AccountsControllerState).internalAccounts.accounts[\n        newAccount.id\n      ] = {\n        ...newAccount,\n        metadata: {\n          ...newAccount.metadata,\n          name: accountName,\n          lastSelected: Date.now(),\n        },\n      };\n    });\n\n    this.setSelectedAccount(newAccount.id);\n  }\n\n  /**\n   * Handles the removal of an account from the internal accounts list.\n   * @param accountId - The ID of the account to be removed.\n   */\n  #handleAccountRemoved(accountId: string) {\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      delete currentState.internalAccounts.accounts[accountId];\n    });\n  }\n\n  /**\n   * Registers message handlers for the AccountsController.\n   * @private\n   */\n  #registerMessageHandlers() {\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:setSelectedAccount`,\n      this.setSelectedAccount.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:listAccounts`,\n      this.listAccounts.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:setAccountName`,\n      this.setAccountName.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:updateAccounts`,\n      this.updateAccounts.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:getSelectedAccount`,\n      this.getSelectedAccount.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:getAccountByAddress`,\n      this.getAccountByAddress.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `AccountsController:getAccount`,\n      this.getAccount.bind(this),\n    );\n  }\n}\n"]}

package/dist/{chunk-GATPL76V.mjs → chunk-JNCGDLI7.mjs}

@@ -3,16 +3,13 @@ import {
   __privateMethod,
   getUUIDFromAddressOfNormalAccount,
   keyringTypeToName
-} from "./chunk-HD5HN6GK.mjs";
+} from "./chunk-E7SBT5BV.mjs";
 
 // src/AccountsController.ts
-import { toBuffer } from "@ethereumjs/util";
 import { BaseController } from "@metamask/base-controller";
 import { SnapKeyring } from "@metamask/eth-snap-keyring";
 import { EthAccountType, EthMethod } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
-import { sha256 } from "ethereum-cryptography/sha256";
-import { v4 as uuid } from "uuid";
 var controllerName = "AccountsController";
 var accountsControllerMetadata = {
   internalAccounts: {
@@ -26,7 +23,7 @@ var defaultState = {
     selectedAccount: ""
   }
 };
-var _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn, _listSnapAccounts, listSnapAccounts_fn, _listNormalAccounts, listNormalAccounts_fn, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn, _handleOnSnapStateChange, handleOnSnapStateChange_fn, _getNextAccountNumber, getNextAccountNumber_fn, _handleNewAccountAdded, handleNewAccountAdded_fn, _handleAccountRemoved, handleAccountRemoved_fn, _registerMessageHandlers, registerMessageHandlers_fn;
+var _generateInternalAccountForNonSnapAccount, generateInternalAccountForNonSnapAccount_fn, _listSnapAccounts, listSnapAccounts_fn, _listNormalAccounts, listNormalAccounts_fn, _handleOnKeyringStateChange, handleOnKeyringStateChange_fn, _handleOnSnapStateChange, handleOnSnapStateChange_fn, _getAccountsByKeyringType, getAccountsByKeyringType_fn, _getNextAccountNumber, getNextAccountNumber_fn, _handleNewAccountAdded, handleNewAccountAdded_fn, _handleAccountRemoved, handleAccountRemoved_fn, _registerMessageHandlers, registerMessageHandlers_fn;
 var AccountsController = class extends BaseController {
   /**
    * Constructor for AccountsController.
@@ -81,6 +78,12 @@ var AccountsController = class extends BaseController {
      * @param snapState - The new SnapControllerState.
      */
     __privateAdd(this, _handleOnSnapStateChange);
+    /**
+     * Returns the list of accounts for a given keyring type.
+     * @param keyringType - The type of keyring.
+     * @returns The list of accounts associcated with this keyring type.
+     */
+    __privateAdd(this, _getAccountsByKeyringType);
     /**
      * Returns the next account number for a given keyring type.
      * @param keyringType - The type of keyring.
@@ -156,7 +159,7 @@ var AccountsController = class extends BaseController {
     }
     const account = this.getAccount(accountId);
     if (account === void 0) {
-      throw new Error(`Account Id ${accountId} not found`);
+      throw new Error(`Account Id "${accountId}" not found`);
     }
     return account;
   }
@@ -185,21 +188,15 @@ var AccountsController = class extends BaseController {
    * @param accountId - The ID of the account to be selected.
    */
   setSelectedAccount(accountId) {
-    const account = this.getAccount(accountId);
+    const account = this.getAccountExpect(accountId);
     this.update((currentState) => {
-      if (account) {
-        currentState.internalAccounts.accounts[account.id].metadata.lastSelected = Date.now();
-        currentState.internalAccounts.selectedAccount = account.id;
-      } else {
-        currentState.internalAccounts.selectedAccount = "";
-      }
+      currentState.internalAccounts.accounts[account.id].metadata.lastSelected = Date.now();
+      currentState.internalAccounts.selectedAccount = account.id;
     });
-    if (account) {
-      this.messagingSystem.publish(
-        "AccountsController:selectedAccountChange",
-        account
-      );
-    }
+    this.messagingSystem.publish(
+      "AccountsController:selectedAccountChange",
+      account
+    );
   }
   /**
    * Sets the name of the account with the given ID.
@@ -326,11 +323,8 @@ listNormalAccounts_fn = async function() {
       "KeyringController:getKeyringForAccount",
       address
     );
-    const v4options = {
-      random: sha256(toBuffer(address)).slice(0, 16)
-    };
     internalAccounts.push({
-      id: uuid(v4options),
+      id: getUUIDFromAddressOfNormalAccount(address),
       address,
       options: {},
       methods: [
@@ -438,7 +432,13 @@ handleOnKeyringStateChange_fn = function(keyringState) {
           return (accountB.metadata.lastSelected ?? 0) - (accountA.metadata.lastSelected ?? 0);
         }
       );
-      this.setSelectedAccount(accountToSelect?.id);
+      if (!accountToSelect) {
+        this.update((currentState) => {
+          currentState.internalAccounts.selectedAccount = "";
+        });
+        return;
+      }
+      this.setSelectedAccount(accountToSelect.id);
     }
   }
 };
@@ -461,27 +461,34 @@ handleOnSnapStateChange_fn = function(snapState) {
     });
   });
 };
+_getAccountsByKeyringType = new WeakSet();
+getAccountsByKeyringType_fn = function(keyringType) {
+  return this.listAccounts().filter((internalAccount) => {
+    if (keyringType === KeyringTypes.hd || keyringType === KeyringTypes.simple) {
+      return internalAccount.metadata.keyring.type === KeyringTypes.hd || internalAccount.metadata.keyring.type === KeyringTypes.simple;
+    }
+    return internalAccount.metadata.keyring.type === keyringType;
+  });
+};
 _getNextAccountNumber = new WeakSet();
 getNextAccountNumber_fn = function(keyringType) {
   const keyringName = keyringTypeToName(keyringType);
-  const previousKeyringAccounts = this.listAccounts().filter(
-    (internalAccount) => {
-      if (keyringType === KeyringTypes.hd || keyringType === KeyringTypes.simple) {
-        return internalAccount.metadata.keyring.type === KeyringTypes.hd || internalAccount.metadata.keyring.type === KeyringTypes.simple;
+  const keyringAccounts = __privateMethod(this, _getAccountsByKeyringType, getAccountsByKeyringType_fn).call(this, keyringType);
+  const lastDefaultIndexUsedForKeyringType = keyringAccounts.reduce(
+    (maxInternalAccountIndex, internalAccount) => {
+      const match = new RegExp(`${keyringName} ([0-9]+)$`, "u").exec(
+        internalAccount.metadata.name
+      );
+      if (match) {
+        const internalAccountIndex = parseInt(match[1], 10);
+        return Math.max(maxInternalAccountIndex, internalAccountIndex);
       }
-      return internalAccount.metadata.keyring.type === keyringType;
-    }
+      return maxInternalAccountIndex;
+    },
+    0
   );
-  const lastDefaultIndexUsedForKeyringType = previousKeyringAccounts.filter(
-    (internalAccount) => new RegExp(`${keyringName} \\d+$`, "u").test(
-      internalAccount.metadata.name
-    )
-  ).map((internalAccount) => {
-    const nameToWords = internalAccount.metadata.name.split(" ");
-    return parseInt(nameToWords[nameToWords.length], 10);
-  }).sort((a, b) => b - a)[0] || 0;
   const indexToUse = Math.max(
-    previousKeyringAccounts.length + 1,
+    keyringAccounts.length + 1,
     lastDefaultIndexUsedForKeyringType + 1
   );
   return { accountPrefix: keyringName, indexToUse };
@@ -558,4 +565,4 @@ registerMessageHandlers_fn = function() {
 export {
   AccountsController
 };
-//# sourceMappingURL=chunk-GATPL76V.mjs.map
+//# sourceMappingURL=chunk-JNCGDLI7.mjs.map