@metamask-previews/account-tree-controller 0.7.0-preview-0910ff0 → 0.7.0-preview-98faf75a

package/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `group.type` tag ([#6214](https://github.com/MetaMask/core/pull/6214))
+  - This `type` can be used as a tag to strongly-type (tagged-union) the `AccountGroupObject`.
+- Add `group.metadata` metadata object ([#6214](https://github.com/MetaMask/core/pull/6214))
+  - Given the `group.type` you will now have access to specific metadata information (e.g. `groupIndex` for multichain account groups)
+
+### Changed
+
+- **BREAKING:** Bump peer dependency `@metamask/account-api` from `^0.3.0` to `^0.7.0` ([#6214](https://github.com/MetaMask/core/pull/6214)), ([#6216](https://github.com/MetaMask/core/pull/6216)), ([#6222](https://github.com/MetaMask/core/pull/6222))
+- **BREAKING:** Move `wallet.metadata.type` tag to `wallet` node ([#6214](https://github.com/MetaMask/core/pull/6214))
+  - This `type` can be used as a tag to strongly-type (tagged-union) the `AccountWalletObject`.
+- Defaults to the EVM account from a group when using `setSelectedAccountGroup` ([#6208](https://github.com/MetaMask/core/pull/6208))
+  - In case no EVM accounts are found in a group (which should not be possible), it will defaults to the first account of that group.
+
 ## [0.7.0]
 
 ### Added

package/dist/AccountTreeController.cjs

@@ -10,15 +10,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 _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_rules, _AccountTreeController_categoryToRule, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_renameAccountWalletIfNeeded, _AccountTreeController_renameAccountGroupIfNeeded, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_getFirstAccountInGroup, _AccountTreeController_findFirstNonEmptyGroup, _AccountTreeController_registerMessageHandlers;
+var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_rules, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_renameAccountWalletIfNeeded, _AccountTreeController_renameAccountGroupIfNeeded, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_registerMessageHandlers;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountTreeController = exports.getDefaultAccountTreeControllerState = exports.controllerName = void 0;
 const account_api_1 = require("@metamask/account-api");
 const base_controller_1 = require("@metamask/base-controller");
-const AccountTreeWallet_1 = require("./AccountTreeWallet.cjs");
+const keyring_api_1 = require("@metamask/keyring-api");
 const entropy_1 = require("./rules/entropy.cjs");
 const keyring_1 = require("./rules/keyring.cjs");
 const snap_1 = require("./rules/snap.cjs");
+const wallet_1 = require("./wallet.cjs");
 exports.controllerName = 'AccountTreeController';
 const accountTreeControllerMetadata = {
     accountTree: {
@@ -61,22 +62,16 @@ class AccountTreeController extends base_controller_1.BaseController {
         _AccountTreeController_instances.add(this);
         _AccountTreeController_accountIdToContext.set(this, void 0);
         _AccountTreeController_rules.set(this, void 0);
-        _AccountTreeController_categoryToRule.set(this, void 0);
         // Reverse map to allow fast node access from an account ID.
         __classPrivateFieldSet(this, _AccountTreeController_accountIdToContext, new Map(), "f");
         // Rules to apply to construct the wallets tree.
-        __classPrivateFieldSet(this, _AccountTreeController_categoryToRule, {
-            [account_api_1.AccountWalletCategory.Entropy]: new entropy_1.EntropyRule(this.messagingSystem),
-            [account_api_1.AccountWalletCategory.Snap]: new snap_1.SnapRule(this.messagingSystem),
-            [account_api_1.AccountWalletCategory.Keyring]: new keyring_1.KeyringRule(this.messagingSystem),
-        }, "f");
         __classPrivateFieldSet(this, _AccountTreeController_rules, [
             // 1. We group by entropy-source
-            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Entropy],
+            new entropy_1.EntropyRule(this.messagingSystem),
             // 2. We group by Snap ID
-            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Snap],
+            new snap_1.SnapRule(this.messagingSystem),
             // 3. We group by wallet type (this rule cannot fail and will group all non-matching accounts)
-            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Keyring],
+            new keyring_1.KeyringRule(this.messagingSystem),
         ], "f");
         this.messagingSystem.subscribe('AccountsController:accountAdded', (account) => {
             __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_handleAccountAdded).call(this, account);
@@ -116,11 +111,11 @@ class AccountTreeController extends base_controller_1.BaseController {
         if (!wallet) {
             return undefined;
         }
-        return new AccountTreeWallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
+        return new wallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
     }
     getAccountWallets() {
         return Object.values(this.state.accountTree.wallets).map((wallet) => {
-            return new AccountTreeWallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
+            return new wallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
         });
     }
     /**
@@ -143,7 +138,7 @@ class AccountTreeController extends base_controller_1.BaseController {
             return;
         }
         // Find the first account in this group to select
-        const accountToSelect = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getFirstAccountInGroup).call(this, groupId);
+        const accountToSelect = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultAccountFromAccountGroupId).call(this, groupId);
         if (!accountToSelect) {
             throw new Error(`No accounts found in group: ${groupId}`);
         }
@@ -157,29 +152,47 @@ class AccountTreeController extends base_controller_1.BaseController {
     }
 }
 exports.AccountTreeController = AccountTreeController;
-_AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeController_rules = new WeakMap(), _AccountTreeController_categoryToRule = new WeakMap(), _AccountTreeController_instances = new WeakSet(), _AccountTreeController_getDefaultSelectedAccountGroup = function _AccountTreeController_getDefaultSelectedAccountGroup(wallets) {
-    const selectedAccount = this.messagingSystem.call('AccountsController:getSelectedAccount');
-    if (selectedAccount && selectedAccount.id) {
-        const accountMapping = __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").get(selectedAccount.id);
-        if (accountMapping) {
-            const { groupId } = accountMapping;
-            return groupId;
-        }
-    }
-    // Default to the first non-empty group in case of errors.
-    return __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_findFirstNonEmptyGroup).call(this, wallets);
+_AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeController_rules = new WeakMap(), _AccountTreeController_instances = new WeakSet(), _AccountTreeController_getEntropyRule = function _AccountTreeController_getEntropyRule() {
+    return __classPrivateFieldGet(this, _AccountTreeController_rules, "f")[0];
+}, _AccountTreeController_getSnapRule = function _AccountTreeController_getSnapRule() {
+    return __classPrivateFieldGet(this, _AccountTreeController_rules, "f")[1];
+}, _AccountTreeController_getKeyringRule = function _AccountTreeController_getKeyringRule() {
+    return __classPrivateFieldGet(this, _AccountTreeController_rules, "f")[2];
 }, _AccountTreeController_renameAccountWalletIfNeeded = function _AccountTreeController_renameAccountWalletIfNeeded(wallet) {
     if (wallet.metadata.name) {
         return;
     }
-    const rule = __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[wallet.metadata.type];
-    wallet.metadata.name = rule.getDefaultAccountWalletName(wallet);
+    if (wallet.type === account_api_1.AccountWalletType.Entropy) {
+        wallet.metadata.name =
+            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getEntropyRule).call(this).getDefaultAccountWalletName(wallet);
+    }
+    else if (wallet.type === account_api_1.AccountWalletType.Snap) {
+        wallet.metadata.name =
+            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getSnapRule).call(this).getDefaultAccountWalletName(wallet);
+    }
+    else {
+        wallet.metadata.name =
+            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getKeyringRule).call(this).getDefaultAccountWalletName(wallet);
+    }
 }, _AccountTreeController_renameAccountGroupIfNeeded = function _AccountTreeController_renameAccountGroupIfNeeded(wallet, group) {
     if (group.metadata.name) {
         return;
     }
-    const rule = __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[wallet.metadata.type];
-    group.metadata.name = rule.getDefaultAccountGroupName(group);
+    if (wallet.type === account_api_1.AccountWalletType.Entropy) {
+        group.metadata.name = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getEntropyRule).call(this).getDefaultAccountGroupName(
+        // Get the group from the wallet, to get the proper type inference.
+        wallet.groups[group.id]);
+    }
+    else if (wallet.type === account_api_1.AccountWalletType.Snap) {
+        group.metadata.name = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getSnapRule).call(this).getDefaultAccountGroupName(
+        // Same here.
+        wallet.groups[group.id]);
+    }
+    else {
+        group.metadata.name = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getKeyringRule).call(this).getDefaultAccountGroupName(
+        // Same here.
+        wallet.groups[group.id]);
+    }
 }, _AccountTreeController_handleAccountAdded = function _AccountTreeController_handleAccountAdded(account) {
     this.update((state) => {
         __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_insert).call(this, state.accountTree.wallets, account);
@@ -211,7 +224,7 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
                         accounts.length === 0) {
                         // The currently selected group is now empty, find a new group to select
                         state.accountTree.selectedAccountGroup =
-                            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_findFirstNonEmptyGroup).call(this, state.accountTree.wallets);
+                            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultAccountGroupId).call(this, state.accountTree.wallets);
                     }
                 }
             }
@@ -220,48 +233,62 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").delete(accountId);
     }
 }, _AccountTreeController_insert = function _AccountTreeController_insert(wallets, account) {
-    for (const rule of __classPrivateFieldGet(this, _AccountTreeController_rules, "f")) {
-        const result = rule.match(account);
-        if (!result) {
-            // No match for that rule, we go to the next one.
-            continue;
-        }
-        // Update controller's state.
-        const walletId = result.wallet.id;
-        let wallet = wallets[walletId];
-        if (!wallet) {
-            wallets[walletId] = {
-                id: walletId,
-                groups: {},
-                metadata: {
-                    name: '',
-                    ...result.wallet.metadata,
-                },
-            };
-            wallet = wallets[walletId];
-        }
-        const groupId = result.group.id;
-        let group = wallet.groups[groupId];
-        if (!group) {
-            wallet.groups[groupId] = {
-                id: groupId,
-                accounts: [],
-                metadata: {
-                    name: '', // Will get updated later.
-                },
-            };
-            group = wallet.groups[groupId];
-        }
+    const result = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getEntropyRule).call(this).match(account) ??
+        __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getSnapRule).call(this).match(account) ??
+        __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getKeyringRule).call(this).match(account); // This one cannot fail.
+    // Update controller's state.
+    const walletId = result.wallet.id;
+    let wallet = wallets[walletId];
+    if (!wallet) {
+        wallets[walletId] = {
+            ...result.wallet,
+            groups: {},
+            metadata: {
+                name: '',
+                ...result.wallet.metadata,
+            },
+            // We do need to type-cast since we're not narrowing `result` with
+            // the union tag `result.wallet.type`.
+        };
+        wallet = wallets[walletId];
+    }
+    const groupId = result.group.id;
+    let group = wallet.groups[groupId];
+    if (!group) {
+        wallet.groups[groupId] = {
+            ...result.group,
+            // Type-wise, we are guaranteed to always have at least 1 account.
+            accounts: [account.id],
+            metadata: {
+                name: '',
+                ...result.group.metadata,
+            },
+            // We do need to type-cast since we're not narrowing `result` with
+            // the union tag `result.group.type`.
+        };
+        group = wallet.groups[groupId];
+    }
+    else {
         group.accounts.push(account.id);
-        // Update the reverse mapping for this account.
-        __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").set(account.id, {
-            walletId: wallet.id,
-            groupId: group.id,
-        });
-        return;
     }
+    // Update the reverse mapping for this account.
+    __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").set(account.id, {
+        walletId: wallet.id,
+        groupId: group.id,
+    });
 }, _AccountTreeController_listAccounts = function _AccountTreeController_listAccounts() {
     return this.messagingSystem.call('AccountsController:listMultichainAccounts');
+}, _AccountTreeController_getDefaultSelectedAccountGroup = function _AccountTreeController_getDefaultSelectedAccountGroup(wallets) {
+    const selectedAccount = this.messagingSystem.call('AccountsController:getSelectedAccount');
+    if (selectedAccount && selectedAccount.id) {
+        const accountMapping = __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").get(selectedAccount.id);
+        if (accountMapping) {
+            const { groupId } = accountMapping;
+            return groupId;
+        }
+    }
+    // Default to the default group in case of errors.
+    return __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultAccountGroupId).call(this, wallets);
 }, _AccountTreeController_handleSelectedAccountChange = function _AccountTreeController_handleSelectedAccountChange(account) {
     const accountMapping = __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").get(account.id);
     if (!accountMapping) {
@@ -278,25 +305,48 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
     this.update((state) => {
         state.accountTree.selectedAccountGroup = groupId;
     });
-}, _AccountTreeController_getFirstAccountInGroup = function _AccountTreeController_getFirstAccountInGroup(groupId) {
-    for (const wallet of Object.values(this.state.accountTree.wallets)) {
-        if (wallet.groups[groupId]) {
-            const group = wallet.groups[groupId];
-            if (group && group.accounts.length > 0) {
-                return group.accounts[0];
+}, _AccountTreeController_getAccountGroup = function _AccountTreeController_getAccountGroup(groupId) {
+    const found = Object.values(this.state.accountTree.wallets).find((wallet) => wallet.groups[groupId] !== undefined);
+    return found?.groups[groupId];
+}, _AccountTreeController_getDefaultAccountFromAccountGroupId = function _AccountTreeController_getDefaultAccountFromAccountGroupId(groupId) {
+    const group = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getAccountGroup).call(this, groupId);
+    if (group) {
+        let candidate;
+        for (const id of group.accounts) {
+            const account = this.messagingSystem.call('AccountsController:getAccount', id);
+            if (!candidate) {
+                candidate = id;
+            }
+            if (account && (0, keyring_api_1.isEvmAccountType)(account.type)) {
+                // EVM accounts have a higher priority, so if we find any, we just
+                // use that account!
+                return account.id;
             }
         }
+        return candidate;
     }
     return undefined;
-}, _AccountTreeController_findFirstNonEmptyGroup = function _AccountTreeController_findFirstNonEmptyGroup(wallets) {
+}, _AccountTreeController_getDefaultAccountGroupId = function _AccountTreeController_getDefaultAccountGroupId(wallets) {
+    let candidate = '';
     for (const wallet of Object.values(wallets)) {
         for (const group of Object.values(wallet.groups)) {
-            if (group.accounts.length > 0) {
-                return group.id;
+            // We only update the candidate with the first non-empty group, but still
+            // try to find a group that contains an EVM account (the `candidate` is
+            // our fallback).
+            if (candidate === '' && group.accounts.length > 0) {
+                candidate = group.id;
+            }
+            for (const id of group.accounts) {
+                const account = this.messagingSystem.call('AccountsController:getAccount', id);
+                if (account && (0, keyring_api_1.isEvmAccountType)(account.type)) {
+                    // EVM accounts have a higher priority, so if we find any, we just
+                    // use that group!
+                    return group.id;
+                }
             }
         }
     }
-    return '';
+    return candidate;
 }, _AccountTreeController_registerMessageHandlers = function _AccountTreeController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:getSelectedAccountGroup`, this.getSelectedAccountGroup.bind(this));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:setSelectedAccountGroup`, this.setSelectedAccountGroup.bind(this));

package/dist/AccountTreeController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AccountTreeController.cjs","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountGroupId, AccountWalletId } from '@metamask/account-api';\nimport { AccountWalletCategory } from '@metamask/account-api';\nimport type { AccountId } from '@metamask/accounts-controller';\nimport type { StateMetadata } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { AccountTreeRule } from './AccountTreeRule';\nimport { AccountTreeWallet } from './AccountTreeWallet';\nimport { EntropyRule } from './rules/entropy';\nimport { KeyringRule } from './rules/keyring';\nimport { SnapRule } from './rules/snap';\nimport type {\n  AccountGroupObject,\n  AccountTreeControllerMessenger,\n  AccountTreeControllerState,\n  AccountWalletObject,\n} from './types';\n\nexport const controllerName = 'AccountTreeController';\n\nconst accountTreeControllerMetadata: StateMetadata<AccountTreeControllerState> =\n  {\n    accountTree: {\n      persist: false, // We do re-recompute this state everytime.\n      anonymous: false,\n    },\n  };\n\n/**\n * Gets default state of the `AccountTreeController`.\n *\n * @returns The default state of the `AccountTreeController`.\n */\nexport function getDefaultAccountTreeControllerState(): AccountTreeControllerState {\n  return {\n    accountTree: {\n      wallets: {},\n      selectedAccountGroup: '',\n    },\n  };\n}\n\n/**\n * Context for an account.\n */\nexport type AccountContext = {\n  /**\n   * Wallet ID associated to that account.\n   */\n  walletId: AccountWalletId;\n\n  /**\n   * Account group ID associated to that account.\n   */\n  groupId: AccountGroupId;\n};\n\nexport class AccountTreeController extends BaseController<\n  typeof controllerName,\n  AccountTreeControllerState,\n  AccountTreeControllerMessenger\n> {\n  readonly #accountIdToContext: Map<AccountId, AccountContext>;\n\n  readonly #rules: AccountTreeRule[];\n\n  readonly #categoryToRule: Record<AccountWalletCategory, AccountTreeRule>;\n\n  /**\n   * Constructor for AccountTreeController.\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: AccountTreeControllerMessenger;\n    state?: Partial<AccountTreeControllerState>;\n  }) {\n    super({\n      messenger,\n      name: controllerName,\n      metadata: accountTreeControllerMetadata,\n      state: {\n        ...getDefaultAccountTreeControllerState(),\n        ...state,\n      },\n    });\n\n    // Reverse map to allow fast node access from an account ID.\n    this.#accountIdToContext = new Map();\n\n    // Rules to apply to construct the wallets tree.\n    this.#categoryToRule = {\n      [AccountWalletCategory.Entropy]: new EntropyRule(this.messagingSystem),\n      [AccountWalletCategory.Snap]: new SnapRule(this.messagingSystem),\n      [AccountWalletCategory.Keyring]: new KeyringRule(this.messagingSystem),\n    } as const;\n    this.#rules = [\n      // 1. We group by entropy-source\n      this.#categoryToRule[AccountWalletCategory.Entropy],\n      // 2. We group by Snap ID\n      this.#categoryToRule[AccountWalletCategory.Snap],\n      // 3. We group by wallet type (this rule cannot fail and will group all non-matching accounts)\n      this.#categoryToRule[AccountWalletCategory.Keyring],\n    ];\n\n    this.messagingSystem.subscribe(\n      'AccountsController:accountAdded',\n      (account) => {\n        this.#handleAccountAdded(account);\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'AccountsController:accountRemoved',\n      (accountId) => {\n        this.#handleAccountRemoved(accountId);\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'AccountsController:selectedAccountChange',\n      (account) => {\n        this.#handleSelectedAccountChange(account);\n      },\n    );\n\n    this.#registerMessageHandlers();\n  }\n\n  init() {\n    const wallets: AccountTreeControllerState['accountTree']['wallets'] = {};\n\n    // For now, we always re-compute all wallets, we do not re-use the existing state.\n    for (const account of this.#listAccounts()) {\n      this.#insert(wallets, account);\n    }\n\n    // Once we have the account tree, we can compute the name.\n    for (const wallet of Object.values(wallets)) {\n      this.#renameAccountWalletIfNeeded(wallet);\n\n      for (const group of Object.values(wallet.groups)) {\n        this.#renameAccountGroupIfNeeded(wallet, group);\n      }\n    }\n\n    this.update((state) => {\n      state.accountTree.wallets = wallets;\n\n      if (state.accountTree.selectedAccountGroup === '') {\n        // No group is selected yet, re-sync with the AccountsController.\n        state.accountTree.selectedAccountGroup =\n          this.#getDefaultSelectedAccountGroup(wallets);\n      }\n    });\n  }\n\n  /**\n   * Initializes the selectedAccountGroup based on the currently selected account from AccountsController.\n   *\n   * @param wallets - Wallets object to use for fallback logic\n   * @returns The default selected account group ID or empty string if none selected.\n   */\n  #getDefaultSelectedAccountGroup(wallets: {\n    [walletId: AccountWalletId]: AccountWalletObject;\n  }): AccountGroupId | '' {\n    const selectedAccount = this.messagingSystem.call(\n      'AccountsController:getSelectedAccount',\n    );\n    if (selectedAccount && selectedAccount.id) {\n      const accountMapping = this.#accountIdToContext.get(selectedAccount.id);\n      if (accountMapping) {\n        const { groupId } = accountMapping;\n\n        return groupId;\n      }\n    }\n\n    // Default to the first non-empty group in case of errors.\n    return this.#findFirstNonEmptyGroup(wallets);\n  }\n\n  #renameAccountWalletIfNeeded(wallet: AccountWalletObject) {\n    if (wallet.metadata.name) {\n      return;\n    }\n\n    const rule = this.#categoryToRule[wallet.metadata.type];\n    wallet.metadata.name = rule.getDefaultAccountWalletName(wallet);\n  }\n\n  #renameAccountGroupIfNeeded(\n    wallet: AccountWalletObject,\n    group: AccountGroupObject,\n  ) {\n    if (group.metadata.name) {\n      return;\n    }\n\n    const rule = this.#categoryToRule[wallet.metadata.type];\n    group.metadata.name = rule.getDefaultAccountGroupName(group);\n  }\n\n  getAccountWallet(walletId: AccountWalletId): AccountTreeWallet | undefined {\n    const wallet = this.state.accountTree.wallets[walletId];\n    if (!wallet) {\n      return undefined;\n    }\n\n    return new AccountTreeWallet({ messenger: this.messagingSystem, wallet });\n  }\n\n  getAccountWallets(): AccountTreeWallet[] {\n    return Object.values(this.state.accountTree.wallets).map((wallet) => {\n      return new AccountTreeWallet({ messenger: this.messagingSystem, wallet });\n    });\n  }\n\n  #handleAccountAdded(account: InternalAccount) {\n    this.update((state) => {\n      this.#insert(state.accountTree.wallets, account);\n\n      const context = this.#accountIdToContext.get(account.id);\n      if (context) {\n        const { walletId, groupId } = context;\n\n        const wallet = state.accountTree.wallets[walletId];\n        if (wallet) {\n          this.#renameAccountWalletIfNeeded(wallet);\n\n          const group = wallet.groups[groupId];\n          if (group) {\n            this.#renameAccountGroupIfNeeded(wallet, group);\n          }\n        }\n      }\n    });\n  }\n\n  #handleAccountRemoved(accountId: AccountId) {\n    const context = this.#accountIdToContext.get(accountId);\n\n    if (context) {\n      const { walletId, groupId } = context;\n\n      this.update((state) => {\n        const accounts =\n          state.accountTree.wallets[walletId]?.groups[groupId]?.accounts;\n\n        if (accounts) {\n          const index = accounts.indexOf(accountId);\n          if (index !== -1) {\n            accounts.splice(index, 1);\n\n            // Check if we need to update selectedAccountGroup after removal\n            if (\n              state.accountTree.selectedAccountGroup === groupId &&\n              accounts.length === 0\n            ) {\n              // The currently selected group is now empty, find a new group to select\n              state.accountTree.selectedAccountGroup =\n                this.#findFirstNonEmptyGroup(state.accountTree.wallets);\n            }\n          }\n        }\n      });\n\n      // Clear reverse-mapping for that account.\n      this.#accountIdToContext.delete(accountId);\n    }\n  }\n\n  #insert(\n    wallets: AccountTreeControllerState['accountTree']['wallets'],\n    account: InternalAccount,\n  ) {\n    for (const rule of this.#rules) {\n      const result = rule.match(account);\n\n      if (!result) {\n        // No match for that rule, we go to the next one.\n        continue;\n      }\n\n      // Update controller's state.\n      const walletId = result.wallet.id;\n      let wallet = wallets[walletId];\n      if (!wallet) {\n        wallets[walletId] = {\n          id: walletId,\n          groups: {},\n          metadata: {\n            name: '', // Will get updated later.\n            ...result.wallet.metadata,\n          },\n        };\n        wallet = wallets[walletId];\n      }\n\n      const groupId = result.group.id;\n      let group = wallet.groups[groupId];\n      if (!group) {\n        wallet.groups[groupId] = {\n          id: groupId,\n          accounts: [],\n          metadata: {\n            name: '', // Will get updated later.\n          },\n        };\n        group = wallet.groups[groupId];\n      }\n\n      group.accounts.push(account.id);\n\n      // Update the reverse mapping for this account.\n      this.#accountIdToContext.set(account.id, {\n        walletId: wallet.id,\n        groupId: group.id,\n      });\n\n      return;\n    }\n  }\n\n  #listAccounts(): InternalAccount[] {\n    return this.messagingSystem.call(\n      'AccountsController:listMultichainAccounts',\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The selected account group ID or empty string if none selected.\n   */\n  getSelectedAccountGroup(): AccountGroupId | '' {\n    return this.state.accountTree.selectedAccountGroup;\n  }\n\n  /**\n   * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n   *\n   * @param groupId - The account group ID to select.\n   */\n  setSelectedAccountGroup(groupId: AccountGroupId): void {\n    const currentSelectedGroup = this.state.accountTree.selectedAccountGroup;\n\n    // Idempotent check - if the same group is already selected, do nothing\n    if (currentSelectedGroup === groupId) {\n      return;\n    }\n\n    // Find the first account in this group to select\n    const accountToSelect = this.#getFirstAccountInGroup(groupId);\n    if (!accountToSelect) {\n      throw new Error(`No accounts found in group: ${groupId}`);\n    }\n\n    // Update our state first\n    this.update((state) => {\n      state.accountTree.selectedAccountGroup = groupId;\n    });\n\n    // Update AccountsController - this will trigger selectedAccountChange event,\n    // but our handler is idempotent so it won't cause infinite loop\n    this.messagingSystem.call(\n      'AccountsController:setSelectedAccount',\n      accountToSelect,\n    );\n  }\n\n  /**\n   * Handles selected account change from AccountsController.\n   * Updates selectedAccountGroup to match the selected account.\n   *\n   * @param account - The newly selected account.\n   */\n  #handleSelectedAccountChange(account: InternalAccount): void {\n    const accountMapping = this.#accountIdToContext.get(account.id);\n    if (!accountMapping) {\n      // Account not in tree yet, might be during initialization\n      return;\n    }\n\n    const { groupId } = accountMapping;\n    const currentSelectedGroup = this.state.accountTree.selectedAccountGroup;\n\n    // Idempotent check - if the same group is already selected, do nothing\n    if (currentSelectedGroup === groupId) {\n      return;\n    }\n\n    // Update selectedAccountGroup to match the selected account\n    this.update((state) => {\n      state.accountTree.selectedAccountGroup = groupId;\n    });\n  }\n\n  /**\n   * Gets the first account ID in the specified group.\n   *\n   * @param groupId - The account group ID.\n   * @returns The first account ID in the group, or undefined if no accounts found.\n   */\n  #getFirstAccountInGroup(groupId: AccountGroupId): AccountId | undefined {\n    for (const wallet of Object.values(this.state.accountTree.wallets)) {\n      if (wallet.groups[groupId]) {\n        const group = wallet.groups[groupId];\n        if (group && group.accounts.length > 0) {\n          return group.accounts[0];\n        }\n      }\n    }\n    return undefined;\n  }\n\n  /**\n   * Finds the first non-empty group in the given wallets object.\n   *\n   * @param wallets - The wallets object to search.\n   * @returns The ID of the first non-empty group, or an empty string if no groups are found.\n   */\n  #findFirstNonEmptyGroup(wallets: {\n    [walletId: AccountWalletId]: AccountWalletObject;\n  }): AccountGroupId | '' {\n    for (const wallet of Object.values(wallets)) {\n      for (const group of Object.values(wallet.groups)) {\n        if (group.accounts.length > 0) {\n          return group.id;\n        }\n      }\n    }\n    return '';\n  }\n\n  /**\n   * Registers message handlers for the AccountTreeController.\n   */\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:getSelectedAccountGroup`,\n      this.getSelectedAccountGroup.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:setSelectedAccountGroup`,\n      this.setSelectedAccountGroup.bind(this),\n    );\n  }\n}\n"]}
+{"version":3,"file":"AccountTreeController.cjs","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountGroupId, AccountWalletId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport type { AccountId } from '@metamask/accounts-controller';\nimport type { StateMetadata } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport { isEvmAccountType } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { AccountGroupObject } from './group';\nimport { EntropyRule } from './rules/entropy';\nimport { KeyringRule } from './rules/keyring';\nimport { SnapRule } from './rules/snap';\nimport type {\n  AccountTreeControllerMessenger,\n  AccountTreeControllerState,\n} from './types';\nimport type { AccountWalletObject } from './wallet';\nimport { AccountTreeWallet } from './wallet';\n\nexport const controllerName = 'AccountTreeController';\n\nconst accountTreeControllerMetadata: StateMetadata<AccountTreeControllerState> =\n  {\n    accountTree: {\n      persist: false, // We do re-recompute this state everytime.\n      anonymous: false,\n    },\n  };\n\n/**\n * Gets default state of the `AccountTreeController`.\n *\n * @returns The default state of the `AccountTreeController`.\n */\nexport function getDefaultAccountTreeControllerState(): AccountTreeControllerState {\n  return {\n    accountTree: {\n      wallets: {},\n      selectedAccountGroup: '',\n    },\n  };\n}\n\n/**\n * Context for an account.\n */\nexport type AccountContext = {\n  /**\n   * Wallet ID associated to that account.\n   */\n  walletId: AccountWalletObject['id'];\n\n  /**\n   * Account group ID associated to that account.\n   */\n  groupId: AccountGroupObject['id'];\n};\n\nexport class AccountTreeController extends BaseController<\n  typeof controllerName,\n  AccountTreeControllerState,\n  AccountTreeControllerMessenger\n> {\n  readonly #accountIdToContext: Map<AccountId, AccountContext>;\n\n  readonly #rules: [EntropyRule, SnapRule, KeyringRule];\n\n  /**\n   * Constructor for AccountTreeController.\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: AccountTreeControllerMessenger;\n    state?: Partial<AccountTreeControllerState>;\n  }) {\n    super({\n      messenger,\n      name: controllerName,\n      metadata: accountTreeControllerMetadata,\n      state: {\n        ...getDefaultAccountTreeControllerState(),\n        ...state,\n      },\n    });\n\n    // Reverse map to allow fast node access from an account ID.\n    this.#accountIdToContext = new Map();\n\n    // Rules to apply to construct the wallets tree.\n    this.#rules = [\n      // 1. We group by entropy-source\n      new EntropyRule(this.messagingSystem),\n      // 2. We group by Snap ID\n      new SnapRule(this.messagingSystem),\n      // 3. We group by wallet type (this rule cannot fail and will group all non-matching accounts)\n      new KeyringRule(this.messagingSystem),\n    ];\n\n    this.messagingSystem.subscribe(\n      'AccountsController:accountAdded',\n      (account) => {\n        this.#handleAccountAdded(account);\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'AccountsController:accountRemoved',\n      (accountId) => {\n        this.#handleAccountRemoved(accountId);\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'AccountsController:selectedAccountChange',\n      (account) => {\n        this.#handleSelectedAccountChange(account);\n      },\n    );\n\n    this.#registerMessageHandlers();\n  }\n\n  init() {\n    const wallets: AccountTreeControllerState['accountTree']['wallets'] = {};\n\n    // For now, we always re-compute all wallets, we do not re-use the existing state.\n    for (const account of this.#listAccounts()) {\n      this.#insert(wallets, account);\n    }\n\n    // Once we have the account tree, we can compute the name.\n    for (const wallet of Object.values(wallets)) {\n      this.#renameAccountWalletIfNeeded(wallet);\n\n      for (const group of Object.values(wallet.groups)) {\n        this.#renameAccountGroupIfNeeded(wallet, group);\n      }\n    }\n\n    this.update((state) => {\n      state.accountTree.wallets = wallets;\n\n      if (state.accountTree.selectedAccountGroup === '') {\n        // No group is selected yet, re-sync with the AccountsController.\n        state.accountTree.selectedAccountGroup =\n          this.#getDefaultSelectedAccountGroup(wallets);\n      }\n    });\n  }\n\n  #getEntropyRule(): EntropyRule {\n    return this.#rules[0];\n  }\n\n  #getSnapRule(): SnapRule {\n    return this.#rules[1];\n  }\n\n  #getKeyringRule(): KeyringRule {\n    return this.#rules[2];\n  }\n\n  #renameAccountWalletIfNeeded(wallet: AccountWalletObject) {\n    if (wallet.metadata.name) {\n      return;\n    }\n\n    if (wallet.type === AccountWalletType.Entropy) {\n      wallet.metadata.name =\n        this.#getEntropyRule().getDefaultAccountWalletName(wallet);\n    } else if (wallet.type === AccountWalletType.Snap) {\n      wallet.metadata.name =\n        this.#getSnapRule().getDefaultAccountWalletName(wallet);\n    } else {\n      wallet.metadata.name =\n        this.#getKeyringRule().getDefaultAccountWalletName(wallet);\n    }\n  }\n\n  #renameAccountGroupIfNeeded(\n    wallet: AccountWalletObject,\n    group: AccountGroupObject,\n  ) {\n    if (group.metadata.name) {\n      return;\n    }\n\n    if (wallet.type === AccountWalletType.Entropy) {\n      group.metadata.name = this.#getEntropyRule().getDefaultAccountGroupName(\n        // Get the group from the wallet, to get the proper type inference.\n        wallet.groups[group.id],\n      );\n    } else if (wallet.type === AccountWalletType.Snap) {\n      group.metadata.name = this.#getSnapRule().getDefaultAccountGroupName(\n        // Same here.\n        wallet.groups[group.id],\n      );\n    } else {\n      group.metadata.name = this.#getKeyringRule().getDefaultAccountGroupName(\n        // Same here.\n        wallet.groups[group.id],\n      );\n    }\n  }\n\n  getAccountWallet(walletId: AccountWalletId): AccountTreeWallet | undefined {\n    const wallet = this.state.accountTree.wallets[walletId];\n    if (!wallet) {\n      return undefined;\n    }\n\n    return new AccountTreeWallet({ messenger: this.messagingSystem, wallet });\n  }\n\n  getAccountWallets(): AccountTreeWallet[] {\n    return Object.values(this.state.accountTree.wallets).map((wallet) => {\n      return new AccountTreeWallet({ messenger: this.messagingSystem, wallet });\n    });\n  }\n\n  #handleAccountAdded(account: InternalAccount) {\n    this.update((state) => {\n      this.#insert(state.accountTree.wallets, account);\n\n      const context = this.#accountIdToContext.get(account.id);\n      if (context) {\n        const { walletId, groupId } = context;\n\n        const wallet = state.accountTree.wallets[walletId];\n        if (wallet) {\n          this.#renameAccountWalletIfNeeded(wallet);\n\n          const group = wallet.groups[groupId];\n          if (group) {\n            this.#renameAccountGroupIfNeeded(wallet, group);\n          }\n        }\n      }\n    });\n  }\n\n  #handleAccountRemoved(accountId: AccountId) {\n    const context = this.#accountIdToContext.get(accountId);\n\n    if (context) {\n      const { walletId, groupId } = context;\n\n      this.update((state) => {\n        const accounts =\n          state.accountTree.wallets[walletId]?.groups[groupId]?.accounts;\n\n        if (accounts) {\n          const index = accounts.indexOf(accountId);\n          if (index !== -1) {\n            accounts.splice(index, 1);\n\n            // Check if we need to update selectedAccountGroup after removal\n            if (\n              state.accountTree.selectedAccountGroup === groupId &&\n              accounts.length === 0\n            ) {\n              // The currently selected group is now empty, find a new group to select\n              state.accountTree.selectedAccountGroup =\n                this.#getDefaultAccountGroupId(state.accountTree.wallets);\n            }\n          }\n        }\n      });\n\n      // Clear reverse-mapping for that account.\n      this.#accountIdToContext.delete(accountId);\n    }\n  }\n\n  #insert(\n    wallets: AccountTreeControllerState['accountTree']['wallets'],\n    account: InternalAccount,\n  ) {\n    const result =\n      this.#getEntropyRule().match(account) ??\n      this.#getSnapRule().match(account) ??\n      this.#getKeyringRule().match(account); // This one cannot fail.\n\n    // Update controller's state.\n    const walletId = result.wallet.id;\n    let wallet = wallets[walletId];\n    if (!wallet) {\n      wallets[walletId] = {\n        ...result.wallet,\n        groups: {},\n        metadata: {\n          name: '', // Will get updated later.\n          ...result.wallet.metadata,\n        },\n        // We do need to type-cast since we're not narrowing `result` with\n        // the union tag `result.wallet.type`.\n      } as AccountWalletObject;\n      wallet = wallets[walletId];\n    }\n\n    const groupId = result.group.id;\n    let group = wallet.groups[groupId];\n    if (!group) {\n      wallet.groups[groupId] = {\n        ...result.group,\n        // Type-wise, we are guaranteed to always have at least 1 account.\n        accounts: [account.id],\n        metadata: {\n          name: '',\n          ...result.group.metadata,\n        },\n        // We do need to type-cast since we're not narrowing `result` with\n        // the union tag `result.group.type`.\n      } as AccountGroupObject;\n      group = wallet.groups[groupId];\n    } else {\n      group.accounts.push(account.id);\n    }\n\n    // Update the reverse mapping for this account.\n    this.#accountIdToContext.set(account.id, {\n      walletId: wallet.id,\n      groupId: group.id,\n    });\n  }\n\n  #listAccounts(): InternalAccount[] {\n    return this.messagingSystem.call(\n      'AccountsController:listMultichainAccounts',\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The selected account group ID or empty string if none selected.\n   */\n  getSelectedAccountGroup(): AccountGroupId | '' {\n    return this.state.accountTree.selectedAccountGroup;\n  }\n\n  /**\n   * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n   *\n   * @param groupId - The account group ID to select.\n   */\n  setSelectedAccountGroup(groupId: AccountGroupId): void {\n    const currentSelectedGroup = this.state.accountTree.selectedAccountGroup;\n\n    // Idempotent check - if the same group is already selected, do nothing\n    if (currentSelectedGroup === groupId) {\n      return;\n    }\n\n    // Find the first account in this group to select\n    const accountToSelect = this.#getDefaultAccountFromAccountGroupId(groupId);\n    if (!accountToSelect) {\n      throw new Error(`No accounts found in group: ${groupId}`);\n    }\n\n    // Update our state first\n    this.update((state) => {\n      state.accountTree.selectedAccountGroup = groupId;\n    });\n\n    // Update AccountsController - this will trigger selectedAccountChange event,\n    // but our handler is idempotent so it won't cause infinite loop\n    this.messagingSystem.call(\n      'AccountsController:setSelectedAccount',\n      accountToSelect,\n    );\n  }\n\n  /**\n   * Initializes the selectedAccountGroup based on the currently selected account from AccountsController.\n   *\n   * @param wallets - Wallets object to use for fallback logic\n   * @returns The default selected account group ID or empty string if none selected.\n   */\n  #getDefaultSelectedAccountGroup(wallets: {\n    [walletId: AccountWalletId]: AccountWalletObject;\n  }): AccountGroupId | '' {\n    const selectedAccount = this.messagingSystem.call(\n      'AccountsController:getSelectedAccount',\n    );\n    if (selectedAccount && selectedAccount.id) {\n      const accountMapping = this.#accountIdToContext.get(selectedAccount.id);\n      if (accountMapping) {\n        const { groupId } = accountMapping;\n\n        return groupId;\n      }\n    }\n\n    // Default to the default group in case of errors.\n    return this.#getDefaultAccountGroupId(wallets);\n  }\n\n  /**\n   * Handles selected account change from AccountsController.\n   * Updates selectedAccountGroup to match the selected account.\n   *\n   * @param account - The newly selected account.\n   */\n  #handleSelectedAccountChange(account: InternalAccount): void {\n    const accountMapping = this.#accountIdToContext.get(account.id);\n    if (!accountMapping) {\n      // Account not in tree yet, might be during initialization\n      return;\n    }\n\n    const { groupId } = accountMapping;\n    const currentSelectedGroup = this.state.accountTree.selectedAccountGroup;\n\n    // Idempotent check - if the same group is already selected, do nothing\n    if (currentSelectedGroup === groupId) {\n      return;\n    }\n\n    // Update selectedAccountGroup to match the selected account\n    this.update((state) => {\n      state.accountTree.selectedAccountGroup = groupId;\n    });\n  }\n\n  /**\n   * Gets account group.\n   *\n   * @param groupId - The account group ID.\n   * @returns The account group or undefined if not found.\n   */\n  #getAccountGroup(groupId: AccountGroupId): AccountGroupObject | undefined {\n    const found = Object.values(this.state.accountTree.wallets).find(\n      (wallet) => wallet.groups[groupId] !== undefined,\n    );\n\n    return found?.groups[groupId];\n  }\n\n  /**\n   * Gets the default account for specified group.\n   *\n   * @param groupId - The account group ID.\n   * @returns The first account ID in the group, or undefined if no accounts found.\n   */\n  #getDefaultAccountFromAccountGroupId(\n    groupId: AccountGroupId,\n  ): AccountId | undefined {\n    const group = this.#getAccountGroup(groupId);\n\n    if (group) {\n      let candidate;\n      for (const id of group.accounts) {\n        const account = this.messagingSystem.call(\n          'AccountsController:getAccount',\n          id,\n        );\n\n        if (!candidate) {\n          candidate = id;\n        }\n        if (account && isEvmAccountType(account.type)) {\n          // EVM accounts have a higher priority, so if we find any, we just\n          // use that account!\n          return account.id;\n        }\n      }\n\n      return candidate;\n    }\n\n    return undefined;\n  }\n\n  /**\n   * Gets the default group id, which is either, the first non-empty group that contains an EVM account or\n   * just the first non-empty group with any accounts.\n   *\n   * @param wallets - The wallets object to search.\n   * @returns The ID of the first non-empty group, or an empty string if no groups are found.\n   */\n  #getDefaultAccountGroupId(wallets: {\n    [walletId: AccountWalletId]: AccountWalletObject;\n  }): AccountGroupId | '' {\n    let candidate: AccountGroupId | '' = '';\n\n    for (const wallet of Object.values(wallets)) {\n      for (const group of Object.values(wallet.groups)) {\n        // We only update the candidate with the first non-empty group, but still\n        // try to find a group that contains an EVM account (the `candidate` is\n        // our fallback).\n        if (candidate === '' && group.accounts.length > 0) {\n          candidate = group.id;\n        }\n\n        for (const id of group.accounts) {\n          const account = this.messagingSystem.call(\n            'AccountsController:getAccount',\n            id,\n          );\n\n          if (account && isEvmAccountType(account.type)) {\n            // EVM accounts have a higher priority, so if we find any, we just\n            // use that group!\n            return group.id;\n          }\n        }\n      }\n    }\n    return candidate;\n  }\n\n  /**\n   * Registers message handlers for the AccountTreeController.\n   */\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:getSelectedAccountGroup`,\n      this.getSelectedAccountGroup.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${controllerName}:setSelectedAccountGroup`,\n      this.setSelectedAccountGroup.bind(this),\n    );\n  }\n}\n"]}

package/dist/AccountTreeController.d.cts

@@ -1,7 +1,9 @@
 import type { AccountGroupId, AccountWalletId } from "@metamask/account-api";
 import { BaseController } from "@metamask/base-controller";
-import { AccountTreeWallet } from "./AccountTreeWallet.cjs";
+import type { AccountGroupObject } from "./group.cjs";
 import type { AccountTreeControllerMessenger, AccountTreeControllerState } from "./types.cjs";
+import type { AccountWalletObject } from "./wallet.cjs";
+import { AccountTreeWallet } from "./wallet.cjs";
 export declare const controllerName = "AccountTreeController";
 /**
  * Gets default state of the `AccountTreeController`.
@@ -16,11 +18,11 @@ export type AccountContext = {
     /**
      * Wallet ID associated to that account.
      */
-    walletId: AccountWalletId;
+    walletId: AccountWalletObject['id'];
     /**
      * Account group ID associated to that account.
      */
-    groupId: AccountGroupId;
+    groupId: AccountGroupObject['id'];
 };
 export declare class AccountTreeController extends BaseController<typeof controllerName, AccountTreeControllerState, AccountTreeControllerMessenger> {
     #private;

package/dist/AccountTreeController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountTreeController.d.cts","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,8BAA8B;AAI7E,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAI3D,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AAIxD,OAAO,KAAK,EAEV,8BAA8B,EAC9B,0BAA0B,EAE3B,oBAAgB;AAEjB,eAAO,MAAM,cAAc,0BAA0B,CAAC;AAUtD;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAOjF;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CACvD,OAAO,cAAc,EACrB,0BAA0B,EAC1B,8BAA8B,CAC/B;;IAOC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,KAAK,GACN,EAAE;QACD,SAAS,EAAE,8BAA8B,CAAC;QAC1C,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAqDD,IAAI;IA0EJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;IAsHxC;;;;OAIG;IACH,uBAAuB,IAAI,cAAc,GAAG,EAAE;IAI9C;;;;OAIG;IACH,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAyGvD"}
+{"version":3,"file":"AccountTreeController.d.cts","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,8BAA8B;AAI7E,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAI3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAIlD,OAAO,KAAK,EACV,8BAA8B,EAC9B,0BAA0B,EAC3B,oBAAgB;AACjB,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAiB;AACpD,OAAO,EAAE,iBAAiB,EAAE,qBAAiB;AAE7C,eAAO,MAAM,cAAc,0BAA0B,CAAC;AAUtD;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAOjF;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEpC;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CACvD,OAAO,cAAc,EACrB,0BAA0B,EAC1B,8BAA8B,CAC/B;;IAKC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,KAAK,GACN,EAAE;QACD,SAAS,EAAE,8BAA8B,CAAC;QAC1C,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAgDD,IAAI;IAmFJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;IAsHxC;;;;OAIG;IACH,uBAAuB,IAAI,cAAc,GAAG,EAAE;IAI9C;;;;OAIG;IACH,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAoLvD"}

package/dist/AccountTreeController.d.mts

@@ -1,7 +1,9 @@
 import type { AccountGroupId, AccountWalletId } from "@metamask/account-api";
 import { BaseController } from "@metamask/base-controller";
-import { AccountTreeWallet } from "./AccountTreeWallet.mjs";
+import type { AccountGroupObject } from "./group.mjs";
 import type { AccountTreeControllerMessenger, AccountTreeControllerState } from "./types.mjs";
+import type { AccountWalletObject } from "./wallet.mjs";
+import { AccountTreeWallet } from "./wallet.mjs";
 export declare const controllerName = "AccountTreeController";
 /**
  * Gets default state of the `AccountTreeController`.
@@ -16,11 +18,11 @@ export type AccountContext = {
     /**
      * Wallet ID associated to that account.
      */
-    walletId: AccountWalletId;
+    walletId: AccountWalletObject['id'];
     /**
      * Account group ID associated to that account.
      */
-    groupId: AccountGroupId;
+    groupId: AccountGroupObject['id'];
 };
 export declare class AccountTreeController extends BaseController<typeof controllerName, AccountTreeControllerState, AccountTreeControllerMessenger> {
     #private;

package/dist/AccountTreeController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountTreeController.d.mts","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,8BAA8B;AAI7E,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAI3D,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AAIxD,OAAO,KAAK,EAEV,8BAA8B,EAC9B,0BAA0B,EAE3B,oBAAgB;AAEjB,eAAO,MAAM,cAAc,0BAA0B,CAAC;AAUtD;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAOjF;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CACvD,OAAO,cAAc,EACrB,0BAA0B,EAC1B,8BAA8B,CAC/B;;IAOC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,KAAK,GACN,EAAE;QACD,SAAS,EAAE,8BAA8B,CAAC;QAC1C,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAqDD,IAAI;IA0EJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;IAsHxC;;;;OAIG;IACH,uBAAuB,IAAI,cAAc,GAAG,EAAE;IAI9C;;;;OAIG;IACH,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAyGvD"}
+{"version":3,"file":"AccountTreeController.d.mts","sourceRoot":"","sources":["../src/AccountTreeController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,8BAA8B;AAI7E,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAI3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAIlD,OAAO,KAAK,EACV,8BAA8B,EAC9B,0BAA0B,EAC3B,oBAAgB;AACjB,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAiB;AACpD,OAAO,EAAE,iBAAiB,EAAE,qBAAiB;AAE7C,eAAO,MAAM,cAAc,0BAA0B,CAAC;AAUtD;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAOjF;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEpC;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CACvD,OAAO,cAAc,EACrB,0BAA0B,EAC1B,8BAA8B,CAC/B;;IAKC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,KAAK,GACN,EAAE;QACD,SAAS,EAAE,8BAA8B,CAAC;QAC1C,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAgDD,IAAI;IAmFJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;IAsHxC;;;;OAIG;IACH,uBAAuB,IAAI,cAAc,GAAG,EAAE;IAI9C;;;;OAIG;IACH,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAoLvD"}