@metamask-previews/multichain-account-service 0.3.0-preview-713be623 → 0.3.0-preview-43d47013

package/dist/MultichainAccountService.cjs

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultichainAccountService = exports.serviceName = void 0;
 const account_api_1 = require("@metamask/account-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
+const MultichainAccountWallet_1 = require("./MultichainAccountWallet.cjs");
 const EvmAccountProvider_1 = require("./providers/EvmAccountProvider.cjs");
 const SolAccountProvider_1 = require("./providers/SolAccountProvider.cjs");
 exports.serviceName = 'MultichainAccountService';
@@ -47,10 +48,11 @@ class MultichainAccountService {
             new EvmAccountProvider_1.EvmAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
             new SolAccountProvider_1.SolAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
         ], "f");
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccount', (...args) => this.getMultichainAccount(...args));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccounts', (...args) => this.getMultichainAccounts(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroup', (...args) => this.getMultichainAccountGroup(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroups', (...args) => this.getMultichainAccountGroups(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallet', (...args) => this.getMultichainAccountWallet(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallets', (...args) => this.getMultichainAccountWallets(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:createNextMultichainAccountGroup', (...args) => this.createNextMultichainAccountGroup(...args));
     }
     /**
      * Initialize the service and constructs the internal reprensentation of
@@ -65,17 +67,17 @@ class MultichainAccountService {
                 const entropySource = keyring.metadata.id;
                 // This will automatically "associate" all multichain accounts for that wallet
                 // (based on the accounts owned by each account providers).
-                const wallet = new account_api_1.MultichainAccountWallet({
+                const wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
                     entropySource,
                     providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
                 });
                 __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
                 // Reverse mapping between account ID and their multichain wallet/account:
-                for (const multichainAccount of wallet.getMultichainAccounts()) {
-                    for (const account of multichainAccount.getAccounts()) {
+                for (const group of wallet.getMultichainAccountGroups()) {
+                    for (const account of group.getAccounts()) {
                         __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
                             wallet,
-                            multichainAccount,
+                            group,
                         });
                     }
                 }
@@ -85,13 +87,13 @@ class MultichainAccountService {
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").subscribe('AccountsController:accountRemoved', (id) => __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_handleOnAccountRemoved).call(this, id));
     }
     /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
+     * Gets the account's context which contains its multichain wallet and
+     * multichain account group references.
      *
      * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
+     * @returns The account context if any, undefined otherwise.
      */
-    getMultichainAccountAndWallet(id) {
+    getAccountContext(id) {
         return __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").get(id);
     }
     /**
@@ -114,7 +116,8 @@ class MultichainAccountService {
         return Array.from(__classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").values());
     }
     /**
-     * Gets a reference to the multichain account matching this entropy source and group index.
+     * Gets a reference to the multichain account group matching this entropy source
+     * and a group index.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source of the multichain account.
@@ -122,23 +125,33 @@ class MultichainAccountService {
      * @throws If none multichain account match this entropy source and group index.
      * @returns A reference to the multichain account.
      */
-    getMultichainAccount({ entropySource, groupIndex, }) {
-        const multichainAccount = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccount(groupIndex);
+    getMultichainAccountGroup({ entropySource, groupIndex, }) {
+        const multichainAccount = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccountGroup(groupIndex);
         if (!multichainAccount) {
             throw new Error(`No multichain account for index: ${groupIndex}`);
         }
         return multichainAccount;
     }
     /**
-     * Gets all multichain accounts for a given entropy source.
+     * Gets all multichain account groups for a given entropy source.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source to query.
      * @throws If no multichain accounts match this entropy source.
      * @returns A list of all multichain accounts.
      */
-    getMultichainAccounts({ entropySource, }) {
-        return __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccounts();
+    getMultichainAccountGroups({ entropySource, }) {
+        return __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccountGroups();
+    }
+    /**
+     * Creates the next multichain account group.
+     *
+     * @param options - Options.
+     * @param options.entropySource - The wallet's entropy source.
+     * @returns The next multichain account group.
+     */
+    async createNextMultichainAccountGroup({ entropySource, }) {
+        return await __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).createNextMultichainAccountGroup();
     }
 }
 exports.MultichainAccountService = MultichainAccountService;
@@ -151,7 +164,7 @@ _MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_p
     let wallet = __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").get((0, account_api_1.toMultichainAccountWalletId)(account.options.entropy.id));
     if (!wallet) {
         // That's a new wallet.
-        wallet = new account_api_1.MultichainAccountWallet({
+        wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
             entropySource: account.options.entropy.id,
             providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
         });
@@ -159,28 +172,28 @@ _MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_p
         // If that's a new wallet wallet. There's nothing to "force-sync".
         sync = false;
     }
-    let multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
-    if (!multichainAccount) {
+    let group = wallet.getMultichainAccountGroup(account.options.entropy.groupIndex);
+    if (!group) {
         // This new account is a new multichain account, let the wallet know
         // it has to re-sync with its providers.
         if (sync) {
             wallet.sync();
         }
-        multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
+        group = wallet.getMultichainAccountGroup(account.options.entropy.groupIndex);
         // If that's a new multichain account. There's nothing to "force-sync".
         sync = false;
     }
     // We have to check against `undefined` in case `getMultichainAccount` is
     // not able to find this multichain account (which should not be possible...)
-    if (multichainAccount) {
+    if (group) {
         if (sync) {
-            multichainAccount.sync();
+            group.sync();
         }
         // Same here, this account should have been already grouped in that
         // multichain account.
         __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
             wallet,
-            multichainAccount,
+            group,
         });
     }
 }, _MultichainAccountService_handleOnAccountRemoved = function _MultichainAccountService_handleOnAccountRemoved(id) {

package/dist/MultichainAccountService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.cjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  MultichainAccountWalletId,\n  AccountProvider,\n  Bip44Account,\n} from '@metamask/account-api';\nimport {\n  isBip44Account,\n  MultichainAccountWallet,\n  toMultichainAccountWalletId,\n  type MultichainAccount,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  multichainAccount: MultichainAccount<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<InternalAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<InternalAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<InternalAccount>['id'],\n    AccountContext<Bip44Account<InternalAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccount',\n      (...args) => this.getMultichainAccount(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccounts',\n      (...args) => this.getMultichainAccounts(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const multichainAccount of wallet.getMultichainAccounts()) {\n          for (const account of multichainAccount.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              multichainAccount,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: InternalAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let multichainAccount = wallet.getMultichainAccount(\n      account.options.entropy.groupIndex,\n    );\n    if (!multichainAccount) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      multichainAccount = wallet.getMultichainAccount(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (multichainAccount) {\n      if (sync) {\n        multichainAccount.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        multichainAccount,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: InternalAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets a reference to the wallet and multichain account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns An object with references to the wallet and multichain account associated for\n   * that account ID, or undefined if this account ID is not part of any.\n   */\n  getMultichainAccountAndWallet(\n    id: InternalAccount['id'],\n  ): AccountContext<Bip44Account<InternalAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<InternalAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account matching this entropy source and group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccount({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccount<Bip44Account<InternalAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccount(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain accounts for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccounts({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccount<Bip44Account<InternalAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccounts();\n  }\n}\n"]}
+{"version":3,"file":"MultichainAccountService.cjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  isBip44Account,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport type {\n  MultichainAccountWalletId,\n  Bip44Account,\n} from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\n\nimport type { MultichainAccountGroup } from './MultichainAccountGroup';\nimport { MultichainAccountWallet } from './MultichainAccountWallet';\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  group: MultichainAccountGroup<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<KeyringAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<KeyringAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<KeyringAccount>['id'],\n    AccountContext<Bip44Account<KeyringAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroup',\n      (...args) => this.getMultichainAccountGroup(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroups',\n      (...args) => this.getMultichainAccountGroups(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:createNextMultichainAccountGroup',\n      (...args) => this.createNextMultichainAccountGroup(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const group of wallet.getMultichainAccountGroups()) {\n          for (const account of group.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              group,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: KeyringAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let group = wallet.getMultichainAccountGroup(\n      account.options.entropy.groupIndex,\n    );\n    if (!group) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      group = wallet.getMultichainAccountGroup(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (group) {\n      if (sync) {\n        group.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        group,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: KeyringAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets the account's context which contains its multichain wallet and\n   * multichain account group references.\n   *\n   * @param id - Account ID.\n   * @returns The account context if any, undefined otherwise.\n   */\n  getAccountContext(\n    id: KeyringAccount['id'],\n  ): AccountContext<Bip44Account<KeyringAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<KeyringAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account group matching this entropy source\n   * and a group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccountGroup({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccountGroup(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain account groups for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccountGroups({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccountGroups();\n  }\n\n  /**\n   * Creates the next multichain account group.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The wallet's entropy source.\n   * @returns The next multichain account group.\n   */\n  async createNextMultichainAccountGroup({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): Promise<MultichainAccountGroup<Bip44Account<KeyringAccount>>> {\n    return await this.#getWallet(\n      entropySource,\n    ).createNextMultichainAccountGroup();\n  }\n}\n"]}

package/dist/MultichainAccountService.d.cts

@@ -1,7 +1,7 @@
 import type { Bip44Account } from "@metamask/account-api";
-import { MultichainAccountWallet, type MultichainAccount } from "@metamask/account-api";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { MultichainAccountGroup } from "./MultichainAccountGroup.cjs";
+import { MultichainAccountWallet } from "./MultichainAccountWallet.cjs";
 import type { MultichainAccountServiceMessenger } from "./types.cjs";
 export declare const serviceName = "MultichainAccountService";
 /**
@@ -13,7 +13,7 @@ type MultichainAccountServiceOptions = {
 /** Reverse mapping object used to map account IDs and their wallet/multichain account. */
 type AccountContext<Account extends Bip44Account<KeyringAccount>> = {
     wallet: MultichainAccountWallet<Account>;
-    multichainAccount: MultichainAccount<Account>;
+    group: MultichainAccountGroup<Account>;
 };
 /**
  * Service to expose multichain accounts capabilities.
@@ -38,13 +38,13 @@ export declare class MultichainAccountService {
      */
     init(): void;
     /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
+     * Gets the account's context which contains its multichain wallet and
+     * multichain account group references.
      *
      * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
+     * @returns The account context if any, undefined otherwise.
      */
-    getMultichainAccountAndWallet(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
+    getAccountContext(id: KeyringAccount['id']): AccountContext<Bip44Account<KeyringAccount>> | undefined;
     /**
      * Gets a reference to the multichain account wallet matching this entropy source.
      *
@@ -55,15 +55,16 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountWallet({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
+    }): MultichainAccountWallet<Bip44Account<KeyringAccount>>;
     /**
      * Gets an array of all multichain account wallets.
      *
      * @returns An array of all multichain account wallets.
      */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
+    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<KeyringAccount>>[];
     /**
-     * Gets a reference to the multichain account matching this entropy source and group index.
+     * Gets a reference to the multichain account group matching this entropy source
+     * and a group index.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source of the multichain account.
@@ -71,21 +72,31 @@ export declare class MultichainAccountService {
      * @throws If none multichain account match this entropy source and group index.
      * @returns A reference to the multichain account.
      */
-    getMultichainAccount({ entropySource, groupIndex, }: {
+    getMultichainAccountGroup({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccount<Bip44Account<InternalAccount>>;
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>;
     /**
-     * Gets all multichain accounts for a given entropy source.
+     * Gets all multichain account groups for a given entropy source.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source to query.
      * @throws If no multichain accounts match this entropy source.
      * @returns A list of all multichain accounts.
      */
-    getMultichainAccounts({ entropySource, }: {
+    getMultichainAccountGroups({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccount<Bip44Account<InternalAccount>>[];
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[];
+    /**
+     * Creates the next multichain account group.
+     *
+     * @param options - Options.
+     * @param options.entropySource - The wallet's entropy source.
+     * @returns The next multichain account group.
+     */
+    createNextMultichainAccountGroup({ entropySource, }: {
+        entropySource: EntropySourceId;
+    }): Promise<MultichainAccountGroup<Bip44Account<KeyringAccount>>>;
 }
 export {};
 //# sourceMappingURL=MultichainAccountService.d.cts.map

package/dist/MultichainAccountService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.d.cts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAC/B,OAAO,EAEL,uBAAuB,EAEvB,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,6BAA6B,CAC3B,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GACxB,cAAc,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GAAG,SAAS;IAI5D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAI1D;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,eAAe,CAAC,CAC9B,EAAE;IAIH;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWpD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAGvD"}
+{"version":3,"file":"MultichainAccountService.d.cts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,YAAY,EACb,8BAA8B;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IAgC1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,GACvB,cAAc,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,GAAG,SAAS;IAI3D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAIzD;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,cAAc,CAAC,CAC7B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAWxD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE;IAI1D;;;;;;OAMG;IACG,gCAAgC,CAAC,EACrC,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;CAKlE"}

package/dist/MultichainAccountService.d.mts

@@ -1,7 +1,7 @@
 import type { Bip44Account } from "@metamask/account-api";
-import { MultichainAccountWallet, type MultichainAccount } from "@metamask/account-api";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
+import { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
 import type { MultichainAccountServiceMessenger } from "./types.mjs";
 export declare const serviceName = "MultichainAccountService";
 /**
@@ -13,7 +13,7 @@ type MultichainAccountServiceOptions = {
 /** Reverse mapping object used to map account IDs and their wallet/multichain account. */
 type AccountContext<Account extends Bip44Account<KeyringAccount>> = {
     wallet: MultichainAccountWallet<Account>;
-    multichainAccount: MultichainAccount<Account>;
+    group: MultichainAccountGroup<Account>;
 };
 /**
  * Service to expose multichain accounts capabilities.
@@ -38,13 +38,13 @@ export declare class MultichainAccountService {
      */
     init(): void;
     /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
+     * Gets the account's context which contains its multichain wallet and
+     * multichain account group references.
      *
      * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
+     * @returns The account context if any, undefined otherwise.
      */
-    getMultichainAccountAndWallet(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
+    getAccountContext(id: KeyringAccount['id']): AccountContext<Bip44Account<KeyringAccount>> | undefined;
     /**
      * Gets a reference to the multichain account wallet matching this entropy source.
      *
@@ -55,15 +55,16 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountWallet({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
+    }): MultichainAccountWallet<Bip44Account<KeyringAccount>>;
     /**
      * Gets an array of all multichain account wallets.
      *
      * @returns An array of all multichain account wallets.
      */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
+    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<KeyringAccount>>[];
     /**
-     * Gets a reference to the multichain account matching this entropy source and group index.
+     * Gets a reference to the multichain account group matching this entropy source
+     * and a group index.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source of the multichain account.
@@ -71,21 +72,31 @@ export declare class MultichainAccountService {
      * @throws If none multichain account match this entropy source and group index.
      * @returns A reference to the multichain account.
      */
-    getMultichainAccount({ entropySource, groupIndex, }: {
+    getMultichainAccountGroup({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccount<Bip44Account<InternalAccount>>;
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>;
     /**
-     * Gets all multichain accounts for a given entropy source.
+     * Gets all multichain account groups for a given entropy source.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source to query.
      * @throws If no multichain accounts match this entropy source.
      * @returns A list of all multichain accounts.
      */
-    getMultichainAccounts({ entropySource, }: {
+    getMultichainAccountGroups({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccount<Bip44Account<InternalAccount>>[];
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[];
+    /**
+     * Creates the next multichain account group.
+     *
+     * @param options - Options.
+     * @param options.entropySource - The wallet's entropy source.
+     * @returns The next multichain account group.
+     */
+    createNextMultichainAccountGroup({ entropySource, }: {
+        entropySource: EntropySourceId;
+    }): Promise<MultichainAccountGroup<Bip44Account<KeyringAccount>>>;
 }
 export {};
 //# sourceMappingURL=MultichainAccountService.d.mts.map

package/dist/MultichainAccountService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.d.mts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAC/B,OAAO,EAEL,uBAAuB,EAEvB,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,6BAA6B,CAC3B,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GACxB,cAAc,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GAAG,SAAS;IAI5D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAI1D;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,eAAe,CAAC,CAC9B,EAAE;IAIH;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWpD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAGvD"}
+{"version":3,"file":"MultichainAccountService.d.mts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,YAAY,EACb,8BAA8B;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IAgC1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,GACvB,cAAc,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,GAAG,SAAS;IAI3D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAIzD;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,cAAc,CAAC,CAC7B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAWxD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE;IAI1D;;;;;;OAMG;IACG,gCAAgC,CAAC,EACrC,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;CAKlE"}

package/dist/MultichainAccountService.mjs

@@ -10,8 +10,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _MultichainAccountService_instances, _MultichainAccountService_messenger, _MultichainAccountService_providers, _MultichainAccountService_wallets, _MultichainAccountService_accountIdToContext, _MultichainAccountService_handleOnAccountAdded, _MultichainAccountService_handleOnAccountRemoved, _MultichainAccountService_getWallet;
-import { isBip44Account, MultichainAccountWallet, toMultichainAccountWalletId } from "@metamask/account-api";
+import { isBip44Account, toMultichainAccountWalletId } from "@metamask/account-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
+import { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
 import { EvmAccountProvider } from "./providers/EvmAccountProvider.mjs";
 import { SolAccountProvider } from "./providers/SolAccountProvider.mjs";
 export const serviceName = 'MultichainAccountService';
@@ -44,10 +45,11 @@ export class MultichainAccountService {
             new EvmAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
             new SolAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
         ], "f");
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccount', (...args) => this.getMultichainAccount(...args));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccounts', (...args) => this.getMultichainAccounts(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroup', (...args) => this.getMultichainAccountGroup(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroups', (...args) => this.getMultichainAccountGroups(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallet', (...args) => this.getMultichainAccountWallet(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallets', (...args) => this.getMultichainAccountWallets(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:createNextMultichainAccountGroup', (...args) => this.createNextMultichainAccountGroup(...args));
     }
     /**
      * Initialize the service and constructs the internal reprensentation of
@@ -68,11 +70,11 @@ export class MultichainAccountService {
                 });
                 __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
                 // Reverse mapping between account ID and their multichain wallet/account:
-                for (const multichainAccount of wallet.getMultichainAccounts()) {
-                    for (const account of multichainAccount.getAccounts()) {
+                for (const group of wallet.getMultichainAccountGroups()) {
+                    for (const account of group.getAccounts()) {
                         __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
                             wallet,
-                            multichainAccount,
+                            group,
                         });
                     }
                 }
@@ -82,13 +84,13 @@ export class MultichainAccountService {
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").subscribe('AccountsController:accountRemoved', (id) => __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_handleOnAccountRemoved).call(this, id));
     }
     /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
+     * Gets the account's context which contains its multichain wallet and
+     * multichain account group references.
      *
      * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
+     * @returns The account context if any, undefined otherwise.
      */
-    getMultichainAccountAndWallet(id) {
+    getAccountContext(id) {
         return __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").get(id);
     }
     /**
@@ -111,7 +113,8 @@ export class MultichainAccountService {
         return Array.from(__classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").values());
     }
     /**
-     * Gets a reference to the multichain account matching this entropy source and group index.
+     * Gets a reference to the multichain account group matching this entropy source
+     * and a group index.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source of the multichain account.
@@ -119,23 +122,33 @@ export class MultichainAccountService {
      * @throws If none multichain account match this entropy source and group index.
      * @returns A reference to the multichain account.
      */
-    getMultichainAccount({ entropySource, groupIndex, }) {
-        const multichainAccount = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccount(groupIndex);
+    getMultichainAccountGroup({ entropySource, groupIndex, }) {
+        const multichainAccount = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccountGroup(groupIndex);
         if (!multichainAccount) {
             throw new Error(`No multichain account for index: ${groupIndex}`);
         }
         return multichainAccount;
     }
     /**
-     * Gets all multichain accounts for a given entropy source.
+     * Gets all multichain account groups for a given entropy source.
      *
      * @param options - Options.
      * @param options.entropySource - The entropy source to query.
      * @throws If no multichain accounts match this entropy source.
      * @returns A list of all multichain accounts.
      */
-    getMultichainAccounts({ entropySource, }) {
-        return __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccounts();
+    getMultichainAccountGroups({ entropySource, }) {
+        return __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).getMultichainAccountGroups();
+    }
+    /**
+     * Creates the next multichain account group.
+     *
+     * @param options - Options.
+     * @param options.entropySource - The wallet's entropy source.
+     * @returns The next multichain account group.
+     */
+    async createNextMultichainAccountGroup({ entropySource, }) {
+        return await __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource).createNextMultichainAccountGroup();
     }
 }
 _MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_providers = new WeakMap(), _MultichainAccountService_wallets = new WeakMap(), _MultichainAccountService_accountIdToContext = new WeakMap(), _MultichainAccountService_instances = new WeakSet(), _MultichainAccountService_handleOnAccountAdded = function _MultichainAccountService_handleOnAccountAdded(account) {
@@ -155,28 +168,28 @@ _MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_p
         // If that's a new wallet wallet. There's nothing to "force-sync".
         sync = false;
     }
-    let multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
-    if (!multichainAccount) {
+    let group = wallet.getMultichainAccountGroup(account.options.entropy.groupIndex);
+    if (!group) {
         // This new account is a new multichain account, let the wallet know
         // it has to re-sync with its providers.
         if (sync) {
             wallet.sync();
         }
-        multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
+        group = wallet.getMultichainAccountGroup(account.options.entropy.groupIndex);
         // If that's a new multichain account. There's nothing to "force-sync".
         sync = false;
     }
     // We have to check against `undefined` in case `getMultichainAccount` is
     // not able to find this multichain account (which should not be possible...)
-    if (multichainAccount) {
+    if (group) {
         if (sync) {
-            multichainAccount.sync();
+            group.sync();
         }
         // Same here, this account should have been already grouped in that
         // multichain account.
         __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
             wallet,
-            multichainAccount,
+            group,
         });
     }
 }, _MultichainAccountService_handleOnAccountRemoved = function _MultichainAccountService_handleOnAccountRemoved(id) {