@metamask-previews/account-api 0.1.0-e86c8ec → 0.2.0-2373565

package/CHANGELOG.md

@@ -7,11 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `MultichainAccountWallet.sync` method ([#321](https://github.com/MetaMask/accounts/pull/321))
+  - This can be used to force wallet synchronization if new accounts are available on the account providers.
+
+### Changed
+
+- **BREAKING:** Force `Bip44Account<Account>` for `Multichain*` types ([#321](https://github.com/MetaMask/accounts/pull/321))
+  - This requires the `AccountProvider`s to also use new `Bip44Account` type constraint.
+
+## [0.2.0]
+
+### Added
+
+- Add multichain account/wallet support ([#315](https://github.com/MetaMask/accounts/pull/315))
+  - This is only about "grouping" wallets and accounts together.
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/keyring-api` from `^18.0.0` to `^19.0.0` ([#317](https://github.com/MetaMask/accounts/pull/317))
+  - The `KeyringAccount.options` field is now partially typed.
+
 ## [0.1.0]
 
 ### Added
 
 - Add `AccountGroup` and `AccountWallet` ([#307](https://github.com/MetaMask/accounts/pull/307))
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/account-api@0.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/account-api@0.2.0...HEAD
+[0.2.0]: https://github.com/MetaMask/accounts/compare/@metamask/account-api@0.1.0...@metamask/account-api@0.2.0
 [0.1.0]: https://github.com/MetaMask/accounts/releases/tag/@metamask/account-api@0.1.0

package/dist/api/bip44.cjs

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBip44Account = isBip44Account;
+const keyring_api_1 = require("@metamask/keyring-api");
+const superstruct_1 = require("@metamask/superstruct");
+/**
+ * Checks if an account is BIP-44 compatible.
+ *
+ * @param account - The account to be tested.
+ * @returns True if the account is BIP-44 compatible.
+ */
+function isBip44Account(account) {
+    // To be BIP-44 compatible, you just need to use this set of options:
+    return (0, superstruct_1.is)(account.options.entropy, keyring_api_1.KeyringAccountEntropyMnemonicOptionsStruct);
+}
+//# sourceMappingURL=bip44.cjs.map

package/dist/api/bip44.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"bip44.cjs","sourceRoot":"","sources":["../../src/api/bip44.ts"],"names":[],"mappings":";;AAwBA,wCAQC;AA5BD,uDAAmF;AACnF,uDAA2C;AAa3C;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,OAAgB;IAEhB,qEAAqE;IACrE,OAAO,IAAA,gBAAE,EACP,OAAO,CAAC,OAAO,CAAC,OAAO,EACvB,wDAA0C,CAC3C,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  KeyringAccount,\n  KeyringAccountEntropyMnemonicOptions,\n} from '@metamask/keyring-api';\nimport { KeyringAccountEntropyMnemonicOptionsStruct } from '@metamask/keyring-api';\nimport { is } from '@metamask/superstruct';\n\n/**\n * BIP-44 compatible account type.\n */\nexport type Bip44Account<Account extends KeyringAccount> = Account & {\n  // We force the option type for those accounts. (That's how we identify\n  // if an account is BIP-44 compatible).\n  options: {\n    entropy: KeyringAccountEntropyMnemonicOptions;\n  };\n};\n\n/**\n * Checks if an account is BIP-44 compatible.\n *\n * @param account - The account to be tested.\n * @returns True if the account is BIP-44 compatible.\n */\nexport function isBip44Account<Account extends KeyringAccount>(\n  account: Account,\n): account is Bip44Account<Account> {\n  // To be BIP-44 compatible, you just need to use this set of options:\n  return is(\n    account.options.entropy,\n    KeyringAccountEntropyMnemonicOptionsStruct,\n  );\n}\n"]}

package/dist/api/bip44.d.cts

@@ -0,0 +1,17 @@
+import type { KeyringAccount, KeyringAccountEntropyMnemonicOptions } from "@metamask/keyring-api";
+/**
+ * BIP-44 compatible account type.
+ */
+export type Bip44Account<Account extends KeyringAccount> = Account & {
+    options: {
+        entropy: KeyringAccountEntropyMnemonicOptions;
+    };
+};
+/**
+ * Checks if an account is BIP-44 compatible.
+ *
+ * @param account - The account to be tested.
+ * @returns True if the account is BIP-44 compatible.
+ */
+export declare function isBip44Account<Account extends KeyringAccount>(account: Account): account is Bip44Account<Account>;
+//# sourceMappingURL=bip44.d.cts.map

package/dist/api/bip44.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bip44.d.cts","sourceRoot":"","sources":["../../src/api/bip44.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,oCAAoC,EACrC,8BAA8B;AAI/B;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,cAAc,IAAI,OAAO,GAAG;IAGnE,OAAO,EAAE;QACP,OAAO,EAAE,oCAAoC,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,SAAS,cAAc,EAC3D,OAAO,EAAE,OAAO,GACf,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAMlC"}

package/dist/api/bip44.d.mts

@@ -0,0 +1,17 @@
+import type { KeyringAccount, KeyringAccountEntropyMnemonicOptions } from "@metamask/keyring-api";
+/**
+ * BIP-44 compatible account type.
+ */
+export type Bip44Account<Account extends KeyringAccount> = Account & {
+    options: {
+        entropy: KeyringAccountEntropyMnemonicOptions;
+    };
+};
+/**
+ * Checks if an account is BIP-44 compatible.
+ *
+ * @param account - The account to be tested.
+ * @returns True if the account is BIP-44 compatible.
+ */
+export declare function isBip44Account<Account extends KeyringAccount>(account: Account): account is Bip44Account<Account>;
+//# sourceMappingURL=bip44.d.mts.map

package/dist/api/bip44.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bip44.d.mts","sourceRoot":"","sources":["../../src/api/bip44.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,oCAAoC,EACrC,8BAA8B;AAI/B;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,cAAc,IAAI,OAAO,GAAG;IAGnE,OAAO,EAAE;QACP,OAAO,EAAE,oCAAoC,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,SAAS,cAAc,EAC3D,OAAO,EAAE,OAAO,GACf,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAMlC"}

package/dist/api/bip44.mjs

@@ -0,0 +1,13 @@
+import { KeyringAccountEntropyMnemonicOptionsStruct } from "@metamask/keyring-api";
+import { is } from "@metamask/superstruct";
+/**
+ * Checks if an account is BIP-44 compatible.
+ *
+ * @param account - The account to be tested.
+ * @returns True if the account is BIP-44 compatible.
+ */
+export function isBip44Account(account) {
+    // To be BIP-44 compatible, you just need to use this set of options:
+    return is(account.options.entropy, KeyringAccountEntropyMnemonicOptionsStruct);
+}
+//# sourceMappingURL=bip44.mjs.map

package/dist/api/bip44.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"bip44.mjs","sourceRoot":"","sources":["../../src/api/bip44.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0CAA0C,EAAE,8BAA8B;AACnF,OAAO,EAAE,EAAE,EAAE,8BAA8B;AAa3C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAgB;IAEhB,qEAAqE;IACrE,OAAO,EAAE,CACP,OAAO,CAAC,OAAO,CAAC,OAAO,EACvB,0CAA0C,CAC3C,CAAC;AACJ,CAAC","sourcesContent":["import type {\n  KeyringAccount,\n  KeyringAccountEntropyMnemonicOptions,\n} from '@metamask/keyring-api';\nimport { KeyringAccountEntropyMnemonicOptionsStruct } from '@metamask/keyring-api';\nimport { is } from '@metamask/superstruct';\n\n/**\n * BIP-44 compatible account type.\n */\nexport type Bip44Account<Account extends KeyringAccount> = Account & {\n  // We force the option type for those accounts. (That's how we identify\n  // if an account is BIP-44 compatible).\n  options: {\n    entropy: KeyringAccountEntropyMnemonicOptions;\n  };\n};\n\n/**\n * Checks if an account is BIP-44 compatible.\n *\n * @param account - The account to be tested.\n * @returns True if the account is BIP-44 compatible.\n */\nexport function isBip44Account<Account extends KeyringAccount>(\n  account: Account,\n): account is Bip44Account<Account> {\n  // To be BIP-44 compatible, you just need to use this set of options:\n  return is(\n    account.options.entropy,\n    KeyringAccountEntropyMnemonicOptionsStruct,\n  );\n}\n"]}

package/dist/api/index.cjs

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./bip44.cjs"), exports);
 __exportStar(require("./group.cjs"), exports);
 __exportStar(require("./wallet.cjs"), exports);
 __exportStar(require("./multichain/index.cjs"), exports);

package/dist/api/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAAwB;AACxB,+CAAyB;AAGzB,yDAA6B","sourcesContent":["export * from './group';\nexport * from './wallet';\nexport type * from './provider';\nexport type * from './selector';\nexport * from './multichain';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAAwB;AACxB,8CAAwB;AACxB,+CAAyB;AAGzB,yDAA6B","sourcesContent":["export * from './bip44';\nexport * from './group';\nexport * from './wallet';\nexport type * from './provider';\nexport type * from './selector';\nexport * from './multichain';\n"]}

package/dist/api/index.d.cts

@@ -1,3 +1,4 @@
+export * from "./bip44.cjs";
 export * from "./group.cjs";
 export * from "./wallet.cjs";
 export type * from "./provider.cjs";

package/dist/api/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,6BAAyB;AACzB,oCAAgC;AAChC,oCAAgC;AAChC,uCAA6B"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,4BAAwB;AACxB,6BAAyB;AACzB,oCAAgC;AAChC,oCAAgC;AAChC,uCAA6B"}

package/dist/api/index.d.mts

@@ -1,3 +1,4 @@
+export * from "./bip44.mjs";
 export * from "./group.mjs";
 export * from "./wallet.mjs";
 export type * from "./provider.mjs";

package/dist/api/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,6BAAyB;AACzB,oCAAgC;AAChC,oCAAgC;AAChC,uCAA6B"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,4BAAwB;AACxB,6BAAyB;AACzB,oCAAgC;AAChC,oCAAgC;AAChC,uCAA6B"}

package/dist/api/index.mjs

@@ -1,3 +1,4 @@
+export * from "./bip44.mjs";
 export * from "./group.mjs";
 export * from "./wallet.mjs";
 export * from "./multichain/index.mjs";

package/dist/api/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,6BAAyB;AAGzB,uCAA6B","sourcesContent":["export * from './group';\nexport * from './wallet';\nexport type * from './provider';\nexport type * from './selector';\nexport * from './multichain';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,4BAAwB;AACxB,4BAAwB;AACxB,6BAAyB;AAGzB,uCAA6B","sourcesContent":["export * from './bip44';\nexport * from './group';\nexport * from './wallet';\nexport type * from './provider';\nexport type * from './selector';\nexport * from './multichain';\n"]}

package/dist/api/multichain/account.cjs

@@ -16,7 +16,6 @@ exports.MultichainAccount = void 0;
 exports.toMultichainAccountId = toMultichainAccountId;
 exports.isMultichainAccountId = isMultichainAccountId;
 exports.getGroupIndexFromMultichainAccountId = getGroupIndexFromMultichainAccountId;
-const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_utils_1 = require("@metamask/keyring-utils");
 const wallet_1 = require("../wallet.cjs");
 const MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(`^${wallet_1.AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\d+)$`, 'u');
@@ -58,14 +57,6 @@ class MultichainAccount {
     get index() {
         return __classPrivateFieldGet(this, _MultichainAccount_index, "f");
     }
-    /**
-     * Checks if there's any underlying accounts for this multichain accounts.
-     *
-     * @returns True if there's any underlying accounts, false otherwise.
-     */
-    hasAccounts() {
-        return this.getAccounts().length > 0;
-    }
     /**
      * Gets the accounts for this multichain account.
      *
@@ -79,10 +70,7 @@ class MultichainAccount {
             // account list. If this becomes too "heavy" in terms of computation
             // we might wanna consider adding a state to that object and store
             // the list of account IDs here.
-            (account) => account.options.entropy &&
-                account.options.entropy.type ===
-                    keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic &&
-                account.options.entropy.id === this.wallet.entropySource &&
+            (account) => account.options.entropy.id === this.wallet.entropySource &&
                 account.options.entropy.groupIndex === this.index));
         }
         return allAccounts;

package/dist/api/multichain/account.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"account.cjs","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  KeyringAccountEntropyTypeOption,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\nimport { isScopeEqualToAny } from '@metamask/keyring-utils';\n\nimport type {\n  MultichainAccountWallet,\n  MultichainAccountWalletId,\n} from './wallet';\nimport type { AccountGroup } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountSelector } from '../selector';\nimport { AccountWalletCategory } from '../wallet';\n\nconst MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(\n  `^${AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\\\d+)$`,\n  'u',\n);\n\n/**\n * Multichain account ID.\n */\nexport type MultichainAccountId = `${MultichainAccountWalletId}/${number}`; // Use number for the account group index.\n\n/**\n * A multichain account that holds multiple accounts.\n */\nexport class MultichainAccount<Account extends KeyringAccount>\n  implements AccountGroup<Account>\n{\n  readonly #id: MultichainAccountId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #index: number;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: AccountProvider<Account>[];\n  }) {\n    this.#id = toMultichainAccountId(wallet.id, groupIndex);\n    this.#index = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n  }\n\n  /**\n   * Gets the multichain account ID.\n   *\n   * @returns The multichain account ID.\n   */\n  get id(): MultichainAccountId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get index(): number {\n    return this.#index;\n  }\n\n  /**\n   * Checks if there's any underlying accounts for this multichain accounts.\n   *\n   * @returns True if there's any underlying accounts, false otherwise.\n   */\n  hasAccounts(): boolean {\n    return this.getAccounts().length > 0;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    let allAccounts: Account[] = [];\n\n    for (const provider of this.#providers) {\n      allAccounts = allAccounts.concat(\n        provider.getAccounts().filter(\n          // NOTE: For now we always query the providers to get the latest\n          // account list. If this becomes too \"heavy\" in terms of computation\n          // we might wanna consider adding a state to that object and store\n          // the list of account IDs here.\n          (account) =>\n            account.options.entropy &&\n            account.options.entropy.type ===\n              KeyringAccountEntropyTypeOption.Mnemonic &&\n            account.options.entropy.id === this.wallet.entropySource &&\n            account.options.entropy.groupIndex === this.index,\n        ),\n      );\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    // NOTE: Same remark here. We could keep a state to make this operation\n    // faster.\n    return this.getAccounts().find((account) => account.id === id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    const accounts = this.select(selector);\n\n    if (accounts.length > 1) {\n      throw new Error(\n        `Too many account candidates, expected 1, got: ${accounts.length}`,\n      );\n    }\n\n    if (accounts.length === 0) {\n      return undefined;\n    }\n\n    return accounts[0]; // This is safe, see checks above.\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return this.getAccounts().filter((account) => {\n      let selected = true;\n\n      if (selector.id) {\n        selected &&= account.id === selector.id;\n      }\n      if (selector.address) {\n        selected &&= account.address === selector.address;\n      }\n      if (selector.type) {\n        selected &&= account.type === selector.type;\n      }\n      if (selector.methods !== undefined) {\n        selected &&= selector.methods.some((method) =>\n          account.methods.includes(method),\n        );\n      }\n      if (selector.scopes !== undefined) {\n        selected &&= selector.scopes.some((scope) => {\n          return (\n            // This will cover specific EVM EOA scopes as well.\n            isScopeEqualToAny(scope, account.scopes)\n          );\n        });\n      }\n\n      return selected;\n    });\n  }\n}\n\n/**\n * Gets the multichain account ID from its multichain account wallet ID and its index.\n *\n * @param walletId - Multichain account wallet ID.\n * @param groupIndex - Index of that multichain account.\n * @returns The multichain account ID.\n */\nexport function toMultichainAccountId(\n  walletId: MultichainAccountWalletId,\n  groupIndex: number,\n): MultichainAccountId {\n  return `${walletId}/${groupIndex}`;\n}\n\n/**\n * Checks if the given value is {@link MultichainAccountId}.\n *\n * @param value - The value to check.\n * @returns Whether the value is a {@link MultichainAccountId}.\n */\nexport function isMultichainAccountId(\n  value: string,\n): value is MultichainAccountId {\n  return MULTICHAIN_ACCOUNT_ID_REGEX.test(value);\n}\n\n/**\n * Gets the multichain account index from an account group ID.\n *\n * @param id - Multichain account ID.\n * @returns The multichain account index if extractable, undefined otherwise.\n */\nexport function getGroupIndexFromMultichainAccountId(\n  id: MultichainAccountId,\n): number {\n  const matched = id.match(MULTICHAIN_ACCOUNT_ID_REGEX);\n  if (matched?.groups?.groupIndex === undefined) {\n    // Unable to extract group index, even though, type wise, this should not\n    // be possible!\n    throw new Error('Unable to extract group index');\n  }\n\n  return Number(matched.groups.groupIndex);\n}\n"]}
+{"version":3,"file":"account.cjs","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"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","sourcesContent":["import { type KeyringAccount } from '@metamask/keyring-api';\nimport { isScopeEqualToAny } from '@metamask/keyring-utils';\n\nimport type {\n  MultichainAccountWallet,\n  MultichainAccountWalletId,\n} from './wallet';\nimport type { Bip44Account } from '../bip44';\nimport type { AccountGroup } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountSelector } from '../selector';\nimport { AccountWalletCategory } from '../wallet';\n\nconst MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(\n  `^${AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\\\d+)$`,\n  'u',\n);\n\n/**\n * Multichain account ID.\n */\nexport type MultichainAccountId = `${MultichainAccountWalletId}/${number}`; // Use number for the account group index.\n\n/**\n * A multichain account that holds multiple accounts.\n */\nexport class MultichainAccount<Account extends Bip44Account<KeyringAccount>>\n  implements AccountGroup<Account>\n{\n  readonly #id: MultichainAccountId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #index: number;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: AccountProvider<Account>[];\n  }) {\n    this.#id = toMultichainAccountId(wallet.id, groupIndex);\n    this.#index = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n  }\n\n  /**\n   * Gets the multichain account ID.\n   *\n   * @returns The multichain account ID.\n   */\n  get id(): MultichainAccountId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get index(): number {\n    return this.#index;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    let allAccounts: Account[] = [];\n\n    for (const provider of this.#providers) {\n      allAccounts = allAccounts.concat(\n        provider.getAccounts().filter(\n          // NOTE: For now we always query the providers to get the latest\n          // account list. If this becomes too \"heavy\" in terms of computation\n          // we might wanna consider adding a state to that object and store\n          // the list of account IDs here.\n          (account) =>\n            account.options.entropy.id === this.wallet.entropySource &&\n            account.options.entropy.groupIndex === this.index,\n        ),\n      );\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    // NOTE: Same remark here. We could keep a state to make this operation\n    // faster.\n    return this.getAccounts().find((account) => account.id === id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    const accounts = this.select(selector);\n\n    if (accounts.length > 1) {\n      throw new Error(\n        `Too many account candidates, expected 1, got: ${accounts.length}`,\n      );\n    }\n\n    if (accounts.length === 0) {\n      return undefined;\n    }\n\n    return accounts[0]; // This is safe, see checks above.\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return this.getAccounts().filter((account) => {\n      let selected = true;\n\n      if (selector.id) {\n        selected &&= account.id === selector.id;\n      }\n      if (selector.address) {\n        selected &&= account.address === selector.address;\n      }\n      if (selector.type) {\n        selected &&= account.type === selector.type;\n      }\n      if (selector.methods !== undefined) {\n        selected &&= selector.methods.some((method) =>\n          account.methods.includes(method),\n        );\n      }\n      if (selector.scopes !== undefined) {\n        selected &&= selector.scopes.some((scope) => {\n          return (\n            // This will cover specific EVM EOA scopes as well.\n            isScopeEqualToAny(scope, account.scopes)\n          );\n        });\n      }\n\n      return selected;\n    });\n  }\n}\n\n/**\n * Gets the multichain account ID from its multichain account wallet ID and its index.\n *\n * @param walletId - Multichain account wallet ID.\n * @param groupIndex - Index of that multichain account.\n * @returns The multichain account ID.\n */\nexport function toMultichainAccountId(\n  walletId: MultichainAccountWalletId,\n  groupIndex: number,\n): MultichainAccountId {\n  return `${walletId}/${groupIndex}`;\n}\n\n/**\n * Checks if the given value is {@link MultichainAccountId}.\n *\n * @param value - The value to check.\n * @returns Whether the value is a {@link MultichainAccountId}.\n */\nexport function isMultichainAccountId(\n  value: string,\n): value is MultichainAccountId {\n  return MULTICHAIN_ACCOUNT_ID_REGEX.test(value);\n}\n\n/**\n * Gets the multichain account index from an account group ID.\n *\n * @param id - Multichain account ID.\n * @returns The multichain account index if extractable, undefined otherwise.\n */\nexport function getGroupIndexFromMultichainAccountId(\n  id: MultichainAccountId,\n): number {\n  const matched = id.match(MULTICHAIN_ACCOUNT_ID_REGEX);\n  if (matched?.groups?.groupIndex === undefined) {\n    // Unable to extract group index, even though, type wise, this should not\n    // be possible!\n    throw new Error('Unable to extract group index');\n  }\n\n  return Number(matched.groups.groupIndex);\n}\n"]}

package/dist/api/multichain/account.d.cts

@@ -1,5 +1,6 @@
 import { type KeyringAccount } from "@metamask/keyring-api";
 import type { MultichainAccountWallet, MultichainAccountWalletId } from "./wallet.cjs";
+import type { Bip44Account } from "../bip44.cjs";
 import type { AccountGroup } from "../group.cjs";
 import type { AccountProvider } from "../provider.cjs";
 import type { AccountSelector } from "../selector.cjs";
@@ -10,7 +11,7 @@ export type MultichainAccountId = `${MultichainAccountWalletId}/${number}`;
 /**
  * A multichain account that holds multiple accounts.
  */
-export declare class MultichainAccount<Account extends KeyringAccount> implements AccountGroup<Account> {
+export declare class MultichainAccount<Account extends Bip44Account<KeyringAccount>> implements AccountGroup<Account> {
     #private;
     constructor({ groupIndex, wallet, providers, }: {
         groupIndex: number;
@@ -35,12 +36,6 @@ export declare class MultichainAccount<Account extends KeyringAccount> implement
      * @returns The multichain account group index.
      */
     get index(): number;
-    /**
-     * Checks if there's any underlying accounts for this multichain accounts.
-     *
-     * @returns True if there's any underlying accounts, false otherwise.
-     */
-    hasAccounts(): boolean;
     /**
      * Gets the accounts for this multichain account.
      *

package/dist/api/multichain/account.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.cts","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACpB,8BAA8B;AAG/B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,qBAAiB;AAClB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AAQnD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,GAAG,yBAAyB,IAAI,MAAM,EAAE,CAAC;AAE3E;;GAEG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,cAAc,CAC3D,YAAW,YAAY,CAAC,OAAO,CAAC;;gBAUpB,EACV,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KACvC;IAOD;;;;OAIG;IACH,IAAI,EAAE,IAAI,mBAAmB,CAE5B;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAItB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAuBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAMlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAgB5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;CA8BtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,GACjB,mBAAmB,CAErB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,mBAAmB,CAE9B;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,mBAAmB,GACtB,MAAM,CASR"}
+{"version":3,"file":"account.d.cts","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,8BAA8B;AAG5D,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,qBAAiB;AAClB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AAQnD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,GAAG,yBAAyB,IAAI,MAAM,EAAE,CAAC;AAE3E;;GAEG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CACzE,YAAW,YAAY,CAAC,OAAO,CAAC;;gBAUpB,EACV,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KACvC;IAOD;;;;OAIG;IACH,IAAI,EAAE,IAAI,mBAAmB,CAE5B;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAoBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAMlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAgB5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;CA8BtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,GACjB,mBAAmB,CAErB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,mBAAmB,CAE9B;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,mBAAmB,GACtB,MAAM,CASR"}

package/dist/api/multichain/account.d.mts

@@ -1,5 +1,6 @@
 import { type KeyringAccount } from "@metamask/keyring-api";
 import type { MultichainAccountWallet, MultichainAccountWalletId } from "./wallet.mjs";
+import type { Bip44Account } from "../bip44.mjs";
 import type { AccountGroup } from "../group.mjs";
 import type { AccountProvider } from "../provider.mjs";
 import type { AccountSelector } from "../selector.mjs";
@@ -10,7 +11,7 @@ export type MultichainAccountId = `${MultichainAccountWalletId}/${number}`;
 /**
  * A multichain account that holds multiple accounts.
  */
-export declare class MultichainAccount<Account extends KeyringAccount> implements AccountGroup<Account> {
+export declare class MultichainAccount<Account extends Bip44Account<KeyringAccount>> implements AccountGroup<Account> {
     #private;
     constructor({ groupIndex, wallet, providers, }: {
         groupIndex: number;
@@ -35,12 +36,6 @@ export declare class MultichainAccount<Account extends KeyringAccount> implement
      * @returns The multichain account group index.
      */
     get index(): number;
-    /**
-     * Checks if there's any underlying accounts for this multichain accounts.
-     *
-     * @returns True if there's any underlying accounts, false otherwise.
-     */
-    hasAccounts(): boolean;
     /**
      * Gets the accounts for this multichain account.
      *

package/dist/api/multichain/account.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.mts","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACpB,8BAA8B;AAG/B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,qBAAiB;AAClB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AAQnD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,GAAG,yBAAyB,IAAI,MAAM,EAAE,CAAC;AAE3E;;GAEG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,cAAc,CAC3D,YAAW,YAAY,CAAC,OAAO,CAAC;;gBAUpB,EACV,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KACvC;IAOD;;;;OAIG;IACH,IAAI,EAAE,IAAI,mBAAmB,CAE5B;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAItB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAuBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAMlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAgB5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;CA8BtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,GACjB,mBAAmB,CAErB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,mBAAmB,CAE9B;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,mBAAmB,GACtB,MAAM,CASR"}
+{"version":3,"file":"account.d.mts","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,8BAA8B;AAG5D,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EAC1B,qBAAiB;AAClB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AAQnD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,GAAG,yBAAyB,IAAI,MAAM,EAAE,CAAC;AAE3E;;GAEG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CACzE,YAAW,YAAY,CAAC,OAAO,CAAC;;gBAUpB,EACV,UAAU,EACV,MAAM,EACN,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;KACvC;IAOD;;;;OAIG;IACH,IAAI,EAAE,IAAI,mBAAmB,CAE5B;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAoBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAMlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAgB5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;CA8BtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,GACjB,mBAAmB,CAErB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,GACZ,KAAK,IAAI,mBAAmB,CAE9B;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,mBAAmB,GACtB,MAAM,CASR"}

package/dist/api/multichain/account.mjs

@@ -10,7 +10,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _MultichainAccount_id, _MultichainAccount_wallet, _MultichainAccount_index, _MultichainAccount_providers;
-import { KeyringAccountEntropyTypeOption } from "@metamask/keyring-api";
 import { isScopeEqualToAny } from "@metamask/keyring-utils";
 import { AccountWalletCategory } from "../wallet.mjs";
 const MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(`^${AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\d+)$`, 'u');
@@ -52,14 +51,6 @@ export class MultichainAccount {
     get index() {
         return __classPrivateFieldGet(this, _MultichainAccount_index, "f");
     }
-    /**
-     * Checks if there's any underlying accounts for this multichain accounts.
-     *
-     * @returns True if there's any underlying accounts, false otherwise.
-     */
-    hasAccounts() {
-        return this.getAccounts().length > 0;
-    }
     /**
      * Gets the accounts for this multichain account.
      *
@@ -73,10 +64,7 @@ export class MultichainAccount {
             // account list. If this becomes too "heavy" in terms of computation
             // we might wanna consider adding a state to that object and store
             // the list of account IDs here.
-            (account) => account.options.entropy &&
-                account.options.entropy.type ===
-                    KeyringAccountEntropyTypeOption.Mnemonic &&
-                account.options.entropy.id === this.wallet.entropySource &&
+            (account) => account.options.entropy.id === this.wallet.entropySource &&
                 account.options.entropy.groupIndex === this.index));
         }
         return allAccounts;

package/dist/api/multichain/account.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"account.mjs","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  KeyringAccountEntropyTypeOption,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\nimport { isScopeEqualToAny } from '@metamask/keyring-utils';\n\nimport type {\n  MultichainAccountWallet,\n  MultichainAccountWalletId,\n} from './wallet';\nimport type { AccountGroup } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountSelector } from '../selector';\nimport { AccountWalletCategory } from '../wallet';\n\nconst MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(\n  `^${AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\\\d+)$`,\n  'u',\n);\n\n/**\n * Multichain account ID.\n */\nexport type MultichainAccountId = `${MultichainAccountWalletId}/${number}`; // Use number for the account group index.\n\n/**\n * A multichain account that holds multiple accounts.\n */\nexport class MultichainAccount<Account extends KeyringAccount>\n  implements AccountGroup<Account>\n{\n  readonly #id: MultichainAccountId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #index: number;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: AccountProvider<Account>[];\n  }) {\n    this.#id = toMultichainAccountId(wallet.id, groupIndex);\n    this.#index = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n  }\n\n  /**\n   * Gets the multichain account ID.\n   *\n   * @returns The multichain account ID.\n   */\n  get id(): MultichainAccountId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get index(): number {\n    return this.#index;\n  }\n\n  /**\n   * Checks if there's any underlying accounts for this multichain accounts.\n   *\n   * @returns True if there's any underlying accounts, false otherwise.\n   */\n  hasAccounts(): boolean {\n    return this.getAccounts().length > 0;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    let allAccounts: Account[] = [];\n\n    for (const provider of this.#providers) {\n      allAccounts = allAccounts.concat(\n        provider.getAccounts().filter(\n          // NOTE: For now we always query the providers to get the latest\n          // account list. If this becomes too \"heavy\" in terms of computation\n          // we might wanna consider adding a state to that object and store\n          // the list of account IDs here.\n          (account) =>\n            account.options.entropy &&\n            account.options.entropy.type ===\n              KeyringAccountEntropyTypeOption.Mnemonic &&\n            account.options.entropy.id === this.wallet.entropySource &&\n            account.options.entropy.groupIndex === this.index,\n        ),\n      );\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    // NOTE: Same remark here. We could keep a state to make this operation\n    // faster.\n    return this.getAccounts().find((account) => account.id === id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    const accounts = this.select(selector);\n\n    if (accounts.length > 1) {\n      throw new Error(\n        `Too many account candidates, expected 1, got: ${accounts.length}`,\n      );\n    }\n\n    if (accounts.length === 0) {\n      return undefined;\n    }\n\n    return accounts[0]; // This is safe, see checks above.\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return this.getAccounts().filter((account) => {\n      let selected = true;\n\n      if (selector.id) {\n        selected &&= account.id === selector.id;\n      }\n      if (selector.address) {\n        selected &&= account.address === selector.address;\n      }\n      if (selector.type) {\n        selected &&= account.type === selector.type;\n      }\n      if (selector.methods !== undefined) {\n        selected &&= selector.methods.some((method) =>\n          account.methods.includes(method),\n        );\n      }\n      if (selector.scopes !== undefined) {\n        selected &&= selector.scopes.some((scope) => {\n          return (\n            // This will cover specific EVM EOA scopes as well.\n            isScopeEqualToAny(scope, account.scopes)\n          );\n        });\n      }\n\n      return selected;\n    });\n  }\n}\n\n/**\n * Gets the multichain account ID from its multichain account wallet ID and its index.\n *\n * @param walletId - Multichain account wallet ID.\n * @param groupIndex - Index of that multichain account.\n * @returns The multichain account ID.\n */\nexport function toMultichainAccountId(\n  walletId: MultichainAccountWalletId,\n  groupIndex: number,\n): MultichainAccountId {\n  return `${walletId}/${groupIndex}`;\n}\n\n/**\n * Checks if the given value is {@link MultichainAccountId}.\n *\n * @param value - The value to check.\n * @returns Whether the value is a {@link MultichainAccountId}.\n */\nexport function isMultichainAccountId(\n  value: string,\n): value is MultichainAccountId {\n  return MULTICHAIN_ACCOUNT_ID_REGEX.test(value);\n}\n\n/**\n * Gets the multichain account index from an account group ID.\n *\n * @param id - Multichain account ID.\n * @returns The multichain account index if extractable, undefined otherwise.\n */\nexport function getGroupIndexFromMultichainAccountId(\n  id: MultichainAccountId,\n): number {\n  const matched = id.match(MULTICHAIN_ACCOUNT_ID_REGEX);\n  if (matched?.groups?.groupIndex === undefined) {\n    // Unable to extract group index, even though, type wise, this should not\n    // be possible!\n    throw new Error('Unable to extract group index');\n  }\n\n  return Number(matched.groups.groupIndex);\n}\n"]}
+{"version":3,"file":"account.mjs","sourceRoot":"","sources":["../../../src/api/multichain/account.ts"],"names":[],"mappings":"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","sourcesContent":["import { type KeyringAccount } from '@metamask/keyring-api';\nimport { isScopeEqualToAny } from '@metamask/keyring-utils';\n\nimport type {\n  MultichainAccountWallet,\n  MultichainAccountWalletId,\n} from './wallet';\nimport type { Bip44Account } from '../bip44';\nimport type { AccountGroup } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountSelector } from '../selector';\nimport { AccountWalletCategory } from '../wallet';\n\nconst MULTICHAIN_ACCOUNT_ID_REGEX = new RegExp(\n  `^${AccountWalletCategory.Entropy}:.*/(?<groupIndex>\\\\d+)$`,\n  'u',\n);\n\n/**\n * Multichain account ID.\n */\nexport type MultichainAccountId = `${MultichainAccountWalletId}/${number}`; // Use number for the account group index.\n\n/**\n * A multichain account that holds multiple accounts.\n */\nexport class MultichainAccount<Account extends Bip44Account<KeyringAccount>>\n  implements AccountGroup<Account>\n{\n  readonly #id: MultichainAccountId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #index: number;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: AccountProvider<Account>[];\n  }) {\n    this.#id = toMultichainAccountId(wallet.id, groupIndex);\n    this.#index = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n  }\n\n  /**\n   * Gets the multichain account ID.\n   *\n   * @returns The multichain account ID.\n   */\n  get id(): MultichainAccountId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get index(): number {\n    return this.#index;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    let allAccounts: Account[] = [];\n\n    for (const provider of this.#providers) {\n      allAccounts = allAccounts.concat(\n        provider.getAccounts().filter(\n          // NOTE: For now we always query the providers to get the latest\n          // account list. If this becomes too \"heavy\" in terms of computation\n          // we might wanna consider adding a state to that object and store\n          // the list of account IDs here.\n          (account) =>\n            account.options.entropy.id === this.wallet.entropySource &&\n            account.options.entropy.groupIndex === this.index,\n        ),\n      );\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    // NOTE: Same remark here. We could keep a state to make this operation\n    // faster.\n    return this.getAccounts().find((account) => account.id === id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    const accounts = this.select(selector);\n\n    if (accounts.length > 1) {\n      throw new Error(\n        `Too many account candidates, expected 1, got: ${accounts.length}`,\n      );\n    }\n\n    if (accounts.length === 0) {\n      return undefined;\n    }\n\n    return accounts[0]; // This is safe, see checks above.\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return this.getAccounts().filter((account) => {\n      let selected = true;\n\n      if (selector.id) {\n        selected &&= account.id === selector.id;\n      }\n      if (selector.address) {\n        selected &&= account.address === selector.address;\n      }\n      if (selector.type) {\n        selected &&= account.type === selector.type;\n      }\n      if (selector.methods !== undefined) {\n        selected &&= selector.methods.some((method) =>\n          account.methods.includes(method),\n        );\n      }\n      if (selector.scopes !== undefined) {\n        selected &&= selector.scopes.some((scope) => {\n          return (\n            // This will cover specific EVM EOA scopes as well.\n            isScopeEqualToAny(scope, account.scopes)\n          );\n        });\n      }\n\n      return selected;\n    });\n  }\n}\n\n/**\n * Gets the multichain account ID from its multichain account wallet ID and its index.\n *\n * @param walletId - Multichain account wallet ID.\n * @param groupIndex - Index of that multichain account.\n * @returns The multichain account ID.\n */\nexport function toMultichainAccountId(\n  walletId: MultichainAccountWalletId,\n  groupIndex: number,\n): MultichainAccountId {\n  return `${walletId}/${groupIndex}`;\n}\n\n/**\n * Checks if the given value is {@link MultichainAccountId}.\n *\n * @param value - The value to check.\n * @returns Whether the value is a {@link MultichainAccountId}.\n */\nexport function isMultichainAccountId(\n  value: string,\n): value is MultichainAccountId {\n  return MULTICHAIN_ACCOUNT_ID_REGEX.test(value);\n}\n\n/**\n * Gets the multichain account index from an account group ID.\n *\n * @param id - Multichain account ID.\n * @returns The multichain account index if extractable, undefined otherwise.\n */\nexport function getGroupIndexFromMultichainAccountId(\n  id: MultichainAccountId,\n): number {\n  const matched = id.match(MULTICHAIN_ACCOUNT_ID_REGEX);\n  if (matched?.groups?.groupIndex === undefined) {\n    // Unable to extract group index, even though, type wise, this should not\n    // be possible!\n    throw new Error('Unable to extract group index');\n  }\n\n  return Number(matched.groups.groupIndex);\n}\n"]}

package/dist/api/multichain/wallet.cjs

@@ -14,7 +14,6 @@ var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _Multichain
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultichainAccountWallet = void 0;
 exports.toMultichainAccountWalletId = toMultichainAccountWalletId;
-const keyring_api_1 = require("@metamask/keyring-api");
 const account_1 = require("./account.cjs");
 const group_1 = require("../group.cjs");
 const wallet_1 = require("../wallet.cjs");
@@ -32,47 +31,45 @@ class MultichainAccountWallet {
         __classPrivateFieldSet(this, _MultichainAccountWallet_providers, providers, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_entropySource, entropySource, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_accounts, new Map(), "f");
-        // NOTE: This will traverse all accounts to compute the max index. We could try
-        // to minimize the number of filtering we're doing on each providers if this
-        // becomes too costly.
-        const maxGroupIndex = MultichainAccountWallet.getHighestGroupIndexFrom(providers, entropySource);
-        // NOTE: We could have some gap for now, until we fully implement the
-        // gap/alignment mechanisms to backfill all "missing accounts".
-        for (let groupIndex = 0; groupIndex <= maxGroupIndex; groupIndex++) {
-            // Use "lower or equal", since we need to "include" the max index (which
-            // can also be 0)
-            const multichainAccount = new account_1.MultichainAccount({
-                groupIndex,
-                wallet: this,
-                providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
-            });
-            // We only add multichain account that has underlying accounts.
-            if (multichainAccount.hasAccounts()) {
-                __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(groupIndex, multichainAccount);
-            }
-        }
+        // Initial synchronization.
+        this.sync();
     }
     /**
-     * Gets the highest group index from multiple account providers for a given
-     * entropy source.
+     * Force wallet synchronization.
      *
-     * @param providers - Account providers.
-     * @param entropySource - Entropy source to filter on.
-     * @returns The highest group index for a given entropy source.
+     * This can be used if account providers got new accounts that the wallet
+     * doesn't know about.
      */
-    static getHighestGroupIndexFrom(providers, entropySource) {
-        let max = -1;
-        for (const provider of providers) {
+    sync() {
+        // We keep track of all existing indexes to see if some of them are no
+        // longer in use after the sync.
+        const outdatedIndexes = new Set(__classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").keys());
+        for (const provider of __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f")) {
             for (const account of provider.getAccounts()) {
-                if (account.options.entropy &&
-                    account.options.entropy.type ===
-                        keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic &&
-                    account.options.entropy.id === entropySource) {
-                    max = Math.max(max, account.options.entropy.groupIndex);
+                const { entropy } = account.options;
+                // Filter for this wallet only.
+                if (entropy.id !== this.entropySource) {
+                    continue;
+                }
+                // We still got an account for this index, thus we can mark this index
+                // as "in use" (to not clean it up later on).
+                outdatedIndexes.delete(entropy.groupIndex);
+                // This multichain account might exists already.
+                let multichainAccount = __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(entropy.groupIndex);
+                if (!multichainAccount) {
+                    multichainAccount = new account_1.MultichainAccount({
+                        groupIndex: entropy.groupIndex,
+                        wallet: this,
+                        providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+                    });
+                    __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(entropy.groupIndex, multichainAccount);
                 }
             }
         }
-        return max;
+        // Clean up old multichain accounts.
+        for (const outdatedIndex of outdatedIndexes) {
+            __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").delete(outdatedIndex);
+        }
     }
     /**
      * Gets the multichain account wallet ID.

package/dist/api/multichain/wallet.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.cjs","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  KeyringAccountEntropyTypeOption,\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport {\n  getGroupIndexFromMultichainAccountId,\n  isMultichainAccountId,\n  MultichainAccount,\n} from './account';\nimport type { AccountGroupId } from '../group';\nimport { toDefaultAccountGroupId } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountWallet } from '../wallet';\nimport { AccountWalletCategory } from '../wallet';\n\n/**\n * Multichain account wallet ID.\n */\nexport type MultichainAccountWalletId =\n  `${AccountWalletCategory.Entropy}:${EntropySourceId}`;\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<Account extends KeyringAccount>\n  implements AccountWallet<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccount<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // NOTE: This will traverse all accounts to compute the max index. We could try\n    // to minimize the number of filtering we're doing on each providers if this\n    // becomes too costly.\n    const maxGroupIndex = MultichainAccountWallet.getHighestGroupIndexFrom(\n      providers,\n      entropySource,\n    );\n\n    // NOTE: We could have some gap for now, until we fully implement the\n    // gap/alignment mechanisms to backfill all \"missing accounts\".\n    for (let groupIndex = 0; groupIndex <= maxGroupIndex; groupIndex++) {\n      // Use \"lower or equal\", since we need to \"include\" the max index (which\n      // can also be 0)\n      const multichainAccount = new MultichainAccount<Account>({\n        groupIndex,\n        wallet: this,\n        providers: this.#providers,\n      });\n\n      // We only add multichain account that has underlying accounts.\n      if (multichainAccount.hasAccounts()) {\n        this.#accounts.set(groupIndex, multichainAccount);\n      }\n    }\n  }\n\n  /**\n   * Gets the highest group index from multiple account providers for a given\n   * entropy source.\n   *\n   * @param providers - Account providers.\n   * @param entropySource - Entropy source to filter on.\n   * @returns The highest group index for a given entropy source.\n   */\n  static getHighestGroupIndexFrom<Account extends KeyringAccount>(\n    providers: AccountProvider<Account>[],\n    entropySource: EntropySourceId,\n  ): number {\n    let max = -1;\n\n    for (const provider of providers) {\n      for (const account of provider.getAccounts()) {\n        if (\n          account.options.entropy &&\n          account.options.entropy.type ===\n            KeyringAccountEntropyTypeOption.Mnemonic &&\n          account.options.entropy.id === entropySource\n        ) {\n          max = Math.max(max, account.options.entropy.groupIndex);\n        }\n      }\n    }\n\n    return max;\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet category, which is always {@link AccountWalletCategory.Entropy}.\n   *\n   * @returns The multichain account wallet category.\n   */\n  get category(): AccountWalletCategory.Entropy {\n    return AccountWalletCategory.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(id: AccountGroupId): MultichainAccount<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccounts}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccount<Account>[] {\n    return this.getMultichainAccounts();\n  }\n\n  /**\n   * Gets multichain account for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccount(\n    groupIndex: number,\n  ): MultichainAccount<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccounts(): MultichainAccount<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletCategory.Entropy}:${entropySource}`;\n}\n"]}
+{"version":3,"file":"wallet.cjs","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport {\n  getGroupIndexFromMultichainAccountId,\n  isMultichainAccountId,\n  MultichainAccount,\n} from './account';\nimport type { Bip44Account } from '../bip44';\nimport type { AccountGroupId } from '../group';\nimport { toDefaultAccountGroupId } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountWallet } from '../wallet';\nimport { AccountWalletCategory } from '../wallet';\n\n/**\n * Multichain account wallet ID.\n */\nexport type MultichainAccountWalletId =\n  `${AccountWalletCategory.Entropy}:${EntropySourceId}`;\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements AccountWallet<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccount<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    // We keep track of all existing indexes to see if some of them are no\n    // longer in use after the sync.\n    const outdatedIndexes = new Set(this.#accounts.keys());\n\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // We still got an account for this index, thus we can mark this index\n        // as \"in use\" (to not clean it up later on).\n        outdatedIndexes.delete(entropy.groupIndex);\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccount<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Clean up old multichain accounts.\n    for (const outdatedIndex of outdatedIndexes) {\n      this.#accounts.delete(outdatedIndex);\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet category, which is always {@link AccountWalletCategory.Entropy}.\n   *\n   * @returns The multichain account wallet category.\n   */\n  get category(): AccountWalletCategory.Entropy {\n    return AccountWalletCategory.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(id: AccountGroupId): MultichainAccount<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccounts}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccount<Account>[] {\n    return this.getMultichainAccounts();\n  }\n\n  /**\n   * Gets multichain account for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccount(\n    groupIndex: number,\n  ): MultichainAccount<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccounts(): MultichainAccount<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletCategory.Entropy}:${entropySource}`;\n}\n"]}

package/dist/api/multichain/wallet.d.cts

@@ -1,5 +1,6 @@
 import { type EntropySourceId, type KeyringAccount } from "@metamask/keyring-api";
 import { MultichainAccount } from "./account.cjs";
+import type { Bip44Account } from "../bip44.cjs";
 import type { AccountGroupId } from "../group.cjs";
 import type { AccountProvider } from "../provider.cjs";
 import type { AccountWallet } from "../wallet.cjs";
@@ -12,21 +13,19 @@ export type MultichainAccountWalletId = `${AccountWalletCategory.Entropy}:${Entr
  * A multichain account wallet that holds multiple multichain accounts (one multichain account per
  * group index).
  */
-export declare class MultichainAccountWallet<Account extends KeyringAccount> implements AccountWallet<Account> {
+export declare class MultichainAccountWallet<Account extends Bip44Account<KeyringAccount>> implements AccountWallet<Account> {
     #private;
     constructor({ providers, entropySource, }: {
         providers: AccountProvider<Account>[];
         entropySource: EntropySourceId;
     });
     /**
-     * Gets the highest group index from multiple account providers for a given
-     * entropy source.
+     * Force wallet synchronization.
      *
-     * @param providers - Account providers.
-     * @param entropySource - Entropy source to filter on.
-     * @returns The highest group index for a given entropy source.
+     * This can be used if account providers got new accounts that the wallet
+     * doesn't know about.
      */
-    static getHighestGroupIndexFrom<Account extends KeyringAccount>(providers: AccountProvider<Account>[], entropySource: EntropySourceId): number;
+    sync(): void;
     /**
      * Gets the multichain account wallet ID.
      *

package/dist/api/multichain/wallet.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAGL,iBAAiB,EAClB,sBAAkB;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAiB;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAkB;AAC/C,OAAO,EAAE,qBAAqB,EAAE,sBAAkB;AAElD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACnC,GAAG,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB,CAAC,OAAO,SAAS,cAAc,CACjE,YAAW,aAAa,CAAC,OAAO,CAAC;;gBAUrB,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAgCD;;;;;;;OAOG;IACH,MAAM,CAAC,wBAAwB,CAAC,OAAO,SAAS,cAAc,EAC5D,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,EACrC,aAAa,EAAE,eAAe,GAC7B,MAAM;IAmBT;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,qBAAqB,CAAC,OAAO,CAE5C;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB3E;;;;OAIG;IACH,gBAAgB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAIhD;;;;;OAKG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAIzC;;;;OAIG;IACH,qBAAqB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;CAGtD;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}
+{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAGL,iBAAiB,EAClB,sBAAkB;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAiB;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAkB;AAC/C,OAAO,EAAE,qBAAqB,EAAE,sBAAkB;AAElD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACnC,GAAG,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,aAAa,CAAC,OAAO,CAAC;;gBAUrB,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAsCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,qBAAqB,CAAC,OAAO,CAE5C;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB3E;;;;OAIG;IACH,gBAAgB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAIhD;;;;;OAKG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAIzC;;;;OAIG;IACH,qBAAqB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;CAGtD;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}

package/dist/api/multichain/wallet.d.mts

@@ -1,5 +1,6 @@
 import { type EntropySourceId, type KeyringAccount } from "@metamask/keyring-api";
 import { MultichainAccount } from "./account.mjs";
+import type { Bip44Account } from "../bip44.mjs";
 import type { AccountGroupId } from "../group.mjs";
 import type { AccountProvider } from "../provider.mjs";
 import type { AccountWallet } from "../wallet.mjs";
@@ -12,21 +13,19 @@ export type MultichainAccountWalletId = `${AccountWalletCategory.Entropy}:${Entr
  * A multichain account wallet that holds multiple multichain accounts (one multichain account per
  * group index).
  */
-export declare class MultichainAccountWallet<Account extends KeyringAccount> implements AccountWallet<Account> {
+export declare class MultichainAccountWallet<Account extends Bip44Account<KeyringAccount>> implements AccountWallet<Account> {
     #private;
     constructor({ providers, entropySource, }: {
         providers: AccountProvider<Account>[];
         entropySource: EntropySourceId;
     });
     /**
-     * Gets the highest group index from multiple account providers for a given
-     * entropy source.
+     * Force wallet synchronization.
      *
-     * @param providers - Account providers.
-     * @param entropySource - Entropy source to filter on.
-     * @returns The highest group index for a given entropy source.
+     * This can be used if account providers got new accounts that the wallet
+     * doesn't know about.
      */
-    static getHighestGroupIndexFrom<Account extends KeyringAccount>(providers: AccountProvider<Account>[], entropySource: EntropySourceId): number;
+    sync(): void;
     /**
      * Gets the multichain account wallet ID.
      *

package/dist/api/multichain/wallet.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAGL,iBAAiB,EAClB,sBAAkB;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAiB;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAkB;AAC/C,OAAO,EAAE,qBAAqB,EAAE,sBAAkB;AAElD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACnC,GAAG,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB,CAAC,OAAO,SAAS,cAAc,CACjE,YAAW,aAAa,CAAC,OAAO,CAAC;;gBAUrB,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAgCD;;;;;;;OAOG;IACH,MAAM,CAAC,wBAAwB,CAAC,OAAO,SAAS,cAAc,EAC5D,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,EACrC,aAAa,EAAE,eAAe,GAC7B,MAAM;IAmBT;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,qBAAqB,CAAC,OAAO,CAE5C;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB3E;;;;OAIG;IACH,gBAAgB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAIhD;;;;;OAKG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAIzC;;;;OAIG;IACH,qBAAqB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;CAGtD;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}
+{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAGL,iBAAiB,EAClB,sBAAkB;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAiB;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAiB;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAoB;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAkB;AAC/C,OAAO,EAAE,qBAAqB,EAAE,sBAAkB;AAElD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACnC,GAAG,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,aAAa,CAAC,OAAO,CAAC;;gBAUrB,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAsCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,qBAAqB,CAAC,OAAO,CAE5C;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB3E;;;;OAIG;IACH,gBAAgB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAIhD;;;;;OAKG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS;IAIzC;;;;OAIG;IACH,qBAAqB,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;CAGtD;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}

package/dist/api/multichain/wallet.mjs

@@ -10,7 +10,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accounts;
-import { KeyringAccountEntropyTypeOption } from "@metamask/keyring-api";
 import { getGroupIndexFromMultichainAccountId, isMultichainAccountId, MultichainAccount } from "./account.mjs";
 import { toDefaultAccountGroupId } from "../group.mjs";
 import { AccountWalletCategory } from "../wallet.mjs";
@@ -28,47 +27,45 @@ export class MultichainAccountWallet {
         __classPrivateFieldSet(this, _MultichainAccountWallet_providers, providers, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_entropySource, entropySource, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_accounts, new Map(), "f");
-        // NOTE: This will traverse all accounts to compute the max index. We could try
-        // to minimize the number of filtering we're doing on each providers if this
-        // becomes too costly.
-        const maxGroupIndex = MultichainAccountWallet.getHighestGroupIndexFrom(providers, entropySource);
-        // NOTE: We could have some gap for now, until we fully implement the
-        // gap/alignment mechanisms to backfill all "missing accounts".
-        for (let groupIndex = 0; groupIndex <= maxGroupIndex; groupIndex++) {
-            // Use "lower or equal", since we need to "include" the max index (which
-            // can also be 0)
-            const multichainAccount = new MultichainAccount({
-                groupIndex,
-                wallet: this,
-                providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
-            });
-            // We only add multichain account that has underlying accounts.
-            if (multichainAccount.hasAccounts()) {
-                __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(groupIndex, multichainAccount);
-            }
-        }
+        // Initial synchronization.
+        this.sync();
     }
     /**
-     * Gets the highest group index from multiple account providers for a given
-     * entropy source.
+     * Force wallet synchronization.
      *
-     * @param providers - Account providers.
-     * @param entropySource - Entropy source to filter on.
-     * @returns The highest group index for a given entropy source.
+     * This can be used if account providers got new accounts that the wallet
+     * doesn't know about.
      */
-    static getHighestGroupIndexFrom(providers, entropySource) {
-        let max = -1;
-        for (const provider of providers) {
+    sync() {
+        // We keep track of all existing indexes to see if some of them are no
+        // longer in use after the sync.
+        const outdatedIndexes = new Set(__classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").keys());
+        for (const provider of __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f")) {
             for (const account of provider.getAccounts()) {
-                if (account.options.entropy &&
-                    account.options.entropy.type ===
-                        KeyringAccountEntropyTypeOption.Mnemonic &&
-                    account.options.entropy.id === entropySource) {
-                    max = Math.max(max, account.options.entropy.groupIndex);
+                const { entropy } = account.options;
+                // Filter for this wallet only.
+                if (entropy.id !== this.entropySource) {
+                    continue;
+                }
+                // We still got an account for this index, thus we can mark this index
+                // as "in use" (to not clean it up later on).
+                outdatedIndexes.delete(entropy.groupIndex);
+                // This multichain account might exists already.
+                let multichainAccount = __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(entropy.groupIndex);
+                if (!multichainAccount) {
+                    multichainAccount = new MultichainAccount({
+                        groupIndex: entropy.groupIndex,
+                        wallet: this,
+                        providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+                    });
+                    __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(entropy.groupIndex, multichainAccount);
                 }
             }
         }
-        return max;
+        // Clean up old multichain accounts.
+        for (const outdatedIndex of outdatedIndexes) {
+            __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").delete(outdatedIndex);
+        }
     }
     /**
      * Gets the multichain account wallet ID.

package/dist/api/multichain/wallet.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.mjs","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  KeyringAccountEntropyTypeOption,\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport {\n  getGroupIndexFromMultichainAccountId,\n  isMultichainAccountId,\n  MultichainAccount,\n} from './account';\nimport type { AccountGroupId } from '../group';\nimport { toDefaultAccountGroupId } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountWallet } from '../wallet';\nimport { AccountWalletCategory } from '../wallet';\n\n/**\n * Multichain account wallet ID.\n */\nexport type MultichainAccountWalletId =\n  `${AccountWalletCategory.Entropy}:${EntropySourceId}`;\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<Account extends KeyringAccount>\n  implements AccountWallet<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccount<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // NOTE: This will traverse all accounts to compute the max index. We could try\n    // to minimize the number of filtering we're doing on each providers if this\n    // becomes too costly.\n    const maxGroupIndex = MultichainAccountWallet.getHighestGroupIndexFrom(\n      providers,\n      entropySource,\n    );\n\n    // NOTE: We could have some gap for now, until we fully implement the\n    // gap/alignment mechanisms to backfill all \"missing accounts\".\n    for (let groupIndex = 0; groupIndex <= maxGroupIndex; groupIndex++) {\n      // Use \"lower or equal\", since we need to \"include\" the max index (which\n      // can also be 0)\n      const multichainAccount = new MultichainAccount<Account>({\n        groupIndex,\n        wallet: this,\n        providers: this.#providers,\n      });\n\n      // We only add multichain account that has underlying accounts.\n      if (multichainAccount.hasAccounts()) {\n        this.#accounts.set(groupIndex, multichainAccount);\n      }\n    }\n  }\n\n  /**\n   * Gets the highest group index from multiple account providers for a given\n   * entropy source.\n   *\n   * @param providers - Account providers.\n   * @param entropySource - Entropy source to filter on.\n   * @returns The highest group index for a given entropy source.\n   */\n  static getHighestGroupIndexFrom<Account extends KeyringAccount>(\n    providers: AccountProvider<Account>[],\n    entropySource: EntropySourceId,\n  ): number {\n    let max = -1;\n\n    for (const provider of providers) {\n      for (const account of provider.getAccounts()) {\n        if (\n          account.options.entropy &&\n          account.options.entropy.type ===\n            KeyringAccountEntropyTypeOption.Mnemonic &&\n          account.options.entropy.id === entropySource\n        ) {\n          max = Math.max(max, account.options.entropy.groupIndex);\n        }\n      }\n    }\n\n    return max;\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet category, which is always {@link AccountWalletCategory.Entropy}.\n   *\n   * @returns The multichain account wallet category.\n   */\n  get category(): AccountWalletCategory.Entropy {\n    return AccountWalletCategory.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(id: AccountGroupId): MultichainAccount<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccounts}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccount<Account>[] {\n    return this.getMultichainAccounts();\n  }\n\n  /**\n   * Gets multichain account for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccount(\n    groupIndex: number,\n  ): MultichainAccount<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccounts(): MultichainAccount<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletCategory.Entropy}:${entropySource}`;\n}\n"]}
+{"version":3,"file":"wallet.mjs","sourceRoot":"","sources":["../../../src/api/multichain/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport {\n  getGroupIndexFromMultichainAccountId,\n  isMultichainAccountId,\n  MultichainAccount,\n} from './account';\nimport type { Bip44Account } from '../bip44';\nimport type { AccountGroupId } from '../group';\nimport { toDefaultAccountGroupId } from '../group';\nimport type { AccountProvider } from '../provider';\nimport type { AccountWallet } from '../wallet';\nimport { AccountWalletCategory } from '../wallet';\n\n/**\n * Multichain account wallet ID.\n */\nexport type MultichainAccountWalletId =\n  `${AccountWalletCategory.Entropy}:${EntropySourceId}`;\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements AccountWallet<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccount<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    // We keep track of all existing indexes to see if some of them are no\n    // longer in use after the sync.\n    const outdatedIndexes = new Set(this.#accounts.keys());\n\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // We still got an account for this index, thus we can mark this index\n        // as \"in use\" (to not clean it up later on).\n        outdatedIndexes.delete(entropy.groupIndex);\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccount<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Clean up old multichain accounts.\n    for (const outdatedIndex of outdatedIndexes) {\n      this.#accounts.delete(outdatedIndex);\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet category, which is always {@link AccountWalletCategory.Entropy}.\n   *\n   * @returns The multichain account wallet category.\n   */\n  get category(): AccountWalletCategory.Entropy {\n    return AccountWalletCategory.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(id: AccountGroupId): MultichainAccount<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccounts}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccount<Account>[] {\n    return this.getMultichainAccounts();\n  }\n\n  /**\n   * Gets multichain account for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccount(\n    groupIndex: number,\n  ): MultichainAccount<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccounts(): MultichainAccount<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletCategory.Entropy}:${entropySource}`;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/account-api",
-  "version": "0.1.0-e86c8ec",
+  "version": "0.2.0-2373565",
   "description": "MetaMask Account API",
   "keywords": [
     "metamask",
@@ -46,14 +46,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "18.0.0",
-    "@metamask/keyring-utils": "3.0.0"
+    "@metamask/keyring-api": "19.0.0",
+    "@metamask/keyring-utils": "3.1.0",
+    "@metamask/superstruct": "^3.1.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-internal-api": "6.2.0",
+    "@metamask/keyring-internal-api": "7.0.0",
     "@ts-bridge/cli": "^0.6.3",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",