@metamask/accounts-controller 3.0.0 → 4.0.0

package/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.0]
+### Changed
+- **BREAKING** Update the `onKeyringStateChange` and `onSnapStateChange` methods, and remove the `keyringApiEnabled` from the AccountsController ([#1839](https://github.com/MetaMask/core/pull/1839))
+- Add getSelectedAccount and getAccountByAddress actions to AccountsController ([#1858](https://github.com/MetaMask/core/pull/1858))
+
 ## [3.0.0]
 ### Changed
 - **BREAKING:** Bump dependency on `@metamask/eth-snap-keyring` to ^1.0.0 ([#1735](https://github.com/MetaMask/core/pull/1735))
@@ -34,7 +39,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@3.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@4.0.0...HEAD
+[4.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@3.0.0...@metamask/accounts-controller@4.0.0
 [3.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@2.0.2...@metamask/accounts-controller@3.0.0
 [2.0.2]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@2.0.1...@metamask/accounts-controller@2.0.2
 [2.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@2.0.0...@metamask/accounts-controller@2.0.1

package/dist/AccountsController.d.ts

@@ -15,23 +15,31 @@ export declare type AccountsControllerGetStateAction = {
     type: `${typeof controllerName}:getState`;
     handler: () => AccountsControllerState;
 };
-export declare type AccountsControllerSetSelectedAccount = {
+export declare type AccountsControllerSetSelectedAccountAction = {
     type: `${typeof controllerName}:setSelectedAccount`;
     handler: AccountsController['setSelectedAccount'];
 };
-export declare type AccountsControllerSetAccountName = {
+export declare type AccountsControllerSetAccountNameAction = {
     type: `${typeof controllerName}:setAccountName`;
     handler: AccountsController['setAccountName'];
 };
-export declare type AccountsControllerListAccounts = {
+export declare type AccountsControllerListAccountsAction = {
     type: `${typeof controllerName}:listAccounts`;
     handler: AccountsController['listAccounts'];
 };
-export declare type AccountsControllerUpdateAccounts = {
+export declare type AccountsControllerUpdateAccountsAction = {
     type: `${typeof controllerName}:updateAccounts`;
     handler: AccountsController['updateAccounts'];
 };
-export declare type AccountsControllerActions = AccountsControllerGetStateAction | AccountsControllerSetSelectedAccount | AccountsControllerListAccounts | AccountsControllerSetAccountName | AccountsControllerUpdateAccounts | KeyringControllerGetKeyringForAccountAction | KeyringControllerGetKeyringsByTypeAction | KeyringControllerGetAccountsAction;
+export declare type AccountsControllerGetSelectedAccountAction = {
+    type: `${typeof controllerName}:getSelectedAccount`;
+    handler: AccountsController['getSelectedAccount'];
+};
+export declare type AccountsControllerGetAccountByAddressAction = {
+    type: `${typeof controllerName}:getAccountByAddress`;
+    handler: AccountsController['getAccountByAddress'];
+};
+export declare type AccountsControllerActions = AccountsControllerGetStateAction | AccountsControllerSetSelectedAccountAction | AccountsControllerListAccountsAction | AccountsControllerSetAccountNameAction | AccountsControllerUpdateAccountsAction | AccountsControllerGetAccountByAddressAction | AccountsControllerGetSelectedAccountAction | KeyringControllerGetKeyringForAccountAction | KeyringControllerGetKeyringsByTypeAction | KeyringControllerGetAccountsAction;
 export declare type AccountsControllerChangeEvent = {
     type: `${typeof controllerName}:stateChange`;
     payload: [AccountsControllerState, Patch[]];
@@ -52,19 +60,16 @@ export declare type AccountsControllerMessenger = RestrictedControllerMessenger<
  */
 export declare class AccountsController extends BaseControllerV2<typeof controllerName, AccountsControllerState, AccountsControllerMessenger> {
     #private;
-    keyringApiEnabled: boolean;
     /**
      * Constructor for AccountsController.
      *
      * @param options - The controller options.
      * @param options.messenger - The messenger object.
      * @param options.state - Initial state to set on this controller
-     * @param [options.keyringApiEnabled] - The keyring API enabled flag.
      */
-    constructor({ messenger, state, keyringApiEnabled, }: {
+    constructor({ messenger, state, }: {
         messenger: AccountsControllerMessenger;
         state: AccountsControllerState;
-        keyringApiEnabled?: boolean;
     });
     /**
      * Returns the internal account object for the given account ID, if it exists.
@@ -93,6 +98,12 @@ export declare class AccountsController extends BaseControllerV2<typeof controll
      * @returns The selected internal account.
      */
     getSelectedAccount(): InternalAccount;
+    /**
+     * Returns the account with the specified address.
+     * ! This method will only return the first account that matches the address
+     * @param address - The address of the account to retrieve.
+     * @returns The account with the specified address, or undefined if not found.
+     */
     getAccountByAddress(address: string): InternalAccount | undefined;
     /**
      * Sets the selected account by its ID.
@@ -122,12 +133,5 @@ export declare class AccountsController extends BaseControllerV2<typeof controll
      */
     loadBackup(backup: AccountsControllerState): void;
 }
-/**
- * Returns the name of the keyring type.
- *
- * @param keyringType - The type of the keyring.
- * @returns The name of the keyring type.
- */
-export declare function keyringTypeToName(keyringType: string): string;
 export {};
 //# sourceMappingURL=AccountsController.d.ts.map

package/dist/AccountsController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsController.d.ts","sourceRoot":"","sources":["../src/AccountsController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountsController.d.ts","sourceRoot":"","sources":["../src/AccountsController.ts"],"names":[],"mappings":"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"}

package/dist/AccountsController.js

@@ -13,14 +13,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AccountsController_instances, _AccountsController_listSnapAccounts, _AccountsController_listNormalAccounts, _AccountsController_handleSelectedAccountRemoved, _AccountsController_handleOnKeyringStateChange, _AccountsController_handleOnSnapStateChange, _AccountsController_handleNewAccountAdded, _AccountsController_registerMessageHandlers;
+var _AccountsController_instances, _AccountsController_generateInternalAccountForNonSnapAccount, _AccountsController_listSnapAccounts, _AccountsController_listNormalAccounts, _AccountsController_handleOnKeyringStateChange, _AccountsController_handleOnSnapStateChange, _AccountsController_getNextAccountNumber, _AccountsController_handleNewAccountAdded, _AccountsController_handleAccountRemoved, _AccountsController_registerMessageHandlers;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.keyringTypeToName = exports.AccountsController = void 0;
+exports.AccountsController = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const eth_snap_keyring_1 = require("@metamask/eth-snap-keyring");
 const keyring_api_1 = require("@metamask/keyring-api");
+const keyring_controller_1 = require("@metamask/keyring-controller");
 const ethereumjs_util_1 = require("ethereumjs-util");
 const uuid_1 = require("uuid");
+const utils_1 = require("./utils");
 const controllerName = 'AccountsController';
 const accountsControllerMetadata = {
     internalAccounts: {
@@ -49,9 +51,8 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
      * @param options - The controller options.
      * @param options.messenger - The messenger object.
      * @param options.state - Initial state to set on this controller
-     * @param [options.keyringApiEnabled] - The keyring API enabled flag.
      */
-    constructor({ messenger, state, keyringApiEnabled, }) {
+    constructor({ messenger, state, }) {
         super({
             messenger,
             name: controllerName,
@@ -59,18 +60,9 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
             state: Object.assign(Object.assign({}, defaultState), state),
         });
         _AccountsController_instances.add(this);
-        this.keyringApiEnabled = Boolean(keyringApiEnabled);
-        if (this.keyringApiEnabled) {
-            this.messagingSystem.subscribe('SnapController:stateChange', (snapStateState) => __awaiter(this, void 0, void 0, function* () { return yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleOnSnapStateChange).call(this, snapStateState); }));
-        }
-        this.messagingSystem.subscribe('KeyringController:stateChange', (keyringState) => __awaiter(this, void 0, void 0, function* () { return yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleOnKeyringStateChange).call(this, keyringState); }));
+        this.messagingSystem.subscribe('SnapController:stateChange', (snapStateState) => __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleOnSnapStateChange).call(this, snapStateState));
+        this.messagingSystem.subscribe('KeyringController:stateChange', (keyringState) => __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleOnKeyringStateChange).call(this, keyringState));
         __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_registerMessageHandlers).call(this);
-        // if somehow the selected account becomes lost then select the first account
-        if (this.state.internalAccounts.selectedAccount !== '' &&
-            !this.getAccount(this.state.internalAccounts.selectedAccount) &&
-            this.listAccounts().length > 0) {
-            this.setSelectedAccount(this.listAccounts()[0].id);
-        }
     }
     /**
      * Returns the internal account object for the given account ID, if it exists.
@@ -128,6 +120,12 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
     getSelectedAccount() {
         return this.getAccountExpect(this.state.internalAccounts.selectedAccount);
     }
+    /**
+     * Returns the account with the specified address.
+     * ! This method will only return the first account that matches the address
+     * @param address - The address of the account to retrieve.
+     * @returns The account with the specified address, or undefined if not found.
+     */
     getAccountByAddress(address) {
         return this.listAccounts().find((account) => account.address.toLowerCase() === address.toLowerCase());
     }
@@ -137,15 +135,19 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
      * @param accountId - The ID of the account to be selected.
      */
     setSelectedAccount(accountId) {
-        const account = this.getAccountExpect(accountId);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore Type instantiation is excessively deep and possibly infinite.
+        const account = this.getAccount(accountId);
         this.update((currentState) => {
-            currentState.internalAccounts.accounts[account.id].metadata.lastSelected =
-                Date.now();
-            currentState.internalAccounts.selectedAccount = account.id;
+            if (account) {
+                currentState.internalAccounts.accounts[account.id].metadata.lastSelected = Date.now();
+                currentState.internalAccounts.selectedAccount = account.id;
+            }
+            else {
+                currentState.internalAccounts.selectedAccount = '';
+            }
         });
-        this.messagingSystem.publish('AccountsController:selectedAccountChange', account);
+        if (account) {
+            this.messagingSystem.publish('AccountsController:selectedAccountChange', account);
+        }
     }
     /**
      * Sets the name of the account with the given ID.
@@ -161,7 +163,10 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
             throw new Error('Account name already exists');
         }
         this.update((currentState) => {
-            currentState.internalAccounts.accounts[accountId] = Object.assign(Object.assign({}, account), { metadata: Object.assign(Object.assign({}, account.metadata), { name: accountName }) });
+            const internalAccount = Object.assign(Object.assign({}, account), { metadata: Object.assign(Object.assign({}, account.metadata), { name: accountName }) });
+            currentState.internalAccounts.accounts[accountId] =
+                // @ts-expect-error Assigning a complex type `T` to `Draft<T>` causes an excessive type instantiation depth error.
+                internalAccount;
         });
     }
     /**
@@ -172,13 +177,8 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
      */
     updateAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            let normalAccounts = yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_listNormalAccounts).call(this);
-            let snapAccounts = [];
-            if (this.keyringApiEnabled) {
-                snapAccounts = yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_listSnapAccounts).call(this);
-                // remove duplicate accounts that are retrieved from the snap keyring.
-                normalAccounts = normalAccounts.filter((account) => !snapAccounts.find((snapAccount) => snapAccount.address === account.address));
-            }
+            const snapAccounts = yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_listSnapAccounts).call(this);
+            const normalAccounts = (yield __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_listNormalAccounts).call(this)).filter((account) => !snapAccounts.find((snapAccount) => snapAccount.address === account.address));
             // keyring type map.
             const keyringTypes = new Map();
             const previousAccounts = this.state.internalAccounts.accounts;
@@ -187,7 +187,7 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
                 ...snapAccounts,
             ].reduce((internalAccountMap, internalAccount) => {
                 var _a, _b;
-                const keyringTypeName = keyringTypeToName(internalAccount.metadata.keyring.type);
+                const keyringTypeName = (0, utils_1.keyringTypeToName)(internalAccount.metadata.keyring.type);
                 const keyringAccountIndex = (_a = keyringTypes.get(keyringTypeName)) !== null && _a !== void 0 ? _a : 0;
                 if (keyringAccountIndex) {
                     keyringTypes.set(keyringTypeName, keyringAccountIndex + 1);
@@ -201,10 +201,9 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
                             : `${keyringTypeName} ${keyringAccountIndex + 1}`, lastSelected: (_b = existingAccount === null || existingAccount === void 0 ? void 0 : existingAccount.metadata) === null || _b === void 0 ? void 0 : _b.lastSelected }) });
                 return internalAccountMap;
             }, {});
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore Type instantiation is excessively deep and possibly infinite.
             this.update((currentState) => {
-                currentState.internalAccounts.accounts = accounts;
+                currentState.internalAccounts.accounts =
+                    accounts;
             });
         });
     }
@@ -216,20 +215,42 @@ class AccountsController extends base_controller_1.BaseControllerV2 {
     loadBackup(backup) {
         if (backup.internalAccounts) {
             this.update((currentState) => {
-                currentState.internalAccounts = backup.internalAccounts;
+                currentState.internalAccounts =
+                    backup.internalAccounts;
             });
         }
     }
 }
 exports.AccountsController = AccountsController;
-_AccountsController_instances = new WeakSet(), _AccountsController_listSnapAccounts = function _AccountsController_listSnapAccounts() {
+_AccountsController_instances = new WeakSet(), _AccountsController_generateInternalAccountForNonSnapAccount = function _AccountsController_generateInternalAccountForNonSnapAccount(address, type) {
+    return {
+        id: (0, utils_1.getUUIDFromAddressOfNormalAccount)(address),
+        address,
+        options: {},
+        methods: [
+            'personal_sign',
+            'eth_sign',
+            'eth_signTransaction',
+            'eth_signTypedData_v1',
+            'eth_signTypedData_v3',
+            'eth_signTypedData_v4',
+        ],
+        type: keyring_api_1.EthAccountType.Eoa,
+        metadata: {
+            name: '',
+            keyring: {
+                type,
+            },
+        },
+    };
+}, _AccountsController_listSnapAccounts = function _AccountsController_listSnapAccounts() {
     return __awaiter(this, void 0, void 0, function* () {
-        const [snapKeyring] = yield this.messagingSystem.call('KeyringController:getKeyringsByType', eth_snap_keyring_1.SnapKeyring.type);
+        const [snapKeyring] = this.messagingSystem.call('KeyringController:getKeyringsByType', eth_snap_keyring_1.SnapKeyring.type);
         // snap keyring is not available until the first account is created in the keyring controller
         if (!snapKeyring) {
             return [];
         }
-        const snapAccounts = yield snapKeyring.listAccounts();
+        const snapAccounts = snapKeyring.listAccounts();
         return snapAccounts;
     });
 }, _AccountsController_listNormalAccounts = function _AccountsController_listNormalAccounts() {
@@ -262,109 +283,163 @@ _AccountsController_instances = new WeakSet(), _AccountsController_listSnapAccou
                 },
             });
         }
-        return internalAccounts.filter((account) => account.metadata.keyring.type !== 'Snap Keyring');
+        return internalAccounts.filter((account) => account.metadata.keyring.type !== keyring_controller_1.KeyringTypes.snap);
     });
-}, _AccountsController_handleSelectedAccountRemoved = function _AccountsController_handleSelectedAccountRemoved() {
-    const previousAccount = this.listAccounts()
-        .filter((account) => account.id !== this.state.internalAccounts.selectedAccount)
-        .sort((accountA, accountB) => {
-        var _a, _b;
-        // sort by lastSelected descending
-        return (((_a = accountB.metadata.lastSelected) !== null && _a !== void 0 ? _a : 0) -
-            ((_b = accountA.metadata.lastSelected) !== null && _b !== void 0 ? _b : 0));
-    })[0];
-    this.setSelectedAccount(previousAccount.id);
 }, _AccountsController_handleOnKeyringStateChange = function _AccountsController_handleOnKeyringStateChange(keyringState) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // check if there are any new accounts added
-        // TODO: change when accountAdded event is added to the keyring controller
-        if (keyringState.isUnlocked) {
-            // TODO: ACCOUNTS_CONTROLLER keyring will return accounts instead of addresses, remove this flatMap after and just get the latest id
-            const updatedKeyringAddresses = keyringState.keyrings.flatMap((keyring) => keyring.accounts);
-            const previousAccounts = this.listAccounts();
-            // if there are no overlaps between the addresses in the keyring and previous accounts,
-            // it means the keyring is being reinitialized because the vault is being restored with the same SRP
-            const overlaps = updatedKeyringAddresses.filter((address) => previousAccounts.find((account) => account.address.toLowerCase() === address.toLowerCase()));
-            yield this.updateAccounts();
-            if (updatedKeyringAddresses.length > previousAccounts.length) {
-                __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleNewAccountAdded).call(this, updatedKeyringAddresses, previousAccounts);
+    // check if there are any new accounts added
+    // TODO: change when accountAdded event is added to the keyring controller
+    if (keyringState.isUnlocked) {
+        const updatedNormalKeyringAddresses = [];
+        const updatedSnapKeyringAddresses = [];
+        for (const keyring of keyringState.keyrings) {
+            if (keyring.type === keyring_controller_1.KeyringTypes.snap) {
+                updatedSnapKeyringAddresses.push(...keyring.accounts.map((address) => {
+                    return {
+                        address,
+                        type: keyring.type,
+                    };
+                }));
             }
-            else if (updatedKeyringAddresses.length > 0 && overlaps.length === 0) {
-                // if the keyring is being reinitialized, the selected account will be reset to the first account
-                this.setSelectedAccount(this.listAccounts()[0].id);
+            else {
+                updatedNormalKeyringAddresses.push(...keyring.accounts.map((address) => {
+                    return {
+                        address,
+                        type: keyring.type,
+                    };
+                }));
+            }
+        }
+        const { previousNormalInternalAccounts, previousSnapInternalAccounts } = this.listAccounts().reduce((accumulator, account) => {
+            if (account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap) {
+                accumulator.previousSnapInternalAccounts.push(account);
             }
-            else if (updatedKeyringAddresses.length < previousAccounts.length &&
-                overlaps.length > 0 &&
-                !this.getAccount(this.state.internalAccounts.selectedAccount)) {
-                __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleSelectedAccountRemoved).call(this);
+            else {
+                accumulator.previousNormalInternalAccounts.push(account);
+            }
+            return accumulator;
+        }, {
+            previousNormalInternalAccounts: [],
+            previousSnapInternalAccounts: [],
+        });
+        const addedAccounts = [];
+        const deletedAccounts = [];
+        // snap account ids are random uuid while normal accounts
+        // are determininistic based on the address
+        // ^NOTE: This will be removed when normal accounts also implement internal accounts
+        // finding all the normal accounts that were added
+        for (const account of updatedNormalKeyringAddresses) {
+            if (!this.state.internalAccounts.accounts[(0, utils_1.getUUIDFromAddressOfNormalAccount)(account.address)]) {
+                addedAccounts.push(account);
             }
         }
-    });
+        // finding all the snap accounts that were added
+        for (const account of updatedSnapKeyringAddresses) {
+            if (!previousSnapInternalAccounts.find((internalAccount) => internalAccount.address.toLowerCase() ===
+                account.address.toLowerCase())) {
+                addedAccounts.push(account);
+            }
+        }
+        // finding all the normal accounts that were deleted
+        for (const account of previousNormalInternalAccounts) {
+            if (!updatedNormalKeyringAddresses.find(({ address }) => address.toLowerCase() === account.address.toLowerCase())) {
+                deletedAccounts.push(account);
+            }
+        }
+        // finding all the snap accounts that were deleted
+        for (const account of previousSnapInternalAccounts) {
+            if (!updatedSnapKeyringAddresses.find(({ address }) => address.toLowerCase() === account.address.toLowerCase())) {
+                deletedAccounts.push(account);
+            }
+        }
+        if (deletedAccounts.length > 0) {
+            for (const account of deletedAccounts) {
+                __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleAccountRemoved).call(this, account.id);
+            }
+        }
+        if (addedAccounts.length > 0) {
+            for (const account of addedAccounts) {
+                __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_handleNewAccountAdded).call(this, account);
+            }
+        }
+        // handle if the selected account was deleted
+        if (!this.getAccount(this.state.internalAccounts.selectedAccount)) {
+            const [accountToSelect] = this.listAccounts().sort((accountA, accountB) => {
+                var _a, _b;
+                // sort by lastSelected descending
+                return (((_a = accountB.metadata.lastSelected) !== null && _a !== void 0 ? _a : 0) -
+                    ((_b = accountA.metadata.lastSelected) !== null && _b !== void 0 ? _b : 0));
+            });
+            // if the accountToSelect is undefined, then there are no accounts
+            // it mean the keyring was reinitialized.
+            this.setSelectedAccount(accountToSelect === null || accountToSelect === void 0 ? void 0 : accountToSelect.id);
+        }
+    }
 }, _AccountsController_handleOnSnapStateChange = function _AccountsController_handleOnSnapStateChange(snapState) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // only check if snaps changed in status
-        const { snaps } = snapState;
-        const accounts = this.listAccounts().filter((account) => account.metadata.snap);
-        this.update((currentState) => {
-            accounts.forEach((account) => {
-                const currentAccount = currentState.internalAccounts.accounts[account.id];
-                if (currentAccount.metadata.snap) {
-                    const snapId = currentAccount.metadata.snap.id;
-                    const storedSnap = snaps[snapId];
-                    if (storedSnap) {
-                        currentAccount.metadata.snap.enabled =
-                            storedSnap.enabled && !storedSnap.blocked;
-                    }
+    // only check if snaps changed in status
+    const { snaps } = snapState;
+    const accounts = this.listAccounts().filter((account) => account.metadata.snap);
+    this.update((currentState) => {
+        accounts.forEach((account) => {
+            const currentAccount = currentState.internalAccounts.accounts[account.id];
+            if (currentAccount.metadata.snap) {
+                const snapId = currentAccount.metadata.snap.id;
+                const storedSnap = snaps[snapId];
+                if (storedSnap) {
+                    currentAccount.metadata.snap.enabled =
+                        storedSnap.enabled && !storedSnap.blocked;
                 }
-            });
+            }
         });
     });
-}, _AccountsController_handleNewAccountAdded = function _AccountsController_handleNewAccountAdded(updatedKeyringAddresses, previousAccounts) {
-    const [newAddress] = updatedKeyringAddresses.filter((address) => !previousAccounts.find((account) => account.address.toLowerCase() === address.toLowerCase()));
-    const [newAccount] = this.listAccounts().filter((account) => account.address.toLowerCase() === newAddress.toLowerCase());
+}, _AccountsController_getNextAccountNumber = function _AccountsController_getNextAccountNumber(keyringType) {
+    const keyringName = (0, utils_1.keyringTypeToName)(keyringType);
+    const previousKeyringAccounts = this.listAccounts().filter((internalAccount) => {
+        if (keyringType === keyring_controller_1.KeyringTypes.hd ||
+            keyringType === keyring_controller_1.KeyringTypes.simple) {
+            return (internalAccount.metadata.keyring.type === keyring_controller_1.KeyringTypes.hd ||
+                internalAccount.metadata.keyring.type === keyring_controller_1.KeyringTypes.simple);
+        }
+        return internalAccount.metadata.keyring.type === keyringType;
+    });
+    const lastDefaultIndexUsedForKeyringType = previousKeyringAccounts
+        .filter((internalAccount) => new RegExp(`${keyringName} \\d+$`, 'u').test(internalAccount.metadata.name))
+        .map((internalAccount) => {
+        const nameToWords = internalAccount.metadata.name.split(' '); // get the index of a default account name
+        return parseInt(nameToWords[nameToWords.length], 10);
+    })
+        .sort((a, b) => b - a)[0] || 0;
+    const indexToUse = Math.max(previousKeyringAccounts.length + 1, lastDefaultIndexUsedForKeyringType + 1);
+    return { accountPrefix: keyringName, indexToUse };
+}, _AccountsController_handleNewAccountAdded = function _AccountsController_handleNewAccountAdded(account) {
+    let newAccount;
+    if (account.type !== keyring_controller_1.KeyringTypes.snap) {
+        newAccount = __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_generateInternalAccountForNonSnapAccount).call(this, account.address, account.type);
+    }
+    else {
+        const [snapKeyring] = this.messagingSystem.call('KeyringController:getKeyringsByType', eth_snap_keyring_1.SnapKeyring.type);
+        newAccount = snapKeyring.getAccountByAddress(account.address);
+        // The snap deleted the account before the keyring controller could add it
+        if (!newAccount) {
+            return;
+        }
+    }
+    // get next index number for the keyring type
+    const { accountPrefix, indexToUse } = __classPrivateFieldGet(this, _AccountsController_instances, "m", _AccountsController_getNextAccountNumber).call(this, newAccount.metadata.keyring.type);
+    const accountName = `${accountPrefix} ${indexToUse}`;
+    this.update((currentState) => {
+        currentState.internalAccounts.accounts[newAccount.id] = Object.assign(Object.assign({}, newAccount), { metadata: Object.assign(Object.assign({}, newAccount.metadata), { name: accountName, lastSelected: Date.now() }) });
+    });
     this.setSelectedAccount(newAccount.id);
+}, _AccountsController_handleAccountRemoved = function _AccountsController_handleAccountRemoved(accountId) {
+    this.update((currentState) => {
+        delete currentState.internalAccounts.accounts[accountId];
+    });
 }, _AccountsController_registerMessageHandlers = function _AccountsController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler(`${controllerName}:setSelectedAccount`, this.setSelectedAccount.bind(this));
     this.messagingSystem.registerActionHandler(`${controllerName}:listAccounts`, this.listAccounts.bind(this));
     this.messagingSystem.registerActionHandler(`${controllerName}:setAccountName`, this.setAccountName.bind(this));
     this.messagingSystem.registerActionHandler(`${controllerName}:updateAccounts`, this.updateAccounts.bind(this));
+    this.messagingSystem.registerActionHandler(`${controllerName}:getSelectedAccount`, this.getSelectedAccount.bind(this));
+    this.messagingSystem.registerActionHandler(`${controllerName}:getAccountByAddress`, this.getAccountByAddress.bind(this));
 };
-/**
- * Returns the name of the keyring type.
- *
- * @param keyringType - The type of the keyring.
- * @returns The name of the keyring type.
- */
-function keyringTypeToName(keyringType) {
-    switch (keyringType) {
-        case 'Simple Key Pair': {
-            return 'Account';
-        }
-        case 'HD Key Tree': {
-            return 'Account';
-        }
-        case 'Trezor Hardware': {
-            return 'Trezor';
-        }
-        case 'Ledger Hardware': {
-            return 'Ledger';
-        }
-        case 'Lattice Hardware': {
-            return 'Lattice';
-        }
-        case 'QR Hardware Wallet Device': {
-            return 'QR';
-        }
-        case 'Snap Keyring': {
-            return 'Snap Account';
-        }
-        case 'Custody': {
-            return 'Custody';
-        }
-        default: {
-            throw new Error(`Unknown keyring ${keyringType}`);
-        }
-    }
-}
-exports.keyringTypeToName = keyringTypeToName;
 //# sourceMappingURL=AccountsController.js.map

package/dist/AccountsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsController.js","sourceRoot":"","sources":["../src/AccountsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseControllerV2 } from '@metamask/base-controller';\nimport { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { InternalAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport type {\n  KeyringControllerState,\n  KeyringControllerEvents,\n  KeyringControllerGetKeyringForAccountAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetAccountsAction,\n} from '@metamask/keyring-controller';\nimport type {\n  SnapControllerEvents,\n  SnapControllerState,\n} from '@metamask/snaps-controllers';\nimport type { Snap, ValidatedSnapId } from '@metamask/snaps-utils';\nimport type { Keyring, Json } from '@metamask/utils';\nimport { sha256FromString } from 'ethereumjs-util';\nimport type { Patch } from 'immer';\nimport { v4 as uuid } from 'uuid';\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 = {\n  type: `${typeof controllerName}:getState`;\n  handler: () => AccountsControllerState;\n};\n\nexport type AccountsControllerSetSelectedAccount = {\n  type: `${typeof controllerName}:setSelectedAccount`;\n  handler: AccountsController['setSelectedAccount'];\n};\n\nexport type AccountsControllerSetAccountName = {\n  type: `${typeof controllerName}:setAccountName`;\n  handler: AccountsController['setAccountName'];\n};\n\nexport type AccountsControllerListAccounts = {\n  type: `${typeof controllerName}:listAccounts`;\n  handler: AccountsController['listAccounts'];\n};\n\nexport type AccountsControllerUpdateAccounts = {\n  type: `${typeof controllerName}:updateAccounts`;\n  handler: AccountsController['updateAccounts'];\n};\n\nexport type AccountsControllerActions =\n  | AccountsControllerGetStateAction\n  | AccountsControllerSetSelectedAccount\n  | AccountsControllerListAccounts\n  | AccountsControllerSetAccountName\n  | AccountsControllerUpdateAccounts\n  | KeyringControllerGetKeyringForAccountAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerGetAccountsAction;\n\nexport type AccountsControllerChangeEvent = {\n  type: `${typeof controllerName}:stateChange`;\n  payload: [AccountsControllerState, Patch[]];\n};\n\nexport type AccountsControllerSelectedAccountChangeEvent = {\n  type: `${typeof controllerName}:selectedAccountChange`;\n  payload: [InternalAccount];\n};\n\nexport type AccountsControllerEvents =\n  | AccountsControllerChangeEvent\n  | AccountsControllerSelectedAccountChangeEvent\n  | SnapControllerEvents\n  | KeyringControllerEvents;\n\nexport type AccountsControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  AccountsControllerActions,\n  AccountsControllerEvents,\n  string,\n  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 BaseControllerV2<\n  typeof controllerName,\n  AccountsControllerState,\n  AccountsControllerMessenger\n> {\n  keyringApiEnabled: boolean;\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   * @param [options.keyringApiEnabled] - The keyring API enabled flag.\n   */\n  constructor({\n    messenger,\n    state,\n    keyringApiEnabled,\n  }: {\n    messenger: AccountsControllerMessenger;\n    state: AccountsControllerState;\n    keyringApiEnabled?: boolean;\n  }) {\n    super({\n      messenger,\n      name: controllerName,\n      metadata: accountsControllerMetadata,\n      state: {\n        ...defaultState,\n        ...state,\n      },\n    });\n\n    this.keyringApiEnabled = Boolean(keyringApiEnabled);\n\n    if (this.keyringApiEnabled) {\n      this.messagingSystem.subscribe(\n        'SnapController:stateChange',\n        async (snapStateState) =>\n          await this.#handleOnSnapStateChange(snapStateState),\n      );\n    }\n\n    this.messagingSystem.subscribe(\n      'KeyringController:stateChange',\n      async (keyringState) =>\n        await this.#handleOnKeyringStateChange(keyringState),\n    );\n\n    this.#registerMessageHandlers();\n\n    // if somehow the selected account becomes lost then select the first account\n    if (\n      this.state.internalAccounts.selectedAccount !== '' &&\n      !this.getAccount(this.state.internalAccounts.selectedAccount) &&\n      this.listAccounts().length > 0\n    ) {\n      this.setSelectedAccount(this.listAccounts()[0].id);\n    }\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  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    // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n    // @ts-ignore Type instantiation is excessively deep and possibly infinite.\n    this.update((currentState: 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: AccountsControllerState) => {\n      currentState.internalAccounts.accounts[accountId] = {\n        ...account,\n        metadata: {\n          ...account.metadata,\n          name: accountName,\n        },\n      };\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    let normalAccounts = await this.#listNormalAccounts();\n    let snapAccounts: InternalAccount[] = [];\n    if (this.keyringApiEnabled) {\n      snapAccounts = await this.#listSnapAccounts();\n      // remove duplicate accounts that are retrieved from the snap keyring.\n      normalAccounts = normalAccounts.filter(\n        (account) =>\n          !snapAccounts.find(\n            (snapAccount) => snapAccount.address === account.address,\n          ),\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    // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n    // @ts-ignore Type instantiation is excessively deep and possibly infinite.\n    this.update((currentState: AccountsControllerState) => {\n      currentState.internalAccounts.accounts = 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: AccountsControllerState) => {\n        currentState.internalAccounts = backup.internalAccounts;\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] = await 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 = await (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      const v4options = {\n        random: sha256FromString(address).slice(0, 16),\n      };\n\n      internalAccounts.push({\n        id: uuid(v4options),\n        address,\n        options: {},\n        methods: [\n          'personal_sign',\n          'eth_sign',\n          'eth_signTransaction',\n          'eth_signTypedData_v1',\n          'eth_signTypedData_v3',\n          'eth_signTypedData_v4',\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 !== 'Snap Keyring',\n    );\n  }\n\n  /**\n   * Handles the removal of the currently selected account by selecting the previous account in the list.\n   */\n  #handleSelectedAccountRemoved() {\n    const previousAccount = this.listAccounts()\n      .filter(\n        (account) => account.id !== this.state.internalAccounts.selectedAccount,\n      )\n      .sort((accountA, accountB) => {\n        // sort by lastSelected descending\n        return (\n          (accountB.metadata.lastSelected ?? 0) -\n          (accountA.metadata.lastSelected ?? 0)\n        );\n      })[0];\n\n    this.setSelectedAccount(previousAccount.id);\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   * @returns A Promise that resolves when the function has finished executing.\n   */\n  async #handleOnKeyringStateChange(\n    keyringState: KeyringControllerState,\n  ): Promise<void> {\n    // check if there are any new accounts added\n    // TODO: change when accountAdded event is added to the keyring controller\n\n    if (keyringState.isUnlocked) {\n      // TODO: ACCOUNTS_CONTROLLER keyring will return accounts instead of addresses, remove this flatMap after and just get the latest id\n      const updatedKeyringAddresses = keyringState.keyrings.flatMap(\n        (keyring) => keyring.accounts,\n      );\n      const previousAccounts = this.listAccounts();\n\n      // if there are no overlaps between the addresses in the keyring and previous accounts,\n      // it means the keyring is being reinitialized because the vault is being restored with the same SRP\n      const overlaps = updatedKeyringAddresses.filter((address) =>\n        previousAccounts.find(\n          (account) => account.address.toLowerCase() === address.toLowerCase(),\n        ),\n      );\n\n      await this.updateAccounts();\n\n      if (updatedKeyringAddresses.length > previousAccounts.length) {\n        this.#handleNewAccountAdded(updatedKeyringAddresses, previousAccounts);\n      } else if (updatedKeyringAddresses.length > 0 && overlaps.length === 0) {\n        // if the keyring is being reinitialized, the selected account will be reset to the first account\n        this.setSelectedAccount(this.listAccounts()[0].id);\n      } else if (\n        updatedKeyringAddresses.length < previousAccounts.length &&\n        overlaps.length > 0 &&\n        !this.getAccount(this.state.internalAccounts.selectedAccount)\n      ) {\n        this.#handleSelectedAccountRemoved();\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   * @returns A Promise that resolves when the update is complete.\n   */\n  async #handleOnSnapStateChange(\n    snapState: SnapControllerState,\n  ): Promise<void> {\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: 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 ValidatedSnapId];\n          if (storedSnap) {\n            currentAccount.metadata.snap.enabled =\n              storedSnap.enabled && !storedSnap.blocked;\n          }\n        }\n      });\n    });\n  }\n\n  /**\n   * Handles the event when a new account is added to the keyring.\n   *\n   * @param updatedKeyringAddresses - An array of updated keyring addresses.\n   * @param previousAccounts - An array of previous internal accounts.\n   */\n  #handleNewAccountAdded(\n    updatedKeyringAddresses: string[],\n    previousAccounts: InternalAccount[],\n  ) {\n    const [newAddress] = updatedKeyringAddresses.filter(\n      (address) =>\n        !previousAccounts.find(\n          (account) => account.address.toLowerCase() === address.toLowerCase(),\n        ),\n    );\n\n    const [newAccount] = this.listAccounts().filter(\n      (account) => account.address.toLowerCase() === newAddress.toLowerCase(),\n    );\n\n    this.setSelectedAccount(newAccount.id);\n  }\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}\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  switch (keyringType) {\n    case 'Simple Key Pair': {\n      return 'Account';\n    }\n    case 'HD Key Tree': {\n      return 'Account';\n    }\n    case 'Trezor Hardware': {\n      return 'Trezor';\n    }\n    case 'Ledger Hardware': {\n      return 'Ledger';\n    }\n    case 'Lattice Hardware': {\n      return 'Lattice';\n    }\n    case 'QR Hardware Wallet Device': {\n      return 'QR';\n    }\n    case 'Snap Keyring': {\n      return 'Snap Account';\n    }\n    case 'Custody': {\n      return 'Custody';\n    }\n    default: {\n      throw new Error(`Unknown keyring ${keyringType}`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"AccountsController.js","sourceRoot":"","sources":["../src/AccountsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseControllerV2 } from '@metamask/base-controller';\nimport { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { InternalAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  KeyringControllerState,\n  KeyringControllerEvents,\n  KeyringControllerGetKeyringForAccountAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetAccountsAction,\n} from '@metamask/keyring-controller';\nimport type {\n  SnapControllerEvents,\n  SnapControllerState,\n} from '@metamask/snaps-controllers';\nimport type { Snap, ValidatedSnapId } from '@metamask/snaps-utils';\nimport type { Keyring, Json } from '@metamask/utils';\nimport { sha256FromString } from 'ethereumjs-util';\nimport type { Patch, Draft } from 'immer';\nimport { v4 as uuid } from 'uuid';\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 = {\n  type: `${typeof controllerName}:getState`;\n  handler: () => 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};\nexport type AccountsControllerActions =\n  | AccountsControllerGetStateAction\n  | AccountsControllerSetSelectedAccountAction\n  | AccountsControllerListAccountsAction\n  | AccountsControllerSetAccountNameAction\n  | AccountsControllerUpdateAccountsAction\n  | AccountsControllerGetAccountByAddressAction\n  | AccountsControllerGetSelectedAccountAction\n  | KeyringControllerGetKeyringForAccountAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerGetAccountsAction;\n\nexport type AccountsControllerChangeEvent = {\n  type: `${typeof controllerName}:stateChange`;\n  payload: [AccountsControllerState, Patch[]];\n};\n\nexport type AccountsControllerSelectedAccountChangeEvent = {\n  type: `${typeof controllerName}:selectedAccountChange`;\n  payload: [InternalAccount];\n};\n\nexport type AccountsControllerEvents =\n  | AccountsControllerChangeEvent\n  | AccountsControllerSelectedAccountChangeEvent\n  | SnapControllerEvents\n  | KeyringControllerEvents;\n\nexport type AccountsControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  AccountsControllerActions,\n  AccountsControllerEvents,\n  string,\n  string\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 BaseControllerV2<\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.getAccount(accountId);\n\n    this.update((currentState: Draft<AccountsControllerState>) => {\n      if (account) {\n        currentState.internalAccounts.accounts[\n          account.id\n        ].metadata.lastSelected = Date.now();\n        currentState.internalAccounts.selectedAccount = account.id;\n      } else {\n        currentState.internalAccounts.selectedAccount = '';\n      }\n    });\n\n    if (account) {\n      this.messagingSystem.publish(\n        'AccountsController:selectedAccountChange',\n        account,\n      );\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        'personal_sign',\n        'eth_sign',\n        'eth_signTransaction',\n        'eth_signTypedData_v1',\n        'eth_signTypedData_v3',\n        'eth_signTypedData_v4',\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      const v4options = {\n        random: sha256FromString(address).slice(0, 16),\n      };\n\n      internalAccounts.push({\n        id: uuid(v4options),\n        address,\n        options: {},\n        methods: [\n          'personal_sign',\n          'eth_sign',\n          'eth_signTransaction',\n          'eth_signTypedData_v1',\n          'eth_signTypedData_v3',\n          'eth_signTypedData_v4',\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    if (keyringState.isUnlocked) {\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        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 ValidatedSnapId];\n          if (storedSnap) {\n            currentAccount.metadata.snap.enabled =\n              storedSnap.enabled && !storedSnap.blocked;\n          }\n        }\n      });\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 previousKeyringAccounts = this.listAccounts().filter(\n      (internalAccount) => {\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        return internalAccount.metadata.keyring.type === keyringType;\n      },\n    );\n    const lastDefaultIndexUsedForKeyringType =\n      previousKeyringAccounts\n        .filter((internalAccount) =>\n          new RegExp(`${keyringName} \\\\d+$`, 'u').test(\n            internalAccount.metadata.name,\n          ),\n        )\n        .map((internalAccount) => {\n          const nameToWords = internalAccount.metadata.name.split(' '); // get the index of a default account name\n          return parseInt(nameToWords[nameToWords.length], 10);\n        })\n        .sort((a, b) => b - a)[0] || 0;\n\n    const indexToUse = Math.max(\n      previousKeyringAccounts.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}\n"]}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './AccountsController';
+export * from './utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AccountsController"), exports);
+__exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC","sourcesContent":["export * from './AccountsController';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,0CAAwB","sourcesContent":["export * from './AccountsController';\nexport * from './utils';\n"]}

package/dist/utils.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Returns the name of the keyring type.
+ *
+ * @param keyringType - The type of the keyring.
+ * @returns The name of the keyring type.
+ */
+export declare function keyringTypeToName(keyringType: string): string;
+/**
+ * Generates a UUID from a given Ethereum address.
+ * @param address - The Ethereum address to generate the UUID from.
+ * @returns The generated UUID.
+ */
+export declare function getUUIDFromAddressOfNormalAccount(address: string): string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CA8B7D;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMzE"}

package/dist/utils.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUUIDFromAddressOfNormalAccount = exports.keyringTypeToName = void 0;
+const keyring_controller_1 = require("@metamask/keyring-controller");
+const ethereumjs_util_1 = require("ethereumjs-util");
+const uuid_1 = require("uuid");
+/**
+ * Returns the name of the keyring type.
+ *
+ * @param keyringType - The type of the keyring.
+ * @returns The name of the keyring type.
+ */
+function keyringTypeToName(keyringType) {
+    switch (keyringType) {
+        case keyring_controller_1.KeyringTypes.simple: {
+            return 'Account';
+        }
+        case keyring_controller_1.KeyringTypes.hd: {
+            return 'Account';
+        }
+        case keyring_controller_1.KeyringTypes.trezor: {
+            return 'Trezor';
+        }
+        case keyring_controller_1.KeyringTypes.ledger: {
+            return 'Ledger';
+        }
+        case keyring_controller_1.KeyringTypes.lattice: {
+            return 'Lattice';
+        }
+        case keyring_controller_1.KeyringTypes.qr: {
+            return 'QR';
+        }
+        case keyring_controller_1.KeyringTypes.snap: {
+            return 'Snap Account';
+        }
+        case keyring_controller_1.KeyringTypes.custody: {
+            return 'Custody';
+        }
+        default: {
+            throw new Error(`Unknown keyring ${keyringType}`);
+        }
+    }
+}
+exports.keyringTypeToName = keyringTypeToName;
+/**
+ * Generates a UUID from a given Ethereum address.
+ * @param address - The Ethereum address to generate the UUID from.
+ * @returns The generated UUID.
+ */
+function getUUIDFromAddressOfNormalAccount(address) {
+    const v4options = {
+        random: (0, ethereumjs_util_1.sha256FromString)(address).slice(0, 16),
+    };
+    return (0, uuid_1.v4)(v4options);
+}
+exports.getUUIDFromAddressOfNormalAccount = getUUIDFromAddressOfNormalAccount;
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAC5D,qDAAmD;AACnD,+BAAkC;AAElC;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,QAAQ,WAAW,EAAE;QACnB,KAAK,iCAAY,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,SAAS,CAAC;SAClB;QACD,KAAK,iCAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,SAAS,CAAC;SAClB;QACD,KAAK,iCAAY,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,iCAAY,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,iCAAY,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO,SAAS,CAAC;SAClB;QACD,KAAK,iCAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,IAAI,CAAC;SACb;QACD,KAAK,iCAAY,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,cAAc,CAAC;SACvB;QACD,KAAK,iCAAY,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,CAAC,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC;SACnD;KACF;AACH,CAAC;AA9BD,8CA8BC;AAED;;;;GAIG;AACH,SAAgB,iCAAiC,CAAC,OAAe;IAC/D,MAAM,SAAS,GAAG;QAChB,MAAM,EAAE,IAAA,kCAAgB,EAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;KAC/C,CAAC;IAEF,OAAO,IAAA,SAAI,EAAC,SAAS,CAAC,CAAC;AACzB,CAAC;AAND,8EAMC","sourcesContent":["import { KeyringTypes } from '@metamask/keyring-controller';\nimport { sha256FromString } from 'ethereumjs-util';\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  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    case KeyringTypes.custody: {\n      return 'Custody';\n    }\n    default: {\n      throw new Error(`Unknown keyring ${keyringType}`);\n    }\n  }\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  const v4options = {\n    random: sha256FromString(address).slice(0, 16),\n  };\n\n  return uuid(v4options);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/accounts-controller",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Manages internal accounts",
   "keywords": [
     "MetaMask",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^3.2.3",
-    "@metamask/eth-snap-keyring": "^1.0.0",
+    "@metamask/eth-snap-keyring": "^2.0.0",
     "@metamask/keyring-api": "^1.0.0",
     "@metamask/snaps-utils": "^3.0.0",
     "@metamask/utils": "^8.1.0",
@@ -40,8 +40,8 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@metamask/auto-changelog": "^3.1.0",
-    "@metamask/keyring-controller": "^8.0.3",
+    "@metamask/auto-changelog": "^3.4.2",
+    "@metamask/keyring-controller": "^8.1.0",
     "@metamask/snaps-controllers": "^3.0.0",
     "@types/jest": "^27.4.1",
     "@types/readable-stream": "^2.3.0",
@@ -52,7 +52,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/keyring-controller": "^8.0.3"
+    "@metamask/keyring-controller": "^8.1.0"
   },
   "engines": {
     "node": ">=16.0.0"