@metamask/multichain-account-service 10.0.3 → 11.1.0

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

@@ -1,7 +1,7 @@
 import type { AccountProvider, Bip44Account } from "@metamask/account-api";
 import type { CreateAccountOptions, EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
 import type { Keyring as KeyringV2, KeyringCapabilities } from "@metamask/keyring-api/v2";
-import type { KeyringMetadata, KeyringSelector, KeyringSelectorV2 } from "@metamask/keyring-controller";
+import type { KeyringMetadata, KeyringSelectorV2 } from "@metamask/keyring-controller";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
 /**
@@ -51,6 +51,17 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      * @returns The created accounts.
      */
     createAccounts(options: CreateAccountOptions): Promise<Account[]>;
+    /**
+     * Delete an account managed by this provider.
+     *
+     * Mirrors the v2 keyring `deleteAccount(accountId)` contract. Each provider
+     * implementation is responsible for resolving any extra information it needs
+     * (e.g. address for snap-based providers) and for performing the underlying
+     * keyring removal.
+     *
+     * @param id - The id of the account to delete.
+     */
+    deleteAccount(id: Account['id']): Promise<void>;
     /**
      * Re-synchronize MetaMask accounts and the providers accounts if needed.
      *
@@ -59,6 +70,25 @@ export type Bip44AccountProvider<Account extends Bip44Account<KeyringAccount> =
      * in-sync and use the same accounts (and same IDs).
      */
     resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;
+    /**
+     * Check if the provider has an aligned (i.e. present and owned) account for
+     * the given entropy source and group index.
+     *
+     * Callers pre-filter the relevant account IDs from the group and pass them
+     * in so the provider needs no messenger call.
+     *
+     * @param context - The entropy source and group index to check.
+     * @param context.entropySource - The entropy source to check against.
+     * @param context.groupIndex - The group index to check against.
+     * @param accountIds - Account IDs already associated with this provider for
+     * the given group (may be empty if no alignment has happened yet).
+     * @returns `true` when `accountIds` is non-empty and every ID is in the
+     * provider's internal accounts Set.
+     */
+    isAligned(context: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }, accountIds: Account['id'][]): boolean;
 };
 export declare abstract class BaseBip44AccountProvider<Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>> implements Bip44AccountProvider<Account> {
     #private;
@@ -87,21 +117,6 @@ export declare abstract class BaseBip44AccountProvider<Account extends Bip44Acco
      * @throws If the account is not found.
      */
     getAccount(id: Account['id']): Account;
-    /**
-     * Run an operation against a V1 keyring selected by `selector`.
-     *
-     * Forwards to `KeyringController:withKeyring`. Use this for keyrings that
-     * have not yet migrated to the unified V2 `Keyring` interface (e.g. the
-     * snap keyring).
-     *
-     * @param selector - The selector identifying the keyring.
-     * @param operation - The operation to run with the selected keyring.
-     * @returns The result of the operation.
-     */
-    protected withKeyring<SelectedKeyring, CallbackResult = void>(selector: KeyringSelector, operation: ({ keyring, metadata, }: {
-        keyring: SelectedKeyring;
-        metadata: KeyringMetadata;
-    }) => Promise<CallbackResult>): Promise<CallbackResult>;
     /**
      * Run an operation against a V2 keyring selected by `selector`.
      *
@@ -117,11 +132,16 @@ export declare abstract class BaseBip44AccountProvider<Account extends Bip44Acco
         keyring: SelectedKeyring;
         metadata: KeyringMetadata;
     }) => Promise<CallbackResult>): Promise<CallbackResult>;
+    isAligned(_context: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }, accountIds: Account['id'][]): boolean;
     abstract get capabilities(): KeyringCapabilities;
     abstract getName(): string;
     abstract resyncAccounts(accounts: Bip44Account<InternalAccount>[]): Promise<void>;
     abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
     abstract createAccounts(options: CreateAccountOptions): Promise<Account[]>;
+    abstract deleteAccount(id: Account['id']): Promise<void>;
     abstract discoverAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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

@@ -70,24 +70,6 @@ export class BaseBip44AccountProvider {
         // but we know that the account is BIP-44 compatible here so it is safe to do so
         return this.messenger.call('AccountsController:getAccount', id);
     }
-    /**
-     * Run an operation against a V1 keyring selected by `selector`.
-     *
-     * Forwards to `KeyringController:withKeyring`. Use this for keyrings that
-     * have not yet migrated to the unified V2 `Keyring` interface (e.g. the
-     * snap keyring).
-     *
-     * @param selector - The selector identifying the keyring.
-     * @param operation - The operation to run with the selected keyring.
-     * @returns The result of the operation.
-     */
-    async withKeyring(selector, operation) {
-        const result = await this.messenger.call('KeyringController:withKeyring', selector, ({ keyring, metadata }) => operation({
-            keyring: keyring,
-            metadata,
-        }));
-        return result;
-    }
     /**
      * Run an operation against a V2 keyring selected by `selector`.
      *
@@ -106,6 +88,9 @@ export class BaseBip44AccountProvider {
         }));
         return result;
     }
+    isAligned(_context, accountIds) {
+        return (accountIds.length >= 1 && accountIds.every((id) => this.accounts.has(id)));
+    }
 }
 _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;AAoBvD;;;;;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;IAO5C,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;IAED;;;;;;;;;;OAUG;IACO,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;;;;;;;;;;OAUG;IACO,KAAK,CAAC,aAAa,CAI3B,QAA4C,EAC5C,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,iCAAiC,EACjC,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;;IAlIG,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} from '@metamask/keyring-api';\nimport type {\n  Keyring as KeyringV2,\n  KeyringCapabilities,\n} from '@metamask/keyring-api/v2';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n  KeyringSelectorV2,\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  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  /**\n   * Run an operation against a V1 keyring selected by `selector`.\n   *\n   * Forwards to `KeyringController:withKeyring`. Use this for keyrings that\n   * have not yet migrated to the unified V2 `Keyring` interface (e.g. the\n   * snap keyring).\n   *\n   * @param selector - The selector identifying the keyring.\n   * @param operation - The operation to run with the selected keyring.\n   * @returns The result of the operation.\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  /**\n   * Run an operation against a V2 keyring selected by `selector`.\n   *\n   * Forwards to `KeyringController:withKeyringV2`. Use this for keyrings\n   * that implement the unified V2 `Keyring` interface from\n   * `@metamask/keyring-api/v2`.\n   *\n   * @param selector - The selector identifying the keyring.\n   * @param operation - The operation to run with the selected keyring.\n   * @returns The result of the operation.\n   */\n  protected async withKeyringV2<\n    SelectedKeyring extends KeyringV2 = KeyringV2,\n    CallbackResult = void,\n  >(\n    selector: KeyringSelectorV2<SelectedKeyring>,\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:withKeyringV2',\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"]}
+{"version":3,"file":"BaseBip44AccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseBip44AccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AAmBvD;;;;;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;AA6ED,MAAM,OAAgB,wBAAwB;IAO5C,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;IAED;;;;;;;;;;OAUG;IACO,KAAK,CAAC,aAAa,CAI3B,QAA4C,EAC5C,SAM6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,iCAAiC,EACjC,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,SAAS,CACP,QAAgE,EAChE,UAA2B;QAE3B,OAAO,CACL,UAAU,CAAC,MAAM,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;IACJ,CAAC;CAuBF;;IA3GG,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} from '@metamask/keyring-api';\nimport type {\n  Keyring as KeyringV2,\n  KeyringCapabilities,\n} from '@metamask/keyring-api/v2';\nimport type {\n  KeyringMetadata,\n  KeyringSelectorV2,\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   * Delete an account managed by this provider.\n   *\n   * Mirrors the v2 keyring `deleteAccount(accountId)` contract. Each provider\n   * implementation is responsible for resolving any extra information it needs\n   * (e.g. address for snap-based providers) and for performing the underlying\n   * keyring removal.\n   *\n   * @param id - The id of the account to delete.\n   */\n  deleteAccount(id: Account['id']): Promise<void>;\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   * Check if the provider has an aligned (i.e. present and owned) account for\n   * the given entropy source and group index.\n   *\n   * Callers pre-filter the relevant account IDs from the group and pass them\n   * in so the provider needs no messenger call.\n   *\n   * @param context - The entropy source and group index to check.\n   * @param context.entropySource - The entropy source to check against.\n   * @param context.groupIndex - The group index to check against.\n   * @param accountIds - Account IDs already associated with this provider for\n   * the given group (may be empty if no alignment has happened yet).\n   * @returns `true` when `accountIds` is non-empty and every ID is in the\n   * provider's internal accounts Set.\n   */\n  isAligned(\n    context: { entropySource: EntropySourceId; groupIndex: number },\n    accountIds: Account['id'][],\n  ): boolean;\n};\n\nexport abstract class BaseBip44AccountProvider<\n  Account extends Bip44Account<KeyringAccount> = Bip44Account<KeyringAccount>,\n> implements Bip44AccountProvider<Account> {\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  /**\n   * Run an operation against a V2 keyring selected by `selector`.\n   *\n   * Forwards to `KeyringController:withKeyringV2`. Use this for keyrings\n   * that implement the unified V2 `Keyring` interface from\n   * `@metamask/keyring-api/v2`.\n   *\n   * @param selector - The selector identifying the keyring.\n   * @param operation - The operation to run with the selected keyring.\n   * @returns The result of the operation.\n   */\n  protected async withKeyringV2<\n    SelectedKeyring extends KeyringV2 = KeyringV2,\n    CallbackResult = void,\n  >(\n    selector: KeyringSelectorV2<SelectedKeyring>,\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:withKeyringV2',\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  isAligned(\n    _context: { entropySource: EntropySourceId; groupIndex: number },\n    accountIds: Account['id'][],\n  ): boolean {\n    return (\n      accountIds.length >= 1 && accountIds.every((id) => this.accounts.has(id))\n    );\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 deleteAccount(id: Account['id']): Promise<void>;\n\n  abstract discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Account[]>;\n}\n"]}

package/dist/providers/EvmAccountProvider.cjs

@@ -195,6 +195,25 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
         // No-op for the EVM account provider, since keyring accounts are already on
         // the MetaMask side.
     }
+    /**
+     * Delete an EVM account by id.
+     *
+     * Resolves the account's entropy source from the tracked account, then
+     * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the
+     * last account on a non-primary HD keyring, the keyring controller will
+     * automatically prune the empty keyring (see
+     * `KeyringController.#cleanUpEmptiedKeyringsAfter`).
+     *
+     * @param id - The id of the account to delete.
+     */
+    async deleteAccount(id) {
+        const account = this.getAccount(id);
+        const entropySource = account.options.entropy.id;
+        await this.withKeyringV2({ id: entropySource }, async ({ keyring }) => {
+            await keyring.deleteAccount(id);
+        });
+        this.accounts.delete(id);
+    }
 }
 exports.EvmAccountProvider = EvmAccountProvider;
 _EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_createAccount = 

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 { publicToAddress } from '@ethereumjs/util';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring/v2';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  EthAccountType,\n  EthScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities, Keyring } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { AccountId } from '@metamask/keyring-utils';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\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 type EvmAccountProviderConfig = {\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n};\n\nexport const EVM_ACCOUNT_PROVIDER_NAME = 'EVM';\n\nexport const EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {\n  discovery: {\n    maxAttempts: 3,\n    timeoutMs: 500,\n    backOffMs: 500,\n  },\n};\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  static NAME = EVM_ACCOUNT_PROVIDER_NAME;\n\n  readonly #config: EvmAccountProviderConfig;\n\n  readonly #trace: TraceCallback;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [EthScope.Eoa],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: EvmAccountProviderConfig = EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace?: TraceCallback,\n  ) {\n    super(messenger);\n    this.#config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n    };\n    this.#trace = trace ?? traceFallback;\n  }\n\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 EvmAccountProvider.NAME;\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  /**\n   * Create an EVM account.\n   *\n   * @param opts - The options for the creation of the account.\n   * @param opts.entropySource - The entropy source to use for the creation of the account.\n   * @param opts.groupIndex - The index of the group to create the account for.\n   * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.\n   * @returns The created or existing keyring account(s) at the requested group\n   * index. Returns an empty array if the keyring did not create an account.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap: boolean;\n  }): Promise<KeyringAccount[]> {\n    return await this.withKeyringV2<Keyring, KeyringAccount[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex]];\n        }\n\n        // If the throwOnGap flag is set, we throw an error to prevent index gaps.\n        if (throwOnGap && groupIndex !== existing.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        return await keyring.createAccounts({\n          type: AccountCreationType.Bip44DeriveIndex,\n          entropySource,\n          groupIndex,\n        });\n      },\n    );\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param options - The options for the creation of the accounts.\n   * @returns The accounts for the EVM provider.\n   */\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    const { entropySource } = options;\n\n    if (options.type === AccountCreationType.Bip44DeriveIndexRange) {\n      const { range } = options;\n\n      // Use a single withKeyring call for the entire range.\n      const accountIds = await this.withKeyringV2<Keyring, AccountId[]>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          const existing = await keyring.getAccounts();\n\n          // Validate no gaps: we can only create accounts starting from existing.length.\n          if (range.from > existing.length) {\n            throw new Error(\n              `Bad account creation request, group index range would create gaps (${range.from} (from) > ${existing.length} (next available index))`,\n            );\n          }\n\n          const result: AccountId[] = [];\n\n          // Collect existing accounts within the range.\n          for (\n            let groupIndex = range.from;\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            if (groupIndex < existing.length) {\n              // Account already exists.\n              result.push(existing[groupIndex].id);\n            }\n          }\n\n          // Create new accounts one-by-one since HdKeyringV2 only supports\n          // bip44:derive-index (not bip44:derive-index-range).\n          for (\n            let groupIndex = Math.max(range.from, existing.length);\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            const [created] = await keyring.createAccounts({\n              type: AccountCreationType.Bip44DeriveIndex,\n              entropySource,\n              groupIndex,\n            });\n            assert(created, 'Account creation failed');\n            result.push(created.id);\n          }\n\n          return result;\n        },\n      );\n\n      const accounts: InternalAccount[] = [];\n      for (const account of this.messenger.call(\n        'AccountsController:getAccounts',\n        accountIds,\n      )) {\n        assertInternalAccountExists(account);\n        this.accounts.add(account.id);\n        accounts.push(account);\n      }\n\n      assertAreBip44Accounts(accounts);\n      return accounts;\n    }\n\n    // Handle Bip44DeriveIndex (single account creation).\n    const { groupIndex } = options;\n\n    const [created] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    assert(created, 'Account creation failed');\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      created.id,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    this.accounts.add(account.id);\n    return accountsArray;\n  }\n\n  /**\n   * Get the address that would be derived for a given group index without\n   * persisting an account in the keyring.\n   *\n   * Peeks at the next address via the HD `root` so discovery can short-circuit\n   * (and skip the vault write + `stateChange` event) when there is no on-chain\n   * activity at this index.\n   *\n   * @param opts - The options for the address derivation.\n   * @param opts.entropySource - The entropy source to derive from.\n   * @param opts.groupIndex - The group index to derive at.\n   * @returns The derived address for the given group index.\n   */\n  async #getAddressFromGroupIndex({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Hex> {\n    // NOTE: To avoid exposing this function at keyring level, we just re-use its internal state\n    // and compute the derivation here.\n    return await this.withKeyringV2<HdKeyring, Hex>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        // If the account already exist, do not re-derive and just re-use that account.\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return existing[groupIndex].address as Hex;\n        }\n\n        // If not, then we just \"peek\" the next address to avoid creating the account.\n        assert(keyring.root, 'Expected HD keyring.root to be set');\n        const hdKey = keyring.root.deriveChild(groupIndex);\n        assert(hdKey.publicKey, 'Expected public key to be set');\n\n        return add0x(\n          bytesToHex(publicToAddress(hdKey.publicKey, true)).toLowerCase(),\n        );\n      },\n    );\n  }\n\n  /**\n   * Get the transaction count for an EVM account.\n   * This method uses a retry and timeout mechanism to handle transient failures.\n   *\n   * @param provider - The provider to use for the transaction count.\n   * @param address - The address of the account.\n   * @returns The transaction count.\n   */\n  async #getTransactionCount(\n    provider: Provider,\n    address: string,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\n          () =>\n            provider.request({\n              method,\n              params: [address, 'latest'],\n            }),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    // Make sure we got the right response format, if not, we fallback to \"0x0\", to avoid having to deal with `NaN`.\n    if (!isStrictHexString(response)) {\n      const message = `Received invalid hex response from \"${method}\" request: ${JSON.stringify(response)}`;\n\n      log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n\n      return 0;\n    }\n\n    return parseInt(response, 16);\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\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 discoverAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.#trace(\n      {\n        name: TraceName.EvmDiscoverAccounts,\n        data: {\n          provider: this.getName(),\n        },\n      },\n      async () => {\n        if (!this.#config.discovery.enabled) {\n          return [];\n        }\n\n        const provider = this.getEvmProvider();\n        const { entropySource, groupIndex } = opts;\n\n        const addressFromGroupIndex = await this.#getAddressFromGroupIndex({\n          entropySource,\n          groupIndex,\n        });\n\n        const count = await this.#getTransactionCount(\n          provider,\n          addressFromGroupIndex,\n        );\n        if (count === 0) {\n          return [];\n        }\n\n        // We have some activity on this address, we try to create the account.\n        const [created] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n          throwOnGap: false,\n        });\n\n        assert(created, 'Account creation failed');\n        assert(\n          addressFromGroupIndex === created.address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          created.id,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        this.accounts.add(account.id);\n        return [account];\n      },\n    );\n  }\n\n  async resyncAccounts(): Promise<void> {\n    // No-op for the EVM account provider, since keyring accounts are already on\n    // the MetaMask side.\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { publicToAddress } from '@ethereumjs/util';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring/v2';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  EthAccountType,\n  EthScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities, Keyring } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { AccountId } from '@metamask/keyring-utils';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\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 type EvmAccountProviderConfig = {\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n};\n\nexport const EVM_ACCOUNT_PROVIDER_NAME = 'EVM';\n\nexport const EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {\n  discovery: {\n    maxAttempts: 3,\n    timeoutMs: 500,\n    backOffMs: 500,\n  },\n};\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  static NAME = EVM_ACCOUNT_PROVIDER_NAME;\n\n  readonly #config: EvmAccountProviderConfig;\n\n  readonly #trace: TraceCallback;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [EthScope.Eoa],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: EvmAccountProviderConfig = EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace?: TraceCallback,\n  ) {\n    super(messenger);\n    this.#config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n    };\n    this.#trace = trace ?? traceFallback;\n  }\n\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 EvmAccountProvider.NAME;\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  /**\n   * Create an EVM account.\n   *\n   * @param opts - The options for the creation of the account.\n   * @param opts.entropySource - The entropy source to use for the creation of the account.\n   * @param opts.groupIndex - The index of the group to create the account for.\n   * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.\n   * @returns The created or existing keyring account(s) at the requested group\n   * index. Returns an empty array if the keyring did not create an account.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap: boolean;\n  }): Promise<KeyringAccount[]> {\n    return await this.withKeyringV2<Keyring, KeyringAccount[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex]];\n        }\n\n        // If the throwOnGap flag is set, we throw an error to prevent index gaps.\n        if (throwOnGap && groupIndex !== existing.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        return await keyring.createAccounts({\n          type: AccountCreationType.Bip44DeriveIndex,\n          entropySource,\n          groupIndex,\n        });\n      },\n    );\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param options - The options for the creation of the accounts.\n   * @returns The accounts for the EVM provider.\n   */\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    const { entropySource } = options;\n\n    if (options.type === AccountCreationType.Bip44DeriveIndexRange) {\n      const { range } = options;\n\n      // Use a single withKeyring call for the entire range.\n      const accountIds = await this.withKeyringV2<Keyring, AccountId[]>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          const existing = await keyring.getAccounts();\n\n          // Validate no gaps: we can only create accounts starting from existing.length.\n          if (range.from > existing.length) {\n            throw new Error(\n              `Bad account creation request, group index range would create gaps (${range.from} (from) > ${existing.length} (next available index))`,\n            );\n          }\n\n          const result: AccountId[] = [];\n\n          // Collect existing accounts within the range.\n          for (\n            let groupIndex = range.from;\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            if (groupIndex < existing.length) {\n              // Account already exists.\n              result.push(existing[groupIndex].id);\n            }\n          }\n\n          // Create new accounts one-by-one since HdKeyringV2 only supports\n          // bip44:derive-index (not bip44:derive-index-range).\n          for (\n            let groupIndex = Math.max(range.from, existing.length);\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            const [created] = await keyring.createAccounts({\n              type: AccountCreationType.Bip44DeriveIndex,\n              entropySource,\n              groupIndex,\n            });\n            assert(created, 'Account creation failed');\n            result.push(created.id);\n          }\n\n          return result;\n        },\n      );\n\n      const accounts: InternalAccount[] = [];\n      for (const account of this.messenger.call(\n        'AccountsController:getAccounts',\n        accountIds,\n      )) {\n        assertInternalAccountExists(account);\n        this.accounts.add(account.id);\n        accounts.push(account);\n      }\n\n      assertAreBip44Accounts(accounts);\n      return accounts;\n    }\n\n    // Handle Bip44DeriveIndex (single account creation).\n    const { groupIndex } = options;\n\n    const [created] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    assert(created, 'Account creation failed');\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      created.id,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    this.accounts.add(account.id);\n    return accountsArray;\n  }\n\n  /**\n   * Get the address that would be derived for a given group index without\n   * persisting an account in the keyring.\n   *\n   * Peeks at the next address via the HD `root` so discovery can short-circuit\n   * (and skip the vault write + `stateChange` event) when there is no on-chain\n   * activity at this index.\n   *\n   * @param opts - The options for the address derivation.\n   * @param opts.entropySource - The entropy source to derive from.\n   * @param opts.groupIndex - The group index to derive at.\n   * @returns The derived address for the given group index.\n   */\n  async #getAddressFromGroupIndex({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Hex> {\n    // NOTE: To avoid exposing this function at keyring level, we just re-use its internal state\n    // and compute the derivation here.\n    return await this.withKeyringV2<HdKeyring, Hex>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        // If the account already exist, do not re-derive and just re-use that account.\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return existing[groupIndex].address as Hex;\n        }\n\n        // If not, then we just \"peek\" the next address to avoid creating the account.\n        assert(keyring.root, 'Expected HD keyring.root to be set');\n        const hdKey = keyring.root.deriveChild(groupIndex);\n        assert(hdKey.publicKey, 'Expected public key to be set');\n\n        return add0x(\n          bytesToHex(publicToAddress(hdKey.publicKey, true)).toLowerCase(),\n        );\n      },\n    );\n  }\n\n  /**\n   * Get the transaction count for an EVM account.\n   * This method uses a retry and timeout mechanism to handle transient failures.\n   *\n   * @param provider - The provider to use for the transaction count.\n   * @param address - The address of the account.\n   * @returns The transaction count.\n   */\n  async #getTransactionCount(\n    provider: Provider,\n    address: string,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\n          () =>\n            provider.request({\n              method,\n              params: [address, 'latest'],\n            }),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    // Make sure we got the right response format, if not, we fallback to \"0x0\", to avoid having to deal with `NaN`.\n    if (!isStrictHexString(response)) {\n      const message = `Received invalid hex response from \"${method}\" request: ${JSON.stringify(response)}`;\n\n      log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n\n      return 0;\n    }\n\n    return parseInt(response, 16);\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\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 discoverAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.#trace(\n      {\n        name: TraceName.EvmDiscoverAccounts,\n        data: {\n          provider: this.getName(),\n        },\n      },\n      async () => {\n        if (!this.#config.discovery.enabled) {\n          return [];\n        }\n\n        const provider = this.getEvmProvider();\n        const { entropySource, groupIndex } = opts;\n\n        const addressFromGroupIndex = await this.#getAddressFromGroupIndex({\n          entropySource,\n          groupIndex,\n        });\n\n        const count = await this.#getTransactionCount(\n          provider,\n          addressFromGroupIndex,\n        );\n        if (count === 0) {\n          return [];\n        }\n\n        // We have some activity on this address, we try to create the account.\n        const [created] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n          throwOnGap: false,\n        });\n\n        assert(created, 'Account creation failed');\n        assert(\n          addressFromGroupIndex === created.address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          created.id,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        this.accounts.add(account.id);\n        return [account];\n      },\n    );\n  }\n\n  async resyncAccounts(): Promise<void> {\n    // No-op for the EVM account provider, since keyring accounts are already on\n    // the MetaMask side.\n  }\n\n  /**\n   * Delete an EVM account by id.\n   *\n   * Resolves the account's entropy source from the tracked account, then\n   * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the\n   * last account on a non-primary HD keyring, the keyring controller will\n   * automatically prune the empty keyring (see\n   * `KeyringController.#cleanUpEmptiedKeyringsAfter`).\n   *\n   * @param id - The id of the account to delete.\n   */\n  async deleteAccount(id: Bip44Account<KeyringAccount>['id']): Promise<void> {\n    const account = this.getAccount(id);\n    const entropySource = account.options.entropy.id;\n\n    await this.withKeyringV2<Keyring>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        await keyring.deleteAccount(id);\n      },\n    );\n\n    this.accounts.delete(id);\n  }\n}\n"]}

package/dist/providers/EvmAccountProvider.d.cts

@@ -55,5 +55,17 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;
     resyncAccounts(): Promise<void>;
+    /**
+     * Delete an EVM account by id.
+     *
+     * Resolves the account's entropy source from the tracked account, then
+     * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the
+     * last account on a non-primary HD keyring, the keyring controller will
+     * automatically prune the empty keyring (see
+     * `KeyringController.#cleanUpEmptiedKeyringsAfter`).
+     *
+     * @param id - The id of the account to delete.
+     */
+    deleteAccount(id: Bip44Account<KeyringAccount>['id']): Promise<void>;
 }
 //# sourceMappingURL=EvmAccountProvider.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACf,8BAA8B;AAO/B,OAAO,KAAK,EAAE,mBAAmB,EAAW,iCAAiC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAO7D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAmBpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,eAAO,MAAM,mCAAmC;;;;;;CAM/C,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,wBAAwB;;IAC9D,MAAM,CAAC,IAAI,SAA6B;IAMxC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,CAAC,EAAE,aAAa;IAavB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAqD1B;;;;;OAKG;IACG,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAwL1C;;;;;;;OAOG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAsDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC"}
+{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACf,8BAA8B;AAO/B,OAAO,KAAK,EAAE,mBAAmB,EAAW,iCAAiC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAO7D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAmBpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,eAAO,MAAM,mCAAmC;;;;;;CAM/C,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,wBAAwB;;IAC9D,MAAM,CAAC,IAAI,SAA6B;IAMxC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,CAAC,EAAE,aAAa;IAavB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAqD1B;;;;;OAKG;IACG,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAwL1C;;;;;;;OAOG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAsDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC;;;;;;;;;;OAUG;IACG,aAAa,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAa3E"}

package/dist/providers/EvmAccountProvider.d.mts

@@ -55,5 +55,17 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;
     resyncAccounts(): Promise<void>;
+    /**
+     * Delete an EVM account by id.
+     *
+     * Resolves the account's entropy source from the tracked account, then
+     * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the
+     * last account on a non-primary HD keyring, the keyring controller will
+     * automatically prune the empty keyring (see
+     * `KeyringController.#cleanUpEmptiedKeyringsAfter`).
+     *
+     * @param id - The id of the account to delete.
+     */
+    deleteAccount(id: Bip44Account<KeyringAccount>['id']): Promise<void>;
 }
 //# sourceMappingURL=EvmAccountProvider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACf,8BAA8B;AAO/B,OAAO,KAAK,EAAE,mBAAmB,EAAW,iCAAiC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAO7D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAmBpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,eAAO,MAAM,mCAAmC;;;;;;CAM/C,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,wBAAwB;;IAC9D,MAAM,CAAC,IAAI,SAA6B;IAMxC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,CAAC,EAAE,aAAa;IAavB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAqD1B;;;;;OAKG;IACG,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAwL1C;;;;;;;OAOG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAsDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC"}
+{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACf,8BAA8B;AAO/B,OAAO,KAAK,EAAE,mBAAmB,EAAW,iCAAiC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAO7D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAmBpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,eAAO,MAAM,mCAAmC;;;;;;CAM/C,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,wBAAwB;;IAC9D,MAAM,CAAC,IAAI,SAA6B;IAMxC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,CAAC,EAAE,aAAa;IAavB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAqD1B;;;;;OAKG;IACG,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAwL1C;;;;;;;OAOG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAsDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC;;;;;;;;;;OAUG;IACG,aAAa,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAa3E"}

package/dist/providers/EvmAccountProvider.mjs

@@ -192,6 +192,25 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         // No-op for the EVM account provider, since keyring accounts are already on
         // the MetaMask side.
     }
+    /**
+     * Delete an EVM account by id.
+     *
+     * Resolves the account's entropy source from the tracked account, then
+     * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the
+     * last account on a non-primary HD keyring, the keyring controller will
+     * automatically prune the empty keyring (see
+     * `KeyringController.#cleanUpEmptiedKeyringsAfter`).
+     *
+     * @param id - The id of the account to delete.
+     */
+    async deleteAccount(id) {
+        const account = this.getAccount(id);
+        const entropySource = account.options.entropy.id;
+        await this.withKeyringV2({ id: entropySource }, async ({ keyring }) => {
+            await keyring.deleteAccount(id);
+        });
+        this.accounts.delete(id);
+    }
 }
 _EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_createAccount = 
 /**

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 { publicToAddress } from '@ethereumjs/util';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring/v2';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  EthAccountType,\n  EthScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities, Keyring } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { AccountId } from '@metamask/keyring-utils';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\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 type EvmAccountProviderConfig = {\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n};\n\nexport const EVM_ACCOUNT_PROVIDER_NAME = 'EVM';\n\nexport const EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {\n  discovery: {\n    maxAttempts: 3,\n    timeoutMs: 500,\n    backOffMs: 500,\n  },\n};\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  static NAME = EVM_ACCOUNT_PROVIDER_NAME;\n\n  readonly #config: EvmAccountProviderConfig;\n\n  readonly #trace: TraceCallback;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [EthScope.Eoa],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: EvmAccountProviderConfig = EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace?: TraceCallback,\n  ) {\n    super(messenger);\n    this.#config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n    };\n    this.#trace = trace ?? traceFallback;\n  }\n\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 EvmAccountProvider.NAME;\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  /**\n   * Create an EVM account.\n   *\n   * @param opts - The options for the creation of the account.\n   * @param opts.entropySource - The entropy source to use for the creation of the account.\n   * @param opts.groupIndex - The index of the group to create the account for.\n   * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.\n   * @returns The created or existing keyring account(s) at the requested group\n   * index. Returns an empty array if the keyring did not create an account.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap: boolean;\n  }): Promise<KeyringAccount[]> {\n    return await this.withKeyringV2<Keyring, KeyringAccount[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex]];\n        }\n\n        // If the throwOnGap flag is set, we throw an error to prevent index gaps.\n        if (throwOnGap && groupIndex !== existing.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        return await keyring.createAccounts({\n          type: AccountCreationType.Bip44DeriveIndex,\n          entropySource,\n          groupIndex,\n        });\n      },\n    );\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param options - The options for the creation of the accounts.\n   * @returns The accounts for the EVM provider.\n   */\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    const { entropySource } = options;\n\n    if (options.type === AccountCreationType.Bip44DeriveIndexRange) {\n      const { range } = options;\n\n      // Use a single withKeyring call for the entire range.\n      const accountIds = await this.withKeyringV2<Keyring, AccountId[]>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          const existing = await keyring.getAccounts();\n\n          // Validate no gaps: we can only create accounts starting from existing.length.\n          if (range.from > existing.length) {\n            throw new Error(\n              `Bad account creation request, group index range would create gaps (${range.from} (from) > ${existing.length} (next available index))`,\n            );\n          }\n\n          const result: AccountId[] = [];\n\n          // Collect existing accounts within the range.\n          for (\n            let groupIndex = range.from;\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            if (groupIndex < existing.length) {\n              // Account already exists.\n              result.push(existing[groupIndex].id);\n            }\n          }\n\n          // Create new accounts one-by-one since HdKeyringV2 only supports\n          // bip44:derive-index (not bip44:derive-index-range).\n          for (\n            let groupIndex = Math.max(range.from, existing.length);\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            const [created] = await keyring.createAccounts({\n              type: AccountCreationType.Bip44DeriveIndex,\n              entropySource,\n              groupIndex,\n            });\n            assert(created, 'Account creation failed');\n            result.push(created.id);\n          }\n\n          return result;\n        },\n      );\n\n      const accounts: InternalAccount[] = [];\n      for (const account of this.messenger.call(\n        'AccountsController:getAccounts',\n        accountIds,\n      )) {\n        assertInternalAccountExists(account);\n        this.accounts.add(account.id);\n        accounts.push(account);\n      }\n\n      assertAreBip44Accounts(accounts);\n      return accounts;\n    }\n\n    // Handle Bip44DeriveIndex (single account creation).\n    const { groupIndex } = options;\n\n    const [created] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    assert(created, 'Account creation failed');\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      created.id,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    this.accounts.add(account.id);\n    return accountsArray;\n  }\n\n  /**\n   * Get the address that would be derived for a given group index without\n   * persisting an account in the keyring.\n   *\n   * Peeks at the next address via the HD `root` so discovery can short-circuit\n   * (and skip the vault write + `stateChange` event) when there is no on-chain\n   * activity at this index.\n   *\n   * @param opts - The options for the address derivation.\n   * @param opts.entropySource - The entropy source to derive from.\n   * @param opts.groupIndex - The group index to derive at.\n   * @returns The derived address for the given group index.\n   */\n  async #getAddressFromGroupIndex({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Hex> {\n    // NOTE: To avoid exposing this function at keyring level, we just re-use its internal state\n    // and compute the derivation here.\n    return await this.withKeyringV2<HdKeyring, Hex>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        // If the account already exist, do not re-derive and just re-use that account.\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return existing[groupIndex].address as Hex;\n        }\n\n        // If not, then we just \"peek\" the next address to avoid creating the account.\n        assert(keyring.root, 'Expected HD keyring.root to be set');\n        const hdKey = keyring.root.deriveChild(groupIndex);\n        assert(hdKey.publicKey, 'Expected public key to be set');\n\n        return add0x(\n          bytesToHex(publicToAddress(hdKey.publicKey, true)).toLowerCase(),\n        );\n      },\n    );\n  }\n\n  /**\n   * Get the transaction count for an EVM account.\n   * This method uses a retry and timeout mechanism to handle transient failures.\n   *\n   * @param provider - The provider to use for the transaction count.\n   * @param address - The address of the account.\n   * @returns The transaction count.\n   */\n  async #getTransactionCount(\n    provider: Provider,\n    address: string,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\n          () =>\n            provider.request({\n              method,\n              params: [address, 'latest'],\n            }),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    // Make sure we got the right response format, if not, we fallback to \"0x0\", to avoid having to deal with `NaN`.\n    if (!isStrictHexString(response)) {\n      const message = `Received invalid hex response from \"${method}\" request: ${JSON.stringify(response)}`;\n\n      log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n\n      return 0;\n    }\n\n    return parseInt(response, 16);\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\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 discoverAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.#trace(\n      {\n        name: TraceName.EvmDiscoverAccounts,\n        data: {\n          provider: this.getName(),\n        },\n      },\n      async () => {\n        if (!this.#config.discovery.enabled) {\n          return [];\n        }\n\n        const provider = this.getEvmProvider();\n        const { entropySource, groupIndex } = opts;\n\n        const addressFromGroupIndex = await this.#getAddressFromGroupIndex({\n          entropySource,\n          groupIndex,\n        });\n\n        const count = await this.#getTransactionCount(\n          provider,\n          addressFromGroupIndex,\n        );\n        if (count === 0) {\n          return [];\n        }\n\n        // We have some activity on this address, we try to create the account.\n        const [created] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n          throwOnGap: false,\n        });\n\n        assert(created, 'Account creation failed');\n        assert(\n          addressFromGroupIndex === created.address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          created.id,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        this.accounts.add(account.id);\n        return [account];\n      },\n    );\n  }\n\n  async resyncAccounts(): Promise<void> {\n    // No-op for the EVM account provider, since keyring accounts are already on\n    // the MetaMask side.\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { publicToAddress } from '@ethereumjs/util';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring/v2';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  EthAccountType,\n  EthScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities, Keyring } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { AccountId } from '@metamask/keyring-utils';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\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 type EvmAccountProviderConfig = {\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n};\n\nexport const EVM_ACCOUNT_PROVIDER_NAME = 'EVM';\n\nexport const EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {\n  discovery: {\n    maxAttempts: 3,\n    timeoutMs: 500,\n    backOffMs: 500,\n  },\n};\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  static NAME = EVM_ACCOUNT_PROVIDER_NAME;\n\n  readonly #config: EvmAccountProviderConfig;\n\n  readonly #trace: TraceCallback;\n\n  readonly capabilities: KeyringCapabilities = {\n    scopes: [EthScope.Eoa],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: EvmAccountProviderConfig = EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace?: TraceCallback,\n  ) {\n    super(messenger);\n    this.#config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n    };\n    this.#trace = trace ?? traceFallback;\n  }\n\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 EvmAccountProvider.NAME;\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  /**\n   * Create an EVM account.\n   *\n   * @param opts - The options for the creation of the account.\n   * @param opts.entropySource - The entropy source to use for the creation of the account.\n   * @param opts.groupIndex - The index of the group to create the account for.\n   * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.\n   * @returns The created or existing keyring account(s) at the requested group\n   * index. Returns an empty array if the keyring did not create an account.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap: boolean;\n  }): Promise<KeyringAccount[]> {\n    return await this.withKeyringV2<Keyring, KeyringAccount[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex]];\n        }\n\n        // If the throwOnGap flag is set, we throw an error to prevent index gaps.\n        if (throwOnGap && groupIndex !== existing.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        return await keyring.createAccounts({\n          type: AccountCreationType.Bip44DeriveIndex,\n          entropySource,\n          groupIndex,\n        });\n      },\n    );\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param options - The options for the creation of the accounts.\n   * @returns The accounts for the EVM provider.\n   */\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    const { entropySource } = options;\n\n    if (options.type === AccountCreationType.Bip44DeriveIndexRange) {\n      const { range } = options;\n\n      // Use a single withKeyring call for the entire range.\n      const accountIds = await this.withKeyringV2<Keyring, AccountId[]>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          const existing = await keyring.getAccounts();\n\n          // Validate no gaps: we can only create accounts starting from existing.length.\n          if (range.from > existing.length) {\n            throw new Error(\n              `Bad account creation request, group index range would create gaps (${range.from} (from) > ${existing.length} (next available index))`,\n            );\n          }\n\n          const result: AccountId[] = [];\n\n          // Collect existing accounts within the range.\n          for (\n            let groupIndex = range.from;\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            if (groupIndex < existing.length) {\n              // Account already exists.\n              result.push(existing[groupIndex].id);\n            }\n          }\n\n          // Create new accounts one-by-one since HdKeyringV2 only supports\n          // bip44:derive-index (not bip44:derive-index-range).\n          for (\n            let groupIndex = Math.max(range.from, existing.length);\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            const [created] = await keyring.createAccounts({\n              type: AccountCreationType.Bip44DeriveIndex,\n              entropySource,\n              groupIndex,\n            });\n            assert(created, 'Account creation failed');\n            result.push(created.id);\n          }\n\n          return result;\n        },\n      );\n\n      const accounts: InternalAccount[] = [];\n      for (const account of this.messenger.call(\n        'AccountsController:getAccounts',\n        accountIds,\n      )) {\n        assertInternalAccountExists(account);\n        this.accounts.add(account.id);\n        accounts.push(account);\n      }\n\n      assertAreBip44Accounts(accounts);\n      return accounts;\n    }\n\n    // Handle Bip44DeriveIndex (single account creation).\n    const { groupIndex } = options;\n\n    const [created] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    assert(created, 'Account creation failed');\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      created.id,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    this.accounts.add(account.id);\n    return accountsArray;\n  }\n\n  /**\n   * Get the address that would be derived for a given group index without\n   * persisting an account in the keyring.\n   *\n   * Peeks at the next address via the HD `root` so discovery can short-circuit\n   * (and skip the vault write + `stateChange` event) when there is no on-chain\n   * activity at this index.\n   *\n   * @param opts - The options for the address derivation.\n   * @param opts.entropySource - The entropy source to derive from.\n   * @param opts.groupIndex - The group index to derive at.\n   * @returns The derived address for the given group index.\n   */\n  async #getAddressFromGroupIndex({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Hex> {\n    // NOTE: To avoid exposing this function at keyring level, we just re-use its internal state\n    // and compute the derivation here.\n    return await this.withKeyringV2<HdKeyring, Hex>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        // If the account already exist, do not re-derive and just re-use that account.\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return existing[groupIndex].address as Hex;\n        }\n\n        // If not, then we just \"peek\" the next address to avoid creating the account.\n        assert(keyring.root, 'Expected HD keyring.root to be set');\n        const hdKey = keyring.root.deriveChild(groupIndex);\n        assert(hdKey.publicKey, 'Expected public key to be set');\n\n        return add0x(\n          bytesToHex(publicToAddress(hdKey.publicKey, true)).toLowerCase(),\n        );\n      },\n    );\n  }\n\n  /**\n   * Get the transaction count for an EVM account.\n   * This method uses a retry and timeout mechanism to handle transient failures.\n   *\n   * @param provider - The provider to use for the transaction count.\n   * @param address - The address of the account.\n   * @returns The transaction count.\n   */\n  async #getTransactionCount(\n    provider: Provider,\n    address: string,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\n          () =>\n            provider.request({\n              method,\n              params: [address, 'latest'],\n            }),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    // Make sure we got the right response format, if not, we fallback to \"0x0\", to avoid having to deal with `NaN`.\n    if (!isStrictHexString(response)) {\n      const message = `Received invalid hex response from \"${method}\" request: ${JSON.stringify(response)}`;\n\n      log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n\n      return 0;\n    }\n\n    return parseInt(response, 16);\n  }\n\n  /**\n   * Discover and create accounts for the EVM provider.\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 discoverAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.#trace(\n      {\n        name: TraceName.EvmDiscoverAccounts,\n        data: {\n          provider: this.getName(),\n        },\n      },\n      async () => {\n        if (!this.#config.discovery.enabled) {\n          return [];\n        }\n\n        const provider = this.getEvmProvider();\n        const { entropySource, groupIndex } = opts;\n\n        const addressFromGroupIndex = await this.#getAddressFromGroupIndex({\n          entropySource,\n          groupIndex,\n        });\n\n        const count = await this.#getTransactionCount(\n          provider,\n          addressFromGroupIndex,\n        );\n        if (count === 0) {\n          return [];\n        }\n\n        // We have some activity on this address, we try to create the account.\n        const [created] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n          throwOnGap: false,\n        });\n\n        assert(created, 'Account creation failed');\n        assert(\n          addressFromGroupIndex === created.address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          created.id,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        this.accounts.add(account.id);\n        return [account];\n      },\n    );\n  }\n\n  async resyncAccounts(): Promise<void> {\n    // No-op for the EVM account provider, since keyring accounts are already on\n    // the MetaMask side.\n  }\n\n  /**\n   * Delete an EVM account by id.\n   *\n   * Resolves the account's entropy source from the tracked account, then\n   * forwards to the v2 HD keyring's `deleteAccount(id)`. When this is the\n   * last account on a non-primary HD keyring, the keyring controller will\n   * automatically prune the empty keyring (see\n   * `KeyringController.#cleanUpEmptiedKeyringsAfter`).\n   *\n   * @param id - The id of the account to delete.\n   */\n  async deleteAccount(id: Bip44Account<KeyringAccount>['id']): Promise<void> {\n    const account = this.getAccount(id);\n    const entropySource = account.options.entropy.id;\n\n    await this.withKeyringV2<Keyring>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        await keyring.deleteAccount(id);\n      },\n    );\n\n    this.accounts.delete(id);\n  }\n}\n"]}