@metamask-previews/multichain-account-service 5.0.0-preview-fa81dffb → 5.1.0-preview-903db2da

package/dist/providers/BtcAccountProvider.cjs.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;gBAGjE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAgC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAMrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}
+{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;gBAGjE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAiC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAMrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;gBAGjE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAgC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAMrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}
+{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;gBAGjE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAiC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAMrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAgD5C"}

package/dist/providers/BtcAccountProvider.mjs

@@ -78,6 +78,7 @@ _BtcAccountProvider_instances = new WeakSet(), _BtcAccountProvider_createAccount
             scope: BtcScope.Mainnet,
         }), this.config.createAccounts.timeoutMs);
         assertIsBip44Account(account);
+        this.accounts.add(account.id);
         return [account];
     });
 };

package/dist/providers/BtcAccountProvider.mjs.map

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

package/dist/providers/EvmAccountProvider.cjs

@@ -10,10 +10,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EvmAccountProvider_instances, _EvmAccountProvider_config, _EvmAccountProvider_trace, _EvmAccountProvider_createAccount, _EvmAccountProvider_getTransactionCount, _EvmAccountProvider_getAddressFromGroupIndex;
+var _EvmAccountProvider_instances, _EvmAccountProvider_config, _EvmAccountProvider_trace, _EvmAccountProvider_getAccountId, _EvmAccountProvider_createAccount, _EvmAccountProvider_getTransactionCount, _EvmAccountProvider_getAddressFromGroupIndex;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAccountProvider = exports.EVM_ACCOUNT_PROVIDER_DEFAULT_CONFIG = exports.EVM_ACCOUNT_PROVIDER_NAME = void 0;
 const util_1 = require("@ethereumjs/util");
+const accounts_controller_1 = require("@metamask/accounts-controller");
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const utils_1 = require("@metamask/utils");
@@ -74,17 +75,27 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
         const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
         return provider;
     }
+    /**
+     * Create accounts for the EVM provider.
+     *
+     * @param opts - The options for the creation of the accounts.
+     * @param opts.entropySource - The entropy source to use for the creation of the accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the EVM provider.
+     */
     async createAccounts({ entropySource, groupIndex, }) {
         const [address] = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_createAccount).call(this, {
             entropySource,
             groupIndex,
             throwOnGap: true,
         });
-        const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+        const accountId = __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccountId).call(this, address);
+        const account = this.messenger.call('AccountsController:getAccount', accountId);
         // We MUST have the associated internal account.
         assertInternalAccountExists(account);
         const accountsArray = [account];
         (0, BaseBip44AccountProvider_1.assertAreBip44Accounts)(accountsArray);
+        this.accounts.add(account.id);
         return accountsArray;
     }
     /**
@@ -121,9 +132,11 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
                 groupIndex,
             });
             (0, utils_1.assert)(addressFromGroupIndex === address, 'Created account does not match address from group index.');
-            const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+            const accoundId = __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccountId).call(this, address);
+            const account = this.messenger.call('AccountsController:getAccount', accoundId);
             assertInternalAccountExists(account);
             (0, BaseBip44AccountProvider_1.assertIsBip44Account)(account);
+            this.accounts.add(account.id);
             return [account];
         });
     }
@@ -133,7 +146,19 @@ class EvmAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountProv
     }
 }
 exports.EvmAccountProvider = EvmAccountProvider;
-_EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_createAccount = async function _EvmAccountProvider_createAccount({ entropySource, groupIndex, throwOnGap = false, }) {
+_EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_getAccountId = function _EvmAccountProvider_getAccountId(address) {
+    return (0, accounts_controller_1.getUUIDFromAddressOfNormalAccount)(address);
+}, _EvmAccountProvider_createAccount = 
+/**
+ * Create an EVM account.
+ *
+ * @param opts - The options for the creation of the account.
+ * @param opts.entropySource - The entropy source to use for the creation of the account.
+ * @param opts.groupIndex - The index of the group to create the account for.
+ * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.
+ * @returns The account ID and a boolean indicating if the account was created.
+ */
+async function _EvmAccountProvider_createAccount({ entropySource, groupIndex, throwOnGap = false, }) {
     const result = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
         const existing = await keyring.getAccounts();
         if (groupIndex < existing.length) {
@@ -147,7 +172,16 @@ _EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new Weak
         return [added, true];
     });
     return result;
-}, _EvmAccountProvider_getTransactionCount = async function _EvmAccountProvider_getTransactionCount(provider, address) {
+}, _EvmAccountProvider_getTransactionCount = 
+/**
+ * Get the transaction count for an EVM account.
+ * This method uses a retry and timeout mechanism to handle transient failures.
+ *
+ * @param provider - The provider to use for the transaction count.
+ * @param address - The address of the account.
+ * @returns The transaction count.
+ */
+async function _EvmAccountProvider_getTransactionCount(provider, address) {
     const method = 'eth_getTransactionCount';
     const response = await (0, utils_2.withRetry)(() => (0, utils_2.withTimeout)(provider.request({
         method,

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';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\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  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  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap = false,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap?: boolean;\n  }): Promise<[Hex, boolean]> {\n    const result = await this.withKeyring<EthKeyring, [Hex, boolean]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex], false];\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        const [added] = await keyring.addAccounts(1);\n        return [added, true];\n      },\n    );\n\n    return result;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const [address] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  async #getTransactionCount(\n    provider: Provider,\n    address: Hex,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\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  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.withKeyring<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];\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   * 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 [address] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n        });\n        assert(\n          addressFromGroupIndex === address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccountByAddress',\n          address,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        return [account];\n      },\n    );\n  }\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 { getUUIDFromAddressOfNormalAccount } from '@metamask/accounts-controller';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\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  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   * Get the account ID for an EVM account.\n   *\n   * Note: Since the account ID is deterministic at the AccountsController level,\n   * we can use this method to get the account ID from the address.\n   *\n   * @param address - The address of the account.\n   * @returns The account ID.\n   */\n  #getAccountId(address: Hex): string {\n    return getUUIDFromAddressOfNormalAccount(address);\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 account ID and a boolean indicating if the account was created.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap = false,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap?: boolean;\n  }): Promise<[Hex, boolean]> {\n    const result = await this.withKeyring<EthKeyring, [Hex, boolean]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex], false];\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        const [added] = await keyring.addAccounts(1);\n        return [added, true];\n      },\n    );\n\n    return result;\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param opts - The options for the creation of the accounts.\n   * @param opts.entropySource - The entropy source to use for the creation of the 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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const [address] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    const accountId = this.#getAccountId(address);\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      accountId,\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 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: Hex,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\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  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.withKeyring<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];\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   * 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 [address] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n        });\n        assert(\n          addressFromGroupIndex === address,\n          'Created account does not match address from group index.',\n        );\n\n        const accoundId = this.#getAccountId(address);\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          accoundId,\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"]}

package/dist/providers/EvmAccountProvider.d.cts

@@ -33,6 +33,14 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
      * @returns The EVM provider.
      */
     getEvmProvider(): Provider;
+    /**
+     * Create accounts for the EVM provider.
+     *
+     * @param opts - The options for the creation of the accounts.
+     * @param opts.entropySource - The entropy source to use for the creation of the accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the EVM provider.
+     */
     createAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAI7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAKpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAkBlE,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;gBAOtC,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;IA0CpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAqF3C;;;;;;;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;IAkDrC,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;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAI7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAKpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAkBlE,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;gBAOtC,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;IAgE1B;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAgG3C;;;;;;;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;IAqDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC"}

package/dist/providers/EvmAccountProvider.d.mts

@@ -33,6 +33,14 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
      * @returns The EVM provider.
      */
     getEvmProvider(): Provider;
+    /**
+     * Create accounts for the EVM provider.
+     *
+     * @param opts - The options for the creation of the accounts.
+     * @param opts.entropySource - The entropy source to use for the creation of the accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the EVM provider.
+     */
     createAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAI7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAKpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAkBlE,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;gBAOtC,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;IA0CpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAqF3C;;;;;;;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;IAkDrC,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;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAI7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAKpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAkBlE,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;gBAOtC,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;IAgE1B;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAgG3C;;;;;;;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;IAqDrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC"}

package/dist/providers/EvmAccountProvider.mjs

@@ -9,8 +9,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EvmAccountProvider_instances, _EvmAccountProvider_config, _EvmAccountProvider_trace, _EvmAccountProvider_createAccount, _EvmAccountProvider_getTransactionCount, _EvmAccountProvider_getAddressFromGroupIndex;
+var _EvmAccountProvider_instances, _EvmAccountProvider_config, _EvmAccountProvider_trace, _EvmAccountProvider_getAccountId, _EvmAccountProvider_createAccount, _EvmAccountProvider_getTransactionCount, _EvmAccountProvider_getAddressFromGroupIndex;
 import { publicToAddress } from "@ethereumjs/util";
+import { getUUIDFromAddressOfNormalAccount } from "@metamask/accounts-controller";
 import { EthAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { add0x, assert, bytesToHex, isStrictHexString } from "@metamask/utils";
@@ -71,17 +72,27 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
         return provider;
     }
+    /**
+     * Create accounts for the EVM provider.
+     *
+     * @param opts - The options for the creation of the accounts.
+     * @param opts.entropySource - The entropy source to use for the creation of the accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the EVM provider.
+     */
     async createAccounts({ entropySource, groupIndex, }) {
         const [address] = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_createAccount).call(this, {
             entropySource,
             groupIndex,
             throwOnGap: true,
         });
-        const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+        const accountId = __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccountId).call(this, address);
+        const account = this.messenger.call('AccountsController:getAccount', accountId);
         // We MUST have the associated internal account.
         assertInternalAccountExists(account);
         const accountsArray = [account];
         assertAreBip44Accounts(accountsArray);
+        this.accounts.add(account.id);
         return accountsArray;
     }
     /**
@@ -118,9 +129,11 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
                 groupIndex,
             });
             assert(addressFromGroupIndex === address, 'Created account does not match address from group index.');
-            const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+            const accoundId = __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccountId).call(this, address);
+            const account = this.messenger.call('AccountsController:getAccount', accoundId);
             assertInternalAccountExists(account);
             assertIsBip44Account(account);
+            this.accounts.add(account.id);
             return [account];
         });
     }
@@ -129,7 +142,19 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         // the MetaMask side.
     }
 }
-_EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_createAccount = async function _EvmAccountProvider_createAccount({ entropySource, groupIndex, throwOnGap = false, }) {
+_EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_getAccountId = function _EvmAccountProvider_getAccountId(address) {
+    return getUUIDFromAddressOfNormalAccount(address);
+}, _EvmAccountProvider_createAccount = 
+/**
+ * Create an EVM account.
+ *
+ * @param opts - The options for the creation of the account.
+ * @param opts.entropySource - The entropy source to use for the creation of the account.
+ * @param opts.groupIndex - The index of the group to create the account for.
+ * @param opts.throwOnGap - Whether to throw an error if the account index is not contiguous.
+ * @returns The account ID and a boolean indicating if the account was created.
+ */
+async function _EvmAccountProvider_createAccount({ entropySource, groupIndex, throwOnGap = false, }) {
     const result = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
         const existing = await keyring.getAccounts();
         if (groupIndex < existing.length) {
@@ -143,7 +168,16 @@ _EvmAccountProvider_config = new WeakMap(), _EvmAccountProvider_trace = new Weak
         return [added, true];
     });
     return result;
-}, _EvmAccountProvider_getTransactionCount = async function _EvmAccountProvider_getTransactionCount(provider, address) {
+}, _EvmAccountProvider_getTransactionCount = 
+/**
+ * Get the transaction count for an EVM account.
+ * This method uses a retry and timeout mechanism to handle transient failures.
+ *
+ * @param provider - The provider to use for the transaction count.
+ * @param address - The address of the account.
+ * @returns The transaction count.
+ */
+async function _EvmAccountProvider_getTransactionCount(provider, address) {
     const method = 'eth_getTransactionCount';
     const response = await withRetry(() => withTimeout(provider.request({
         method,

package/dist/providers/EvmAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,yBAAyB;AAKnD,OAAO,EAAE,cAAc,EAAE,8BAA8B;AACvD,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAM5D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,wBAAwB;AAG/E,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,wBAAwB,EACzB,uCAAmC;AACpC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAgB;AACjD,OAAO,EAAE,aAAa,EAAE,+BAAqB;AAC7C,OAAO,EAAE,SAAS,EAAE,gCAA4B;AAChD,OAAO,EAAE,aAAa,IAAI,GAAG,EAAE,cAAc,EAAE,sBAAkB;AAGjE,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAEnC;;;;;GAKG;AACH,SAAS,2BAA2B,CAClC,OAAoC;IAEpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAWD,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAE/C,MAAM,CAAC,MAAM,mCAAmC,GAAG;IACjD,SAAS,EAAE;QACT,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACf;CACF,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,wBAAwB;IAO9D,YACE,SAA4C,EAC5C,SAAmC,mCAAmC,EACtE,KAAqB;QAErB,KAAK,CAAC,SAAS,CAAC,CAAC;;QATV,6CAAkC;QAElC,4CAAsB;QAQ7B,uBAAA,IAAI,8BAAW;YACb,GAAG,MAAM;YACT,SAAS,EAAE;gBACT,GAAG,MAAM,CAAC,SAAS;gBACnB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI;aAC1C;SACF,MAAA,CAAC;QACF,uBAAA,IAAI,6BAAU,KAAK,IAAI,aAAa,MAAA,CAAC;IACvC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,EAAa,CAC9D,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACzC,gDAAgD,EAChD,oBAAoB,CACrB,CAAC;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACtC,wCAAwC,EACxC,eAAe,CAChB,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAgCD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,uBAAA,IAAI,wEAAe,MAAnB,IAAI,EAAgB;YAC1C,aAAa;YACb,UAAU;YACV,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACjC,wCAAwC,EACxC,OAAO,CACR,CAAC;QAEF,gDAAgD;QAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAEtC,OAAO,aAAa,CAAC;IACvB,CAAC;IAkED;;;;;;;OAOG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAGtB;QACC,OAAO,uBAAA,IAAI,iCAAO,MAAX,IAAI,EACT;YACE,IAAI,EAAE,SAAS,CAAC,mBAAmB;YACnC,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;aACzB;SACF,EACD,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,uBAAA,IAAI,kCAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACpC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACvC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;YAE3C,MAAM,qBAAqB,GAAG,MAAM,uBAAA,IAAI,mFAA0B,MAA9B,IAAI,EAA2B;gBACjE,aAAa;gBACb,UAAU;aACX,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,uBAAA,IAAI,8EAAqB,MAAzB,IAAI,EACtB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACF,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,uEAAuE;YACvE,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,uBAAA,IAAI,wEAAe,MAAnB,IAAI,EAAgB;gBAC1C,aAAa;gBACb,UAAU;aACX,CAAC,CAAC;YACH,MAAM,CACJ,qBAAqB,KAAK,OAAO,EACjC,0DAA0D,CAC3D,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACjC,wCAAwC,EACxC,OAAO,CACR,CAAC;YACF,2BAA2B,CAAC,OAAO,CAAC,CAAC;YACrC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,4EAA4E;QAC5E,qBAAqB;IACvB,CAAC;;0KAzLD,KAAK,4CAAgB,EACnB,aAAa,EACb,UAAU,EACV,UAAU,GAAG,KAAK,GAKnB;IACC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,EAAE,EAAE,EAAE,aAAa,EAAE,EACrB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;QAED,0EAA0E;QAC1E,IAAI,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7C,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,4CA6BD,KAAK,kDACH,QAAkB,EAClB,OAAY;IAEZ,MAAM,MAAM,GAAG,yBAAyB,CAAC;IAEzC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAC9B,GAAG,EAAE,CACH,WAAW,CACT,QAAQ,CAAC,OAAO,CAAC;QACf,MAAM;QACN,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;KAC5B,CAAC,EACF,uBAAA,IAAI,kCAAQ,CAAC,SAAS,CAAC,SAAS,CACjC,EACH;QACE,WAAW,EAAE,uBAAA,IAAI,kCAAQ,CAAC,SAAS,CAAC,WAAW;QAC/C,SAAS,EAAE,uBAAA,IAAI,kCAAQ,CAAC,SAAS,CAAC,SAAS;KAC5C,CACF,CAAC;IAEF,gHAAgH;IAChH,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,uCAAuC,MAAM,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEtG,GAAG,CAAC,GAAG,cAAc,IAAI,OAAO,EAAE,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC,iDAED,KAAK,uDAA2B,EAC9B,aAAa,EACb,UAAU,GAIX;IACC,4FAA4F;IAC5F,mCAAmC;IACnC,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,EAAE,EAAE,EAAE,aAAa,EAAE,EACrB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpB,+EAA+E;QAC/E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YACjC,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QAED,8EAA8E;QAC9E,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,oCAAoC,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;QAEzD,OAAO,KAAK,CACV,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CACjE,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAzKM,uBAAI,GAAG,yBAAyB,AAA5B,CAA6B","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';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\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  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  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap = false,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap?: boolean;\n  }): Promise<[Hex, boolean]> {\n    const result = await this.withKeyring<EthKeyring, [Hex, boolean]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex], false];\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        const [added] = await keyring.addAccounts(1);\n        return [added, true];\n      },\n    );\n\n    return result;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const [address] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  async #getTransactionCount(\n    provider: Provider,\n    address: Hex,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\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  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.withKeyring<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];\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   * 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 [address] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n        });\n        assert(\n          addressFromGroupIndex === address,\n          'Created account does not match address from group index.',\n        );\n\n        const account = this.messenger.call(\n          'AccountsController:getAccountByAddress',\n          address,\n        );\n        assertInternalAccountExists(account);\n        assertIsBip44Account(account);\n        return [account];\n      },\n    );\n  }\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 { getUUIDFromAddressOfNormalAccount } from '@metamask/accounts-controller';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { HdKeyring } from '@metamask/eth-hd-keyring';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Provider } from '@metamask/network-controller';\nimport { add0x, assert, bytesToHex, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\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  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   * Get the account ID for an EVM account.\n   *\n   * Note: Since the account ID is deterministic at the AccountsController level,\n   * we can use this method to get the account ID from the address.\n   *\n   * @param address - The address of the account.\n   * @returns The account ID.\n   */\n  #getAccountId(address: Hex): string {\n    return getUUIDFromAddressOfNormalAccount(address);\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 account ID and a boolean indicating if the account was created.\n   */\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    throwOnGap = false,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    throwOnGap?: boolean;\n  }): Promise<[Hex, boolean]> {\n    const result = await this.withKeyring<EthKeyring, [Hex, boolean]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const existing = await keyring.getAccounts();\n        if (groupIndex < existing.length) {\n          return [existing[groupIndex], false];\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        const [added] = await keyring.addAccounts(1);\n        return [added, true];\n      },\n    );\n\n    return result;\n  }\n\n  /**\n   * Create accounts for the EVM provider.\n   *\n   * @param opts - The options for the creation of the accounts.\n   * @param opts.entropySource - The entropy source to use for the creation of the 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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const [address] = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      throwOnGap: true,\n    });\n\n    const accountId = this.#getAccountId(address);\n\n    const account = this.messenger.call(\n      'AccountsController:getAccount',\n      accountId,\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 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: Hex,\n  ): Promise<number> {\n    const method = 'eth_getTransactionCount';\n\n    const response = await withRetry(\n      () =>\n        withTimeout(\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  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.withKeyring<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];\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   * 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 [address] = await this.#createAccount({\n          entropySource,\n          groupIndex,\n        });\n        assert(\n          addressFromGroupIndex === address,\n          'Created account does not match address from group index.',\n        );\n\n        const accoundId = this.#getAccountId(address);\n\n        const account = this.messenger.call(\n          'AccountsController:getAccount',\n          accoundId,\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"]}

package/dist/providers/SnapAccountProvider.cjs

@@ -76,19 +76,31 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
         await this.withSnap(async ({ keyring }) => {
             const localSnapAccounts = accounts.filter((account) => account.metadata.snap && account.metadata.snap.id === this.snapId);
             const snapAccounts = new Set((await __classPrivateFieldGet(this, _SnapAccountProvider_client, "f").listAccounts()).map((account) => account.id));
-            // NOTE: This should never happen, but we want to report that kind of errors still
-            // in case states are de-sync.
+            // NOTE: This should never happen, but if it does, we recover by deleting the
+            // extra accounts from the Snap to bring it back in sync with MetaMask.
             if (localSnapAccounts.length < snapAccounts.size) {
-                this.messenger.captureException?.(new Error(`Snap "${this.snapId}" has de-synced accounts, Snap has more accounts than MetaMask!`));
-                // We don't recover from this case yet.
-                return;
+                // Build a set of local account IDs for quick lookup
+                const localAccountIds = new Set(localSnapAccounts.map((account) => account.id));
+                // Find and delete accounts that exist in Snap but not in MetaMask
+                await Promise.all([...snapAccounts].map(async (snapAccountId) => {
+                    try {
+                        if (!localAccountIds.has(snapAccountId)) {
+                            // This account exists in the Snap but not in MetaMask, delete it from
+                            // the Snap.
+                            await __classPrivateFieldGet(this, _SnapAccountProvider_client, "f").deleteAccount(snapAccountId);
+                            // Update the local Set so subsequent checks use the correct size
+                            snapAccounts.delete(snapAccountId);
+                        }
+                    }
+                    catch (error) {
+                        const sentryError = (0, utils_1.createSentryError)(`Unable to delete de-synced Snap account: ${this.snapId}`, error, { provider: this.getName(), snapAccountId });
+                        this.messenger.captureException?.(sentryError);
+                    }
+                }));
             }
             // We want this part to be fast, so we only check for sizes, but we might need
             // to make a real "diff" between the 2 states to not miss any de-sync.
             if (localSnapAccounts.length > snapAccounts.size) {
-                // Accounts should never really be de-synced, so we want to log this to see how often this
-                // happens, cause that means that something else is buggy elsewhere...
-                this.messenger.captureException?.(new Error(`Snap "${this.snapId}" has de-synced accounts, we'll attempt to re-sync them...`));
                 // We always use the MetaMask list as the main reference here.
                 await Promise.all(localSnapAccounts.map(async (account) => {
                     const { id: entropySource, groupIndex } = account.options.entropy;