@metamask/multichain-account-service 7.0.0 → 8.0.0

package/dist/providers/BaseBip44AccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseBip44AccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseBip44AccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAAuD;AAEvD,uDAA4D;AAe5D;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,IAAA,4BAAc,EAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAND,oDAMC;AAED;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,QAA0B;IAE1B,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACzC,CAAC;AAJD,wDAIC;AA8DD,MAAsB,wBAAwB;IAQ5C,YAAY,SAA4C;;QAF9C,aAAQ,GAA4C,IAAI,GAAG,EAAE,CAAC;QAGtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,QAAyB;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAWD;;;;OAIG;IACH,WAAW;QACT,MAAM,WAAW,GAAG,uBAAA,IAAI,oFAAe,MAAnB,IAAI,CAAiB,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,gCAAgC,EAChC,WAAW,CACZ,CAAC;QACF,uEAAuE;QACvE,OAAO,gBAAwC,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,EAAiB;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,iFAAiF;QACjF,gFAAgF;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CACxB,+BAA+B,EAC/B,EAAE,CACmB,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAClB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC;YACzC,IAAI,EAAE,iCAAmB,CAAC,gBAAgB;YAC1C,aAAa;YACb,UAAU;SACX,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzD,OAAO,UAAU,CAAC;IACpB,CAAC;CAqBF;AAjID,4DAiIC;;IAlGG,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { isBip44Account } from '@metamask/account-api';\nimport type { AccountProvider, Bip44Account } from '@metamask/account-api';\nimport { AccountCreationType } from '@metamask/keyring-api';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\n/**\n * Asserts that a list of keyring accounts are all BIP-44 compatible.\n *\n * @param accounts - Keyring accounts to check.\n * @throws If any of the keyring account is not compatible.\n */\nexport function assertAreBip44Accounts(\n  accounts: KeyringAccount[],\n): asserts accounts is Bip44Account<KeyringAccount>[] {\n  accounts.forEach(assertIsBip44Account);\n}\n\nexport type Bip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> = AccountProvider<Account> & {\n  /**\n   * Provider capabilities, including supported scopes and BIP-44 options.\n   *\n   * @returns The provider capabilities.\n   */\n  get capabilities(): KeyringCapabilities;\n  /**\n   * Get the name of the provider.\n   *\n   * @returns The name of the provider.\n   */\n  getName(): string;\n  /**\n   * Initialize the provider with the given accounts.\n   *\n   * @param accounts - The accounts to initialize the provider with.\n   */\n  init(accounts: Bip44Account<KeyringAccount>['id'][]): void;\n  /**\n   * Check if the account is compatible with the provider.\n   */\n  isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n  /**\n   * Align the accounts with the given entropy source and group index.\n   *\n   * @param options - The options for aligning the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @returns The already and newly aligned accounts IDs.\n   */\n  alignAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account['id'][]>;\n  /**\n   * Create accounts for the provider.\n   *\n   * @param options - The options for creating the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @param options.type - The type of account creation.\n   * @returns The created accounts.\n   */\n  createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n  /**\n   * Re-synchronize MetaMask accounts and the providers accounts if needed.\n   *\n   * NOTE: This is mostly required if one of the providers (keyrings or Snaps)\n   * have different sets of accounts. This method would ensure that both are\n   * in-sync and use the same accounts (and same IDs).\n   */\n  resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;\n};\n\nexport abstract class BaseBip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> implements Bip44AccountProvider\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  protected accounts: Set<Bip44Account<KeyringAccount>['id']> = new Set();\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  /**\n   * Add accounts to the provider.\n   *\n   * Note: There's an implicit assumption that the accounts are BIP-44 compatible.\n   *\n   * @param accounts - The accounts to add.\n   */\n  init(accounts: Account['id'][]): void {\n    for (const account of accounts) {\n      this.accounts.add(account);\n    }\n  }\n\n  /**\n   * Get the accounts list for the provider.\n   *\n   * @returns The accounts list.\n   */\n  #getAccountIds(): Account['id'][] {\n    return [...this.accounts];\n  }\n\n  /**\n   * Get the accounts list for the provider from the AccountsController.\n   *\n   * @returns The accounts list.\n   */\n  getAccounts(): Account[] {\n    const accountsIds = this.#getAccountIds();\n    const internalAccounts = this.messenger.call(\n      'AccountsController:getAccounts',\n      accountsIds,\n    );\n    // we cast here because we know that the accounts are BIP-44 compatible\n    return internalAccounts as unknown as Account[];\n  }\n\n  /**\n   * Get the account for the provider.\n   *\n   * @param id - The account ID.\n   * @returns The account.\n   * @throws If the account is not found.\n   */\n  getAccount(id: Account['id']): Account {\n    const hasAccount = this.accounts.has(id);\n\n    if (!hasAccount) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    // We need to upcast here since InternalAccounts are not always BIP-44 compatible\n    // but we know that the account is BIP-44 compatible here so it is safe to do so\n    return this.messenger.call(\n      'AccountsController:getAccount',\n      id,\n    ) as unknown as Account;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  async alignAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account['id'][]> {\n    const accounts = await this.createAccounts({\n      type: AccountCreationType.Bip44DeriveIndex,\n      entropySource,\n      groupIndex,\n    });\n    const accountIds = accounts.map((account) => account.id);\n    return accountIds;\n  }\n\n  abstract get capabilities(): KeyringCapabilities;\n\n  abstract getName(): string;\n\n  abstract resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void>;\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n\n  abstract discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account[]>;\n}\n"]}
+{"version":3,"file":"BaseBip44AccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseBip44AccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAAuD;AAgBvD;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,IAAA,4BAAc,EAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAND,oDAMC;AAED;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,QAA0B;IAE1B,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACzC,CAAC;AAJD,wDAIC;AA+CD,MAAsB,wBAAwB;IAQ5C,YAAY,SAA4C;;QAF9C,aAAQ,GAA4C,IAAI,GAAG,EAAE,CAAC;QAGtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,QAAyB;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAWD;;;;OAIG;IACH,WAAW;QACT,MAAM,WAAW,GAAG,uBAAA,IAAI,oFAAe,MAAnB,IAAI,CAAiB,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,gCAAgC,EAChC,WAAW,CACZ,CAAC;QACF,uEAAuE;QACvE,OAAO,gBAAwC,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,EAAiB;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,iFAAiF;QACjF,gFAAgF;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CACxB,+BAA+B,EAC/B,EAAE,CACmB,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;CAqBF;AAjHD,4DAiHC;;IAlFG,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { isBip44Account } from '@metamask/account-api';\nimport type { AccountProvider, Bip44Account } from '@metamask/account-api';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\n/**\n * Asserts that a list of keyring accounts are all BIP-44 compatible.\n *\n * @param accounts - Keyring accounts to check.\n * @throws If any of the keyring account is not compatible.\n */\nexport function assertAreBip44Accounts(\n  accounts: KeyringAccount[],\n): asserts accounts is Bip44Account<KeyringAccount>[] {\n  accounts.forEach(assertIsBip44Account);\n}\n\nexport type Bip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> = AccountProvider<Account> & {\n  /**\n   * Provider capabilities, including supported scopes and BIP-44 options.\n   *\n   * @returns The provider capabilities.\n   */\n  get capabilities(): KeyringCapabilities;\n  /**\n   * Get the name of the provider.\n   *\n   * @returns The name of the provider.\n   */\n  getName(): string;\n  /**\n   * Initialize the provider with the given accounts.\n   *\n   * @param accounts - The accounts to initialize the provider with.\n   */\n  init(accounts: Bip44Account<KeyringAccount>['id'][]): void;\n  /**\n   * Check if the account is compatible with the provider.\n   */\n  isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n  /**\n   * Create accounts for the provider.\n   *\n   * @param options - The options for creating the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @param options.type - The type of account creation.\n   * @returns The created accounts.\n   */\n  createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n  /**\n   * Re-synchronize MetaMask accounts and the providers accounts if needed.\n   *\n   * NOTE: This is mostly required if one of the providers (keyrings or Snaps)\n   * have different sets of accounts. This method would ensure that both are\n   * in-sync and use the same accounts (and same IDs).\n   */\n  resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;\n};\n\nexport abstract class BaseBip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> implements Bip44AccountProvider<Account>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  protected accounts: Set<Bip44Account<KeyringAccount>['id']> = new Set();\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  /**\n   * Add accounts to the provider.\n   *\n   * Note: There's an implicit assumption that the accounts are BIP-44 compatible.\n   *\n   * @param accounts - The accounts to add.\n   */\n  init(accounts: Account['id'][]): void {\n    for (const account of accounts) {\n      this.accounts.add(account);\n    }\n  }\n\n  /**\n   * Get the accounts list for the provider.\n   *\n   * @returns The accounts list.\n   */\n  #getAccountIds(): Account['id'][] {\n    return [...this.accounts];\n  }\n\n  /**\n   * Get the accounts list for the provider from the AccountsController.\n   *\n   * @returns The accounts list.\n   */\n  getAccounts(): Account[] {\n    const accountsIds = this.#getAccountIds();\n    const internalAccounts = this.messenger.call(\n      'AccountsController:getAccounts',\n      accountsIds,\n    );\n    // we cast here because we know that the accounts are BIP-44 compatible\n    return internalAccounts as unknown as Account[];\n  }\n\n  /**\n   * Get the account for the provider.\n   *\n   * @param id - The account ID.\n   * @returns The account.\n   * @throws If the account is not found.\n   */\n  getAccount(id: Account['id']): Account {\n    const hasAccount = this.accounts.has(id);\n\n    if (!hasAccount) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    // We need to upcast here since InternalAccounts are not always BIP-44 compatible\n    // but we know that the account is BIP-44 compatible here so it is safe to do so\n    return this.messenger.call(\n      'AccountsController:getAccount',\n      id,\n    ) as unknown as Account;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  abstract get capabilities(): KeyringCapabilities;\n\n  abstract getName(): string;\n\n  abstract resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void>;\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n\n  abstract discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account[]>;\n}\n"]}

package/dist/providers/BaseBip44AccountProvider.d.cts

@@ -40,18 +40,6 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      * Check if the account is compatible with the provider.
      */
     isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
-    /**
-     * Align the accounts with the given entropy source and group index.
-     *
-     * @param options - The options for aligning the accounts.
-     * @param options.entropySource - The entropy source.
-     * @param options.groupIndex - The group index.
-     * @returns The already and newly aligned accounts IDs.
-     */
-    alignAccounts({ entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<Account['id'][]>;
     /**
      * Create accounts for the provider.
      *
@@ -71,7 +59,7 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      */
     resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;
 };
-export declare abstract class BaseBip44AccountProvider<Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>> implements Bip44AccountProvider {
+export declare abstract class BaseBip44AccountProvider<Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>> implements Bip44AccountProvider<Account> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     protected accounts: Set<Bip44Account<KeyringAccount>['id']>;
@@ -102,10 +90,6 @@ export declare abstract class BaseBip44AccountProvider<Account extends Bip44Acco
         keyring: SelectedKeyring;
         metadata: KeyringMetadata;
     }) => Promise<CallbackResult>): Promise<CallbackResult>;
-    alignAccounts({ entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<Account['id'][]>;
     abstract get capabilities(): KeyringCapabilities;
     abstract getName(): string;
     abstract resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;

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

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

package/dist/providers/BaseBip44AccountProvider.d.mts

@@ -40,18 +40,6 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      * Check if the account is compatible with the provider.
      */
     isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
-    /**
-     * Align the accounts with the given entropy source and group index.
-     *
-     * @param options - The options for aligning the accounts.
-     * @param options.entropySource - The entropy source.
-     * @param options.groupIndex - The group index.
-     * @returns The already and newly aligned accounts IDs.
-     */
-    alignAccounts({ entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<Account['id'][]>;
     /**
      * Create accounts for the provider.
      *
@@ -71,7 +59,7 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      */
     resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;
 };
-export declare abstract class BaseBip44AccountProvider<Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>> implements Bip44AccountProvider {
+export declare abstract class BaseBip44AccountProvider<Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>> implements Bip44AccountProvider<Account> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     protected accounts: Set<Bip44Account<KeyringAccount>['id']>;
@@ -102,10 +90,6 @@ export declare abstract class BaseBip44AccountProvider<Account extends Bip44Acco
         keyring: SelectedKeyring;
         metadata: KeyringMetadata;
     }) => Promise<CallbackResult>): Promise<CallbackResult>;
-    alignAccounts({ entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<Account['id'][]>;
     abstract get capabilities(): KeyringCapabilities;
     abstract getName(): string;
     abstract resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;

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

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

package/dist/providers/BaseBip44AccountProvider.mjs

@@ -5,7 +5,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _BaseBip44AccountProvider_instances, _BaseBip44AccountProvider_getAccountIds;
 import { isBip44Account } from "@metamask/account-api";
-import { AccountCreationType } from "@metamask/keyring-api";
 /**
  * Asserts a keyring account is BIP-44 compatible.
  *
@@ -78,15 +77,6 @@ export class BaseBip44AccountProvider {
         }));
         return result;
     }
-    async alignAccounts({ entropySource, groupIndex, }) {
-        const accounts = await this.createAccounts({
-            type: AccountCreationType.Bip44DeriveIndex,
-            entropySource,
-            groupIndex,
-        });
-        const accountIds = accounts.map((account) => account.id);
-        return accountIds;
-    }
 }
 _BaseBip44AccountProvider_instances = new WeakSet(), _BaseBip44AccountProvider_getAccountIds = function _BaseBip44AccountProvider_getAccountIds() {
     return [...this.accounts];

package/dist/providers/BaseBip44AccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseBip44AccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseBip44AccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AAEvD,OAAO,EAAE,mBAAmB,EAAE,8BAA8B;AAe5D;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAA0B;IAE1B,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACzC,CAAC;AA8DD,MAAM,OAAgB,wBAAwB;IAQ5C,YAAY,SAA4C;;QAF9C,aAAQ,GAA4C,IAAI,GAAG,EAAE,CAAC;QAGtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,QAAyB;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAWD;;;;OAIG;IACH,WAAW;QACT,MAAM,WAAW,GAAG,uBAAA,IAAI,oFAAe,MAAnB,IAAI,CAAiB,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,gCAAgC,EAChC,WAAW,CACZ,CAAC;QACF,uEAAuE;QACvE,OAAO,gBAAwC,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,EAAiB;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,iFAAiF;QACjF,gFAAgF;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CACxB,+BAA+B,EAC/B,EAAE,CACmB,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAClB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC;YACzC,IAAI,EAAE,mBAAmB,CAAC,gBAAgB;YAC1C,aAAa;YACb,UAAU;SACX,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzD,OAAO,UAAU,CAAC;IACpB,CAAC;CAqBF;;IAlGG,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { isBip44Account } from '@metamask/account-api';\nimport type { AccountProvider, Bip44Account } from '@metamask/account-api';\nimport { AccountCreationType } from '@metamask/keyring-api';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\n/**\n * Asserts that a list of keyring accounts are all BIP-44 compatible.\n *\n * @param accounts - Keyring accounts to check.\n * @throws If any of the keyring account is not compatible.\n */\nexport function assertAreBip44Accounts(\n  accounts: KeyringAccount[],\n): asserts accounts is Bip44Account<KeyringAccount>[] {\n  accounts.forEach(assertIsBip44Account);\n}\n\nexport type Bip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> = AccountProvider<Account> & {\n  /**\n   * Provider capabilities, including supported scopes and BIP-44 options.\n   *\n   * @returns The provider capabilities.\n   */\n  get capabilities(): KeyringCapabilities;\n  /**\n   * Get the name of the provider.\n   *\n   * @returns The name of the provider.\n   */\n  getName(): string;\n  /**\n   * Initialize the provider with the given accounts.\n   *\n   * @param accounts - The accounts to initialize the provider with.\n   */\n  init(accounts: Bip44Account<KeyringAccount>['id'][]): void;\n  /**\n   * Check if the account is compatible with the provider.\n   */\n  isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n  /**\n   * Align the accounts with the given entropy source and group index.\n   *\n   * @param options - The options for aligning the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @returns The already and newly aligned accounts IDs.\n   */\n  alignAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account['id'][]>;\n  /**\n   * Create accounts for the provider.\n   *\n   * @param options - The options for creating the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @param options.type - The type of account creation.\n   * @returns The created accounts.\n   */\n  createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n  /**\n   * Re-synchronize MetaMask accounts and the providers accounts if needed.\n   *\n   * NOTE: This is mostly required if one of the providers (keyrings or Snaps)\n   * have different sets of accounts. This method would ensure that both are\n   * in-sync and use the same accounts (and same IDs).\n   */\n  resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;\n};\n\nexport abstract class BaseBip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> implements Bip44AccountProvider\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  protected accounts: Set<Bip44Account<KeyringAccount>['id']> = new Set();\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  /**\n   * Add accounts to the provider.\n   *\n   * Note: There's an implicit assumption that the accounts are BIP-44 compatible.\n   *\n   * @param accounts - The accounts to add.\n   */\n  init(accounts: Account['id'][]): void {\n    for (const account of accounts) {\n      this.accounts.add(account);\n    }\n  }\n\n  /**\n   * Get the accounts list for the provider.\n   *\n   * @returns The accounts list.\n   */\n  #getAccountIds(): Account['id'][] {\n    return [...this.accounts];\n  }\n\n  /**\n   * Get the accounts list for the provider from the AccountsController.\n   *\n   * @returns The accounts list.\n   */\n  getAccounts(): Account[] {\n    const accountsIds = this.#getAccountIds();\n    const internalAccounts = this.messenger.call(\n      'AccountsController:getAccounts',\n      accountsIds,\n    );\n    // we cast here because we know that the accounts are BIP-44 compatible\n    return internalAccounts as unknown as Account[];\n  }\n\n  /**\n   * Get the account for the provider.\n   *\n   * @param id - The account ID.\n   * @returns The account.\n   * @throws If the account is not found.\n   */\n  getAccount(id: Account['id']): Account {\n    const hasAccount = this.accounts.has(id);\n\n    if (!hasAccount) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    // We need to upcast here since InternalAccounts are not always BIP-44 compatible\n    // but we know that the account is BIP-44 compatible here so it is safe to do so\n    return this.messenger.call(\n      'AccountsController:getAccount',\n      id,\n    ) as unknown as Account;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  async alignAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account['id'][]> {\n    const accounts = await this.createAccounts({\n      type: AccountCreationType.Bip44DeriveIndex,\n      entropySource,\n      groupIndex,\n    });\n    const accountIds = accounts.map((account) => account.id);\n    return accountIds;\n  }\n\n  abstract get capabilities(): KeyringCapabilities;\n\n  abstract getName(): string;\n\n  abstract resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void>;\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n\n  abstract discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account[]>;\n}\n"]}
+{"version":3,"file":"BaseBip44AccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseBip44AccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AAgBvD;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAuB;IAEvB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAA0B;IAE1B,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACzC,CAAC;AA+CD,MAAM,OAAgB,wBAAwB;IAQ5C,YAAY,SAA4C;;QAF9C,aAAQ,GAA4C,IAAI,GAAG,EAAE,CAAC;QAGtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,QAAyB;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAWD;;;;OAIG;IACH,WAAW;QACT,MAAM,WAAW,GAAG,uBAAA,IAAI,oFAAe,MAAnB,IAAI,CAAiB,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,gCAAgC,EAChC,WAAW,CACZ,CAAC;QACF,uEAAuE;QACvE,OAAO,gBAAwC,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,EAAiB;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,iFAAiF;QACjF,gFAAgF;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CACxB,+BAA+B,EAC/B,EAAE,CACmB,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAyB,EACzB,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;YACR,OAAO,EAAE,OAA0B;YACnC,QAAQ;SACT,CAAC,CACL,CAAC;QAEF,OAAO,MAAwB,CAAC;IAClC,CAAC;CAqBF;;IAlFG,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { isBip44Account } from '@metamask/account-api';\nimport type { AccountProvider, Bip44Account } from '@metamask/account-api';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\n/**\n * Asserts a keyring account is BIP-44 compatible.\n *\n * @param account - Keyring account to check.\n * @throws If the keyring account is not compatible.\n */\nexport function assertIsBip44Account(\n  account: KeyringAccount,\n): asserts account is Bip44Account<KeyringAccount> {\n  if (!isBip44Account(account)) {\n    throw new Error('Created account is not BIP-44 compatible');\n  }\n}\n\n/**\n * Asserts that a list of keyring accounts are all BIP-44 compatible.\n *\n * @param accounts - Keyring accounts to check.\n * @throws If any of the keyring account is not compatible.\n */\nexport function assertAreBip44Accounts(\n  accounts: KeyringAccount[],\n): asserts accounts is Bip44Account<KeyringAccount>[] {\n  accounts.forEach(assertIsBip44Account);\n}\n\nexport type Bip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> = AccountProvider<Account> & {\n  /**\n   * Provider capabilities, including supported scopes and BIP-44 options.\n   *\n   * @returns The provider capabilities.\n   */\n  get capabilities(): KeyringCapabilities;\n  /**\n   * Get the name of the provider.\n   *\n   * @returns The name of the provider.\n   */\n  getName(): string;\n  /**\n   * Initialize the provider with the given accounts.\n   *\n   * @param accounts - The accounts to initialize the provider with.\n   */\n  init(accounts: Bip44Account<KeyringAccount>['id'][]): void;\n  /**\n   * Check if the account is compatible with the provider.\n   */\n  isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n  /**\n   * Create accounts for the provider.\n   *\n   * @param options - The options for creating the accounts.\n   * @param options.entropySource - The entropy source.\n   * @param options.groupIndex - The group index.\n   * @param options.type - The type of account creation.\n   * @returns The created accounts.\n   */\n  createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n  /**\n   * Re-synchronize MetaMask accounts and the providers accounts if needed.\n   *\n   * NOTE: This is mostly required if one of the providers (keyrings or Snaps)\n   * have different sets of accounts. This method would ensure that both are\n   * in-sync and use the same accounts (and same IDs).\n   */\n  resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;\n};\n\nexport abstract class BaseBip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> implements Bip44AccountProvider<Account>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  protected accounts: Set<Bip44Account<KeyringAccount>['id']> = new Set();\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  /**\n   * Add accounts to the provider.\n   *\n   * Note: There's an implicit assumption that the accounts are BIP-44 compatible.\n   *\n   * @param accounts - The accounts to add.\n   */\n  init(accounts: Account['id'][]): void {\n    for (const account of accounts) {\n      this.accounts.add(account);\n    }\n  }\n\n  /**\n   * Get the accounts list for the provider.\n   *\n   * @returns The accounts list.\n   */\n  #getAccountIds(): Account['id'][] {\n    return [...this.accounts];\n  }\n\n  /**\n   * Get the accounts list for the provider from the AccountsController.\n   *\n   * @returns The accounts list.\n   */\n  getAccounts(): Account[] {\n    const accountsIds = this.#getAccountIds();\n    const internalAccounts = this.messenger.call(\n      'AccountsController:getAccounts',\n      accountsIds,\n    );\n    // we cast here because we know that the accounts are BIP-44 compatible\n    return internalAccounts as unknown as Account[];\n  }\n\n  /**\n   * Get the account for the provider.\n   *\n   * @param id - The account ID.\n   * @returns The account.\n   * @throws If the account is not found.\n   */\n  getAccount(id: Account['id']): Account {\n    const hasAccount = this.accounts.has(id);\n\n    if (!hasAccount) {\n      throw new Error(`Unable to find account: ${id}`);\n    }\n\n    // We need to upcast here since InternalAccounts are not always BIP-44 compatible\n    // but we know that the account is BIP-44 compatible here so it is safe to do so\n    return this.messenger.call(\n      'AccountsController:getAccount',\n      id,\n    ) as unknown as Account;\n  }\n\n  protected async withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  abstract get capabilities(): KeyringCapabilities;\n\n  abstract getName(): string;\n\n  abstract resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void>;\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n\n  abstract createAccounts(options: CreateAccountOptions): Promise<Account[]>;\n\n  abstract discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account[]>;\n}\n"]}

package/dist/providers/BtcAccountProvider.cjs

@@ -1,22 +1,16 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BtcAccountProvider_instances, _BtcAccountProvider_createAccounts;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BtcAccountProvider = exports.BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG = exports.BTC_ACCOUNT_PROVIDER_NAME = void 0;
-const account_api_1 = require("@metamask/account-api");
 const keyring_api_1 = require("@metamask/keyring-api");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
 const utils_1 = require("./utils.cjs");
 const analytics_1 = require("../analytics/index.cjs");
-const traces_1 = require("../constants/traces.cjs");
+const traces_1 = require("../analytics/traces.cjs");
 exports.BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';
 exports.BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
     createAccounts: {
+        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
     discovery: {
@@ -25,15 +19,18 @@ exports.BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         maxAttempts: 3,
         backOffMs: 1000,
     },
+    resyncAccounts: {
+        autoRemoveExtraSnapAccounts: true,
+    },
 };
 class BtcAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger, config = exports.BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = analytics_1.traceFallback) {
         super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);
-        _BtcAccountProvider_instances.add(this);
         this.capabilities = {
             scopes: [keyring_api_1.BtcScope.Mainnet, keyring_api_1.BtcScope.Testnet],
             bip44: {
                 deriveIndex: true,
+                deriveIndexRange: true,
             },
         };
     }
@@ -44,13 +41,12 @@ class BtcAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.BtcAccountType.P2wpkh &&
             Object.values(keyring_api_1.BtcAccountType).includes(account.type));
     }
-    async createAccounts(options) {
-        (0, keyring_api_1.assertCreateAccountOptionIsSupported)(options, [
-            `${keyring_api_1.AccountCreationType.Bip44DeriveIndex}`,
-        ]);
-        const { entropySource, groupIndex } = options;
-        return this.withSnap(async ({ keyring }) => {
-            return __classPrivateFieldGet(this, _BtcAccountProvider_instances, "m", _BtcAccountProvider_createAccounts).call(this, { keyring, entropySource, groupIndex });
+    createAccountV1(keyring, { entropySource, groupIndex, }) {
+        return keyring.createAccount({
+            entropySource,
+            index: groupIndex,
+            addressType: keyring_api_1.BtcAccountType.P2wpkh,
+            scope: keyring_api_1.BtcScope.Mainnet,
         });
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
@@ -64,7 +60,7 @@ class BtcAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
                 if (!this.config.discovery.enabled) {
                     return [];
                 }
-                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(client.discoverAccounts([keyring_api_1.BtcScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(() => client.discoverAccounts([keyring_api_1.BtcScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
                     maxAttempts: this.config.discovery.maxAttempts,
                     backOffMs: this.config.discovery.backOffMs,
                 });
@@ -72,30 +68,16 @@ class BtcAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
                     discoveredAccounts.length === 0) {
                     return [];
                 }
-                const createdAccounts = await __classPrivateFieldGet(this, _BtcAccountProvider_instances, "m", _BtcAccountProvider_createAccounts).call(this, {
-                    keyring,
+                return await this.createBip44Accounts(keyring, {
+                    type: keyring_api_1.AccountCreationType.Bip44DeriveIndex,
                     entropySource,
                     groupIndex,
                 });
-                return createdAccounts;
             });
         });
     }
 }
 exports.BtcAccountProvider = BtcAccountProvider;
-_BtcAccountProvider_instances = new WeakSet(), _BtcAccountProvider_createAccounts = async function _BtcAccountProvider_createAccounts({ keyring, entropySource, groupIndex: index, }) {
-    return this.withMaxConcurrency(async () => {
-        const account = await (0, utils_1.withTimeout)(keyring.createAccount({
-            entropySource,
-            index,
-            addressType: keyring_api_1.BtcAccountType.P2wpkh,
-            scope: keyring_api_1.BtcScope.Mainnet,
-        }), this.config.createAccounts.timeoutMs);
-        (0, account_api_1.assertIsBip44Account)(account);
-        this.accounts.add(account.id);
-        return [account];
-    });
-};
 BtcAccountProvider.NAME = exports.BTC_ACCOUNT_PROVIDER_NAME;
 BtcAccountProvider.BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap';
 //# sourceMappingURL=BtcAccountProvider.cjs.map

package/dist/providers/BtcAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  BtcAccountType,\n  BtcScope,\n} from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type BtcAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';\n\nexport const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig = {\n  maxConcurrency: 3,\n  createAccounts: {\n    timeoutMs: 3000,\n  },\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [BtcScope.Mainnet, BtcScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  async #createAccounts({\n    keyring,\n    entropySource,\n    groupIndex: index,\n  }: {\n    keyring: RestrictedSnapKeyring;\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const account = await withTimeout(\n        keyring.createAccount({\n          entropySource,\n          index,\n          addressType: BtcAccountType.P2wpkh,\n          scope: BtcScope.Mainnet,\n        }),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      assertIsBip44Account(account);\n      this.accounts.add(account.id);\n      return [account];\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n    ]);\n\n    const { entropySource, groupIndex } = options;\n\n    return this.withSnap(async ({ keyring }) => {\n      return this.#createAccounts({ keyring, entropySource, groupIndex });\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                client.discoverAccounts(\n                  [BtcScope.Mainnet],\n                  entropySource,\n                  groupIndex,\n                ),\n                this.config.discovery.timeoutMs,\n              ),\n            {\n              maxAttempts: this.config.discovery.maxAttempts,\n              backOffMs: this.config.discovery.backOffMs,\n            },\n          );\n\n          if (\n            !Array.isArray(discoveredAccounts) ||\n            discoveredAccounts.length === 0\n          ) {\n            return [];\n          }\n\n          const createdAccounts = await this.#createAccounts({\n            keyring,\n            entropySource,\n            groupIndex,\n          });\n\n          return createdAccounts;\n        },\n      );\n    });\n  }\n}\n"]}
+{"version":3,"file":"BtcAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  BtcAccountType,\n  BtcScope,\n} from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type BtcAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';\n\nexport const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig = {\n  maxConcurrency: 3,\n  createAccounts: {\n    batched: false, // For now, the Snap is not fully v2 compliant.\n    timeoutMs: 3000,\n  },\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [BtcScope.Mainnet, BtcScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  protected override createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    return keyring.createAccount({\n      entropySource,\n      index: groupIndex,\n      addressType: BtcAccountType.P2wpkh,\n      scope: BtcScope.Mainnet,\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    [BtcScope.Mainnet],\n                    entropySource,\n                    groupIndex,\n                  ),\n                this.config.discovery.timeoutMs,\n              ),\n            {\n              maxAttempts: this.config.discovery.maxAttempts,\n              backOffMs: this.config.discovery.backOffMs,\n            },\n          );\n\n          if (\n            !Array.isArray(discoveredAccounts) ||\n            discoveredAccounts.length === 0\n          ) {\n            return [];\n          }\n\n          return await this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      );\n    });\n  }\n}\n"]}

package/dist/providers/BtcAccountProvider.d.cts

@@ -1,23 +1,25 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { CreateAccountOptions, EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
+import type { EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-import type { SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
 export type BtcAccountProviderConfig = SnapAccountProviderConfig;
 export declare const BTC_ACCOUNT_PROVIDER_NAME = "Bitcoin";
 export declare const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig;
 export declare class BtcAccountProvider extends SnapAccountProvider {
-    #private;
     static NAME: string;
     static BTC_SNAP_ID: SnapId;
     readonly capabilities: KeyringCapabilities;
     constructor(messenger: MultichainAccountServiceMessenger, config?: BtcAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<KeyringAccount>;
     discoverAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAEnE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAKxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAiC9D,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAYpC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}
+{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAejD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAEnE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAOjD,eAAe,CAChC,OAAO,EAAE,qBAAqB,EAC9B,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC,cAAc,CAAC;IASpB,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA+C5C"}

package/dist/providers/BtcAccountProvider.d.mts

@@ -1,23 +1,25 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { CreateAccountOptions, EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
+import type { EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-import type { SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
 export type BtcAccountProviderConfig = SnapAccountProviderConfig;
 export declare const BTC_ACCOUNT_PROVIDER_NAME = "Bitcoin";
 export declare const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig;
 export declare class BtcAccountProvider extends SnapAccountProvider {
-    #private;
     static NAME: string;
     static BTC_SNAP_ID: SnapId;
     readonly capabilities: KeyringCapabilities;
     constructor(messenger: MultichainAccountServiceMessenger, config?: BtcAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<KeyringAccount>;
     discoverAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAEnE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAKxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAiC9D,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAYpC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}
+{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAejD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAEnE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAOjD,eAAe,CAChC,OAAO,EAAE,qBAAqB,EAC9B,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC,cAAc,CAAC;IASpB,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA+C5C"}

package/dist/providers/BtcAccountProvider.mjs

@@ -1,19 +1,13 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BtcAccountProvider_instances, _BtcAccountProvider_createAccounts;
-import { assertIsBip44Account } from "@metamask/account-api";
-import { AccountCreationType, assertCreateAccountOptionIsSupported, BtcAccountType, BtcScope } from "@metamask/keyring-api";
+import { AccountCreationType, BtcAccountType, BtcScope } from "@metamask/keyring-api";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
 import { withRetry, withTimeout } from "./utils.mjs";
 import { traceFallback } from "../analytics/index.mjs";
-import { TraceName } from "../constants/traces.mjs";
+import { TraceName } from "../analytics/traces.mjs";
 export const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';
 export const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
     createAccounts: {
+        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
     discovery: {
@@ -22,15 +16,18 @@ export const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         maxAttempts: 3,
         backOffMs: 1000,
     },
+    resyncAccounts: {
+        autoRemoveExtraSnapAccounts: true,
+    },
 };
 export class BtcAccountProvider extends SnapAccountProvider {
     constructor(messenger, config = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = traceFallback) {
         super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);
-        _BtcAccountProvider_instances.add(this);
         this.capabilities = {
             scopes: [BtcScope.Mainnet, BtcScope.Testnet],
             bip44: {
                 deriveIndex: true,
+                deriveIndexRange: true,
             },
         };
     }
@@ -41,13 +38,12 @@ export class BtcAccountProvider extends SnapAccountProvider {
         return (account.type === BtcAccountType.P2wpkh &&
             Object.values(BtcAccountType).includes(account.type));
     }
-    async createAccounts(options) {
-        assertCreateAccountOptionIsSupported(options, [
-            `${AccountCreationType.Bip44DeriveIndex}`,
-        ]);
-        const { entropySource, groupIndex } = options;
-        return this.withSnap(async ({ keyring }) => {
-            return __classPrivateFieldGet(this, _BtcAccountProvider_instances, "m", _BtcAccountProvider_createAccounts).call(this, { keyring, entropySource, groupIndex });
+    createAccountV1(keyring, { entropySource, groupIndex, }) {
+        return keyring.createAccount({
+            entropySource,
+            index: groupIndex,
+            addressType: BtcAccountType.P2wpkh,
+            scope: BtcScope.Mainnet,
         });
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
@@ -61,7 +57,7 @@ export class BtcAccountProvider extends SnapAccountProvider {
                 if (!this.config.discovery.enabled) {
                     return [];
                 }
-                const discoveredAccounts = await withRetry(() => withTimeout(client.discoverAccounts([BtcScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+                const discoveredAccounts = await withRetry(() => withTimeout(() => client.discoverAccounts([BtcScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
                     maxAttempts: this.config.discovery.maxAttempts,
                     backOffMs: this.config.discovery.backOffMs,
                 });
@@ -69,29 +65,15 @@ export class BtcAccountProvider extends SnapAccountProvider {
                     discoveredAccounts.length === 0) {
                     return [];
                 }
-                const createdAccounts = await __classPrivateFieldGet(this, _BtcAccountProvider_instances, "m", _BtcAccountProvider_createAccounts).call(this, {
-                    keyring,
+                return await this.createBip44Accounts(keyring, {
+                    type: AccountCreationType.Bip44DeriveIndex,
                     entropySource,
                     groupIndex,
                 });
-                return createdAccounts;
             });
         });
     }
 }
-_BtcAccountProvider_instances = new WeakSet(), _BtcAccountProvider_createAccounts = async function _BtcAccountProvider_createAccounts({ keyring, entropySource, groupIndex: index, }) {
-    return this.withMaxConcurrency(async () => {
-        const account = await withTimeout(keyring.createAccount({
-            entropySource,
-            index,
-            addressType: BtcAccountType.P2wpkh,
-            scope: BtcScope.Mainnet,
-        }), this.config.createAccounts.timeoutMs);
-        assertIsBip44Account(account);
-        this.accounts.add(account.id);
-        return [account];
-    });
-};
 BtcAccountProvider.NAME = BTC_ACCOUNT_PROVIDER_NAME;
 BtcAccountProvider.BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap';
 //# sourceMappingURL=BtcAccountProvider.mjs.map

package/dist/providers/BtcAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  BtcAccountType,\n  BtcScope,\n} from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type BtcAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';\n\nexport const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig = {\n  maxConcurrency: 3,\n  createAccounts: {\n    timeoutMs: 3000,\n  },\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [BtcScope.Mainnet, BtcScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  async #createAccounts({\n    keyring,\n    entropySource,\n    groupIndex: index,\n  }: {\n    keyring: RestrictedSnapKeyring;\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const account = await withTimeout(\n        keyring.createAccount({\n          entropySource,\n          index,\n          addressType: BtcAccountType.P2wpkh,\n          scope: BtcScope.Mainnet,\n        }),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      assertIsBip44Account(account);\n      this.accounts.add(account.id);\n      return [account];\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n    ]);\n\n    const { entropySource, groupIndex } = options;\n\n    return this.withSnap(async ({ keyring }) => {\n      return this.#createAccounts({ keyring, entropySource, groupIndex });\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                client.discoverAccounts(\n                  [BtcScope.Mainnet],\n                  entropySource,\n                  groupIndex,\n                ),\n                this.config.discovery.timeoutMs,\n              ),\n            {\n              maxAttempts: this.config.discovery.maxAttempts,\n              backOffMs: this.config.discovery.backOffMs,\n            },\n          );\n\n          if (\n            !Array.isArray(discoveredAccounts) ||\n            discoveredAccounts.length === 0\n          ) {\n            return [];\n          }\n\n          const createdAccounts = await this.#createAccounts({\n            keyring,\n            entropySource,\n            groupIndex,\n          });\n\n          return createdAccounts;\n        },\n      );\n    });\n  }\n}\n"]}
+{"version":3,"file":"BtcAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  BtcAccountType,\n  BtcScope,\n} from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type BtcAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin';\n\nexport const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig = {\n  maxConcurrency: 3,\n  createAccounts: {\n    batched: false, // For now, the Snap is not fully v2 compliant.\n    timeoutMs: 3000,\n  },\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [BtcScope.Mainnet, BtcScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  protected override createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    return keyring.createAccount({\n      entropySource,\n      index: groupIndex,\n      addressType: BtcAccountType.P2wpkh,\n      scope: BtcScope.Mainnet,\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    [BtcScope.Mainnet],\n                    entropySource,\n                    groupIndex,\n                  ),\n                this.config.discovery.timeoutMs,\n              ),\n            {\n              maxAttempts: this.config.discovery.maxAttempts,\n              backOffMs: this.config.discovery.backOffMs,\n            },\n          );\n\n          if (\n            !Array.isArray(discoveredAccounts) ||\n            discoveredAccounts.length === 0\n          ) {\n            return [];\n          }\n\n          return await this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      );\n    });\n  }\n}\n"]}