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

package/dist/MultichainAccountWallet.mjs

@@ -0,0 +1,233 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accounts;
+import { getGroupIndexFromMultichainAccountGroupId, isMultichainAccountGroupId, toMultichainAccountWalletId } from "@metamask/account-api";
+import { toDefaultAccountGroupId } from "@metamask/account-api";
+import { AccountWalletType } from "@metamask/account-api";
+import { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
+/**
+ * A multichain account wallet that holds multiple multichain accounts (one multichain account per
+ * group index).
+ */
+export class MultichainAccountWallet {
+    constructor({ providers, entropySource, }) {
+        _MultichainAccountWallet_id.set(this, void 0);
+        _MultichainAccountWallet_providers.set(this, void 0);
+        _MultichainAccountWallet_entropySource.set(this, void 0);
+        _MultichainAccountWallet_accounts.set(this, void 0);
+        __classPrivateFieldSet(this, _MultichainAccountWallet_id, toMultichainAccountWalletId(entropySource), "f");
+        __classPrivateFieldSet(this, _MultichainAccountWallet_providers, providers, "f");
+        __classPrivateFieldSet(this, _MultichainAccountWallet_entropySource, entropySource, "f");
+        __classPrivateFieldSet(this, _MultichainAccountWallet_accounts, new Map(), "f");
+        // Initial synchronization.
+        this.sync();
+    }
+    /**
+     * Force wallet synchronization.
+     *
+     * This can be used if account providers got new accounts that the wallet
+     * doesn't know about.
+     */
+    sync() {
+        for (const provider of __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f")) {
+            for (const account of provider.getAccounts()) {
+                const { entropy } = account.options;
+                // Filter for this wallet only.
+                if (entropy.id !== this.entropySource) {
+                    continue;
+                }
+                // This multichain account might exists already.
+                let multichainAccount = __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(entropy.groupIndex);
+                if (!multichainAccount) {
+                    multichainAccount = new MultichainAccountGroup({
+                        groupIndex: entropy.groupIndex,
+                        wallet: this,
+                        providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+                    });
+                    // This existing multichain account group might differ from the
+                    // `createMultichainAccountGroup` behavior. When creating a new
+                    // group, we expect the providers to all succeed. But here, we're
+                    // just fetching the account lists from them, so this group might
+                    // not be "aligned" yet (e.g having a missing Solana account).
+                    //
+                    // Since "aligning" is an async operation, it would have to be run
+                    // after the first-sync.
+                    // TODO: Implement align mechanism to create "missing" accounts.
+                    __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(entropy.groupIndex, multichainAccount);
+                }
+            }
+        }
+        // Now force-sync all remaining multichain accounts.
+        for (const [groupIndex, multichainAccount] of __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").entries()) {
+            multichainAccount.sync();
+            // Clean up old multichain accounts.
+            if (!multichainAccount.hasAccounts()) {
+                __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").delete(groupIndex);
+            }
+        }
+    }
+    /**
+     * Gets the multichain account wallet ID.
+     *
+     * @returns The multichain account wallet ID.
+     */
+    get id() {
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_id, "f");
+    }
+    /**
+     * Gets the multichain account wallet type, which is always {@link AccountWalletType.Entropy}.
+     *
+     * @returns The multichain account wallet type.
+     */
+    get type() {
+        return AccountWalletType.Entropy;
+    }
+    /**
+     * Gets the multichain account wallet entropy source.
+     *
+     * @returns The multichain account wallet entropy source.
+     */
+    get entropySource() {
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f");
+    }
+    /**
+     * Gets multichain account for a given ID.
+     * The default group ID will default to the multichain account with index 0.
+     *
+     * @param id - Account group ID.
+     * @returns Account group.
+     */
+    getAccountGroup(id) {
+        // We consider the "default case" to be mapped to index 0.
+        if (id === toDefaultAccountGroupId(this.id)) {
+            return __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(0);
+        }
+        // If it is not a valid ID, we cannot extract the group index
+        // from it, so we fail fast.
+        if (!isMultichainAccountGroupId(id)) {
+            return undefined;
+        }
+        const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(groupIndex);
+    }
+    /**
+     * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.
+     *
+     * @returns The multichain accounts.
+     */
+    getAccountGroups() {
+        return this.getMultichainAccountGroups();
+    }
+    /**
+     * Gets multichain account group for a given index.
+     *
+     * @param groupIndex - Multichain account index.
+     * @returns The multichain account associated with the given index.
+     */
+    getMultichainAccountGroup(groupIndex) {
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").get(groupIndex);
+    }
+    /**
+     * Gets all multichain account groups.
+     *
+     * @returns The multichain accounts.
+     */
+    getMultichainAccountGroups() {
+        return Array.from(__classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").values()); // TODO: Prevent copy here.
+    }
+    /**
+     * Gets next group index for this wallet.
+     *
+     * @returns The next group index of this wallet.
+     */
+    getNextGroupIndex() {
+        // Assuming we cannot have indexes gaps.
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").size; // No +1 here, group indexes starts at 0.
+    }
+    /**
+     * Creates a multichain account group for a given group index.
+     *
+     * @param groupIndex - The group index to use.
+     * @throws If any of the account providers fails to create their accounts.
+     * @returns The multichain account group for this group index.
+     */
+    async createMultichainAccountGroup(groupIndex) {
+        const nextGroupIndex = this.getNextGroupIndex();
+        if (groupIndex > nextGroupIndex) {
+            throw new Error(`You cannot use a group index that is higher than the next available one: expected <=${nextGroupIndex}, got ${groupIndex}`);
+        }
+        let group = this.getMultichainAccountGroup(groupIndex);
+        if (group) {
+            // If the group already exists, we just `sync` it and returns the same
+            // reference.
+            group.sync();
+            return group;
+        }
+        const results = await Promise.allSettled(__classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f").map((provider) => provider.createAccounts({
+            entropySource: __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f"),
+            groupIndex,
+        })));
+        // READ THIS CAREFULLY:
+        // Since we're not "fully supporting multichain" for now, we still rely on single
+        // :accountCreated events to sync multichain account groups and wallets. Which means
+        // that even if of the provider fails, some accouns (on the `AccountsController`
+        // might be showing up AND that some multichain account wallets/groups might have
+        // been automatically sync'd too.
+        //
+        // We will need to unsubscribe from :accountAdded once we "fully support multichain"
+        // (meaning, the entire codebase relies on this new service for multichain account
+        // creations).
+        // --------------------------------------------------------------------------------
+        // If any of the provider failed to create their accounts, then we consider the
+        // multichain account group to have failed too.
+        // NOTE: Though, we don't rollback existing created accounts and that's totally fine
+        // because account creations is assumed to be imdepotent, thus, trying again should
+        // just create the missing accounts, and previously created accounts will just be
+        // re-used as is.
+        if (results.some((result) => result.status === 'rejected')) {
+            const error = `Unable to create multichain account group for index: ${groupIndex}`;
+            let warn = `${error}:`;
+            for (const result of results) {
+                if (result.status === 'rejected') {
+                    warn += `\n- ${result.reason}`;
+                }
+            }
+            console.warn(warn);
+            throw new Error(error);
+        }
+        // Because of the :accountAdded automatic sync, we might already have created the
+        // group, so we first try to get it.
+        group = this.getMultichainAccountGroup(groupIndex);
+        if (!group) {
+            // If for some reason it's still not created, we're creating it explicitly now:
+            group = new MultichainAccountGroup({
+                wallet: this,
+                providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+                groupIndex,
+            });
+        }
+        // Register the account to our internal map.
+        __classPrivateFieldGet(this, _MultichainAccountWallet_accounts, "f").set(groupIndex, group); // `group` cannot be undefined here.
+        return group;
+    }
+    /**
+     * Creates the next multichain account group.
+     *
+     * @throws If any of the account providers fails to create their accounts.
+     * @returns The multichain account group for the next group index available.
+     */
+    async createNextMultichainAccountGroup() {
+        return this.createMultichainAccountGroup(this.getNextGroupIndex());
+    }
+}
+_MultichainAccountWallet_id = new WeakMap(), _MultichainAccountWallet_providers = new WeakMap(), _MultichainAccountWallet_entropySource = new WeakMap(), _MultichainAccountWallet_accounts = new WeakMap();
+//# sourceMappingURL=MultichainAccountWallet.mjs.map

package/dist/MultichainAccountWallet.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"MultichainAccountWallet.mjs","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getGroupIndexFromMultichainAccountGroupId,\n  isMultichainAccountGroupId,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport { toDefaultAccountGroupId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport type {\n  Bip44Account,\n  MultichainAccountWalletId,\n  MultichainAccountWallet as MultichainAccountWalletDefinition,\n} from '@metamask/account-api';\nimport type { AccountGroupId } from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\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 MultichainAccountWalletDefinition<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccountGroup<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    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        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccountGroup<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          // This existing multichain account group might differ from the\n          // `createMultichainAccountGroup` behavior. When creating a new\n          // group, we expect the providers to all succeed. But here, we're\n          // just fetching the account lists from them, so this group might\n          // not be \"aligned\" yet (e.g having a missing Solana account).\n          //\n          // Since \"aligning\" is an async operation, it would have to be run\n          // after the first-sync.\n          // TODO: Implement align mechanism to create \"missing\" accounts.\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [groupIndex, multichainAccount] of this.#accounts.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accounts.delete(groupIndex);\n      }\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 type, which is always {@link AccountWalletType.Entropy}.\n   *\n   * @returns The multichain account wallet type.\n   */\n  get type(): AccountWalletType.Entropy {\n    return AccountWalletType.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(\n    id: AccountGroupId,\n  ): MultichainAccountGroup<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 (!isMultichainAccountGroupId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccountGroup<Account>[] {\n    return this.getMultichainAccountGroups();\n  }\n\n  /**\n   * Gets multichain account group for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccountGroup(\n    groupIndex: number,\n  ): MultichainAccountGroup<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain account groups.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccountGroups(): MultichainAccountGroup<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n\n  /**\n   * Gets next group index for this wallet.\n   *\n   * @returns The next group index of this wallet.\n   */\n  getNextGroupIndex(): number {\n    // Assuming we cannot have indexes gaps.\n    return this.#accounts.size; // No +1 here, group indexes starts at 0.\n  }\n\n  /**\n   * Creates a multichain account group for a given group index.\n   *\n   * @param groupIndex - The group index to use.\n   * @throws If any of the account providers fails to create their accounts.\n   * @returns The multichain account group for this group index.\n   */\n  async createMultichainAccountGroup(\n    groupIndex: number,\n  ): Promise<MultichainAccountGroup<Account>> {\n    const nextGroupIndex = this.getNextGroupIndex();\n    if (groupIndex > nextGroupIndex) {\n      throw new Error(\n        `You cannot use a group index that is higher than the next available one: expected <=${nextGroupIndex}, got ${groupIndex}`,\n      );\n    }\n\n    let group = this.getMultichainAccountGroup(groupIndex);\n    if (group) {\n      // If the group already exists, we just `sync` it and returns the same\n      // reference.\n      group.sync();\n\n      return group;\n    }\n\n    const results = await Promise.allSettled(\n      this.#providers.map((provider) =>\n        provider.createAccounts({\n          entropySource: this.#entropySource,\n          groupIndex,\n        }),\n      ),\n    );\n\n    // READ THIS CAREFULLY:\n    // Since we're not \"fully supporting multichain\" for now, we still rely on single\n    // :accountCreated events to sync multichain account groups and wallets. Which means\n    // that even if of the provider fails, some accouns (on the `AccountsController`\n    // might be showing up AND that some multichain account wallets/groups might have\n    // been automatically sync'd too.\n    //\n    // We will need to unsubscribe from :accountAdded once we \"fully support multichain\"\n    // (meaning, the entire codebase relies on this new service for multichain account\n    // creations).\n    // --------------------------------------------------------------------------------\n\n    // If any of the provider failed to create their accounts, then we consider the\n    // multichain account group to have failed too.\n    // NOTE: Though, we don't rollback existing created accounts and that's totally fine\n    // because account creations is assumed to be imdepotent, thus, trying again should\n    // just create the missing accounts, and previously created accounts will just be\n    // re-used as is.\n    if (results.some((result) => result.status === 'rejected')) {\n      const error = `Unable to create multichain account group for index: ${groupIndex}`;\n\n      let warn = `${error}:`;\n      for (const result of results) {\n        if (result.status === 'rejected') {\n          warn += `\\n- ${result.reason}`;\n        }\n      }\n      console.warn(warn);\n\n      throw new Error(error);\n    }\n\n    // Because of the :accountAdded automatic sync, we might already have created the\n    // group, so we first try to get it.\n    group = this.getMultichainAccountGroup(groupIndex);\n    if (!group) {\n      // If for some reason it's still not created, we're creating it explicitly now:\n      group = new MultichainAccountGroup({\n        wallet: this,\n        providers: this.#providers,\n        groupIndex,\n      });\n    }\n\n    // Register the account to our internal map.\n    this.#accounts.set(groupIndex, group); // `group` cannot be undefined here.\n\n    return group;\n  }\n\n  /**\n   * Creates the next multichain account group.\n   *\n   * @throws If any of the account providers fails to create their accounts.\n   * @returns The multichain account group for the next group index available.\n   */\n  async createNextMultichainAccountGroup(): Promise<\n    MultichainAccountGroup<Account>\n  > {\n    return this.createMultichainAccountGroup(this.getNextGroupIndex());\n  }\n}\n"]}

package/dist/index.cjs

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultichainAccountService = void 0;
+exports.MultichainAccountService = exports.MultichainAccountGroup = exports.MultichainAccountWallet = void 0;
+var MultichainAccountWallet_1 = require("./MultichainAccountWallet.cjs");
+Object.defineProperty(exports, "MultichainAccountWallet", { enumerable: true, get: function () { return MultichainAccountWallet_1.MultichainAccountWallet; } });
+var MultichainAccountGroup_1 = require("./MultichainAccountGroup.cjs");
+Object.defineProperty(exports, "MultichainAccountGroup", { enumerable: true, get: function () { return MultichainAccountGroup_1.MultichainAccountGroup; } });
 var MultichainAccountService_1 = require("./MultichainAccountService.cjs");
 Object.defineProperty(exports, "MultichainAccountService", { enumerable: true, get: function () { return MultichainAccountService_1.MultichainAccountService; } });
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountsAction,\n} from './types';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,yEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountWallet } from './MultichainAccountWallet';\nexport { MultichainAccountGroup } from './MultichainAccountGroup';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}

package/dist/index.d.cts

@@ -1,3 +1,5 @@
-export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountsAction, } from "./types.cjs";
+export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountGroupAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountGroupsAction, } from "./types.cjs";
+export { MultichainAccountWallet } from "./MultichainAccountWallet.cjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.cjs";
 export { MultichainAccountService } from "./MultichainAccountService.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,kDAAkD,EAClD,wDAAwD,EACxD,yDAAyD,EACzD,mDAAmD,GACpD,oBAAgB;AACjB,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}

package/dist/index.d.mts

@@ -1,3 +1,5 @@
-export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountsAction, } from "./types.mjs";
+export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountGroupAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountGroupsAction, } from "./types.mjs";
+export { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 export { MultichainAccountService } from "./MultichainAccountService.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,kDAAkD,EAClD,wDAAwD,EACxD,yDAAyD,EACzD,mDAAmD,GACpD,oBAAgB;AACjB,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}

package/dist/index.mjs

@@ -1,2 +1,4 @@
+export { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 export { MultichainAccountService } from "./MultichainAccountService.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,wBAAwB,EAAE,uCAAmC","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountsAction,\n} from './types';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountWallet } from './MultichainAccountWallet';\nexport { MultichainAccountGroup } from './MultichainAccountGroup';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}

package/dist/providers/BaseAccountProvider.cjs

@@ -6,8 +6,20 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _BaseAccountProvider_instances, _BaseAccountProvider_getAccounts;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseAccountProvider = void 0;
+exports.BaseAccountProvider = exports.assertIsBip44Account = void 0;
 const account_api_1 = require("@metamask/account-api");
+/**
+ * Asserts a keyring account is BIP-44 compatible.
+ *
+ * @param account - Keyring account to check.
+ * @throws If the keyring account is not compatible.
+ */
+function assertIsBip44Account(account) {
+    if (!(0, account_api_1.isBip44Account)(account)) {
+        throw new Error('Created account is not BIP-44 compatible');
+    }
+}
+exports.assertIsBip44Account = assertIsBip44Account;
 class BaseAccountProvider {
     constructor(messenger) {
         _BaseAccountProvider_instances.add(this);
@@ -24,6 +36,13 @@ class BaseAccountProvider {
         }
         return found;
     }
+    async withKeyring(selector, operation) {
+        const result = await this.messenger.call('KeyringController:withKeyring', selector, ({ keyring, metadata }) => operation({
+            keyring: keyring,
+            metadata,
+        }));
+        return result;
+    }
 }
 exports.BaseAccountProvider = BaseAccountProvider;
 _BaseAccountProvider_instances = new WeakSet(), _BaseAccountProvider_getAccounts = function _BaseAccountProvider_getAccounts(filter = () => true) {

package/dist/providers/BaseAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAI+B;AAK/B,MAAsB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,EAAyB;QAClC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;AAhDD,kDAgDC;6HAtCG,SAAgD,GAAG,EAAE,CAAC,IAAI;IAE1D,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,IAAA,4BAAc,EAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<InternalAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): Bip44Account<InternalAccount>[] {\n    const accounts: Bip44Account<InternalAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<InternalAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount> {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n}\n"]}
+{"version":3,"file":"BaseAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAI+B;AAS/B;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,IAAA,4BAAc,EAAC,OAAO,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;AACH,CAAC;AAND,oDAMC;AAED,MAAsB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CACR,EAAsC;QAEtC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;CAmBF;AAzFD,kDAyFC;6HA/EG,SAA+C,GAAG,EAAE,CAAC,IAAI;IAEzD,MAAM,QAAQ,GAAmC,EAAE,CAAC;IAEpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,IAAA,4BAAc,EAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<KeyringAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: KeyringAccount) => boolean = () => true,\n  ): Bip44Account<KeyringAccount>[] {\n    const accounts: Bip44Account<KeyringAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<KeyringAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(\n    id: Bip44Account<KeyringAccount>['id'],\n  ): Bip44Account<KeyringAccount> {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    return found;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]>;\n\n  abstract discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]>;\n}\n"]}

package/dist/providers/BaseAccountProvider.d.cts

@@ -1,12 +1,32 @@
 import { type AccountProvider, type Bip44Account } from "@metamask/account-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import type { KeyringMetadata, KeyringSelector } from "@metamask/keyring-controller";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
-export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<InternalAccount>> {
+/**
+ * Asserts a keyring account is BIP-44 compatible.
+ *
+ * @param account - Keyring account to check.
+ * @throws If the keyring account is not compatible.
+ */
+export declare function assertIsBip44Account(account: KeyringAccount): asserts account is Bip44Account<KeyringAccount>;
+export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<KeyringAccount>> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     constructor(messenger: MultichainAccountServiceMessenger);
-    getAccounts(): Bip44Account<InternalAccount>[];
-    getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount>;
-    abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    getAccounts(): Bip44Account<KeyringAccount>[];
+    getAccount(id: Bip44Account<KeyringAccount>['id']): Bip44Account<KeyringAccount>;
+    protected withKeyring<SelectedKeyring, CallbackResult = void>(selector: KeyringSelector, operation: ({ keyring, metadata, }: {
+        keyring: SelectedKeyring;
+        metadata: KeyringMetadata;
+    }) => Promise<CallbackResult>): Promise<CallbackResult>;
+    abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
+    abstract createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<KeyringAccount>[]>;
+    abstract discoverAndCreateAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<KeyringAccount>[]>;
 }
 //# sourceMappingURL=BaseAccountProvider.d.cts.map

package/dist/providers/BaseAccountProvider.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;;IAEzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,eAAe,CAAC,EAAE;IAI9C,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC;IAWpE,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAC9E"}
+{"version":3,"file":"BaseAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EAChB,qCAAqC;AAEtC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,OAAO,IAAI,YAAY,CAAC,cAAc,CAAC,CAIjD;AAED,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;;IAExD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE;IAI7C,UAAU,CACR,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GACrC,YAAY,CAAC,cAAc,CAAC;cAWf,WAAW,CAAC,eAAe,EAAE,cAAc,GAAG,IAAI,EAChE,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,CAAC,EACV,OAAO,EACP,QAAQ,GACT,EAAE;QACD,OAAO,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,eAAe,CAAC;KAC3B,KAAK,OAAO,CAAC,cAAc,CAAC,GAC5B,OAAO,CAAC,cAAc,CAAC;IAc1B,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO;IAE5E,QAAQ,CAAC,cAAc,CAAC,EACtB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAE3C,QAAQ,CAAC,yBAAyB,CAAC,EACjC,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAC5C"}

package/dist/providers/BaseAccountProvider.d.mts

@@ -1,12 +1,32 @@
 import { type AccountProvider, type Bip44Account } from "@metamask/account-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import type { KeyringMetadata, KeyringSelector } from "@metamask/keyring-controller";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
-export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<InternalAccount>> {
+/**
+ * Asserts a keyring account is BIP-44 compatible.
+ *
+ * @param account - Keyring account to check.
+ * @throws If the keyring account is not compatible.
+ */
+export declare function assertIsBip44Account(account: KeyringAccount): asserts account is Bip44Account<KeyringAccount>;
+export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<KeyringAccount>> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     constructor(messenger: MultichainAccountServiceMessenger);
-    getAccounts(): Bip44Account<InternalAccount>[];
-    getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount>;
-    abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    getAccounts(): Bip44Account<KeyringAccount>[];
+    getAccount(id: Bip44Account<KeyringAccount>['id']): Bip44Account<KeyringAccount>;
+    protected withKeyring<SelectedKeyring, CallbackResult = void>(selector: KeyringSelector, operation: ({ keyring, metadata, }: {
+        keyring: SelectedKeyring;
+        metadata: KeyringMetadata;
+    }) => Promise<CallbackResult>): Promise<CallbackResult>;
+    abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
+    abstract createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<KeyringAccount>[]>;
+    abstract discoverAndCreateAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<KeyringAccount>[]>;
 }
 //# sourceMappingURL=BaseAccountProvider.d.mts.map

package/dist/providers/BaseAccountProvider.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;;IAEzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,eAAe,CAAC,EAAE;IAI9C,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC;IAWpE,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAC9E"}
+{"version":3,"file":"BaseAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EAChB,qCAAqC;AAEtC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,OAAO,IAAI,YAAY,CAAC,cAAc,CAAC,CAIjD;AAED,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;;IAExD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE;IAI7C,UAAU,CACR,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GACrC,YAAY,CAAC,cAAc,CAAC;cAWf,WAAW,CAAC,eAAe,EAAE,cAAc,GAAG,IAAI,EAChE,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,CAAC,EACV,OAAO,EACP,QAAQ,GACT,EAAE;QACD,OAAO,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,eAAe,CAAC;KAC3B,KAAK,OAAO,CAAC,cAAc,CAAC,GAC5B,OAAO,CAAC,cAAc,CAAC;IAc1B,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO;IAE5E,QAAQ,CAAC,cAAc,CAAC,EACtB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAE3C,QAAQ,CAAC,yBAAyB,CAAC,EACjC,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAC5C"}

package/dist/providers/BaseAccountProvider.mjs

@@ -5,6 +5,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _BaseAccountProvider_instances, _BaseAccountProvider_getAccounts;
 import { isBip44Account } from "@metamask/account-api";
+/**
+ * Asserts a keyring account is BIP-44 compatible.
+ *
+ * @param account - Keyring account to check.
+ * @throws If the keyring account is not compatible.
+ */
+export function assertIsBip44Account(account) {
+    if (!isBip44Account(account)) {
+        throw new Error('Created account is not BIP-44 compatible');
+    }
+}
 export class BaseAccountProvider {
     constructor(messenger) {
         _BaseAccountProvider_instances.add(this);
@@ -21,6 +32,13 @@ export class BaseAccountProvider {
         }
         return found;
     }
+    async withKeyring(selector, operation) {
+        const result = await this.messenger.call('KeyringController:withKeyring', selector, ({ keyring, metadata }) => operation({
+            keyring: keyring,
+            metadata,
+        }));
+        return result;
+    }
 }
 _BaseAccountProvider_instances = new WeakSet(), _BaseAccountProvider_getAccounts = function _BaseAccountProvider_getAccounts(filter = () => true) {
     const accounts = [];

package/dist/providers/BaseAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,cAAc,EAGf,8BAA8B;AAK/B,MAAM,OAAgB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,EAAyB;QAClC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;6HAtCG,SAAgD,GAAG,EAAE,CAAC,IAAI;IAE1D,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,cAAc,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<InternalAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): Bip44Account<InternalAccount>[] {\n    const accounts: Bip44Account<InternalAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<InternalAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount> {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n}\n"]}
+{"version":3,"file":"BaseAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,cAAc,EAGf,8BAA8B;AAS/B;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;AACH,CAAC;AAED,MAAM,OAAgB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CACR,EAAsC;QAEtC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;CAmBF;6HA/EG,SAA+C,GAAG,EAAE,CAAC,IAAI;IAEzD,MAAM,QAAQ,GAAmC,EAAE,CAAC;IAEpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,cAAc,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<KeyringAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: KeyringAccount) => boolean = () => true,\n  ): Bip44Account<KeyringAccount>[] {\n    const accounts: Bip44Account<KeyringAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<KeyringAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(\n    id: Bip44Account<KeyringAccount>['id'],\n  ): Bip44Account<KeyringAccount> {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    return found;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]>;\n\n  abstract discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]>;\n}\n"]}

package/dist/providers/EvmAccountProvider.cjs

@@ -4,11 +4,46 @@ exports.EvmAccountProvider = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const BaseAccountProvider_1 = require("./BaseAccountProvider.cjs");
+/**
+ * Asserts an internal account exists.
+ *
+ * @param account - The internal account to check.
+ * @throws An error if the internal account does not exist.
+ */
+function assertInternalAccountExists(account) {
+    if (!account) {
+        throw new Error('Internal account does not exist');
+    }
+}
 class EvmAccountProvider extends BaseAccountProvider_1.BaseAccountProvider {
     isAccountCompatible(account) {
         return (account.type === keyring_api_1.EthAccountType.Eoa &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.hd);
     }
+    async createAccounts({ entropySource, groupIndex, }) {
+        const [address] = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
+            const accounts = await keyring.getAccounts();
+            if (groupIndex < accounts.length) {
+                // Nothing new to create, we just re-use the existing accounts here,
+                return [accounts[groupIndex]];
+            }
+            // For now, we don't allow for gap, so if we need to create a new
+            // account, this has to be the next one.
+            if (groupIndex !== accounts.length) {
+                throw new Error('Trying to create too many accounts');
+            }
+            // Create next account (and returns their addresses).
+            return await keyring.addAccounts(1);
+        });
+        const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+        // We MUST have the associated internal account.
+        assertInternalAccountExists(account);
+        (0, BaseAccountProvider_1.assertIsBip44Account)(account);
+        return [account];
+    }
+    async discoverAndCreateAccounts(_) {
+        return []; // TODO: Implement account discovery.
+    }
 }
 exports.EvmAccountProvider = EvmAccountProvider;
 //# sourceMappingURL=EvmAccountProvider.cjs.map

package/dist/providers/EvmAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AACvD,qEAA4D;AAG5D,mEAA4D;AAE5D,MAAa,kBAAmB,SAAQ,yCAAmB;IACzD,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,iCAAY,CAAC,EAAa,CAC9D,CAAC;IACJ,CAAC;CACF;AAPD,gDAOC","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { BaseAccountProvider } from './BaseAccountProvider';\n\nexport class EvmAccountProvider extends BaseAccountProvider {\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === EthAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.hd as string)\n    );\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":";;;AAEA,uDAAuD;AACvD,qEAA4D;AAO5D,mEAG+B;AAE/B;;;;;GAKG;AACH,SAAS,2BAA2B,CAClC,OAAoC;IAEpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;AACH,CAAC;AAED,MAAa,kBAAmB,SAAQ,yCAAmB;IACzD,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,iCAAY,CAAC,EAAa,CAC9D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CACtC,EAAE,EAAE,EAAE,aAAa,EAAE,EACrB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAC7C,IAAI,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE;gBAChC,oEAAoE;gBACpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;aAC/B;YAED,iEAAiE;YACjE,wCAAwC;YACxC,IAAI,UAAU,KAAK,QAAQ,CAAC,MAAM,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACvD;YAED,qDAAqD;YACrD,OAAO,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACjC,wCAAwC,EACxC,OAAO,CACR,CAAC;QAEF,gDAAgD;QAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACrC,IAAA,0CAAoB,EAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;CACF;AArDD,gDAqDC","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertIsBip44Account,\n  BaseAccountProvider,\n} from './BaseAccountProvider';\n\n/**\n * Asserts an internal account exists.\n *\n * @param account - The internal account to check.\n * @throws An error if the internal account does not exist.\n */\nfunction assertInternalAccountExists(\n  account: InternalAccount | undefined,\n): asserts account is InternalAccount {\n  if (!account) {\n    throw new Error('Internal account does not exist');\n  }\n}\n\nexport class EvmAccountProvider extends BaseAccountProvider {\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === EthAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.hd as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const [address] = await this.withKeyring<EthKeyring, Hex[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const accounts = await keyring.getAccounts();\n        if (groupIndex < accounts.length) {\n          // Nothing new to create, we just re-use the existing accounts here,\n          return [accounts[groupIndex]];\n        }\n\n        // For now, we don't allow for gap, so if we need to create a new\n        // account, this has to be the next one.\n        if (groupIndex !== accounts.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        // Create next account (and returns their addresses).\n        return await keyring.addAccounts(1);\n      },\n    );\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n\n    return [account];\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}