@metamask/multichain-account-service 12.0.0 → 13.0.0

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.0.0]
+
+### Changed
+
+- Bump `@metamask/accounts-controller` from `^39.0.4` to `^39.0.5` ([#9470](https://github.com/MetaMask/core/pull/9470))
+
+### Removed
+
+- **BREAKING:** Removed use of v1 `createAccount` entirely ([#9460](https://github.com/MetaMask/core/pull/9460))
+  - All BIP-44 Snaps are expected to implement `createAccounts` (v1 or v2).
+  - The old v1 `createAccount` flow had some undesired side-effetcs sometimes (e.g auto-selecting a non-EVM account after being created, which is not compatible with our new group model).
+
 ## [12.0.0]
 
 ### Added
@@ -571,7 +583,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `MultichainAccountService` ([#6141](https://github.com/MetaMask/core/pull/6141), [#6165](https://github.com/MetaMask/core/pull/6165))
   - This service manages multichain accounts/wallets.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@12.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@13.0.0...HEAD
+[13.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@12.0.0...@metamask/multichain-account-service@13.0.0
 [12.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@11.1.0...@metamask/multichain-account-service@12.0.0
 [11.1.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@11.0.0...@metamask/multichain-account-service@11.1.0
 [11.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@10.0.3...@metamask/multichain-account-service@11.0.0

package/dist/analytics/traces.cjs

@@ -60,7 +60,6 @@ var TraceName;
 (function (TraceName) {
     TraceName["SnapDiscoverAccounts"] = "Snap Discover Accounts";
     TraceName["EvmDiscoverAccounts"] = "EVM Discover Accounts";
-    TraceName["ProviderCreateAccountV1"] = "Provider Create Account (v1)";
     TraceName["ProviderCreateAccounts"] = "Provider Create Accounts (v2 - batched)";
     TraceName["WalletAlignment"] = "Wallet Alignment";
     TraceName["WalletCreateMultichainAccountGroup"] = "Wallet Create Multichain Account Group";

package/dist/analytics/traces.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"traces.cjs","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":";;;AAUA;;;;;;;;;GASG;AACI,MAAM,aAAa,GAAkB,KAAK,EAC/C,QAAsB,EACtB,EAA2C,EACtB,EAAE;IACvB,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,SAAuB,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB;AAEF;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,SAAiC;IAEjC,wFAAwF;IACxF,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,IAAI;QACP,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI;KAC3B,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAXD,oDAWC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CAC1C,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC1C,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;QACvD,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACxB,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;SACrB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAdD,oEAcC;AAED;;GAEG;AACH,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,4DAA+C,CAAA;IAC/C,0DAA6C,CAAA;IAC7C,qEAAwD,CAAA;IACxD,+EAAkE,CAAA;IAClE,iDAAoC,CAAA;IACpC,0FAA6E,CAAA;IAC7E,4FAA+E,CAAA;AACjF,CAAC,EARW,SAAS,yBAAT,SAAS,QAQpB","sourcesContent":["import type {\n  TraceCallback,\n  TraceContext,\n  TraceRequest,\n} from '@metamask/controller-utils';\nimport { CreateAccountOptions } from '@metamask/keyring-api';\n\n// Explicit import to avoid circular dependency between `analytics` and `providers`.\nimport type { Bip44AccountProvider } from '../providers/BaseBip44AccountProvider';\n\n/**\n * Fallback function for tracing.\n * This function is used when no specific trace function is provided.\n * It executes the provided function in a trace context if available.\n *\n * @param _request - The trace request containing additional data and context.\n * @param fn - The function to execute within the trace context.\n * @returns A promise that resolves to the result of the executed function.\n * If no function is provided, it resolves to undefined.\n */\nexport const traceFallback: TraceCallback = async <ReturnType>(\n  _request: TraceRequest,\n  fn?: (context?: TraceContext) => ReturnType,\n): Promise<ReturnType> => {\n  if (!fn) {\n    return undefined as ReturnType;\n  }\n  return await Promise.resolve(fn());\n};\n\n/**\n * Compute trace data for a list of providers.\n *\n * @param providers Providers to be included in the trace data.\n * @returns An object mapping provider names to true, indicating their presence in the trace.\n */\nexport function toProviderDataTraces(\n  providers: Bip44AccountProvider[],\n): Record<string, boolean> {\n  // We cannot use complex objects within traces, so we just map provider names with true.\n  return providers.reduce(\n    (data, provider) => ({\n      ...data,\n      [provider.getName()]: true,\n    }),\n    {},\n  );\n}\n\n/**\n * Compute trace data for `createAccounts` options.\n *\n * @param options The `createAccounts` options.\n * @returns An object containing options data depending on its type.\n */\nexport function toCreateAccountsV2DataTraces(\n  options: CreateAccountOptions,\n): Record<string, string | number | boolean> {\n  if (options.type === 'bip44:derive-index') {\n    return {\n      groupIndex: options.groupIndex,\n    };\n  } else if (options.type === 'bip44:derive-index-range') {\n    return {\n      from: options.range.from,\n      to: options.range.to,\n    };\n  }\n  return {};\n}\n\n/**\n * Trace names.\n */\nexport enum TraceName {\n  SnapDiscoverAccounts = 'Snap Discover Accounts',\n  EvmDiscoverAccounts = 'EVM Discover Accounts',\n  ProviderCreateAccountV1 = 'Provider Create Account (v1)',\n  ProviderCreateAccounts = 'Provider Create Accounts (v2 - batched)',\n  WalletAlignment = 'Wallet Alignment',\n  WalletCreateMultichainAccountGroup = 'Wallet Create Multichain Account Group',\n  WalletCreateMultichainAccountGroups = 'Wallet Create Multichain Account Groups',\n}\n"]}
+{"version":3,"file":"traces.cjs","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":";;;AAUA;;;;;;;;;GASG;AACI,MAAM,aAAa,GAAkB,KAAK,EAC/C,QAAsB,EACtB,EAA2C,EACtB,EAAE;IACvB,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,SAAuB,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB;AAEF;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,SAAiC;IAEjC,wFAAwF;IACxF,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,IAAI;QACP,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI;KAC3B,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAXD,oDAWC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CAC1C,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC1C,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;QACvD,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACxB,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;SACrB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAdD,oEAcC;AAED;;GAEG;AACH,IAAY,SAOX;AAPD,WAAY,SAAS;IACnB,4DAA+C,CAAA;IAC/C,0DAA6C,CAAA;IAC7C,+EAAkE,CAAA;IAClE,iDAAoC,CAAA;IACpC,0FAA6E,CAAA;IAC7E,4FAA+E,CAAA;AACjF,CAAC,EAPW,SAAS,yBAAT,SAAS,QAOpB","sourcesContent":["import type {\n  TraceCallback,\n  TraceContext,\n  TraceRequest,\n} from '@metamask/controller-utils';\nimport { CreateAccountOptions } from '@metamask/keyring-api';\n\n// Explicit import to avoid circular dependency between `analytics` and `providers`.\nimport type { Bip44AccountProvider } from '../providers/BaseBip44AccountProvider';\n\n/**\n * Fallback function for tracing.\n * This function is used when no specific trace function is provided.\n * It executes the provided function in a trace context if available.\n *\n * @param _request - The trace request containing additional data and context.\n * @param fn - The function to execute within the trace context.\n * @returns A promise that resolves to the result of the executed function.\n * If no function is provided, it resolves to undefined.\n */\nexport const traceFallback: TraceCallback = async <ReturnType>(\n  _request: TraceRequest,\n  fn?: (context?: TraceContext) => ReturnType,\n): Promise<ReturnType> => {\n  if (!fn) {\n    return undefined as ReturnType;\n  }\n  return await Promise.resolve(fn());\n};\n\n/**\n * Compute trace data for a list of providers.\n *\n * @param providers Providers to be included in the trace data.\n * @returns An object mapping provider names to true, indicating their presence in the trace.\n */\nexport function toProviderDataTraces(\n  providers: Bip44AccountProvider[],\n): Record<string, boolean> {\n  // We cannot use complex objects within traces, so we just map provider names with true.\n  return providers.reduce(\n    (data, provider) => ({\n      ...data,\n      [provider.getName()]: true,\n    }),\n    {},\n  );\n}\n\n/**\n * Compute trace data for `createAccounts` options.\n *\n * @param options The `createAccounts` options.\n * @returns An object containing options data depending on its type.\n */\nexport function toCreateAccountsV2DataTraces(\n  options: CreateAccountOptions,\n): Record<string, string | number | boolean> {\n  if (options.type === 'bip44:derive-index') {\n    return {\n      groupIndex: options.groupIndex,\n    };\n  } else if (options.type === 'bip44:derive-index-range') {\n    return {\n      from: options.range.from,\n      to: options.range.to,\n    };\n  }\n  return {};\n}\n\n/**\n * Trace names.\n */\nexport enum TraceName {\n  SnapDiscoverAccounts = 'Snap Discover Accounts',\n  EvmDiscoverAccounts = 'EVM Discover Accounts',\n  ProviderCreateAccounts = 'Provider Create Accounts (v2 - batched)',\n  WalletAlignment = 'Wallet Alignment',\n  WalletCreateMultichainAccountGroup = 'Wallet Create Multichain Account Group',\n  WalletCreateMultichainAccountGroups = 'Wallet Create Multichain Account Groups',\n}\n"]}

package/dist/analytics/traces.d.cts

@@ -32,7 +32,6 @@ export declare function toCreateAccountsV2DataTraces(options: CreateAccountOptio
 export declare enum TraceName {
     SnapDiscoverAccounts = "Snap Discover Accounts",
     EvmDiscoverAccounts = "EVM Discover Accounts",
-    ProviderCreateAccountV1 = "Provider Create Account (v1)",
     ProviderCreateAccounts = "Provider Create Accounts (v2 - batched)",
     WalletAlignment = "Wallet Alignment",
     WalletCreateMultichainAccountGroup = "Wallet Create Multichain Account Group",

package/dist/analytics/traces.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"traces.d.cts","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGd,mCAAmC;AACpC,OAAO,EAAE,oBAAoB,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,kDAA8C;AAElF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,EAAE,aAQ3B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,oBAAoB,EAAE,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAY3C;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,oBAAoB,2BAA2B;IAC/C,mBAAmB,0BAA0B;IAC7C,uBAAuB,iCAAiC;IACxD,sBAAsB,4CAA4C;IAClE,eAAe,qBAAqB;IACpC,kCAAkC,2CAA2C;IAC7E,mCAAmC,4CAA4C;CAChF"}
+{"version":3,"file":"traces.d.cts","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGd,mCAAmC;AACpC,OAAO,EAAE,oBAAoB,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,kDAA8C;AAElF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,EAAE,aAQ3B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,oBAAoB,EAAE,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAY3C;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,oBAAoB,2BAA2B;IAC/C,mBAAmB,0BAA0B;IAC7C,sBAAsB,4CAA4C;IAClE,eAAe,qBAAqB;IACpC,kCAAkC,2CAA2C;IAC7E,mCAAmC,4CAA4C;CAChF"}

package/dist/analytics/traces.d.mts

@@ -32,7 +32,6 @@ export declare function toCreateAccountsV2DataTraces(options: CreateAccountOptio
 export declare enum TraceName {
     SnapDiscoverAccounts = "Snap Discover Accounts",
     EvmDiscoverAccounts = "EVM Discover Accounts",
-    ProviderCreateAccountV1 = "Provider Create Account (v1)",
     ProviderCreateAccounts = "Provider Create Accounts (v2 - batched)",
     WalletAlignment = "Wallet Alignment",
     WalletCreateMultichainAccountGroup = "Wallet Create Multichain Account Group",

package/dist/analytics/traces.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"traces.d.mts","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGd,mCAAmC;AACpC,OAAO,EAAE,oBAAoB,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,kDAA8C;AAElF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,EAAE,aAQ3B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,oBAAoB,EAAE,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAY3C;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,oBAAoB,2BAA2B;IAC/C,mBAAmB,0BAA0B;IAC7C,uBAAuB,iCAAiC;IACxD,sBAAsB,4CAA4C;IAClE,eAAe,qBAAqB;IACpC,kCAAkC,2CAA2C;IAC7E,mCAAmC,4CAA4C;CAChF"}
+{"version":3,"file":"traces.d.mts","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGd,mCAAmC;AACpC,OAAO,EAAE,oBAAoB,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,kDAA8C;AAElF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,EAAE,aAQ3B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,oBAAoB,EAAE,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAY3C;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,oBAAoB,2BAA2B;IAC/C,mBAAmB,0BAA0B;IAC7C,sBAAsB,4CAA4C;IAClE,eAAe,qBAAqB;IACpC,kCAAkC,2CAA2C;IAC7E,mCAAmC,4CAA4C;CAChF"}

package/dist/analytics/traces.mjs

@@ -54,7 +54,6 @@ export var TraceName;
 (function (TraceName) {
     TraceName["SnapDiscoverAccounts"] = "Snap Discover Accounts";
     TraceName["EvmDiscoverAccounts"] = "EVM Discover Accounts";
-    TraceName["ProviderCreateAccountV1"] = "Provider Create Account (v1)";
     TraceName["ProviderCreateAccounts"] = "Provider Create Accounts (v2 - batched)";
     TraceName["WalletAlignment"] = "Wallet Alignment";
     TraceName["WalletCreateMultichainAccountGroup"] = "Wallet Create Multichain Account Group";

package/dist/analytics/traces.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"traces.mjs","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAUA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,KAAK,EAC/C,QAAsB,EACtB,EAA2C,EACtB,EAAE;IACvB,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,SAAuB,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAiC;IAEjC,wFAAwF;IACxF,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,IAAI;QACP,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI;KAC3B,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC1C,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;QACvD,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACxB,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;SACrB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,4DAA+C,CAAA;IAC/C,0DAA6C,CAAA;IAC7C,qEAAwD,CAAA;IACxD,+EAAkE,CAAA;IAClE,iDAAoC,CAAA;IACpC,0FAA6E,CAAA;IAC7E,4FAA+E,CAAA;AACjF,CAAC,EARW,SAAS,KAAT,SAAS,QAQpB","sourcesContent":["import type {\n  TraceCallback,\n  TraceContext,\n  TraceRequest,\n} from '@metamask/controller-utils';\nimport { CreateAccountOptions } from '@metamask/keyring-api';\n\n// Explicit import to avoid circular dependency between `analytics` and `providers`.\nimport type { Bip44AccountProvider } from '../providers/BaseBip44AccountProvider';\n\n/**\n * Fallback function for tracing.\n * This function is used when no specific trace function is provided.\n * It executes the provided function in a trace context if available.\n *\n * @param _request - The trace request containing additional data and context.\n * @param fn - The function to execute within the trace context.\n * @returns A promise that resolves to the result of the executed function.\n * If no function is provided, it resolves to undefined.\n */\nexport const traceFallback: TraceCallback = async <ReturnType>(\n  _request: TraceRequest,\n  fn?: (context?: TraceContext) => ReturnType,\n): Promise<ReturnType> => {\n  if (!fn) {\n    return undefined as ReturnType;\n  }\n  return await Promise.resolve(fn());\n};\n\n/**\n * Compute trace data for a list of providers.\n *\n * @param providers Providers to be included in the trace data.\n * @returns An object mapping provider names to true, indicating their presence in the trace.\n */\nexport function toProviderDataTraces(\n  providers: Bip44AccountProvider[],\n): Record<string, boolean> {\n  // We cannot use complex objects within traces, so we just map provider names with true.\n  return providers.reduce(\n    (data, provider) => ({\n      ...data,\n      [provider.getName()]: true,\n    }),\n    {},\n  );\n}\n\n/**\n * Compute trace data for `createAccounts` options.\n *\n * @param options The `createAccounts` options.\n * @returns An object containing options data depending on its type.\n */\nexport function toCreateAccountsV2DataTraces(\n  options: CreateAccountOptions,\n): Record<string, string | number | boolean> {\n  if (options.type === 'bip44:derive-index') {\n    return {\n      groupIndex: options.groupIndex,\n    };\n  } else if (options.type === 'bip44:derive-index-range') {\n    return {\n      from: options.range.from,\n      to: options.range.to,\n    };\n  }\n  return {};\n}\n\n/**\n * Trace names.\n */\nexport enum TraceName {\n  SnapDiscoverAccounts = 'Snap Discover Accounts',\n  EvmDiscoverAccounts = 'EVM Discover Accounts',\n  ProviderCreateAccountV1 = 'Provider Create Account (v1)',\n  ProviderCreateAccounts = 'Provider Create Accounts (v2 - batched)',\n  WalletAlignment = 'Wallet Alignment',\n  WalletCreateMultichainAccountGroup = 'Wallet Create Multichain Account Group',\n  WalletCreateMultichainAccountGroups = 'Wallet Create Multichain Account Groups',\n}\n"]}
+{"version":3,"file":"traces.mjs","sourceRoot":"","sources":["../../src/analytics/traces.ts"],"names":[],"mappings":"AAUA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,KAAK,EAC/C,QAAsB,EACtB,EAA2C,EACtB,EAAE;IACvB,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,SAAuB,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAiC;IAEjC,wFAAwF;IACxF,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,IAAI;QACP,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI;KAC3B,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC1C,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;QACvD,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACxB,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;SACrB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,SAOX;AAPD,WAAY,SAAS;IACnB,4DAA+C,CAAA;IAC/C,0DAA6C,CAAA;IAC7C,+EAAkE,CAAA;IAClE,iDAAoC,CAAA;IACpC,0FAA6E,CAAA;IAC7E,4FAA+E,CAAA;AACjF,CAAC,EAPW,SAAS,KAAT,SAAS,QAOpB","sourcesContent":["import type {\n  TraceCallback,\n  TraceContext,\n  TraceRequest,\n} from '@metamask/controller-utils';\nimport { CreateAccountOptions } from '@metamask/keyring-api';\n\n// Explicit import to avoid circular dependency between `analytics` and `providers`.\nimport type { Bip44AccountProvider } from '../providers/BaseBip44AccountProvider';\n\n/**\n * Fallback function for tracing.\n * This function is used when no specific trace function is provided.\n * It executes the provided function in a trace context if available.\n *\n * @param _request - The trace request containing additional data and context.\n * @param fn - The function to execute within the trace context.\n * @returns A promise that resolves to the result of the executed function.\n * If no function is provided, it resolves to undefined.\n */\nexport const traceFallback: TraceCallback = async <ReturnType>(\n  _request: TraceRequest,\n  fn?: (context?: TraceContext) => ReturnType,\n): Promise<ReturnType> => {\n  if (!fn) {\n    return undefined as ReturnType;\n  }\n  return await Promise.resolve(fn());\n};\n\n/**\n * Compute trace data for a list of providers.\n *\n * @param providers Providers to be included in the trace data.\n * @returns An object mapping provider names to true, indicating their presence in the trace.\n */\nexport function toProviderDataTraces(\n  providers: Bip44AccountProvider[],\n): Record<string, boolean> {\n  // We cannot use complex objects within traces, so we just map provider names with true.\n  return providers.reduce(\n    (data, provider) => ({\n      ...data,\n      [provider.getName()]: true,\n    }),\n    {},\n  );\n}\n\n/**\n * Compute trace data for `createAccounts` options.\n *\n * @param options The `createAccounts` options.\n * @returns An object containing options data depending on its type.\n */\nexport function toCreateAccountsV2DataTraces(\n  options: CreateAccountOptions,\n): Record<string, string | number | boolean> {\n  if (options.type === 'bip44:derive-index') {\n    return {\n      groupIndex: options.groupIndex,\n    };\n  } else if (options.type === 'bip44:derive-index-range') {\n    return {\n      from: options.range.from,\n      to: options.range.to,\n    };\n  }\n  return {};\n}\n\n/**\n * Trace names.\n */\nexport enum TraceName {\n  SnapDiscoverAccounts = 'Snap Discover Accounts',\n  EvmDiscoverAccounts = 'EVM Discover Accounts',\n  ProviderCreateAccounts = 'Provider Create Accounts (v2 - batched)',\n  WalletAlignment = 'Wallet Alignment',\n  WalletCreateMultichainAccountGroup = 'Wallet Create Multichain Account Group',\n  WalletCreateMultichainAccountGroups = 'Wallet Create Multichain Account Groups',\n}\n"]}

package/dist/providers/BtcAccountProvider.cjs

@@ -34,17 +34,6 @@ class BtcAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.BtcAccountType.P2wpkh &&
             Object.values(keyring_api_1.BtcAccountType).includes(account.type));
     }
-    createAccountV1(keyring, { entropySource, groupIndex, }) {
-        if (!keyring.v1) {
-            throw new Error(`Snap "${BtcAccountProvider.BTC_SNAP_ID}" is v2-only and does not support v1 account creation`);
-        }
-        return keyring.v1.createAccount({
-            entropySource,
-            index: groupIndex,
-            addressType: keyring_api_1.BtcAccountType.P2wpkh,
-            scope: keyring_api_1.BtcScope.Mainnet,
-        });
-    }
 }
 exports.BtcAccountProvider = BtcAccountProvider;
 BtcAccountProvider.NAME = exports.BTC_ACCOUNT_PROVIDER_NAME;

package/dist/providers/BtcAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":";;;AAGA,uDAAiE;AAKjE,sDAA6C;AAE7C,mEAA4D;AAQ/C,QAAA,yBAAyB,GAAG,SAAS,CAAC;AAEtC,QAAA,mCAAmC,GAA6B;IAC3E,cAAc,EAAE,CAAC;IACjB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAa,kBAAmB,SAAQ,yCAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,2CAAmC,EACtE,QAAuB,yBAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QATlE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,sBAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,MAAM;YACtC,MAAM,CAAC,MAAM,CAAS,4BAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAC7D,CAAC;IACJ,CAAC;IAEkB,eAAe,CAChC,OAA8B,EAC9B,EACE,aAAa,EACb,UAAU,GAC6C;QAEzD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,SAAS,kBAAkB,CAAC,WAAW,uDAAuD,CAC/F,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC;YAC9B,aAAa;YACb,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,4BAAc,CAAC,MAAM;YAClC,KAAK,EAAE,sBAAQ,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;;AA9CH,gDA+CC;AA9CQ,uBAAI,GAAG,iCAAyB,AAA5B,CAA6B;AAEjC,8BAAW,GAAG,mCAA6C,AAAhD,CAAiD","sourcesContent":["import 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';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\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  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [BtcScope.Mainnet];\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  protected override createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    if (!keyring.v1) {\n      throw new Error(\n        `Snap \"${BtcAccountProvider.BTC_SNAP_ID}\" is v2-only and does not support v1 account creation`,\n      );\n    }\n    return keyring.v1.createAccount({\n      entropySource,\n      index: groupIndex,\n      addressType: BtcAccountType.P2wpkh,\n      scope: BtcScope.Mainnet,\n    });\n  }\n}\n"]}
+{"version":3,"file":"BtcAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":";;;AAEA,uDAAiE;AAKjE,sDAA6C;AAE7C,mEAA4D;AAK/C,QAAA,yBAAyB,GAAG,SAAS,CAAC;AAEtC,QAAA,mCAAmC,GAA6B;IAC3E,cAAc,EAAE,CAAC;IACjB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAa,kBAAmB,SAAQ,yCAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,2CAAmC,EACtE,QAAuB,yBAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QATlE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,sBAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,MAAM;YACtC,MAAM,CAAC,MAAM,CAAS,4BAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAC7D,CAAC;IACJ,CAAC;;AA1BH,gDA2BC;AA1BQ,uBAAI,GAAG,iCAAyB,AAA5B,CAA6B;AAEjC,8BAAW,GAAG,mCAA6C,AAAhD,CAAiD","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport { BtcAccountType, BtcScope } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type { SnapAccountProviderConfig } from './SnapAccountProvider';\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  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [BtcScope.Mainnet];\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"]}

package/dist/providers/BtcAccountProvider.d.cts

@@ -1,12 +1,11 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import type { CaipChainId } from "@metamask/utils";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
 export type BtcAccountProviderConfig = SnapAccountProviderConfig;
 export declare const BTC_ACCOUNT_PROVIDER_NAME = "Bitcoin";
 export declare const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig;
@@ -17,9 +16,5 @@ export declare class BtcAccountProvider extends SnapAccountProvider {
     constructor(messenger: MultichainAccountServiceMessenger, config?: BtcAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<KeyringAccount>;
 }
 //# sourceMappingURL=BtcAccountProvider.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAE/B,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAInE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAOjD,eAAe,CAChC,OAAO,EAAE,qBAAqB,EAC9B,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC,cAAc,CAAC;CAa3B"}
+{"version":3,"file":"BtcAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAInE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,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;CAMrE"}

package/dist/providers/BtcAccountProvider.d.mts

@@ -1,12 +1,11 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import type { CaipChainId } from "@metamask/utils";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
 export type BtcAccountProviderConfig = SnapAccountProviderConfig;
 export declare const BTC_ACCOUNT_PROVIDER_NAME = "Bitcoin";
 export declare const BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG: BtcAccountProviderConfig;
@@ -17,9 +16,5 @@ export declare class BtcAccountProvider extends SnapAccountProvider {
     constructor(messenger: MultichainAccountServiceMessenger, config?: BtcAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<KeyringAccount>;
 }
 //# sourceMappingURL=BtcAccountProvider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAE/B,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAInE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAOjD,eAAe,CAChC,OAAO,EAAE,qBAAqB,EAC9B,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC,cAAc,CAAC;CAa3B"}
+{"version":3,"file":"BtcAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,eAAO,MAAM,mCAAmC,EAAE,wBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAAiD;IAInE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,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;CAMrE"}

package/dist/providers/BtcAccountProvider.mjs

@@ -31,17 +31,6 @@ export class BtcAccountProvider extends SnapAccountProvider {
         return (account.type === BtcAccountType.P2wpkh &&
             Object.values(BtcAccountType).includes(account.type));
     }
-    createAccountV1(keyring, { entropySource, groupIndex, }) {
-        if (!keyring.v1) {
-            throw new Error(`Snap "${BtcAccountProvider.BTC_SNAP_ID}" is v2-only and does not support v1 account creation`);
-        }
-        return keyring.v1.createAccount({
-            entropySource,
-            index: groupIndex,
-            addressType: BtcAccountType.P2wpkh,
-            scope: BtcScope.Mainnet,
-        });
-    }
 }
 BtcAccountProvider.NAME = BTC_ACCOUNT_PROVIDER_NAME;
 BtcAccountProvider.BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap';

package/dist/providers/BtcAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BtcAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,8BAA8B;AAKjE,OAAO,EAAE,aAAa,EAAE,+BAAqB;AAE7C,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAQ5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAEnD,MAAM,CAAC,MAAM,mCAAmC,GAA6B;IAC3E,cAAc,EAAE,CAAC;IACjB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,mCAAmC,EACtE,QAAuB,aAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QATlE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM;YACtC,MAAM,CAAC,MAAM,CAAS,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAC7D,CAAC;IACJ,CAAC;IAEkB,eAAe,CAChC,OAA8B,EAC9B,EACE,aAAa,EACb,UAAU,GAC6C;QAEzD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,SAAS,kBAAkB,CAAC,WAAW,uDAAuD,CAC/F,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC;YAC9B,aAAa;YACb,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,cAAc,CAAC,MAAM;YAClC,KAAK,EAAE,QAAQ,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;;AA7CM,uBAAI,GAAG,yBAAyB,AAA5B,CAA6B;AAEjC,8BAAW,GAAG,mCAA6C,AAAhD,CAAiD","sourcesContent":["import 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';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\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  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [BtcScope.Mainnet];\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: BtcAccountProviderConfig = BTC_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(BtcAccountProvider.BTC_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return BtcAccountProvider.NAME;\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === BtcAccountType.P2wpkh &&\n      Object.values<string>(BtcAccountType).includes(account.type)\n    );\n  }\n\n  protected override createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    if (!keyring.v1) {\n      throw new Error(\n        `Snap \"${BtcAccountProvider.BTC_SNAP_ID}\" is v2-only and does not support v1 account creation`,\n      );\n    }\n    return keyring.v1.createAccount({\n      entropySource,\n      index: groupIndex,\n      addressType: BtcAccountType.P2wpkh,\n      scope: BtcScope.Mainnet,\n    });\n  }\n}\n"]}
+{"version":3,"file":"BtcAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BtcAccountProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,8BAA8B;AAKjE,OAAO,EAAE,aAAa,EAAE,+BAAqB;AAE7C,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAK5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAEnD,MAAM,CAAC,MAAM,mCAAmC,GAA6B;IAC3E,cAAc,EAAE,CAAC;IACjB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,mCAAmC,EACtE,QAAuB,aAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QATlE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM;YACtC,MAAM,CAAC,MAAM,CAAS,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAC7D,CAAC;IACJ,CAAC;;AAzBM,uBAAI,GAAG,yBAAyB,AAA5B,CAA6B;AAEjC,8BAAW,GAAG,mCAA6C,AAAhD,CAAiD","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport { BtcAccountType, BtcScope } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type { SnapAccountProviderConfig } from './SnapAccountProvider';\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  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\n\nexport class BtcAccountProvider extends SnapAccountProvider {\n  static NAME = BTC_ACCOUNT_PROVIDER_NAME;\n\n  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;\n\n  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [BtcScope.Mainnet];\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"]}

package/dist/providers/SnapAccountProvider.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _SnapAccountProvider_instances, _SnapAccountProvider_client, _SnapAccountProvider_sender, _SnapAccountProvider_queue, _SnapAccountProvider_trace, _SnapAccountProvider_getRestrictedSnapKeyring, _SnapAccountProvider_createSender, _SnapAccountProvider_resolveClient, _SnapAccountProvider_withSnapKeyring;
+var _SnapAccountProvider_instances, _SnapAccountProvider_client, _SnapAccountProvider_sender, _SnapAccountProvider_queue, _SnapAccountProvider_trace, _SnapAccountProvider_createSender, _SnapAccountProvider_resolveClient, _SnapAccountProvider_withSnapKeyring;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSnapAccountProvider = exports.SnapAccountProvider = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -64,6 +64,10 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
     /**
      * Ensures that the Snap is ready to be used.
      *
+     * Once this resolves, a Snap keyring for {@link snapId} is guaranteed to
+     * exist in the `KeyringController`, so subsequent {@link #withSnapKeyring}
+     * calls will not fail with "No keyring matches the selector".
+     *
      * @returns A promise that resolves when the Snap is ready.
      * @throws An error if the Snap could not become ready.
      */
@@ -166,10 +170,11 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
     async withSnap(operation) {
         await this.ensureReady();
         const client = await __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_resolveClient).call(this);
-        return await operation({
-            client,
-            keyring: await __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_getRestrictedSnapKeyring).call(this),
-        });
+        const keyring = {
+            createAccounts: (options) => __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_withSnapKeyring).call(this, ({ keyring: snapKeyring }) => snapKeyring.createAccounts(options)),
+            deleteAccount: (id) => __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_withSnapKeyring).call(this, ({ keyring: snapKeyring }) => snapKeyring.deleteAccount(id)),
+        };
+        return await operation({ client, keyring });
     }
     toBip44Account(account, _options) {
         (0, account_api_1.assertIsBip44Account)(account);
@@ -177,58 +182,17 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
     }
     async createBip44Accounts(keyring, options) {
         return this.withMaxConcurrency(async () => {
-            let groupIndexOffset = 0;
-            let snapAccounts = [];
-            // v2 Snaps expose `createAccounts` but no singular `createAccount`, so
-            // they must always go through the batched flow. v1 Snaps only have the
-            // singular `createAccount`.
-            const batched = this.isV2();
             const { entropySource } = options;
-            const createAccountV1 = async (groupIndex) => await (0, utils_1.withTimeout)(() => this.trace({
-                name: analytics_1.TraceName.ProviderCreateAccountV1,
-                data: {
-                    provider: this.getName(),
-                    groupIndex,
-                },
-            }, () => this.createAccountV1(keyring, { entropySource, groupIndex })), this.config.createAccounts.timeoutMs);
-            const createAccountsV2 = async (optionsV2) => await (0, utils_1.withTimeout)(() => this.trace({
+            const snapAccounts = await (0, utils_1.withTimeout)(() => this.trace({
                 name: analytics_1.TraceName.ProviderCreateAccounts,
                 data: {
                     provider: this.getName(),
-                    ...(0, analytics_1.toCreateAccountsV2DataTraces)(optionsV2),
+                    ...(0, analytics_1.toCreateAccountsV2DataTraces)(options),
                 },
-            }, () => keyring.createAccounts(optionsV2)), this.config.createAccounts.timeoutMs);
-            if (options.type === `${keyring_api_1.AccountCreationType.Bip44DeriveIndexRange}`) {
-                if (batched) {
-                    // Batch account creations.
-                    snapAccounts = await createAccountsV2(options);
-                }
-                else {
-                    const { range } = options;
-                    // Create accounts one by one.
-                    for (let groupIndex = range.from; groupIndex <= range.to; groupIndex++) {
-                        const snapAccount = await createAccountV1(groupIndex);
-                        snapAccounts.push(snapAccount);
-                    }
-                }
-                // Group indices are sequential, so we just need the starting index.
-                groupIndexOffset = options.range.from;
-            }
-            else {
-                if (batched) {
-                    // Create account using new v2-like flow (no async flow + no Snap keyring events).
-                    snapAccounts = await createAccountsV2(options);
-                }
-                else {
-                    const { groupIndex } = options;
-                    // Create account using the existing v1 flow.
-                    const snapAccount = await createAccountV1(groupIndex);
-                    snapAccounts = [snapAccount];
-                }
-                // For single account, there will only be 1 account, so we can use the
-                // provided group index directly.
-                groupIndexOffset = options.groupIndex;
-            }
+            }, () => keyring.createAccounts(options)), this.config.createAccounts.timeoutMs);
+            const groupIndexOffset = options.type === `${keyring_api_1.AccountCreationType.Bip44DeriveIndexRange}`
+                ? options.range.from
+                : options.groupIndex;
             return snapAccounts.map((snapAccount, index) => {
                 const groupIndex = groupIndexOffset + index;
                 const account = this.toBip44Account(snapAccount, {
@@ -324,30 +288,7 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
     }
 }
 exports.SnapAccountProvider = SnapAccountProvider;
-_SnapAccountProvider_client = new WeakMap(), _SnapAccountProvider_sender = new WeakMap(), _SnapAccountProvider_queue = new WeakMap(), _SnapAccountProvider_trace = new WeakMap(), _SnapAccountProvider_instances = new WeakSet(), _SnapAccountProvider_getRestrictedSnapKeyring = async function _SnapAccountProvider_getRestrictedSnapKeyring() {
-    // NOTE: We're not supposed to make the keyring instance escape `withKeyringV2` but
-    // we have to use the `SnapKeyringV2` instance to be able to create Solana account
-    // without triggering UI confirmation.
-    // Also, creating account that way won't invalidate the Snap keyring state. The
-    // account will get created and persisted properly with the Snap account creation
-    // flow "asynchronously" (with `notify:accountCreated`).
-    const createAccount = await __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_withSnapKeyring).call(this, async ({ keyring }) => {
-        if (keyring.v1) {
-            return keyring.v1.createAccount.bind(keyring.v1);
-        }
-        // This method does not exist in v2.
-        return undefined;
-    });
-    return {
-        // V1 interface is only present for v1 Snaps, otherwise it's `undefined`.
-        v1: createAccount ? { createAccount } : undefined,
-        // Every v2 operations must be done through the `#withSnapKeyring` transaction:
-        createAccounts: async (options) => await __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_withSnapKeyring).call(this, async ({ keyring }) => await keyring.createAccounts(options)),
-        deleteAccount: async (id) => await __classPrivateFieldGet(this, _SnapAccountProvider_instances, "m", _SnapAccountProvider_withSnapKeyring).call(this, async ({ keyring }) => {
-            await keyring.deleteAccount(id);
-        }),
-    };
-}, _SnapAccountProvider_createSender = function _SnapAccountProvider_createSender(snapId) {
+_SnapAccountProvider_client = new WeakMap(), _SnapAccountProvider_sender = new WeakMap(), _SnapAccountProvider_queue = new WeakMap(), _SnapAccountProvider_trace = new WeakMap(), _SnapAccountProvider_instances = new WeakSet(), _SnapAccountProvider_createSender = function _SnapAccountProvider_createSender(snapId) {
     return {
         send: async (request) => {
             const response = await this.messenger.call('SnapController:handleRequest', {

package/dist/providers/SnapAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SnapAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback, TraceRequest } from '@metamask/controller-utils';\nimport type { SnapKeyringV1 } from '@metamask/eth-snap-keyring';\nimport type { SnapKeyring as SnapKeyringV2 } from '@metamask/eth-snap-keyring/v2';\nimport {\n  EMPTY_CAPABILITIES,\n  isSnapKeyring,\n} from '@metamask/eth-snap-keyring/v2';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n} from '@metamask/keyring-api';\nimport type {\n  CreateAccountBip44DeriveIndexOptions,\n  CreateAccountBip44DeriveIndexRangeOptions,\n  CreateAccountBip44DiscoverOptions,\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities } from '@metamask/keyring-api/v2';\nimport type { KeyringMetadata } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { CaipChainId } from '@metamask/utils';\nimport { Semaphore } from 'async-mutex';\n\nimport {\n  toCreateAccountsV2DataTraces,\n  traceFallback,\n  TraceName,\n} from '../analytics';\nimport { reportError } from '../errors';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { BaseBip44AccountProvider } from './BaseBip44AccountProvider';\nimport { createSnapKeyringClient } from './SnapKeyringClient';\nimport type { Sender, SnapKeyringClient } from './SnapKeyringClient';\nimport { withRetry, withTimeout } from './utils';\n\nexport type RestrictedSnapKeyring = {\n  /**\n   * V1 interface, present only when the Snap does not declare v2 capabilities.\n   * `undefined` for v2-only Snaps.\n   *\n   * Use this to make v1 calls explicit:\n   *   if (!keyring.v1) { throw new Error('Snap is v2-only'); }\n   *   keyring.v1.createAccount(options);\n   */\n  v1?: { createAccount: SnapKeyringV1['createAccount'] };\n  createAccounts: SnapKeyringV2['createAccounts'];\n  deleteAccount: SnapKeyringV2['deleteAccount'];\n};\n\nexport type SnapAccountProviderConfig = {\n  maxConcurrency?: number;\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    /**\n     * Timeout for account creation operations.\n     *\n     * NOTE: Batching (and thus whether a single call may create multiple\n     * accounts) is driven by the Snap's declared capabilities, not this config.\n     * The value might have to be adapted when the Snap supports batching.\n     */\n    timeoutMs: number;\n  };\n  resyncAccounts?: {\n    /**\n     * Whether to automatically remove extra Snap accounts when the Snap has\n     * more accounts than MetaMask. If `false`, a warning is logged instead.\n     * Defaults to `true`.\n     */\n    autoRemoveExtraSnapAccounts?: boolean;\n  };\n};\n\nexport abstract class SnapAccountProvider extends BaseBip44AccountProvider {\n  readonly snapId: SnapId;\n\n  protected readonly config: SnapAccountProviderConfig;\n\n  /**\n   * The Snap's keyring capabilities, sourced from `SnapAccountService` (which\n   * reads them from the Snap's manifest). Populated the first time the client\n   * is resolved; defaults to an empty capability set until then.\n   */\n  capabilities: KeyringCapabilities = EMPTY_CAPABILITIES;\n\n  /**\n   * Version-agnostic keyring client, resolved lazily once the Snap is ready and\n   * its capabilities are known — see {@link SnapAccountProvider.withSnap}.\n   */\n  #client?: SnapKeyringClient;\n\n  readonly #sender: Sender;\n\n  readonly #queue?: Semaphore;\n\n  readonly #trace: TraceCallback;\n\n  /**\n   * Scopes passed to the v1 `discoverAccounts` client method. Only used on the\n   * v1 discovery path.\n   *\n   * TODO: Remove once all Snaps are fully v2 — discovery is then driven by the\n   * Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n   */\n  protected abstract readonly v1DiscoveryScopes: CaipChainId[];\n\n  constructor(\n    snapId: SnapId,\n    messenger: MultichainAccountServiceMessenger,\n    config: SnapAccountProviderConfig,\n    /* istanbul ignore next */\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(messenger);\n\n    this.snapId = snapId;\n    this.#sender = this.#createSender(snapId);\n\n    const maxConcurrency = config.maxConcurrency ?? Infinity;\n    this.config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n      maxConcurrency,\n    };\n\n    // Create semaphore only if concurrency is limited\n    if (isFinite(maxConcurrency)) {\n      this.#queue = new Semaphore(maxConcurrency);\n    }\n\n    this.#trace = trace;\n  }\n\n  /**\n   * Ensures that the Snap is ready to be used.\n   *\n   * @returns A promise that resolves when the Snap is ready.\n   * @throws An error if the Snap could not become ready.\n   */\n  async ensureReady(): Promise<void> {\n    return this.messenger.call('SnapAccountService:ensureReady', this.snapId);\n  }\n\n  /**\n   * Wraps an async operation with concurrency limiting based on maxConcurrency config.\n   * If maxConcurrency is Infinity (the default), the operation runs immediately without throttling.\n   * Otherwise, it's queued through the semaphore to respect the concurrency limit.\n   *\n   * @param operation - The async operation to execute.\n   * @returns The result of the operation.\n   */\n  protected async withMaxConcurrency<Result>(\n    operation: () => Promise<Result>,\n  ): Promise<Result> {\n    if (this.#queue) {\n      return this.#queue.runExclusive(operation);\n    }\n    return operation();\n  }\n\n  protected async trace<ReturnType>(\n    request: TraceRequest,\n    fn: () => Promise<ReturnType>,\n  ): Promise<ReturnType> {\n    return this.#trace(request, fn);\n  }\n\n  async #getRestrictedSnapKeyring(): Promise<RestrictedSnapKeyring> {\n    // NOTE: We're not supposed to make the keyring instance escape `withKeyringV2` but\n    // we have to use the `SnapKeyringV2` instance to be able to create Solana account\n    // without triggering UI confirmation.\n    // Also, creating account that way won't invalidate the Snap keyring state. The\n    // account will get created and persisted properly with the Snap account creation\n    // flow \"asynchronously\" (with `notify:accountCreated`).\n    const createAccount = await this.#withSnapKeyring(async ({ keyring }) => {\n      if (keyring.v1) {\n        return keyring.v1.createAccount.bind(keyring.v1);\n      }\n\n      // This method does not exist in v2.\n      return undefined;\n    });\n\n    return {\n      // V1 interface is only present for v1 Snaps, otherwise it's `undefined`.\n      v1: createAccount ? { createAccount } : undefined,\n      // Every v2 operations must be done through the `#withSnapKeyring` transaction:\n      createAccounts: async (options) =>\n        await this.#withSnapKeyring(\n          async ({ keyring }) => await keyring.createAccounts(options),\n        ),\n      deleteAccount: async (id: string) =>\n        await this.#withSnapKeyring(async ({ keyring }) => {\n          await keyring.deleteAccount(id);\n        }),\n    };\n  }\n\n  #createSender(snapId: string): Sender {\n    return {\n      send: async (request: JsonRpcRequest): Promise<Json> => {\n        const response = await this.messenger.call(\n          'SnapController:handleRequest',\n          {\n            snapId: snapId as SnapId,\n            origin: 'metamask',\n            handler: HandlerType.OnKeyringRequest,\n            request,\n          },\n        );\n        return response as Json;\n      },\n    };\n  }\n\n  /**\n   * Whether the Snap supports the v2 keyring protocol, inferred from its\n   * declared capabilities (a v2-capable Snap declares BIP-44 capabilities).\n   *\n   * @returns `true` if the Snap is v2-capable.\n   */\n  protected isV2(): boolean {\n    return Boolean(this.capabilities.bip44);\n  }\n\n  /**\n   * Resolves the version-agnostic keyring client, fetching the Snap's\n   * capabilities from `SnapAccountService` on first use and caching both the\n   * capabilities and the resulting client.\n   *\n   * Callers must ensure the Snap is ready (via\n   * {@link SnapAccountProvider.ensureReady}) beforehand so that the\n   * capabilities are reliably populated — {@link SnapAccountProvider.withSnap}\n   * guarantees this ordering.\n   *\n   * @returns The resolved {@link SnapKeyringClient}.\n   */\n  async #resolveClient(): Promise<SnapKeyringClient> {\n    if (!this.#client) {\n      this.capabilities = await this.messenger.call(\n        'SnapAccountService:getCapabilities',\n        this.snapId,\n      );\n      this.#client = createSnapKeyringClient(this.#sender, this.isV2());\n    }\n    return this.#client;\n  }\n\n  async resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void> {\n    await this.withSnap(async ({ client, keyring }) => {\n      const localSnapAccounts = accounts.filter(\n        (account) => account.metadata.snap?.id === this.snapId,\n      );\n      const snapAccounts = new Set(\n        (await client.getAccounts()).map((account) => account.id),\n      );\n\n      // NOTE: This should never happen, but if it does, we recover by deleting the\n      // extra accounts from the Snap to bring it back in sync with MetaMask.\n      if (localSnapAccounts.length < snapAccounts.size) {\n        const autoRemoveExtraSnapAccounts =\n          this.config.resyncAccounts?.autoRemoveExtraSnapAccounts ?? true;\n\n        if (autoRemoveExtraSnapAccounts) {\n          // Build a set of local account IDs for quick lookup\n          const localAccountIds = new Set(\n            localSnapAccounts.map((account) => account.id),\n          );\n\n          // Find and delete accounts that exist in Snap but not in MetaMask\n          await Promise.all(\n            [...snapAccounts].map(async (snapAccountId) => {\n              try {\n                if (!localAccountIds.has(snapAccountId)) {\n                  // This account exists in the Snap but not in MetaMask, delete it from\n                  // the Snap.\n                  await client.deleteAccount(snapAccountId);\n                  // Update the local Set so subsequent checks use the correct size\n                  snapAccounts.delete(snapAccountId);\n                }\n              } catch (error) {\n                reportError(\n                  this.messenger,\n                  `Unable to delete de-synced Snap account: ${this.snapId}`,\n                  error,\n                  {\n                    provider: this.getName(),\n                    snapAccountId,\n                  },\n                );\n              }\n            }),\n          );\n        } else {\n          const message = `Snap \"${this.snapId}\" has de-synced accounts, Snap has more accounts than MetaMask! (${localSnapAccounts.length} < ${snapAccounts.size})`;\n          log(`${WARNING_PREFIX} ${message}`);\n          console.warn(message);\n          return;\n        }\n      }\n\n      // We want this part to be fast, so we only check for sizes, but we might need\n      // to make a real \"diff\" between the 2 states to not miss any de-sync.\n      if (localSnapAccounts.length > snapAccounts.size) {\n        // We always use the MetaMask list as the main reference here.\n        await Promise.all(\n          localSnapAccounts.map(async (account) => {\n            const { id: entropySource, groupIndex } = account.options.entropy;\n\n            try {\n              if (!snapAccounts.has(account.id)) {\n                // We still need to remove the accounts from the Snap keyring since we're\n                // about to create the same account again, which will use a new ID, but will\n                // keep using the same address, and the Snap keyring does not allow this.\n                await keyring.deleteAccount(account.id);\n                // The Snap has no account in its state for this one, we re-create it.\n                await this.createAccounts({\n                  type: AccountCreationType.Bip44DeriveIndex,\n                  entropySource,\n                  groupIndex,\n                });\n              }\n            } catch (error) {\n              reportError(this.messenger, 'Unable to re-sync accounts', error, {\n                provider: this.getName(),\n                groupIndex,\n              });\n            }\n          }),\n        );\n      }\n    });\n  }\n\n  async #withSnapKeyring<CallbackResult = void>(\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SnapKeyringV2;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    return this.withKeyringV2<SnapKeyringV2, CallbackResult>(\n      {\n        filter: (keyring) =>\n          isSnapKeyring(keyring) && keyring.snapId === this.snapId,\n      },\n      (args) => operation(args),\n    );\n  }\n\n  protected async withSnap<CallbackResult = void>(\n    operation: (snap: {\n      client: SnapKeyringClient;\n      keyring: RestrictedSnapKeyring;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    await this.ensureReady();\n    const client = await this.#resolveClient();\n\n    return await operation({\n      client,\n      keyring: await this.#getRestrictedSnapKeyring(),\n    });\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n\n  protected abstract createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    options: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount>;\n\n  protected toBip44Account(\n    account: KeyringAccount,\n    _options: { entropySource: EntropySourceId; groupIndex: number },\n  ): Bip44Account<KeyringAccount> {\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  protected async createBip44Accounts(\n    keyring: RestrictedSnapKeyring,\n    options:\n      | CreateAccountBip44DeriveIndexOptions\n      | CreateAccountBip44DeriveIndexRangeOptions\n      | CreateAccountBip44DiscoverOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      let groupIndexOffset = 0;\n      let snapAccounts: KeyringAccount[] = [];\n\n      // v2 Snaps expose `createAccounts` but no singular `createAccount`, so\n      // they must always go through the batched flow. v1 Snaps only have the\n      // singular `createAccount`.\n      const batched = this.isV2();\n      const { entropySource } = options;\n\n      const createAccountV1 = async (\n        groupIndex: number,\n      ): Promise<KeyringAccount> =>\n        await withTimeout(\n          () =>\n            this.trace(\n              {\n                name: TraceName.ProviderCreateAccountV1,\n                data: {\n                  provider: this.getName(),\n                  groupIndex,\n                },\n              },\n              () =>\n                this.createAccountV1(keyring, { entropySource, groupIndex }),\n            ),\n          this.config.createAccounts.timeoutMs,\n        );\n      const createAccountsV2 = async (\n        optionsV2:\n          | CreateAccountBip44DeriveIndexOptions\n          | CreateAccountBip44DeriveIndexRangeOptions\n          | CreateAccountBip44DiscoverOptions,\n      ): Promise<KeyringAccount[]> =>\n        await withTimeout(\n          () =>\n            this.trace(\n              {\n                name: TraceName.ProviderCreateAccounts,\n                data: {\n                  provider: this.getName(),\n                  ...toCreateAccountsV2DataTraces(optionsV2),\n                },\n              },\n              () => keyring.createAccounts(optionsV2),\n            ),\n          this.config.createAccounts.timeoutMs,\n        );\n\n      if (options.type === `${AccountCreationType.Bip44DeriveIndexRange}`) {\n        if (batched) {\n          // Batch account creations.\n          snapAccounts = await createAccountsV2(options);\n        } else {\n          const { range } = options;\n\n          // Create accounts one by one.\n          for (\n            let groupIndex = range.from;\n            groupIndex <= range.to;\n            groupIndex++\n          ) {\n            const snapAccount = await createAccountV1(groupIndex);\n\n            snapAccounts.push(snapAccount);\n          }\n        }\n\n        // Group indices are sequential, so we just need the starting index.\n        groupIndexOffset = options.range.from;\n      } else {\n        if (batched) {\n          // Create account using new v2-like flow (no async flow + no Snap keyring events).\n          snapAccounts = await createAccountsV2(options);\n        } else {\n          const { groupIndex } = options;\n\n          // Create account using the existing v1 flow.\n          const snapAccount = await createAccountV1(groupIndex);\n\n          snapAccounts = [snapAccount];\n        }\n\n        // For single account, there will only be 1 account, so we can use the\n        // provided group index directly.\n        groupIndexOffset = options.groupIndex;\n      }\n\n      return snapAccounts.map((snapAccount, index) => {\n        const groupIndex = groupIndexOffset + index;\n        const account = this.toBip44Account(snapAccount, {\n          entropySource,\n          groupIndex,\n        });\n\n        this.accounts.add(snapAccount.id);\n        return account;\n      });\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    return this.withSnap(async ({ keyring }) =>\n      this.createBip44Accounts(keyring, options),\n    );\n  }\n\n  /**\n   * Delete a snap account by id.\n   *\n   * Resolves the account's address from the tracked account, then forwards to\n   * the legacy `SnapKeyring.removeAccount(address)`. The Snap keyring takes\n   * care of notifying the snap to clean up its own state through the normal\n   * account-removal flow (same path used by `resyncAccounts`).\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\n    await this.#withSnapKeyring(async ({ keyring }) => {\n      await keyring.deleteAccount(account.id);\n    });\n\n    this.accounts.delete(id);\n  }\n\n  /**\n   * Discovers accounts for the given entropy source and group index.\n   *\n   * v2 Snaps drive discovery through `createAccounts({ bip44:discover })`: the\n   * Snap checks for on-chain activity (using its own supported scopes) and\n   * returns the created account(s), or nothing once discovery is exhausted.\n   *\n   * v1 Snaps use the client's `discoverAccounts` to detect activity on\n   * {@link v1DiscoveryScopes}, then create the account for the group index.\n   *\n   * @param options - The discovery options.\n   * @param options.entropySource - The entropy source to discover accounts for.\n   * @param options.groupIndex - The group index to discover accounts for.\n   * @returns The discovered (and created) accounts, or an empty array when\n   * there is nothing to discover at this group index.\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      this.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          if (this.isV2()) {\n            // The v2 client has no `discoverAccounts`, so discovery is only\n            // possible when the Snap supports `bip44:discover`. Otherwise there\n            // is no way to discover and we report nothing.\n            if (!this.capabilities.bip44?.discover) {\n              return [];\n            }\n\n            // v2: the Snap detects on-chain activity and creates the account in\n            // a single `createAccounts({ bip44:discover })` call. An empty\n            // result means discovery is exhausted at this group index.\n            return this.createBip44Accounts(keyring, {\n              type: AccountCreationType.Bip44Discover,\n              entropySource,\n              groupIndex,\n            });\n          }\n\n          // v1: detect activity via the client, then create the account for\n          // this group index.\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    this.v1DiscoveryScopes,\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 (!discoveredAccounts.length) {\n            return [];\n          }\n\n          return this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      ),\n    );\n  }\n}\n\nexport const isSnapAccountProvider = (\n  provider: unknown,\n): provider is SnapAccountProvider => {\n  return provider instanceof SnapAccountProvider;\n};\n"]}
+{"version":3,"file":"SnapAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SnapAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAA6D;AAI7D,sDAGuC;AACvC,uDAG+B;AAa/B,uDAAoD;AAEpD,6CAAwC;AAExC,sDAIsB;AACtB,0CAAwC;AACxC,0CAAiE;AAEjE,6EAAsE;AACtE,+DAA8D;AAE9D,uCAAiD;AAyCjD,MAAsB,mBAAoB,SAAQ,mDAAwB;IAiCxE,YACE,MAAc,EACd,SAA4C,EAC5C,MAAiC;IACjC,0BAA0B;IAC1B,QAAuB,yBAAa;QAEpC,KAAK,CAAC,SAAS,CAAC,CAAC;;QAnCnB;;;;WAIG;QACH,iBAAY,GAAwB,uBAAkB,CAAC;QAEvD;;;WAGG;QACH,8CAA4B;QAEnB,8CAAgB;QAEhB,6CAAmB;QAEnB,6CAAsB;QAoB7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,uBAAA,IAAI,+BAAW,uBAAA,IAAI,yEAAc,MAAlB,IAAI,EAAe,MAAM,CAAC,MAAA,CAAC;QAE1C,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,QAAQ,CAAC;QACzD,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,MAAM;YACT,SAAS,EAAE;gBACT,GAAG,MAAM,CAAC,SAAS;gBACnB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,IAAI,IAAI;aAC1C;YACD,cAAc;SACf,CAAC;QAEF,kDAAkD;QAClD,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YAC7B,uBAAA,IAAI,8BAAU,IAAI,uBAAS,CAAC,cAAc,CAAC,MAAA,CAAC;QAC9C,CAAC;QAED,uBAAA,IAAI,8BAAU,KAAK,MAAA,CAAC;IACtB,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gCAAgC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,kBAAkB,CAChC,SAAgC;QAEhC,IAAI,uBAAA,IAAI,kCAAO,EAAE,CAAC;YAChB,OAAO,uBAAA,IAAI,kCAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,KAAK,CACnB,OAAqB,EACrB,EAA6B;QAE7B,OAAO,uBAAA,IAAI,kCAAO,MAAX,IAAI,EAAQ,OAAO,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAmBD;;;;;OAKG;IACO,IAAI;QACZ,OAAO,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAyBD,KAAK,CAAC,cAAc,CAClB,QAAyC;QAEzC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YAChD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CACvC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,IAAI,CAAC,MAAM,CACvD,CAAC;YACF,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,CAAC,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAC1D,CAAC;YAEF,6EAA6E;YAC7E,uEAAuE;YACvE,IAAI,iBAAiB,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;gBACjD,MAAM,2BAA2B,GAC/B,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,2BAA2B,IAAI,IAAI,CAAC;gBAElE,IAAI,2BAA2B,EAAE,CAAC;oBAChC,oDAAoD;oBACpD,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAC/C,CAAC;oBAEF,kEAAkE;oBAClE,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;wBAC5C,IAAI,CAAC;4BACH,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;gCACxC,sEAAsE;gCACtE,YAAY;gCACZ,MAAM,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gCAC1C,iEAAiE;gCACjE,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;4BACrC,CAAC;wBACH,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,IAAA,oBAAW,EACT,IAAI,CAAC,SAAS,EACd,4CAA4C,IAAI,CAAC,MAAM,EAAE,EACzD,KAAK,EACL;gCACE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;gCACxB,aAAa;6BACd,CACF,CAAC;wBACJ,CAAC;oBACH,CAAC,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,MAAM,oEAAoE,iBAAiB,CAAC,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,CAAC;oBAC3J,IAAA,sBAAG,EAAC,GAAG,uBAAc,IAAI,OAAO,EAAE,CAAC,CAAC;oBACpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACtB,OAAO;gBACT,CAAC;YACH,CAAC;YAED,8EAA8E;YAC9E,sEAAsE;YACtE,IAAI,iBAAiB,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;gBACjD,8DAA8D;gBAC9D,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACtC,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;oBAElE,IAAI,CAAC;wBACH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;4BAClC,yEAAyE;4BACzE,4EAA4E;4BAC5E,yEAAyE;4BACzE,MAAM,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;4BACxC,sEAAsE;4BACtE,MAAM,IAAI,CAAC,cAAc,CAAC;gCACxB,IAAI,EAAE,iCAAmB,CAAC,gBAAgB;gCAC1C,aAAa;gCACb,UAAU;6BACX,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,IAAA,oBAAW,EAAC,IAAI,CAAC,SAAS,EAAE,4BAA4B,EAAE,KAAK,EAAE;4BAC/D,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;4BACxB,UAAU;yBACX,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CACH,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAoBS,KAAK,CAAC,QAAQ,CACtB,SAG6B;QAE7B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,0EAAe,MAAnB,IAAI,CAAiB,CAAC;QAC3C,MAAM,OAAO,GAAqB;YAChC,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE,CAC1B,uBAAA,IAAI,4EAAiB,MAArB,IAAI,EAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CACjD,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CACpC;YACH,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,CACpB,uBAAA,IAAI,4EAAiB,MAArB,IAAI,EAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CACjD,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,CAC9B;SACJ,CAAC;QACF,OAAO,MAAM,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAIS,cAAc,CACtB,OAAuB,EACvB,QAAgE;QAEhE,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,OAAyB,EACzB,OAGqC;QAErC,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;YAElC,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAW,EACpC,GAAG,EAAE,CACH,IAAI,CAAC,KAAK,CACR;gBACE,IAAI,EAAE,qBAAS,CAAC,sBAAsB;gBACtC,IAAI,EAAE;oBACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;oBACxB,GAAG,IAAA,wCAA4B,EAAC,OAAO,CAAC;iBACzC;aACF,EACD,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CACtC,EACH,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CACrC,CAAC;YAEF,MAAM,gBAAgB,GACpB,OAAO,CAAC,IAAI,KAAK,GAAG,iCAAmB,CAAC,qBAAqB,EAAE;gBAC7D,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI;gBACpB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;YAEzB,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;gBAC7C,MAAM,UAAU,GAAG,gBAAgB,GAAG,KAAK,CAAC;gBAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE;oBAC/C,aAAa;oBACb,UAAU;iBACX,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAClC,OAAO,OAAO,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,OAA6B;QAE7B,IAAA,kDAAoC,EAAC,OAAO,EAAE;YAC5C,GAAG,iCAAmB,CAAC,gBAAgB,EAAE;YACzC,GAAG,iCAAmB,CAAC,qBAAqB,EAAE;SAC/C,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACzC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,aAAa,CAAC,EAAsC;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAEpC,MAAM,uBAAA,IAAI,4EAAiB,MAArB,IAAI,EAAkB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAChD,MAAM,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,KAAK,CAAC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GAIX;QACC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CACjD,IAAI,CAAC,KAAK,CACR;YACE,IAAI,EAAE,qBAAS,CAAC,oBAAoB;YACpC,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;aACzB;SACF,EACD,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACnC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChB,gEAAgE;gBAChE,oEAAoE;gBACpE,+CAA+C;gBAC/C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;oBACvC,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,oEAAoE;gBACpE,+DAA+D;gBAC/D,2DAA2D;gBAC3D,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE;oBACvC,IAAI,EAAE,iCAAmB,CAAC,aAAa;oBACvC,aAAa;oBACb,UAAU;iBACX,CAAC,CAAC;YACL,CAAC;YAED,kEAAkE;YAClE,oBAAoB;YACpB,MAAM,kBAAkB,GAAG,MAAM,IAAA,iBAAS,EACxC,GAAG,EAAE,CACH,IAAA,mBAAW,EACT,GAAG,EAAE,CACH,MAAM,CAAC,gBAAgB,CACrB,IAAI,CAAC,iBAAiB,EACtB,aAAa,EACb,UAAU,CACX,EACH,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAChC,EACH;gBACE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW;gBAC9C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS;aAC3C,CACF,CAAC;YAEF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAC/B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE;gBACvC,IAAI,EAAE,iCAAmB,CAAC,gBAAgB;gBAC1C,aAAa;gBACb,UAAU;aACX,CAAC,CAAC;QACL,CAAC,CACF,CACF,CAAC;IACJ,CAAC;CACF;AAlcD,kDAkcC;iTA7Ve,MAAc;IAC1B,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,OAAuB,EAAiB,EAAE;YACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACxC,8BAA8B,EAC9B;gBACE,MAAM,EAAE,MAAgB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,yBAAW,CAAC,gBAAgB;gBACrC,OAAO;aACR,CACF,CAAC;YACF,OAAO,QAAgB,CAAC;QAC1B,CAAC;KACF,CAAC;AACJ,CAAC;AAYD;;;;;;;;;;;GAWG;AACH,KAAK;IACH,IAAI,CAAC,uBAAA,IAAI,mCAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAC3C,oCAAoC,EACpC,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,uBAAA,IAAI,+BAAW,IAAA,2CAAuB,EAAC,uBAAA,IAAI,mCAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,MAAA,CAAC;IACpE,CAAC;IACD,OAAO,uBAAA,IAAI,mCAAQ,CAAC;AACtB,CAAC,yCA0FD,KAAK,+CACH,SAM6B;IAE7B,OAAO,IAAI,CAAC,aAAa,CACvB;QACE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,IAAA,kBAAa,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;KAC3D,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAC1B,CAAC;AACJ,CAAC;AAqMI,MAAM,qBAAqB,GAAG,CACnC,QAAiB,EACgB,EAAE;IACnC,OAAO,QAAQ,YAAY,mBAAmB,CAAC;AACjD,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback, TraceRequest } from '@metamask/controller-utils';\nimport type { SnapKeyring as SnapKeyringV2 } from '@metamask/eth-snap-keyring/v2';\nimport {\n  EMPTY_CAPABILITIES,\n  isSnapKeyring,\n} from '@metamask/eth-snap-keyring/v2';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n} from '@metamask/keyring-api';\nimport type {\n  CreateAccountBip44DeriveIndexOptions,\n  CreateAccountBip44DeriveIndexRangeOptions,\n  CreateAccountBip44DiscoverOptions,\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities } from '@metamask/keyring-api/v2';\nimport type { KeyringMetadata } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { CaipChainId } from '@metamask/utils';\nimport { Semaphore } from 'async-mutex';\n\nimport {\n  toCreateAccountsV2DataTraces,\n  traceFallback,\n  TraceName,\n} from '../analytics';\nimport { reportError } from '../errors';\nimport { projectLogger as log, WARNING_PREFIX } from '../logger';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { BaseBip44AccountProvider } from './BaseBip44AccountProvider';\nimport { createSnapKeyringClient } from './SnapKeyringClient';\nimport type { Sender, SnapKeyringClient } from './SnapKeyringClient';\nimport { withRetry, withTimeout } from './utils';\n\n/**\n * A proxy to the Snap's keyring operations that routes every call through the\n * `KeyringController` mutex (via {@link SnapAccountProvider.#withSnapKeyring}).\n * Callers receive this object from {@link SnapAccountProvider.withSnap} and\n * never interact with the raw keyring or the mutex directly.\n */\nexport type SnapKeyringProxy = {\n  createAccounts: SnapKeyringV2['createAccounts'];\n  deleteAccount: SnapKeyringV2['deleteAccount'];\n};\n\nexport type SnapAccountProviderConfig = {\n  maxConcurrency?: number;\n  discovery: {\n    enabled?: boolean;\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    /**\n     * Timeout for account creation operations.\n     *\n     * NOTE: Batching (and thus whether a single call may create multiple\n     * accounts) is driven by the Snap's declared capabilities, not this config.\n     * The value might have to be adapted when the Snap supports batching.\n     */\n    timeoutMs: number;\n  };\n  resyncAccounts?: {\n    /**\n     * Whether to automatically remove extra Snap accounts when the Snap has\n     * more accounts than MetaMask. If `false`, a warning is logged instead.\n     * Defaults to `true`.\n     */\n    autoRemoveExtraSnapAccounts?: boolean;\n  };\n};\n\nexport abstract class SnapAccountProvider extends BaseBip44AccountProvider {\n  readonly snapId: SnapId;\n\n  protected readonly config: SnapAccountProviderConfig;\n\n  /**\n   * The Snap's keyring capabilities, sourced from `SnapAccountService` (which\n   * reads them from the Snap's manifest). Populated the first time the client\n   * is resolved; defaults to an empty capability set until then.\n   */\n  capabilities: KeyringCapabilities = EMPTY_CAPABILITIES;\n\n  /**\n   * Version-agnostic keyring client, resolved lazily once the Snap is ready and\n   * its capabilities are known — see {@link SnapAccountProvider.withSnap}.\n   */\n  #client?: SnapKeyringClient;\n\n  readonly #sender: Sender;\n\n  readonly #queue?: Semaphore;\n\n  readonly #trace: TraceCallback;\n\n  /**\n   * Scopes passed to the v1 `discoverAccounts` client method. Only used on the\n   * v1 discovery path.\n   *\n   * TODO: Remove once all Snaps are fully v2 — discovery is then driven by the\n   * Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n   */\n  protected abstract readonly v1DiscoveryScopes: CaipChainId[];\n\n  constructor(\n    snapId: SnapId,\n    messenger: MultichainAccountServiceMessenger,\n    config: SnapAccountProviderConfig,\n    /* istanbul ignore next */\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(messenger);\n\n    this.snapId = snapId;\n    this.#sender = this.#createSender(snapId);\n\n    const maxConcurrency = config.maxConcurrency ?? Infinity;\n    this.config = {\n      ...config,\n      discovery: {\n        ...config.discovery,\n        enabled: config.discovery.enabled ?? true,\n      },\n      maxConcurrency,\n    };\n\n    // Create semaphore only if concurrency is limited\n    if (isFinite(maxConcurrency)) {\n      this.#queue = new Semaphore(maxConcurrency);\n    }\n\n    this.#trace = trace;\n  }\n\n  /**\n   * Ensures that the Snap is ready to be used.\n   *\n   * Once this resolves, a Snap keyring for {@link snapId} is guaranteed to\n   * exist in the `KeyringController`, so subsequent {@link #withSnapKeyring}\n   * calls will not fail with \"No keyring matches the selector\".\n   *\n   * @returns A promise that resolves when the Snap is ready.\n   * @throws An error if the Snap could not become ready.\n   */\n  async ensureReady(): Promise<void> {\n    return this.messenger.call('SnapAccountService:ensureReady', this.snapId);\n  }\n\n  /**\n   * Wraps an async operation with concurrency limiting based on maxConcurrency config.\n   * If maxConcurrency is Infinity (the default), the operation runs immediately without throttling.\n   * Otherwise, it's queued through the semaphore to respect the concurrency limit.\n   *\n   * @param operation - The async operation to execute.\n   * @returns The result of the operation.\n   */\n  protected async withMaxConcurrency<Result>(\n    operation: () => Promise<Result>,\n  ): Promise<Result> {\n    if (this.#queue) {\n      return this.#queue.runExclusive(operation);\n    }\n    return operation();\n  }\n\n  protected async trace<ReturnType>(\n    request: TraceRequest,\n    fn: () => Promise<ReturnType>,\n  ): Promise<ReturnType> {\n    return this.#trace(request, fn);\n  }\n\n  #createSender(snapId: string): Sender {\n    return {\n      send: async (request: JsonRpcRequest): Promise<Json> => {\n        const response = await this.messenger.call(\n          'SnapController:handleRequest',\n          {\n            snapId: snapId as SnapId,\n            origin: 'metamask',\n            handler: HandlerType.OnKeyringRequest,\n            request,\n          },\n        );\n        return response as Json;\n      },\n    };\n  }\n\n  /**\n   * Whether the Snap supports the v2 keyring protocol, inferred from its\n   * declared capabilities (a v2-capable Snap declares BIP-44 capabilities).\n   *\n   * @returns `true` if the Snap is v2-capable.\n   */\n  protected isV2(): boolean {\n    return Boolean(this.capabilities.bip44);\n  }\n\n  /**\n   * Resolves the version-agnostic keyring client, fetching the Snap's\n   * capabilities from `SnapAccountService` on first use and caching both the\n   * capabilities and the resulting client.\n   *\n   * Callers must ensure the Snap is ready (via\n   * {@link SnapAccountProvider.ensureReady}) beforehand so that the\n   * capabilities are reliably populated — {@link SnapAccountProvider.withSnap}\n   * guarantees this ordering.\n   *\n   * @returns The resolved {@link SnapKeyringClient}.\n   */\n  async #resolveClient(): Promise<SnapKeyringClient> {\n    if (!this.#client) {\n      this.capabilities = await this.messenger.call(\n        'SnapAccountService:getCapabilities',\n        this.snapId,\n      );\n      this.#client = createSnapKeyringClient(this.#sender, this.isV2());\n    }\n    return this.#client;\n  }\n\n  async resyncAccounts(\n    accounts: Bip44Account<InternalAccount>[],\n  ): Promise<void> {\n    await this.withSnap(async ({ client, keyring }) => {\n      const localSnapAccounts = accounts.filter(\n        (account) => account.metadata.snap?.id === this.snapId,\n      );\n      const snapAccounts = new Set(\n        (await client.getAccounts()).map((account) => account.id),\n      );\n\n      // NOTE: This should never happen, but if it does, we recover by deleting the\n      // extra accounts from the Snap to bring it back in sync with MetaMask.\n      if (localSnapAccounts.length < snapAccounts.size) {\n        const autoRemoveExtraSnapAccounts =\n          this.config.resyncAccounts?.autoRemoveExtraSnapAccounts ?? true;\n\n        if (autoRemoveExtraSnapAccounts) {\n          // Build a set of local account IDs for quick lookup\n          const localAccountIds = new Set(\n            localSnapAccounts.map((account) => account.id),\n          );\n\n          // Find and delete accounts that exist in Snap but not in MetaMask\n          await Promise.all(\n            [...snapAccounts].map(async (snapAccountId) => {\n              try {\n                if (!localAccountIds.has(snapAccountId)) {\n                  // This account exists in the Snap but not in MetaMask, delete it from\n                  // the Snap.\n                  await client.deleteAccount(snapAccountId);\n                  // Update the local Set so subsequent checks use the correct size\n                  snapAccounts.delete(snapAccountId);\n                }\n              } catch (error) {\n                reportError(\n                  this.messenger,\n                  `Unable to delete de-synced Snap account: ${this.snapId}`,\n                  error,\n                  {\n                    provider: this.getName(),\n                    snapAccountId,\n                  },\n                );\n              }\n            }),\n          );\n        } else {\n          const message = `Snap \"${this.snapId}\" has de-synced accounts, Snap has more accounts than MetaMask! (${localSnapAccounts.length} < ${snapAccounts.size})`;\n          log(`${WARNING_PREFIX} ${message}`);\n          console.warn(message);\n          return;\n        }\n      }\n\n      // We want this part to be fast, so we only check for sizes, but we might need\n      // to make a real \"diff\" between the 2 states to not miss any de-sync.\n      if (localSnapAccounts.length > snapAccounts.size) {\n        // We always use the MetaMask list as the main reference here.\n        await Promise.all(\n          localSnapAccounts.map(async (account) => {\n            const { id: entropySource, groupIndex } = account.options.entropy;\n\n            try {\n              if (!snapAccounts.has(account.id)) {\n                // We still need to remove the accounts from the Snap keyring since we're\n                // about to create the same account again, which will use a new ID, but will\n                // keep using the same address, and the Snap keyring does not allow this.\n                await keyring.deleteAccount(account.id);\n                // The Snap has no account in its state for this one, we re-create it.\n                await this.createAccounts({\n                  type: AccountCreationType.Bip44DeriveIndex,\n                  entropySource,\n                  groupIndex,\n                });\n              }\n            } catch (error) {\n              reportError(this.messenger, 'Unable to re-sync accounts', error, {\n                provider: this.getName(),\n                groupIndex,\n              });\n            }\n          }),\n        );\n      }\n    });\n  }\n\n  async #withSnapKeyring<CallbackResult = void>(\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SnapKeyringV2;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    return this.withKeyringV2<SnapKeyringV2, CallbackResult>(\n      {\n        filter: (keyring) =>\n          isSnapKeyring(keyring) && keyring.snapId === this.snapId,\n      },\n      (args) => operation(args),\n    );\n  }\n\n  protected async withSnap<CallbackResult = void>(\n    operation: (snap: {\n      client: SnapKeyringClient;\n      keyring: SnapKeyringProxy;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    await this.ensureReady();\n    const client = await this.#resolveClient();\n    const keyring: SnapKeyringProxy = {\n      createAccounts: (options) =>\n        this.#withSnapKeyring(({ keyring: snapKeyring }) =>\n          snapKeyring.createAccounts(options),\n        ),\n      deleteAccount: (id) =>\n        this.#withSnapKeyring(({ keyring: snapKeyring }) =>\n          snapKeyring.deleteAccount(id),\n        ),\n    };\n    return await operation({ client, keyring });\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n\n  protected toBip44Account(\n    account: KeyringAccount,\n    _options: { entropySource: EntropySourceId; groupIndex: number },\n  ): Bip44Account<KeyringAccount> {\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  protected async createBip44Accounts(\n    keyring: SnapKeyringProxy,\n    options:\n      | CreateAccountBip44DeriveIndexOptions\n      | CreateAccountBip44DeriveIndexRangeOptions\n      | CreateAccountBip44DiscoverOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const { entropySource } = options;\n\n      const snapAccounts = await withTimeout(\n        () =>\n          this.trace(\n            {\n              name: TraceName.ProviderCreateAccounts,\n              data: {\n                provider: this.getName(),\n                ...toCreateAccountsV2DataTraces(options),\n              },\n            },\n            () => keyring.createAccounts(options),\n          ),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      const groupIndexOffset =\n        options.type === `${AccountCreationType.Bip44DeriveIndexRange}`\n          ? options.range.from\n          : options.groupIndex;\n\n      return snapAccounts.map((snapAccount, index) => {\n        const groupIndex = groupIndexOffset + index;\n        const account = this.toBip44Account(snapAccount, {\n          entropySource,\n          groupIndex,\n        });\n\n        this.accounts.add(snapAccount.id);\n        return account;\n      });\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n      `${AccountCreationType.Bip44DeriveIndexRange}`,\n    ]);\n\n    return this.withSnap(async ({ keyring }) =>\n      this.createBip44Accounts(keyring, options),\n    );\n  }\n\n  /**\n   * Delete a snap account by id.\n   *\n   * Resolves the account's address from the tracked account, then forwards to\n   * the legacy `SnapKeyring.removeAccount(address)`. The Snap keyring takes\n   * care of notifying the snap to clean up its own state through the normal\n   * account-removal flow (same path used by `resyncAccounts`).\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\n    await this.#withSnapKeyring(async ({ keyring }) => {\n      await keyring.deleteAccount(account.id);\n    });\n\n    this.accounts.delete(id);\n  }\n\n  /**\n   * Discovers accounts for the given entropy source and group index.\n   *\n   * v2 Snaps drive discovery through `createAccounts({ bip44:discover })`: the\n   * Snap checks for on-chain activity (using its own supported scopes) and\n   * returns the created account(s), or nothing once discovery is exhausted.\n   *\n   * v1 Snaps use the client's `discoverAccounts` to detect activity on\n   * {@link v1DiscoveryScopes}, then create the account for the group index.\n   *\n   * @param options - The discovery options.\n   * @param options.entropySource - The entropy source to discover accounts for.\n   * @param options.groupIndex - The group index to discover accounts for.\n   * @returns The discovered (and created) accounts, or an empty array when\n   * there is nothing to discover at this group index.\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      this.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          if (this.isV2()) {\n            // The v2 client has no `discoverAccounts`, so discovery is only\n            // possible when the Snap supports `bip44:discover`. Otherwise there\n            // is no way to discover and we report nothing.\n            if (!this.capabilities.bip44?.discover) {\n              return [];\n            }\n\n            // v2: the Snap detects on-chain activity and creates the account in\n            // a single `createAccounts({ bip44:discover })` call. An empty\n            // result means discovery is exhausted at this group index.\n            return this.createBip44Accounts(keyring, {\n              type: AccountCreationType.Bip44Discover,\n              entropySource,\n              groupIndex,\n            });\n          }\n\n          // v1: detect activity via the client, then create the account for\n          // this group index.\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    this.v1DiscoveryScopes,\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 (!discoveredAccounts.length) {\n            return [];\n          }\n\n          return this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      ),\n    );\n  }\n}\n\nexport const isSnapAccountProvider = (\n  provider: unknown,\n): provider is SnapAccountProvider => {\n  return provider instanceof SnapAccountProvider;\n};\n"]}