@metamask-previews/multichain-account-service 0.6.0-preview-3734aa94 → 0.6.0-preview-fa84029c

package/dist/MultichainAccountWallet.mjs

@@ -13,7 +13,9 @@ var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _Multichain
 import { getGroupIndexFromMultichainAccountGroupId, isMultichainAccountGroupId, toMultichainAccountWalletId } from "@metamask/account-api";
 import { toDefaultAccountGroupId } from "@metamask/account-api";
 import { AccountWalletType } from "@metamask/account-api";
+import { createProjectLogger } from "@metamask/utils";
 import { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
+const log = createProjectLogger('multichain-account-service');
 /**
  * A multichain account wallet that holds multiple multichain accounts (one multichain account per
  * group index).
@@ -285,8 +287,6 @@ export class MultichainAccountWallet {
     /**
      * Discover and create accounts for all providers.
      *
-     * NOTE: This method should only be called on a newly created wallet.
-     *
      * @returns The discovered accounts for each provider.
      */
     async discoverAndCreateAccounts() {
@@ -295,11 +295,11 @@ export class MultichainAccountWallet {
         let maxGroupIndex = this.getNextGroupIndex();
         // One serialized loop per provider; all run concurrently
         const runProviderDiscovery = async (context) => {
-            const step = (stepName) => `[${context.provider.getName()}] Discover ${stepName} (groupIndex=${context.groupIndex})`;
+            const message = (stepName) => `[${context.provider.getName()}] Discovery ${stepName} (groupIndex=${context.groupIndex})`;
             while (!context.stopped) {
                 // Fast‑forward to current high‑water mark
                 const targetGroupIndex = Math.max(context.groupIndex, maxGroupIndex);
-                console.log(step('STARTED'));
+                log(message('STARTED'));
                 let accounts = [];
                 try {
                     accounts = await context.provider.discoverAndCreateAccounts({
@@ -310,15 +310,15 @@ export class MultichainAccountWallet {
                 catch (error) {
                     context.stopped = true;
                     console.error(error);
-                    console.error(step('FAILED'), error);
+                    log(message('FAILED'), error);
                     break;
                 }
                 if (!accounts.length) {
-                    console.log(step('STOPPED'));
+                    log(message('STOPPED'));
                     context.stopped = true;
                     break;
                 }
-                console.log(step('SUCCEED'));
+                log(message('SUCCEEDED'));
                 context.count += accounts.length;
                 const nextGroupIndex = targetGroupIndex + 1;
                 context.groupIndex = nextGroupIndex;

package/dist/MultichainAccountWallet.mjs.map

@@ -1 +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 {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\nimport type { NamedAccountProvider } from './providers';\n\n/**\n * The context for a provider discovery.\n */\nexport type AccountProviderDiscoveryContext = {\n  provider: NamedAccountProvider;\n  stopped: boolean;\n  groupIndex: number;\n  count: number;\n};\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: NamedAccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accountGroups: Map<number, MultichainAccountGroup<Account>>;\n\n  #isAlignmentInProgress: boolean = false;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: NamedAccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accountGroups = 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.#accountGroups.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.#accountGroups.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [\n      groupIndex,\n      multichainAccount,\n    ] of this.#accountGroups.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accountGroups.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.#accountGroups.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.#accountGroups.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.#accountGroups.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.#accountGroups.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    // We do not check for gaps.\n    return (\n      Math.max(\n        -1, // So it will default to 0 if no groups.\n        ...this.#accountGroups.keys(),\n      ) + 1\n    );\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    // --------------------------------------------------------------------------------\n    // READ THIS CAREFULLY:\n    //\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 accounts will still be created on some\n    // other providers and will become \"available\" on the `AccountsController`, like:\n    //\n    // 1. Creating a multichain account group for index 1\n    // 2. EvmAccountProvider.createAccounts returns the EVM account for index 1\n    //   * AccountsController WILL fire :accountCreated for this account\n    //   * This account WILL BE \"available\" on the AccountsController state\n    // 3. SolAccountProvider.createAccounts fails to create a Solana account for index 1\n    //   * AccountsController WON't fire :accountCreated for this account\n    //   * This account WON'T be \"available\" on the Account\n    // 4. MultichainAccountService will receive a :accountCreated for the EVM account from\n    // step 2 and will create a new multichain account group for index 1, but it won't\n    // receive any event for the Solana account of this group. Thus, this group won't be\n    // \"aligned\" (missing \"blockchain account\" on this group).\n    //\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    if (results.some((result) => result.status === 'rejected')) {\n      // NOTE: Some accounts might still have been created on other account providers. We\n      // don't rollback them.\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.#accountGroups.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  /**\n   * Gets whether alignment is currently in progress for this wallet.\n   *\n   * @returns True if alignment is in progress, false otherwise.\n   */\n  getIsAlignmentInProgress(): boolean {\n    return this.#isAlignmentInProgress;\n  }\n\n  /**\n   * Align all multichain account groups.\n   */\n  async alignGroups(): Promise<void> {\n    if (this.#isAlignmentInProgress) {\n      return; // Prevent concurrent alignments\n    }\n\n    this.#isAlignmentInProgress = true;\n    try {\n      const groups = this.getMultichainAccountGroups();\n      await Promise.all(groups.map((g) => g.align()));\n    } finally {\n      this.#isAlignmentInProgress = false;\n    }\n  }\n\n  /**\n   * Align a specific multichain account group.\n   *\n   * @param groupIndex - The group index to align.\n   */\n  async alignGroup(groupIndex: number): Promise<void> {\n    if (this.#isAlignmentInProgress) {\n      return; // Prevent concurrent alignments\n    }\n\n    this.#isAlignmentInProgress = true;\n    try {\n      const group = this.getMultichainAccountGroup(groupIndex);\n      if (group) {\n        await group.align();\n      }\n    } finally {\n      this.#isAlignmentInProgress = false;\n    }\n  }\n\n  /**\n   * Discover and create accounts for all providers.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   *\n   * @returns The discovered accounts for each provider.\n   */\n  async discoverAndCreateAccounts(): Promise<Record<string, number>> {\n    // Start with the next available group index (so we can resume the discovery\n    // from there).\n    let maxGroupIndex = this.getNextGroupIndex();\n\n    // One serialized loop per provider; all run concurrently\n    const runProviderDiscovery = async (\n      context: AccountProviderDiscoveryContext,\n    ) => {\n      const step = (stepName: string) =>\n        `[${context.provider.getName()}] Discover ${stepName} (groupIndex=${context.groupIndex})`;\n\n      while (!context.stopped) {\n        // Fast‑forward to current high‑water mark\n        const targetGroupIndex = Math.max(context.groupIndex, maxGroupIndex);\n\n        console.log(step('STARTED'));\n\n        let accounts: Bip44Account<KeyringAccount>[] = [];\n        try {\n          accounts = await context.provider.discoverAndCreateAccounts({\n            entropySource: this.#entropySource,\n            groupIndex: targetGroupIndex,\n          });\n        } catch (error) {\n          context.stopped = true;\n          console.error(error);\n          console.error(step('FAILED'), error);\n          break;\n        }\n\n        if (!accounts.length) {\n          console.log(step('STOPPED'));\n          context.stopped = true;\n          break;\n        }\n\n        console.log(step('SUCCEED'));\n\n        context.count += accounts.length;\n\n        const nextGroupIndex = targetGroupIndex + 1;\n        context.groupIndex = nextGroupIndex;\n\n        if (nextGroupIndex > maxGroupIndex) {\n          maxGroupIndex = nextGroupIndex;\n        }\n      }\n    };\n\n    const providerContexts: AccountProviderDiscoveryContext[] =\n      this.#providers.map((provider) => ({\n        provider,\n        stopped: false,\n        groupIndex: maxGroupIndex,\n        count: 0,\n      }));\n\n    // Start discovery for each providers.\n    await Promise.all(providerContexts.map(runProviderDiscovery));\n\n    // Sync the wallet after discovery to ensure that the newly added accounts are added into their groups.\n    // We can potentially remove this if we know that this race condition is not an issue in practice.\n    this.sync();\n\n    // Align missing accounts from group. This is required to create missing account from non-discovered\n    // indexes for some providers.\n    await this.alignGroups();\n\n    const discoveredAccounts: Record<string, number> = {};\n    for (const context of providerContexts) {\n      const providerName = context.provider.getName();\n      discoveredAccounts[providerName] = context.count;\n    }\n\n    return discoveredAccounts;\n  }\n}\n"]}
+{"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 {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\nimport { createProjectLogger } from '@metamask/utils';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\nimport type { NamedAccountProvider } from './providers';\n\n/**\n * The context for a provider discovery.\n */\nexport type AccountProviderDiscoveryContext = {\n  provider: NamedAccountProvider;\n  stopped: boolean;\n  groupIndex: number;\n  count: number;\n};\n\nconst log = createProjectLogger('multichain-account-service');\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: NamedAccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accountGroups: Map<number, MultichainAccountGroup<Account>>;\n\n  #isAlignmentInProgress: boolean = false;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: NamedAccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accountGroups = 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.#accountGroups.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.#accountGroups.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [\n      groupIndex,\n      multichainAccount,\n    ] of this.#accountGroups.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accountGroups.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.#accountGroups.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.#accountGroups.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.#accountGroups.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.#accountGroups.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    // We do not check for gaps.\n    return (\n      Math.max(\n        -1, // So it will default to 0 if no groups.\n        ...this.#accountGroups.keys(),\n      ) + 1\n    );\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    // --------------------------------------------------------------------------------\n    // READ THIS CAREFULLY:\n    //\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 accounts will still be created on some\n    // other providers and will become \"available\" on the `AccountsController`, like:\n    //\n    // 1. Creating a multichain account group for index 1\n    // 2. EvmAccountProvider.createAccounts returns the EVM account for index 1\n    //   * AccountsController WILL fire :accountCreated for this account\n    //   * This account WILL BE \"available\" on the AccountsController state\n    // 3. SolAccountProvider.createAccounts fails to create a Solana account for index 1\n    //   * AccountsController WON't fire :accountCreated for this account\n    //   * This account WON'T be \"available\" on the Account\n    // 4. MultichainAccountService will receive a :accountCreated for the EVM account from\n    // step 2 and will create a new multichain account group for index 1, but it won't\n    // receive any event for the Solana account of this group. Thus, this group won't be\n    // \"aligned\" (missing \"blockchain account\" on this group).\n    //\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    if (results.some((result) => result.status === 'rejected')) {\n      // NOTE: Some accounts might still have been created on other account providers. We\n      // don't rollback them.\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.#accountGroups.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  /**\n   * Gets whether alignment is currently in progress for this wallet.\n   *\n   * @returns True if alignment is in progress, false otherwise.\n   */\n  getIsAlignmentInProgress(): boolean {\n    return this.#isAlignmentInProgress;\n  }\n\n  /**\n   * Align all multichain account groups.\n   */\n  async alignGroups(): Promise<void> {\n    if (this.#isAlignmentInProgress) {\n      return; // Prevent concurrent alignments\n    }\n\n    this.#isAlignmentInProgress = true;\n    try {\n      const groups = this.getMultichainAccountGroups();\n      await Promise.all(groups.map((g) => g.align()));\n    } finally {\n      this.#isAlignmentInProgress = false;\n    }\n  }\n\n  /**\n   * Align a specific multichain account group.\n   *\n   * @param groupIndex - The group index to align.\n   */\n  async alignGroup(groupIndex: number): Promise<void> {\n    if (this.#isAlignmentInProgress) {\n      return; // Prevent concurrent alignments\n    }\n\n    this.#isAlignmentInProgress = true;\n    try {\n      const group = this.getMultichainAccountGroup(groupIndex);\n      if (group) {\n        await group.align();\n      }\n    } finally {\n      this.#isAlignmentInProgress = false;\n    }\n  }\n\n  /**\n   * Discover and create accounts for all providers.\n   *\n   * @returns The discovered accounts for each provider.\n   */\n  async discoverAndCreateAccounts(): Promise<Record<string, number>> {\n    // Start with the next available group index (so we can resume the discovery\n    // from there).\n    let maxGroupIndex = this.getNextGroupIndex();\n\n    // One serialized loop per provider; all run concurrently\n    const runProviderDiscovery = async (\n      context: AccountProviderDiscoveryContext,\n    ) => {\n      const message = (stepName: string) =>\n        `[${context.provider.getName()}] Discovery ${stepName} (groupIndex=${context.groupIndex})`;\n\n      while (!context.stopped) {\n        // Fast‑forward to current high‑water mark\n        const targetGroupIndex = Math.max(context.groupIndex, maxGroupIndex);\n\n        log(message('STARTED'));\n\n        let accounts: Bip44Account<KeyringAccount>[] = [];\n        try {\n          accounts = await context.provider.discoverAndCreateAccounts({\n            entropySource: this.#entropySource,\n            groupIndex: targetGroupIndex,\n          });\n        } catch (error) {\n          context.stopped = true;\n          console.error(error);\n          log(message('FAILED'), error);\n          break;\n        }\n\n        if (!accounts.length) {\n          log(message('STOPPED'));\n          context.stopped = true;\n          break;\n        }\n\n        log(message('SUCCEEDED'));\n\n        context.count += accounts.length;\n\n        const nextGroupIndex = targetGroupIndex + 1;\n        context.groupIndex = nextGroupIndex;\n\n        if (nextGroupIndex > maxGroupIndex) {\n          maxGroupIndex = nextGroupIndex;\n        }\n      }\n    };\n\n    const providerContexts: AccountProviderDiscoveryContext[] =\n      this.#providers.map((provider) => ({\n        provider,\n        stopped: false,\n        groupIndex: maxGroupIndex,\n        count: 0,\n      }));\n\n    // Start discovery for each providers.\n    await Promise.all(providerContexts.map(runProviderDiscovery));\n\n    // Sync the wallet after discovery to ensure that the newly added accounts are added into their groups.\n    // We can potentially remove this if we know that this race condition is not an issue in practice.\n    this.sync();\n\n    // Align missing accounts from group. This is required to create missing account from non-discovered\n    // indexes for some providers.\n    await this.alignGroups();\n\n    const discoveredAccounts: Record<string, number> = {};\n    for (const context of providerContexts) {\n      const providerName = context.provider.getName();\n      discoveredAccounts[providerName] = context.count;\n    }\n\n    return discoveredAccounts;\n  }\n}\n"]}

package/dist/{utils.cjs → mnemonic.cjs}

@@ -16,4 +16,4 @@ const convertMnemonicToWordlistIndices = (mnemonic) => {
     return new Uint8Array(new Uint16Array(indices).buffer);
 };
 exports.convertMnemonicToWordlistIndices = convertMnemonicToWordlistIndices;
-//# sourceMappingURL=utils.cjs.map
+//# sourceMappingURL=mnemonic.cjs.map

package/dist/mnemonic.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"mnemonic.cjs","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":";;;AAAA,6EAAwE;AAEjE,MAAM,yCAAyC,GAAG,CACvD,eAA2B,EACnB,EAAE;IACV,OAAO,MAAM,CAAC,IAAI,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAQ,CAAC,CAAC,CAAC,CAAC;SACvB,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,yCAAyC,6CAQpD;AAEK,MAAM,gCAAgC,GAAG,CAC9C,QAAgB,EACJ,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ;SACrB,QAAQ,EAAE;SACV,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,OAAO,IAAI,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC,CAAC;AARW,QAAA,gCAAgC,oCAQ3C","sourcesContent":["import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\n\nexport const convertEnglishWordlistIndicesToCodepoints = (\n  wordlistIndices: Uint8Array,\n): Buffer => {\n  return Buffer.from(\n    Array.from(new Uint16Array(wordlistIndices.buffer))\n      .map((i) => wordlist[i])\n      .join(' '),\n  );\n};\n\nexport const convertMnemonicToWordlistIndices = (\n  mnemonic: string,\n): Uint8Array => {\n  const indices = mnemonic\n    .toString()\n    .split(' ')\n    .map((word) => wordlist.indexOf(word));\n  return new Uint8Array(new Uint16Array(indices).buffer);\n};\n"]}

package/dist/{utils.d.mts → mnemonic.d.cts}

@@ -1,3 +1,3 @@
 export declare const convertEnglishWordlistIndicesToCodepoints: (wordlistIndices: Uint8Array) => Buffer;
 export declare const convertMnemonicToWordlistIndices: (mnemonic: string) => Uint8Array;
-//# sourceMappingURL=utils.d.mts.map
+//# sourceMappingURL=mnemonic.d.cts.map

package/dist/mnemonic.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mnemonic.d.cts","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yCAAyC,oBACnC,UAAU,KAC1B,MAMF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,KACf,UAMF,CAAC"}

package/dist/{utils.d.cts → mnemonic.d.mts}

@@ -1,3 +1,3 @@
 export declare const convertEnglishWordlistIndicesToCodepoints: (wordlistIndices: Uint8Array) => Buffer;
 export declare const convertMnemonicToWordlistIndices: (mnemonic: string) => Uint8Array;
-//# sourceMappingURL=utils.d.cts.map
+//# sourceMappingURL=mnemonic.d.mts.map

package/dist/mnemonic.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mnemonic.d.mts","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yCAAyC,oBACnC,UAAU,KAC1B,MAMF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,KACf,UAMF,CAAC"}

package/dist/{utils.mjs → mnemonic.mjs}

@@ -11,4 +11,4 @@ export const convertMnemonicToWordlistIndices = (mnemonic) => {
         .map((word) => wordlist.indexOf(word));
     return new Uint8Array(new Uint16Array(indices).buffer);
 };
-//# sourceMappingURL=utils.mjs.map
+//# sourceMappingURL=mnemonic.mjs.map

package/dist/mnemonic.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"mnemonic.mjs","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,wDAAqD;AAExE,MAAM,CAAC,MAAM,yCAAyC,GAAG,CACvD,eAA2B,EACnB,EAAE;IACV,OAAO,MAAM,CAAC,IAAI,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACvB,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,QAAgB,EACJ,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ;SACrB,QAAQ,EAAE;SACV,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,OAAO,IAAI,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC,CAAC","sourcesContent":["import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\n\nexport const convertEnglishWordlistIndicesToCodepoints = (\n  wordlistIndices: Uint8Array,\n): Buffer => {\n  return Buffer.from(\n    Array.from(new Uint16Array(wordlistIndices.buffer))\n      .map((i) => wordlist[i])\n      .join(' '),\n  );\n};\n\nexport const convertMnemonicToWordlistIndices = (\n  mnemonic: string,\n): Uint8Array => {\n  const indices = mnemonic\n    .toString()\n    .split(' ')\n    .map((word) => wordlist.indexOf(word));\n  return new Uint8Array(new Uint16Array(indices).buffer);\n};\n"]}

package/dist/providers/EvmAccountProvider.cjs

@@ -4,6 +4,7 @@ exports.EvmAccountProvider = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const BaseBip44AccountProvider_1 = require("./BaseBip44AccountProvider.cjs");
+const ETH_MAINNET_CHAIN_ID = '0x1';
 /**
  * Asserts an internal account exists.
  *
@@ -24,12 +25,12 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
         return 'EVM';
     }
     /**
-     * Get the Evm provider.
+     * Get the EVM provider.
      *
-     * @returns The Evm provider.
+     * @returns The EVM provider.
      */
     getEvmProvider() {
-        const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', '0x1');
+        const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', ETH_MAINNET_CHAIN_ID);
         const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
         return provider;
     }
@@ -56,14 +57,14 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
         return accountsArray;
     }
     /**
-     * Discover and create accounts for the Evm provider.
+     * Discover and create accounts for the EVM provider.
      *
      * NOTE: This method should only be called on a newly created wallet.
      *
      * @param opts - The options for the discovery and creation of accounts.
      * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
      * @param opts.groupIndex - The index of the group to create the accounts for.
-     * @returns The accounts for the Evm provider.
+     * @returns The accounts for the EVM provider.
      */
     async discoverAndCreateAccounts(opts) {
         const provider = this.getEvmProvider();

package/dist/providers/EvmAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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 { Provider } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\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 BaseBip44AccountProvider {\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  getName(): string {\n    return 'EVM';\n  }\n\n  /**\n   * Get the Evm provider.\n   *\n   * @returns The Evm provider.\n   */\n  getEvmProvider(): Provider {\n    const networkClientId = this.messenger.call(\n      'NetworkController:findNetworkClientIdByChainId',\n      '0x1',\n    );\n    const { provider } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    return provider;\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\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  /**\n   * Discover and create accounts for the Evm provider.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   *\n   * @param opts - The options for the discovery and creation of accounts.\n   * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.\n   * @param opts.groupIndex - The index of the group to create the accounts for.\n   * @returns The accounts for the Evm provider.\n   */\n  async discoverAndCreateAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const provider = this.getEvmProvider();\n    const { entropySource, groupIndex } = opts;\n\n    const [address, didCreate] = await this.withKeyring<\n      EthKeyring,\n      [Hex, boolean]\n    >({ id: entropySource }, async ({ keyring }) => {\n      const existing = await keyring.getAccounts();\n      if (groupIndex < existing.length) {\n        return [existing[groupIndex], false];\n      }\n      const [added] = await keyring.addAccounts(1);\n      return [added, true];\n    });\n\n    const countHex = (await provider.request({\n      method: 'eth_getTransactionCount',\n      params: [address, 'latest'],\n    })) as Hex;\n    const count = parseInt(countHex, 16);\n\n    // We don't want to remove the account if it's the first one.\n    if (count === 0 && didCreate && groupIndex !== 0) {\n      await this.withKeyring<EthKeyring>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          keyring.removeAccount?.(address);\n        },\n      );\n      return [];\n    }\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n    return [account];\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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 { Provider } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\n\nconst ETH_MAINNET_CHAIN_ID = '0x1';\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 BaseBip44AccountProvider {\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  getName(): string {\n    return 'EVM';\n  }\n\n  /**\n   * Get the EVM provider.\n   *\n   * @returns The EVM provider.\n   */\n  getEvmProvider(): Provider {\n    const networkClientId = this.messenger.call(\n      'NetworkController:findNetworkClientIdByChainId',\n      ETH_MAINNET_CHAIN_ID,\n    );\n    const { provider } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    return provider;\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\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   *\n   * @param opts - The options for the discovery and creation of accounts.\n   * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.\n   * @param opts.groupIndex - The index of the group to create the accounts for.\n   * @returns The accounts for the EVM provider.\n   */\n  async discoverAndCreateAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const provider = this.getEvmProvider();\n    const { entropySource, groupIndex } = opts;\n\n    const [address, didCreate] = await this.withKeyring<\n      EthKeyring,\n      [Hex, boolean]\n    >({ id: entropySource }, async ({ keyring }) => {\n      const existing = await keyring.getAccounts();\n      if (groupIndex < existing.length) {\n        return [existing[groupIndex], false];\n      }\n      const [added] = await keyring.addAccounts(1);\n      return [added, true];\n    });\n\n    const countHex = (await provider.request({\n      method: 'eth_getTransactionCount',\n      params: [address, 'latest'],\n    })) as Hex;\n    const count = parseInt(countHex, 16);\n\n    // We don't want to remove the account if it's the first one.\n    if (count === 0 && didCreate && groupIndex !== 0) {\n      await this.withKeyring<EthKeyring>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          keyring.removeAccount?.(address);\n        },\n      );\n      return [];\n    }\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n    return [account];\n  }\n}\n"]}

package/dist/providers/EvmAccountProvider.d.cts

@@ -7,9 +7,9 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
     getName(): string;
     /**
-     * Get the Evm provider.
+     * Get the EVM provider.
      *
-     * @returns The Evm provider.
+     * @returns The EVM provider.
      */
     getEvmProvider(): Provider;
     createAccounts({ entropySource, groupIndex, }: {
@@ -65,14 +65,14 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
         methods: string[];
     }>[]>;
     /**
-     * Discover and create accounts for the Evm provider.
+     * Discover and create accounts for the EVM provider.
      *
      * NOTE: This method should only be called on a newly created wallet.
      *
      * @param opts - The options for the discovery and creation of accounts.
      * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
      * @param opts.groupIndex - The index of the group to create the accounts for.
-     * @returns The accounts for the Evm provider.
+     * @returns The accounts for the EVM provider.
      */
     discoverAndCreateAccounts(opts: {
         entropySource: EntropySourceId;

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAG7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAgBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAYpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCD;;;;;;;;;OASG;IACG,yBAAyB,CAAC,IAAI,EAAE;QACpC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCF"}
+{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAG7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAkBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAYpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCD;;;;;;;;;OASG;IACG,yBAAyB,CAAC,IAAI,EAAE;QACpC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCF"}

package/dist/providers/EvmAccountProvider.d.mts

@@ -7,9 +7,9 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
     getName(): string;
     /**
-     * Get the Evm provider.
+     * Get the EVM provider.
      *
-     * @returns The Evm provider.
+     * @returns The EVM provider.
      */
     getEvmProvider(): Provider;
     createAccounts({ entropySource, groupIndex, }: {
@@ -65,14 +65,14 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
         methods: string[];
     }>[]>;
     /**
-     * Discover and create accounts for the Evm provider.
+     * Discover and create accounts for the EVM provider.
      *
      * NOTE: This method should only be called on a newly created wallet.
      *
      * @param opts - The options for the discovery and creation of accounts.
      * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
      * @param opts.groupIndex - The index of the group to create the accounts for.
-     * @returns The accounts for the Evm provider.
+     * @returns The accounts for the EVM provider.
      */
     discoverAndCreateAccounts(opts: {
         entropySource: EntropySourceId;

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAG7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAgBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAYpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCD;;;;;;;;;OASG;IACG,yBAAyB,CAAC,IAAI,EAAE;QACpC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCF"}
+{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAG7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAkBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAYpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCD;;;;;;;;;OASG;IACG,yBAAyB,CAAC,IAAI,EAAE;QACpC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCF"}

package/dist/providers/EvmAccountProvider.mjs

@@ -1,6 +1,7 @@
 import { EthAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { assertAreBip44Accounts, assertIsBip44Account, BaseBip44AccountProvider } from "./BaseBip44AccountProvider.mjs";
+const ETH_MAINNET_CHAIN_ID = '0x1';
 /**
  * Asserts an internal account exists.
  *
@@ -21,12 +22,12 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         return 'EVM';
     }
     /**
-     * Get the Evm provider.
+     * Get the EVM provider.
      *
-     * @returns The Evm provider.
+     * @returns The EVM provider.
      */
     getEvmProvider() {
-        const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', '0x1');
+        const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', ETH_MAINNET_CHAIN_ID);
         const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
         return provider;
     }
@@ -53,14 +54,14 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         return accountsArray;
     }
     /**
-     * Discover and create accounts for the Evm provider.
+     * Discover and create accounts for the EVM provider.
      *
      * NOTE: This method should only be called on a newly created wallet.
      *
      * @param opts - The options for the discovery and creation of accounts.
      * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
      * @param opts.groupIndex - The index of the group to create the accounts for.
-     * @returns The accounts for the Evm provider.
+     * @returns The accounts for the EVM provider.
      */
     async discoverAndCreateAccounts(opts) {
         const provider = this.getEvmProvider();

package/dist/providers/EvmAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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 { Provider } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\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 BaseBip44AccountProvider {\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  getName(): string {\n    return 'EVM';\n  }\n\n  /**\n   * Get the Evm provider.\n   *\n   * @returns The Evm provider.\n   */\n  getEvmProvider(): Provider {\n    const networkClientId = this.messenger.call(\n      'NetworkController:findNetworkClientIdByChainId',\n      '0x1',\n    );\n    const { provider } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    return provider;\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\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  /**\n   * Discover and create accounts for the Evm provider.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   *\n   * @param opts - The options for the discovery and creation of accounts.\n   * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.\n   * @param opts.groupIndex - The index of the group to create the accounts for.\n   * @returns The accounts for the Evm provider.\n   */\n  async discoverAndCreateAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const provider = this.getEvmProvider();\n    const { entropySource, groupIndex } = opts;\n\n    const [address, didCreate] = await this.withKeyring<\n      EthKeyring,\n      [Hex, boolean]\n    >({ id: entropySource }, async ({ keyring }) => {\n      const existing = await keyring.getAccounts();\n      if (groupIndex < existing.length) {\n        return [existing[groupIndex], false];\n      }\n      const [added] = await keyring.addAccounts(1);\n      return [added, true];\n    });\n\n    const countHex = (await provider.request({\n      method: 'eth_getTransactionCount',\n      params: [address, 'latest'],\n    })) as Hex;\n    const count = parseInt(countHex, 16);\n\n    // We don't want to remove the account if it's the first one.\n    if (count === 0 && didCreate && groupIndex !== 0) {\n      await this.withKeyring<EthKeyring>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          keyring.removeAccount?.(address);\n        },\n      );\n      return [];\n    }\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n    return [account];\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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 { Provider } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\n\nconst ETH_MAINNET_CHAIN_ID = '0x1';\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 BaseBip44AccountProvider {\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  getName(): string {\n    return 'EVM';\n  }\n\n  /**\n   * Get the EVM provider.\n   *\n   * @returns The EVM provider.\n   */\n  getEvmProvider(): Provider {\n    const networkClientId = this.messenger.call(\n      'NetworkController:findNetworkClientIdByChainId',\n      ETH_MAINNET_CHAIN_ID,\n    );\n    const { provider } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    return provider;\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\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   *\n   * @param opts - The options for the discovery and creation of accounts.\n   * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.\n   * @param opts.groupIndex - The index of the group to create the accounts for.\n   * @returns The accounts for the EVM provider.\n   */\n  async discoverAndCreateAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const provider = this.getEvmProvider();\n    const { entropySource, groupIndex } = opts;\n\n    const [address, didCreate] = await this.withKeyring<\n      EthKeyring,\n      [Hex, boolean]\n    >({ id: entropySource }, async ({ keyring }) => {\n      const existing = await keyring.getAccounts();\n      if (groupIndex < existing.length) {\n        return [existing[groupIndex], false];\n      }\n      const [added] = await keyring.addAccounts(1);\n      return [added, true];\n    });\n\n    const countHex = (await provider.request({\n      method: 'eth_getTransactionCount',\n      params: [address, 'latest'],\n    })) as Hex;\n    const count = parseInt(countHex, 16);\n\n    // We don't want to remove the account if it's the first one.\n    if (count === 0 && didCreate && groupIndex !== 0) {\n      await this.withKeyring<EthKeyring>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          keyring.removeAccount?.(address);\n        },\n      );\n      return [];\n    }\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n    return [account];\n  }\n}\n"]}

package/dist/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerAccountAddedEvent,\n  AccountsControllerAccountRemovedEvent,\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type {\n  KeyringControllerAddNewKeyringAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerWithKeyringAction,\n} from '@metamask/keyring-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n} from '@metamask/network-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\nimport type {\n  MultichainAccountService,\n  serviceName,\n} from './MultichainAccountService';\n\nexport type MultichainAccountServiceGetMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroup`;\n  handler: MultichainAccountService['getMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountGroupsAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroups`;\n  handler: MultichainAccountService['getMultichainAccountGroups'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallet`;\n  handler: MultichainAccountService['getMultichainAccountWallet'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletsAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallets`;\n  handler: MultichainAccountService['getMultichainAccountWallets'];\n};\n\nexport type MultichainAccountServiceCreateNextMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createNextMultichainAccountGroup`;\n  handler: MultichainAccountService['createNextMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createMultichainAccountGroup`;\n  handler: MultichainAccountService['createMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceSetBasicFunctionalityAction = {\n  type: `${typeof serviceName}:setBasicFunctionality`;\n  handler: MultichainAccountService['setBasicFunctionality'];\n};\n\nexport type MultichainAccountServiceAlignWalletAction = {\n  type: `${typeof serviceName}:alignWallet`;\n  handler: MultichainAccountService['alignWallet'];\n};\n\nexport type MultichainAccountServiceAlignWalletsAction = {\n  type: `${typeof serviceName}:alignWallets`;\n  handler: MultichainAccountService['alignWallets'];\n};\n\nexport type MultichainAccountServiceGetIsAlignmentInProgressAction = {\n  type: `${typeof serviceName}:getIsAlignmentInProgress`;\n  handler: MultichainAccountService['getIsAlignmentInProgress'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:createMultichainAccountWallet`;\n  handler: MultichainAccountService['createMultichainAccountWallet'];\n};\n\n/**\n * All actions that {@link MultichainAccountService} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountServiceActions =\n  | MultichainAccountServiceGetMultichainAccountGroupAction\n  | MultichainAccountServiceGetMultichainAccountGroupsAction\n  | MultichainAccountServiceGetMultichainAccountWalletAction\n  | MultichainAccountServiceGetMultichainAccountWalletsAction\n  | MultichainAccountServiceCreateNextMultichainAccountGroupAction\n  | MultichainAccountServiceCreateMultichainAccountGroupAction\n  | MultichainAccountServiceSetBasicFunctionalityAction\n  | MultichainAccountServiceAlignWalletAction\n  | MultichainAccountServiceAlignWalletsAction\n  | MultichainAccountServiceGetIsAlignmentInProgressAction\n  | MultichainAccountServiceCreateMultichainAccountWalletAction;\n\n/**\n * All events that {@link MultichainAccountService} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountServiceEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountService}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction\n  | KeyringControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerAddNewKeyringAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountService}\n * subscribes to.\n */\nexport type AllowedEvents =\n  | KeyringControllerStateChangeEvent\n  | AccountsControllerAccountAddedEvent\n  | AccountsControllerAccountRemovedEvent;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountService} needs to access.\n */\nexport type MultichainAccountServiceMessenger = RestrictedMessenger<\n  'MultichainAccountService',\n  MultichainAccountServiceActions | AllowedActions,\n  MultichainAccountServiceEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\n/**\n * The context for a provider discovery.\n */\nexport type ProviderDiscoveryContext = {\n  stopped: boolean;\n  running?: Promise<void>;\n  groupIndex: number;\n  count: number;\n};\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerAccountAddedEvent,\n  AccountsControllerAccountRemovedEvent,\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type {\n  KeyringControllerAddNewKeyringAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerWithKeyringAction,\n} from '@metamask/keyring-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n} from '@metamask/network-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\nimport type {\n  MultichainAccountService,\n  serviceName,\n} from './MultichainAccountService';\n\nexport type MultichainAccountServiceGetMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroup`;\n  handler: MultichainAccountService['getMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountGroupsAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroups`;\n  handler: MultichainAccountService['getMultichainAccountGroups'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallet`;\n  handler: MultichainAccountService['getMultichainAccountWallet'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletsAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallets`;\n  handler: MultichainAccountService['getMultichainAccountWallets'];\n};\n\nexport type MultichainAccountServiceCreateNextMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createNextMultichainAccountGroup`;\n  handler: MultichainAccountService['createNextMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createMultichainAccountGroup`;\n  handler: MultichainAccountService['createMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceSetBasicFunctionalityAction = {\n  type: `${typeof serviceName}:setBasicFunctionality`;\n  handler: MultichainAccountService['setBasicFunctionality'];\n};\n\nexport type MultichainAccountServiceAlignWalletAction = {\n  type: `${typeof serviceName}:alignWallet`;\n  handler: MultichainAccountService['alignWallet'];\n};\n\nexport type MultichainAccountServiceAlignWalletsAction = {\n  type: `${typeof serviceName}:alignWallets`;\n  handler: MultichainAccountService['alignWallets'];\n};\n\nexport type MultichainAccountServiceGetIsAlignmentInProgressAction = {\n  type: `${typeof serviceName}:getIsAlignmentInProgress`;\n  handler: MultichainAccountService['getIsAlignmentInProgress'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:createMultichainAccountWallet`;\n  handler: MultichainAccountService['createMultichainAccountWallet'];\n};\n\n/**\n * All actions that {@link MultichainAccountService} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountServiceActions =\n  | MultichainAccountServiceGetMultichainAccountGroupAction\n  | MultichainAccountServiceGetMultichainAccountGroupsAction\n  | MultichainAccountServiceGetMultichainAccountWalletAction\n  | MultichainAccountServiceGetMultichainAccountWalletsAction\n  | MultichainAccountServiceCreateNextMultichainAccountGroupAction\n  | MultichainAccountServiceCreateMultichainAccountGroupAction\n  | MultichainAccountServiceSetBasicFunctionalityAction\n  | MultichainAccountServiceAlignWalletAction\n  | MultichainAccountServiceAlignWalletsAction\n  | MultichainAccountServiceGetIsAlignmentInProgressAction\n  | MultichainAccountServiceCreateMultichainAccountWalletAction;\n\n/**\n * All events that {@link MultichainAccountService} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountServiceEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountService}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction\n  | KeyringControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerAddNewKeyringAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountService}\n * subscribes to.\n */\nexport type AllowedEvents =\n  | KeyringControllerStateChangeEvent\n  | AccountsControllerAccountAddedEvent\n  | AccountsControllerAccountRemovedEvent;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountService} needs to access.\n */\nexport type MultichainAccountServiceMessenger = RestrictedMessenger<\n  'MultichainAccountService',\n  MultichainAccountServiceActions | AllowedActions,\n  MultichainAccountServiceEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}

package/dist/types.d.cts

@@ -73,13 +73,4 @@ export type AllowedEvents = KeyringControllerStateChangeEvent | AccountsControll
  * {@link MultichainAccountService} needs to access.
  */
 export type MultichainAccountServiceMessenger = RestrictedMessenger<'MultichainAccountService', MultichainAccountServiceActions | AllowedActions, MultichainAccountServiceEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
-/**
- * The context for a provider discovery.
- */
-export type ProviderDiscoveryContext = {
-    stopped: boolean;
-    running?: Promise<void>;
-    groupIndex: number;
-    count: number;
-};
 //# sourceMappingURL=types.d.cts.map

package/dist/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mCAAmC,EACnC,qCAAqC,EACrC,kCAAkC,EAClC,2CAA2C,EAC3C,8CAA8C,EAC/C,sCAAsC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,kCAAkC;AACrE,OAAO,KAAK,EACV,oCAAoC,EACpC,wCAAwC,EACxC,+BAA+B,EAC/B,iCAAiC,EACjC,kCAAkC,EACnC,qCAAqC;AACtC,OAAO,KAAK,EACV,mDAAmD,EACnD,2CAA2C,EAC5C,qCAAqC;AACtC,OAAO,KAAK,EAAE,iBAAiB,IAAI,qCAAqC,EAAE,oCAAoC;AAE9G,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACZ,uCAAmC;AAEpC,MAAM,MAAM,uDAAuD,GAAG;IACpE,IAAI,EAAE,GAAG,OAAO,WAAW,4BAA4B,CAAC;IACxD,OAAO,EAAE,wBAAwB,CAAC,2BAA2B,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,wDAAwD,GAAG;IACrE,IAAI,EAAE,GAAG,OAAO,WAAW,6BAA6B,CAAC;IACzD,OAAO,EAAE,wBAAwB,CAAC,4BAA4B,CAAC,CAAC;CACjE,CAAC;AAEF,MAAM,MAAM,wDAAwD,GAAG;IACrE,IAAI,EAAE,GAAG,OAAO,WAAW,6BAA6B,CAAC;IACzD,OAAO,EAAE,wBAAwB,CAAC,4BAA4B,CAAC,CAAC;CACjE,CAAC;AAEF,MAAM,MAAM,yDAAyD,GAAG;IACtE,IAAI,EAAE,GAAG,OAAO,WAAW,8BAA8B,CAAC;IAC1D,OAAO,EAAE,wBAAwB,CAAC,6BAA6B,CAAC,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,8DAA8D,GAAG;IAC3E,IAAI,EAAE,GAAG,OAAO,WAAW,mCAAmC,CAAC;IAC/D,OAAO,EAAE,wBAAwB,CAAC,kCAAkC,CAAC,CAAC;CACvE,CAAC;AAEF,MAAM,MAAM,0DAA0D,GAAG;IACvE,IAAI,EAAE,GAAG,OAAO,WAAW,+BAA+B,CAAC;IAC3D,OAAO,EAAE,wBAAwB,CAAC,8BAA8B,CAAC,CAAC;CACnE,CAAC;AAEF,MAAM,MAAM,mDAAmD,GAAG;IAChE,IAAI,EAAE,GAAG,OAAO,WAAW,wBAAwB,CAAC;IACpD,OAAO,EAAE,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;CAC5D,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,IAAI,EAAE,GAAG,OAAO,WAAW,cAAc,CAAC;IAC1C,OAAO,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,GAAG,OAAO,WAAW,eAAe,CAAC;IAC3C,OAAO,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,sDAAsD,GAAG;IACnE,IAAI,EAAE,GAAG,OAAO,WAAW,2BAA2B,CAAC;IACvD,OAAO,EAAE,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,2DAA2D,GAAG;IACxE,IAAI,EAAE,GAAG,OAAO,WAAW,gCAAgC,CAAC;IAC5D,OAAO,EAAE,wBAAwB,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,+BAA+B,GACvC,uDAAuD,GACvD,wDAAwD,GACxD,wDAAwD,GACxD,yDAAyD,GACzD,8DAA8D,GAC9D,0DAA0D,GAC1D,mDAAmD,GACnD,yCAAyC,GACzC,0CAA0C,GAC1C,sDAAsD,GACtD,2DAA2D,CAAC;AAEhE;;;GAGG;AACH,MAAM,MAAM,8BAA8B,GAAG,KAAK,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,cAAc,GACtB,8CAA8C,GAC9C,kCAAkC,GAClC,2CAA2C,GAC3C,qCAAqC,GACrC,kCAAkC,GAClC,+BAA+B,GAC/B,2CAA2C,GAC3C,mDAAmD,GACnD,wCAAwC,GACxC,oCAAoC,CAAC;AAEzC;;;GAGG;AACH,MAAM,MAAM,aAAa,GACrB,iCAAiC,GACjC,mCAAmC,GACnC,qCAAqC,CAAC;AAE1C;;;GAGG;AACH,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,CACjE,0BAA0B,EAC1B,+BAA+B,GAAG,cAAc,EAChD,8BAA8B,GAAG,aAAa,EAC9C,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.d.mts

@@ -73,13 +73,4 @@ export type AllowedEvents = KeyringControllerStateChangeEvent | AccountsControll
  * {@link MultichainAccountService} needs to access.
  */
 export type MultichainAccountServiceMessenger = RestrictedMessenger<'MultichainAccountService', MultichainAccountServiceActions | AllowedActions, MultichainAccountServiceEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
-/**
- * The context for a provider discovery.
- */
-export type ProviderDiscoveryContext = {
-    stopped: boolean;
-    running?: Promise<void>;
-    groupIndex: number;
-    count: number;
-};
 //# sourceMappingURL=types.d.mts.map

package/dist/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerAccountAddedEvent,\n  AccountsControllerAccountRemovedEvent,\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type {\n  KeyringControllerAddNewKeyringAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerWithKeyringAction,\n} from '@metamask/keyring-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n} from '@metamask/network-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\nimport type {\n  MultichainAccountService,\n  serviceName,\n} from './MultichainAccountService';\n\nexport type MultichainAccountServiceGetMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroup`;\n  handler: MultichainAccountService['getMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountGroupsAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroups`;\n  handler: MultichainAccountService['getMultichainAccountGroups'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallet`;\n  handler: MultichainAccountService['getMultichainAccountWallet'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletsAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallets`;\n  handler: MultichainAccountService['getMultichainAccountWallets'];\n};\n\nexport type MultichainAccountServiceCreateNextMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createNextMultichainAccountGroup`;\n  handler: MultichainAccountService['createNextMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createMultichainAccountGroup`;\n  handler: MultichainAccountService['createMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceSetBasicFunctionalityAction = {\n  type: `${typeof serviceName}:setBasicFunctionality`;\n  handler: MultichainAccountService['setBasicFunctionality'];\n};\n\nexport type MultichainAccountServiceAlignWalletAction = {\n  type: `${typeof serviceName}:alignWallet`;\n  handler: MultichainAccountService['alignWallet'];\n};\n\nexport type MultichainAccountServiceAlignWalletsAction = {\n  type: `${typeof serviceName}:alignWallets`;\n  handler: MultichainAccountService['alignWallets'];\n};\n\nexport type MultichainAccountServiceGetIsAlignmentInProgressAction = {\n  type: `${typeof serviceName}:getIsAlignmentInProgress`;\n  handler: MultichainAccountService['getIsAlignmentInProgress'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:createMultichainAccountWallet`;\n  handler: MultichainAccountService['createMultichainAccountWallet'];\n};\n\n/**\n * All actions that {@link MultichainAccountService} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountServiceActions =\n  | MultichainAccountServiceGetMultichainAccountGroupAction\n  | MultichainAccountServiceGetMultichainAccountGroupsAction\n  | MultichainAccountServiceGetMultichainAccountWalletAction\n  | MultichainAccountServiceGetMultichainAccountWalletsAction\n  | MultichainAccountServiceCreateNextMultichainAccountGroupAction\n  | MultichainAccountServiceCreateMultichainAccountGroupAction\n  | MultichainAccountServiceSetBasicFunctionalityAction\n  | MultichainAccountServiceAlignWalletAction\n  | MultichainAccountServiceAlignWalletsAction\n  | MultichainAccountServiceGetIsAlignmentInProgressAction\n  | MultichainAccountServiceCreateMultichainAccountWalletAction;\n\n/**\n * All events that {@link MultichainAccountService} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountServiceEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountService}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction\n  | KeyringControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerAddNewKeyringAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountService}\n * subscribes to.\n */\nexport type AllowedEvents =\n  | KeyringControllerStateChangeEvent\n  | AccountsControllerAccountAddedEvent\n  | AccountsControllerAccountRemovedEvent;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountService} needs to access.\n */\nexport type MultichainAccountServiceMessenger = RestrictedMessenger<\n  'MultichainAccountService',\n  MultichainAccountServiceActions | AllowedActions,\n  MultichainAccountServiceEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\n/**\n * The context for a provider discovery.\n */\nexport type ProviderDiscoveryContext = {\n  stopped: boolean;\n  running?: Promise<void>;\n  groupIndex: number;\n  count: number;\n};\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerAccountAddedEvent,\n  AccountsControllerAccountRemovedEvent,\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type {\n  KeyringControllerAddNewKeyringAction,\n  KeyringControllerGetKeyringsByTypeAction,\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerWithKeyringAction,\n} from '@metamask/keyring-controller';\nimport type {\n  NetworkControllerFindNetworkClientIdByChainIdAction,\n  NetworkControllerGetNetworkClientByIdAction,\n} from '@metamask/network-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\nimport type {\n  MultichainAccountService,\n  serviceName,\n} from './MultichainAccountService';\n\nexport type MultichainAccountServiceGetMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroup`;\n  handler: MultichainAccountService['getMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountGroupsAction = {\n  type: `${typeof serviceName}:getMultichainAccountGroups`;\n  handler: MultichainAccountService['getMultichainAccountGroups'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallet`;\n  handler: MultichainAccountService['getMultichainAccountWallet'];\n};\n\nexport type MultichainAccountServiceGetMultichainAccountWalletsAction = {\n  type: `${typeof serviceName}:getMultichainAccountWallets`;\n  handler: MultichainAccountService['getMultichainAccountWallets'];\n};\n\nexport type MultichainAccountServiceCreateNextMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createNextMultichainAccountGroup`;\n  handler: MultichainAccountService['createNextMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountGroupAction = {\n  type: `${typeof serviceName}:createMultichainAccountGroup`;\n  handler: MultichainAccountService['createMultichainAccountGroup'];\n};\n\nexport type MultichainAccountServiceSetBasicFunctionalityAction = {\n  type: `${typeof serviceName}:setBasicFunctionality`;\n  handler: MultichainAccountService['setBasicFunctionality'];\n};\n\nexport type MultichainAccountServiceAlignWalletAction = {\n  type: `${typeof serviceName}:alignWallet`;\n  handler: MultichainAccountService['alignWallet'];\n};\n\nexport type MultichainAccountServiceAlignWalletsAction = {\n  type: `${typeof serviceName}:alignWallets`;\n  handler: MultichainAccountService['alignWallets'];\n};\n\nexport type MultichainAccountServiceGetIsAlignmentInProgressAction = {\n  type: `${typeof serviceName}:getIsAlignmentInProgress`;\n  handler: MultichainAccountService['getIsAlignmentInProgress'];\n};\n\nexport type MultichainAccountServiceCreateMultichainAccountWalletAction = {\n  type: `${typeof serviceName}:createMultichainAccountWallet`;\n  handler: MultichainAccountService['createMultichainAccountWallet'];\n};\n\n/**\n * All actions that {@link MultichainAccountService} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountServiceActions =\n  | MultichainAccountServiceGetMultichainAccountGroupAction\n  | MultichainAccountServiceGetMultichainAccountGroupsAction\n  | MultichainAccountServiceGetMultichainAccountWalletAction\n  | MultichainAccountServiceGetMultichainAccountWalletsAction\n  | MultichainAccountServiceCreateNextMultichainAccountGroupAction\n  | MultichainAccountServiceCreateMultichainAccountGroupAction\n  | MultichainAccountServiceSetBasicFunctionalityAction\n  | MultichainAccountServiceAlignWalletAction\n  | MultichainAccountServiceAlignWalletsAction\n  | MultichainAccountServiceGetIsAlignmentInProgressAction\n  | MultichainAccountServiceCreateMultichainAccountWalletAction;\n\n/**\n * All events that {@link MultichainAccountService} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountServiceEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountService}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction\n  | KeyringControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | KeyringControllerGetKeyringsByTypeAction\n  | KeyringControllerAddNewKeyringAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountService}\n * subscribes to.\n */\nexport type AllowedEvents =\n  | KeyringControllerStateChangeEvent\n  | AccountsControllerAccountAddedEvent\n  | AccountsControllerAccountRemovedEvent;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountService} needs to access.\n */\nexport type MultichainAccountServiceMessenger = RestrictedMessenger<\n  'MultichainAccountService',\n  MultichainAccountServiceActions | AllowedActions,\n  MultichainAccountServiceEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/multichain-account-service",
-  "version": "0.6.0-preview-3734aa94",
+  "version": "0.6.0-preview-fa84029c",
   "description": "Service to manage multichain accounts",
   "keywords": [
     "MetaMask",
@@ -56,7 +56,8 @@
     "@metamask/scure-bip39": "^2.1.1",
     "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/snaps-utils": "^11.0.0",
-    "@metamask/superstruct": "^3.1.0"
+    "@metamask/superstruct": "^3.1.0",
+    "@metamask/utils": "11.4.2"
   },
   "devDependencies": {
     "@metamask/account-api": "^0.9.0",

package/dist/utils.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,6EAAwE;AAEjE,MAAM,yCAAyC,GAAG,CACvD,eAA2B,EACnB,EAAE;IACV,OAAO,MAAM,CAAC,IAAI,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAQ,CAAC,CAAC,CAAC,CAAC;SACvB,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,yCAAyC,6CAQpD;AAEK,MAAM,gCAAgC,GAAG,CAC9C,QAAgB,EACJ,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ;SACrB,QAAQ,EAAE;SACV,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,OAAO,IAAI,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC,CAAC;AARW,QAAA,gCAAgC,oCAQ3C","sourcesContent":["import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\n\nexport const convertEnglishWordlistIndicesToCodepoints = (\n  wordlistIndices: Uint8Array,\n): Buffer => {\n  return Buffer.from(\n    Array.from(new Uint16Array(wordlistIndices.buffer))\n      .map((i) => wordlist[i])\n      .join(' '),\n  );\n};\n\nexport const convertMnemonicToWordlistIndices = (\n  mnemonic: string,\n): Uint8Array => {\n  const indices = mnemonic\n    .toString()\n    .split(' ')\n    .map((word) => wordlist.indexOf(word));\n  return new Uint8Array(new Uint16Array(indices).buffer);\n};\n"]}

package/dist/utils.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yCAAyC,oBACnC,UAAU,KAC1B,MAMF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,KACf,UAMF,CAAC"}

package/dist/utils.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yCAAyC,oBACnC,UAAU,KAC1B,MAMF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,KACf,UAMF,CAAC"}