@metamask-previews/account-tree-controller 0.6.0-preview-c2e921a9 → 0.6.0-preview-ec3106a5

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add BIP-44/multichain accounts support ([#6185](https://github.com/MetaMask/core/pull/6185))
+  - Those are being attached to the `entropy` wallet category.
+
+### Changed
+
+- Now use one account group per account for `snap` and `keyring` wallet categories ([#6185](https://github.com/MetaMask/core/pull/6185))
+  - We used to group all accounts under the `'default'` group, but we now compute the group ID using the address of each accounts.
+- Compute account group name based on their underlying account. ([#6185](https://github.com/MetaMask/core/pull/6185))
+  - This replaces the previous `'Default'` name for groups.
+
 ## [0.6.0]
 
 ### Changed

package/dist/AccountTreeController.cjs

@@ -10,12 +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_reverse, _AccountTreeController_rules, _AccountTreeController_wallets, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts;
+var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_rules, _AccountTreeController_categoryToRule, _AccountTreeController_renameAccountWalletIfNeeded, _AccountTreeController_renameAccountGroupIfNeeded, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountTreeController = exports.getDefaultAccountTreeControllerState = void 0;
+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 rules_1 = require("./rules/index.cjs");
-const controllerName = 'AccountTreeController';
+const AccountTreeWallet_1 = require("./AccountTreeWallet.cjs");
+const entropy_1 = require("./rules/entropy.cjs");
+const keyring_1 = require("./rules/keyring.cjs");
+const snap_1 = require("./rules/snap.cjs");
+exports.controllerName = 'AccountTreeController';
 const accountTreeControllerMetadata = {
     accountTree: {
         persist: false,
@@ -46,7 +50,7 @@ class AccountTreeController extends base_controller_1.BaseController {
     constructor({ messenger, state, }) {
         super({
             messenger,
-            name: controllerName,
+            name: exports.controllerName,
             metadata: accountTreeControllerMetadata,
             state: {
                 ...getDefaultAccountTreeControllerState(),
@@ -54,20 +58,24 @@ class AccountTreeController extends base_controller_1.BaseController {
             },
         });
         _AccountTreeController_instances.add(this);
-        _AccountTreeController_reverse.set(this, void 0);
+        _AccountTreeController_accountIdToContext.set(this, void 0);
         _AccountTreeController_rules.set(this, void 0);
-        _AccountTreeController_wallets.set(this, void 0);
-        __classPrivateFieldSet(this, _AccountTreeController_wallets, new Map(), "f");
+        _AccountTreeController_categoryToRule.set(this, void 0);
         // Reverse map to allow fast node access from an account ID.
-        __classPrivateFieldSet(this, _AccountTreeController_reverse, new Map(), "f");
+        __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
-            new rules_1.EntropySourceWalletRule(this.messagingSystem),
+            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Entropy],
             // 2. We group by Snap ID
-            new rules_1.SnapWalletRule(this.messagingSystem),
+            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Snap],
             // 3. We group by wallet type (this rule cannot fail and will group all non-matching accounts)
-            new rules_1.KeyringWalletRule(this.messagingSystem),
+            __classPrivateFieldGet(this, _AccountTreeController_categoryToRule, "f")[account_api_1.AccountWalletCategory.Keyring],
         ], "f");
         this.messagingSystem.subscribe('AccountsController:accountAdded', (account) => {
             __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_handleAccountAdded).call(this, account);
@@ -82,26 +90,63 @@ class AccountTreeController extends base_controller_1.BaseController {
         for (const account of __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_listAccounts).call(this)) {
             __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_insert).call(this, wallets, account);
         }
+        // Once we have the account tree, we can compute the name.
+        for (const wallet of Object.values(wallets)) {
+            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_renameAccountWalletIfNeeded).call(this, wallet);
+            for (const group of Object.values(wallet.groups)) {
+                __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_renameAccountGroupIfNeeded).call(this, wallet, group);
+            }
+        }
         this.update((state) => {
             state.accountTree.wallets = wallets;
         });
     }
-    getWallet(id) {
-        return __classPrivateFieldGet(this, _AccountTreeController_wallets, "f").get(id);
+    getAccountWallet(walletId) {
+        const wallet = this.state.accountTree.wallets[walletId];
+        if (!wallet) {
+            return undefined;
+        }
+        return new AccountTreeWallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
     }
-    getWallets() {
-        return Array.from(__classPrivateFieldGet(this, _AccountTreeController_wallets, "f").values());
+    getAccountWallets() {
+        return Object.values(this.state.accountTree.wallets).map((wallet) => {
+            return new AccountTreeWallet_1.AccountTreeWallet({ messenger: this.messagingSystem, wallet });
+        });
     }
 }
 exports.AccountTreeController = AccountTreeController;
-_AccountTreeController_reverse = new WeakMap(), _AccountTreeController_rules = new WeakMap(), _AccountTreeController_wallets = new WeakMap(), _AccountTreeController_instances = new WeakSet(), _AccountTreeController_handleAccountAdded = function _AccountTreeController_handleAccountAdded(account) {
+_AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeController_rules = new WeakMap(), _AccountTreeController_categoryToRule = new WeakMap(), _AccountTreeController_instances = new WeakSet(), _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);
+}, _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);
+}, _AccountTreeController_handleAccountAdded = function _AccountTreeController_handleAccountAdded(account) {
     this.update((state) => {
         __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_insert).call(this, state.accountTree.wallets, account);
+        const context = __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").get(account.id);
+        if (context) {
+            const { walletId, groupId } = context;
+            const wallet = state.accountTree.wallets[walletId];
+            if (wallet) {
+                __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_renameAccountWalletIfNeeded).call(this, wallet);
+                const group = wallet.groups[groupId];
+                if (group) {
+                    __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_renameAccountGroupIfNeeded).call(this, wallet, group);
+                }
+            }
+        }
     });
 }, _AccountTreeController_handleAccountRemoved = function _AccountTreeController_handleAccountRemoved(accountId) {
-    const found = __classPrivateFieldGet(this, _AccountTreeController_reverse, "f").get(accountId);
-    if (found) {
-        const { walletId, groupId } = found;
+    const context = __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").get(accountId);
+    if (context) {
+        const { walletId, groupId } = context;
         this.update((state) => {
             const { accounts } = state.accountTree.wallets[walletId].groups[groupId];
             const index = accounts.indexOf(accountId);
@@ -109,36 +154,45 @@ _AccountTreeController_reverse = new WeakMap(), _AccountTreeController_rules = n
                 accounts.splice(index, 1);
             }
         });
+        // Clear reverse-mapping for that account.
+        __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").delete(accountId);
     }
 }, _AccountTreeController_insert = function _AccountTreeController_insert(wallets, account) {
     for (const rule of __classPrivateFieldGet(this, _AccountTreeController_rules, "f")) {
-        const match = rule.match(account);
-        if (!match) {
+        const result = rule.match(account);
+        if (!result) {
             // No match for that rule, we go to the next one.
             continue;
         }
-        const { wallet, group } = match;
-        // Update in-memory wallet/group instances.
-        __classPrivateFieldGet(this, _AccountTreeController_wallets, "f").set(wallet.id, wallet);
         // Update controller's state.
-        if (!wallets[wallet.id]) {
-            wallets[wallet.id] = {
-                id: wallet.id,
-                groups: {
-                    [group.id]: {
-                        id: group.id,
-                        accounts: [],
-                        metadata: { name: group.getDefaultName() },
-                    },
+        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: wallet.getDefaultName(),
+                    name: '', // Will get updated later.
                 },
             };
+            group = wallet.groups[groupId];
         }
-        wallets[wallet.id].groups[group.id].accounts.push(account.id);
+        group.accounts.push(account.id);
         // Update the reverse mapping for this account.
-        __classPrivateFieldGet(this, _AccountTreeController_reverse, "f").set(account.id, {
+        __classPrivateFieldGet(this, _AccountTreeController_accountIdToContext, "f").set(account.id, {
             walletId: wallet.id,
             groupId: group.id,
         });

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 type {\n  AccountId,\n  AccountsControllerAccountAddedEvent,\n  AccountsControllerAccountRemovedEvent,\n  AccountsControllerGetAccountAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { StateMetadata } from '@metamask/base-controller';\nimport {\n  type ControllerGetStateAction,\n  type ControllerStateChangeEvent,\n  type RestrictedMessenger,\n  BaseController,\n} from '@metamask/base-controller';\nimport type { KeyringControllerGetStateAction } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { GetSnap as SnapControllerGetSnap } from '@metamask/snaps-controllers';\n\nimport type { AccountTreeWallet } from './AccountTreeWallet';\nimport type { WalletRule } from './rules';\nimport {\n  EntropySourceWalletRule,\n  SnapWalletRule,\n  KeyringWalletRule,\n} from './rules';\n\nconst controllerName = 'AccountTreeController';\n\ntype AccountReverseMapping = {\n  walletId: AccountWalletId;\n  groupId: AccountGroupId;\n};\n\n// Do not export this one, we just use it to have a common type interface between group and wallet metadata.\ntype Metadata = {\n  name: string;\n};\n\nexport type AccountWalletMetadata = Metadata;\n\nexport type AccountGroupMetadata = Metadata;\n\nexport type AccountGroupObject = {\n  id: AccountGroupId;\n  // Blockchain Accounts:\n  accounts: AccountId[];\n  metadata: AccountGroupMetadata;\n};\n\nexport type AccountWalletObject = {\n  id: AccountWalletId;\n  // Account groups OR Multichain accounts (once available).\n  groups: {\n    [groupId: AccountGroupId]: AccountGroupObject;\n  };\n  metadata: AccountWalletMetadata;\n};\n\nexport type AccountTreeControllerState = {\n  accountTree: {\n    wallets: {\n      // Wallets:\n      [walletId: AccountWalletId]: AccountWalletObject;\n    };\n  };\n};\n\nexport type AccountTreeControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  AccountTreeControllerState\n>;\n\nexport type AllowedActions =\n  | AccountsControllerGetAccountAction\n  | AccountsControllerListMultichainAccountsAction\n  | KeyringControllerGetStateAction\n  | SnapControllerGetSnap;\n\nexport type AccountTreeControllerActions = never;\n\nexport type AccountTreeControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof controllerName,\n  AccountTreeControllerState\n>;\n\nexport type AllowedEvents =\n  | AccountsControllerAccountAddedEvent\n  | AccountsControllerAccountRemovedEvent;\n\nexport type AccountTreeControllerEvents = AccountTreeControllerStateChangeEvent;\n\nexport type AccountTreeControllerMessenger = RestrictedMessenger<\n  typeof controllerName,\n  AccountTreeControllerActions | AllowedActions,\n  AccountTreeControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\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    },\n  };\n}\n\nexport class AccountTreeController extends BaseController<\n  typeof controllerName,\n  AccountTreeControllerState,\n  AccountTreeControllerMessenger\n> {\n  readonly #reverse: Map<AccountId, AccountReverseMapping>;\n\n  readonly #rules: WalletRule[];\n\n  readonly #wallets: Map<AccountWalletId, AccountTreeWallet>;\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    this.#wallets = new Map();\n\n    // Reverse map to allow fast node access from an account ID.\n    this.#reverse = new Map();\n\n    // Rules to apply to construct the wallets tree.\n    this.#rules = [\n      // 1. We group by entropy-source\n      new EntropySourceWalletRule(this.messagingSystem),\n      // 2. We group by Snap ID\n      new SnapWalletRule(this.messagingSystem),\n      // 3. We group by wallet type (this rule cannot fail and will group all non-matching accounts)\n      new KeyringWalletRule(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\n  init() {\n    const 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    this.update((state) => {\n      state.accountTree.wallets = wallets;\n    });\n  }\n\n  getWallet(id: AccountWalletId): AccountTreeWallet | undefined {\n    return this.#wallets.get(id);\n  }\n\n  getWallets(): AccountTreeWallet[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  #handleAccountAdded(account: InternalAccount) {\n    this.update((state) => {\n      this.#insert(state.accountTree.wallets, account);\n    });\n  }\n\n  #handleAccountRemoved(accountId: AccountId) {\n    const found = this.#reverse.get(accountId);\n\n    if (found) {\n      const { walletId, groupId } = found;\n      this.update((state) => {\n        const { accounts } =\n          state.accountTree.wallets[walletId].groups[groupId];\n\n        const index = accounts.indexOf(accountId);\n        if (index !== -1) {\n          accounts.splice(index, 1);\n        }\n      });\n    }\n  }\n\n  #insert(\n    wallets: { [walletId: AccountWalletId]: AccountWalletObject },\n    account: InternalAccount,\n  ) {\n    for (const rule of this.#rules) {\n      const match = rule.match(account);\n\n      if (!match) {\n        // No match for that rule, we go to the next one.\n        continue;\n      }\n\n      const { wallet, group } = match;\n\n      // Update in-memory wallet/group instances.\n      this.#wallets.set(wallet.id, wallet);\n\n      // Update controller's state.\n      if (!wallets[wallet.id]) {\n        wallets[wallet.id] = {\n          id: wallet.id,\n          groups: {\n            [group.id]: {\n              id: group.id,\n              accounts: [],\n              metadata: { name: group.getDefaultName() },\n            },\n          },\n          metadata: {\n            name: wallet.getDefaultName(),\n          },\n        };\n      }\n      wallets[wallet.id].groups[group.id].accounts.push(account.id);\n\n      // Update the reverse mapping for this account.\n      this.#reverse.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"]}
+{"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    },\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\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  }\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];\n\n        const index = accounts.indexOf(accountId);\n        if (index !== -1) {\n          accounts.splice(index, 1);\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"]}

package/dist/AccountTreeController.d.cts

@@ -1,47 +1,27 @@
 import type { AccountGroupId, AccountWalletId } from "@metamask/account-api";
-import type { AccountId, AccountsControllerAccountAddedEvent, AccountsControllerAccountRemovedEvent, AccountsControllerGetAccountAction, AccountsControllerListMultichainAccountsAction } from "@metamask/accounts-controller";
-import { type ControllerGetStateAction, type ControllerStateChangeEvent, type RestrictedMessenger, BaseController } from "@metamask/base-controller";
-import type { KeyringControllerGetStateAction } from "@metamask/keyring-controller";
-import type { GetSnap as SnapControllerGetSnap } from "@metamask/snaps-controllers";
-import type { AccountTreeWallet } from "./AccountTreeWallet.cjs";
-declare const controllerName = "AccountTreeController";
-type Metadata = {
-    name: string;
-};
-export type AccountWalletMetadata = Metadata;
-export type AccountGroupMetadata = Metadata;
-export type AccountGroupObject = {
-    id: AccountGroupId;
-    accounts: AccountId[];
-    metadata: AccountGroupMetadata;
-};
-export type AccountWalletObject = {
-    id: AccountWalletId;
-    groups: {
-        [groupId: AccountGroupId]: AccountGroupObject;
-    };
-    metadata: AccountWalletMetadata;
-};
-export type AccountTreeControllerState = {
-    accountTree: {
-        wallets: {
-            [walletId: AccountWalletId]: AccountWalletObject;
-        };
-    };
-};
-export type AccountTreeControllerGetStateAction = ControllerGetStateAction<typeof controllerName, AccountTreeControllerState>;
-export type AllowedActions = AccountsControllerGetAccountAction | AccountsControllerListMultichainAccountsAction | KeyringControllerGetStateAction | SnapControllerGetSnap;
-export type AccountTreeControllerActions = never;
-export type AccountTreeControllerStateChangeEvent = ControllerStateChangeEvent<typeof controllerName, AccountTreeControllerState>;
-export type AllowedEvents = AccountsControllerAccountAddedEvent | AccountsControllerAccountRemovedEvent;
-export type AccountTreeControllerEvents = AccountTreeControllerStateChangeEvent;
-export type AccountTreeControllerMessenger = RestrictedMessenger<typeof controllerName, AccountTreeControllerActions | AllowedActions, AccountTreeControllerEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
+import { BaseController } from "@metamask/base-controller";
+import { AccountTreeWallet } from "./AccountTreeWallet.cjs";
+import type { AccountTreeControllerMessenger, AccountTreeControllerState } from "./types.cjs";
+export declare const controllerName = "AccountTreeController";
 /**
  * Gets default state of the `AccountTreeController`.
  *
  * @returns The default state of the `AccountTreeController`.
  */
 export declare function getDefaultAccountTreeControllerState(): AccountTreeControllerState;
+/**
+ * Context for an account.
+ */
+export type AccountContext = {
+    /**
+     * Wallet ID associated to that account.
+     */
+    walletId: AccountWalletId;
+    /**
+     * Account group ID associated to that account.
+     */
+    groupId: AccountGroupId;
+};
 export declare class AccountTreeController extends BaseController<typeof controllerName, AccountTreeControllerState, AccountTreeControllerMessenger> {
     #private;
     /**
@@ -56,8 +36,7 @@ export declare class AccountTreeController extends BaseController<typeof control
         state?: Partial<AccountTreeControllerState>;
     });
     init(): void;
-    getWallet(id: AccountWalletId): AccountTreeWallet | undefined;
-    getWallets(): AccountTreeWallet[];
+    getAccountWallet(walletId: AccountWalletId): AccountTreeWallet | undefined;
+    getAccountWallets(): AccountTreeWallet[];
 }
-export {};
 //# sourceMappingURL=AccountTreeController.d.cts.map

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;AAC7E,OAAO,KAAK,EACV,SAAS,EACT,mCAAmC,EACnC,qCAAqC,EACrC,kCAAkC,EAClC,8CAA8C,EAC/C,sCAAsC;AAEvC,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,cAAc,EACf,kCAAkC;AACnC,OAAO,KAAK,EAAE,+BAA+B,EAAE,qCAAqC;AAEpF,OAAO,KAAK,EAAE,OAAO,IAAI,qBAAqB,EAAE,oCAAoC;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gCAA4B;AAQ7D,QAAA,MAAM,cAAc,0BAA0B,CAAC;AAQ/C,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAE5C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,cAAc,CAAC;IAEnB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,eAAe,CAAC;IAEpB,MAAM,EAAE;QACN,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB,CAAC;KAC/C,CAAC;IACF,QAAQ,EAAE,qBAAqB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,WAAW,EAAE;QACX,OAAO,EAAE;YAEP,CAAC,QAAQ,EAAE,eAAe,GAAG,mBAAmB,CAAC;SAClD,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,wBAAwB,CACxE,OAAO,cAAc,EACrB,0BAA0B,CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB,kCAAkC,GAClC,8CAA8C,GAC9C,+BAA+B,GAC/B,qBAAqB,CAAC;AAE1B,MAAM,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAEjD,MAAM,MAAM,qCAAqC,GAAG,0BAA0B,CAC5E,OAAO,cAAc,EACrB,0BAA0B,CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GACrB,mCAAmC,GACnC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,2BAA2B,GAAG,qCAAqC,CAAC;AAEhF,MAAM,MAAM,8BAA8B,GAAG,mBAAmB,CAC9D,OAAO,cAAc,EACrB,4BAA4B,GAAG,cAAc,EAC7C,2BAA2B,GAAG,aAAa,EAC3C,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAUF;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAMjF;AAED,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;IAwCD,IAAI;IAaJ,SAAS,CAAC,EAAE,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAI7D,UAAU,IAAI,iBAAiB,EAAE;CA6ElC"}
+{"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,CAMjF;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;IA4CD,IAAI;IA2CJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;CAyGzC"}

package/dist/AccountTreeController.d.mts

@@ -1,47 +1,27 @@
 import type { AccountGroupId, AccountWalletId } from "@metamask/account-api";
-import type { AccountId, AccountsControllerAccountAddedEvent, AccountsControllerAccountRemovedEvent, AccountsControllerGetAccountAction, AccountsControllerListMultichainAccountsAction } from "@metamask/accounts-controller";
-import { type ControllerGetStateAction, type ControllerStateChangeEvent, type RestrictedMessenger, BaseController } from "@metamask/base-controller";
-import type { KeyringControllerGetStateAction } from "@metamask/keyring-controller";
-import type { GetSnap as SnapControllerGetSnap } from "@metamask/snaps-controllers";
-import type { AccountTreeWallet } from "./AccountTreeWallet.mjs";
-declare const controllerName = "AccountTreeController";
-type Metadata = {
-    name: string;
-};
-export type AccountWalletMetadata = Metadata;
-export type AccountGroupMetadata = Metadata;
-export type AccountGroupObject = {
-    id: AccountGroupId;
-    accounts: AccountId[];
-    metadata: AccountGroupMetadata;
-};
-export type AccountWalletObject = {
-    id: AccountWalletId;
-    groups: {
-        [groupId: AccountGroupId]: AccountGroupObject;
-    };
-    metadata: AccountWalletMetadata;
-};
-export type AccountTreeControllerState = {
-    accountTree: {
-        wallets: {
-            [walletId: AccountWalletId]: AccountWalletObject;
-        };
-    };
-};
-export type AccountTreeControllerGetStateAction = ControllerGetStateAction<typeof controllerName, AccountTreeControllerState>;
-export type AllowedActions = AccountsControllerGetAccountAction | AccountsControllerListMultichainAccountsAction | KeyringControllerGetStateAction | SnapControllerGetSnap;
-export type AccountTreeControllerActions = never;
-export type AccountTreeControllerStateChangeEvent = ControllerStateChangeEvent<typeof controllerName, AccountTreeControllerState>;
-export type AllowedEvents = AccountsControllerAccountAddedEvent | AccountsControllerAccountRemovedEvent;
-export type AccountTreeControllerEvents = AccountTreeControllerStateChangeEvent;
-export type AccountTreeControllerMessenger = RestrictedMessenger<typeof controllerName, AccountTreeControllerActions | AllowedActions, AccountTreeControllerEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
+import { BaseController } from "@metamask/base-controller";
+import { AccountTreeWallet } from "./AccountTreeWallet.mjs";
+import type { AccountTreeControllerMessenger, AccountTreeControllerState } from "./types.mjs";
+export declare const controllerName = "AccountTreeController";
 /**
  * Gets default state of the `AccountTreeController`.
  *
  * @returns The default state of the `AccountTreeController`.
  */
 export declare function getDefaultAccountTreeControllerState(): AccountTreeControllerState;
+/**
+ * Context for an account.
+ */
+export type AccountContext = {
+    /**
+     * Wallet ID associated to that account.
+     */
+    walletId: AccountWalletId;
+    /**
+     * Account group ID associated to that account.
+     */
+    groupId: AccountGroupId;
+};
 export declare class AccountTreeController extends BaseController<typeof controllerName, AccountTreeControllerState, AccountTreeControllerMessenger> {
     #private;
     /**
@@ -56,8 +36,7 @@ export declare class AccountTreeController extends BaseController<typeof control
         state?: Partial<AccountTreeControllerState>;
     });
     init(): void;
-    getWallet(id: AccountWalletId): AccountTreeWallet | undefined;
-    getWallets(): AccountTreeWallet[];
+    getAccountWallet(walletId: AccountWalletId): AccountTreeWallet | undefined;
+    getAccountWallets(): AccountTreeWallet[];
 }
-export {};
 //# sourceMappingURL=AccountTreeController.d.mts.map

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;AAC7E,OAAO,KAAK,EACV,SAAS,EACT,mCAAmC,EACnC,qCAAqC,EACrC,kCAAkC,EAClC,8CAA8C,EAC/C,sCAAsC;AAEvC,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,cAAc,EACf,kCAAkC;AACnC,OAAO,KAAK,EAAE,+BAA+B,EAAE,qCAAqC;AAEpF,OAAO,KAAK,EAAE,OAAO,IAAI,qBAAqB,EAAE,oCAAoC;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gCAA4B;AAQ7D,QAAA,MAAM,cAAc,0BAA0B,CAAC;AAQ/C,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAE5C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,cAAc,CAAC;IAEnB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,eAAe,CAAC;IAEpB,MAAM,EAAE;QACN,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB,CAAC;KAC/C,CAAC;IACF,QAAQ,EAAE,qBAAqB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,WAAW,EAAE;QACX,OAAO,EAAE;YAEP,CAAC,QAAQ,EAAE,eAAe,GAAG,mBAAmB,CAAC;SAClD,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,wBAAwB,CACxE,OAAO,cAAc,EACrB,0BAA0B,CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB,kCAAkC,GAClC,8CAA8C,GAC9C,+BAA+B,GAC/B,qBAAqB,CAAC;AAE1B,MAAM,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAEjD,MAAM,MAAM,qCAAqC,GAAG,0BAA0B,CAC5E,OAAO,cAAc,EACrB,0BAA0B,CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GACrB,mCAAmC,GACnC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,2BAA2B,GAAG,qCAAqC,CAAC;AAEhF,MAAM,MAAM,8BAA8B,GAAG,mBAAmB,CAC9D,OAAO,cAAc,EACrB,4BAA4B,GAAG,cAAc,EAC7C,2BAA2B,GAAG,aAAa,EAC3C,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAUF;;;;GAIG;AACH,wBAAgB,oCAAoC,IAAI,0BAA0B,CAMjF;AAED,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;IAwCD,IAAI;IAaJ,SAAS,CAAC,EAAE,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAI7D,UAAU,IAAI,iBAAiB,EAAE;CA6ElC"}
+{"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,CAMjF;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;IA4CD,IAAI;IA2CJ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,SAAS;IAS1E,iBAAiB,IAAI,iBAAiB,EAAE;CAyGzC"}