@metamask-previews/multichain-account-service 2.0.1-preview-c222de5 → 2.1.0-preview-578568f

package/dist/providers/SolAccountProvider.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 _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_config, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount;
+var _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolAccountProvider = exports.SOL_ACCOUNT_PROVIDER_NAME = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -24,6 +24,7 @@ const utils_1 = require("./utils.cjs");
 exports.SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger, config = {
+        maxConcurrency: 3,
         discovery: {
             timeoutMs: 2000,
             maxAttempts: 3,
@@ -33,12 +34,10 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
             timeoutMs: 3000,
         },
     }) {
-        super(SolAccountProvider.SOLANA_SNAP_ID, messenger);
+        super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config);
         _SolAccountProvider_instances.add(this);
         _SolAccountProvider_client.set(this, void 0);
-        _SolAccountProvider_config.set(this, void 0);
         __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SolAccountProvider.SOLANA_SNAP_ID), "f");
-        __classPrivateFieldSet(this, _SolAccountProvider_config, config, "f");
     }
     getName() {
         return SolAccountProvider.NAME;
@@ -48,18 +47,20 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
-        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-            entropySource,
-            groupIndex,
-            derivationPath,
+        return this.withMaxConcurrency(async () => {
+            const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
+            const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+                entropySource,
+                groupIndex,
+                derivationPath,
+            });
+            return [account];
         });
-        return [account];
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
-        const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(__classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([keyring_api_1.SolScope.Mainnet], entropySource, groupIndex), __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.timeoutMs), {
-            maxAttempts: __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.maxAttempts,
-            backOffMs: __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.backOffMs,
+        const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(__classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([keyring_api_1.SolScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+            maxAttempts: this.config.discovery.maxAttempts,
+            backOffMs: this.config.discovery.backOffMs,
         });
         if (!discoveredAccounts.length) {
             return [];
@@ -73,7 +74,7 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     }
 }
 exports.SolAccountProvider = SolAccountProvider;
-_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_config = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new keyring_snap_client_1.KeyringClient({
         send: async (request) => {
             const response = await this.messenger.call('SnapController:handleRequest', {
@@ -87,7 +88,7 @@ _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_config = new Wea
     });
 }, _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount({ entropySource, groupIndex, derivationPath, }) {
     const createAccount = await this.getRestrictedSnapAccountCreator();
-    const account = await (0, utils_1.withTimeout)(createAccount({ entropySource, derivationPath }), __classPrivateFieldGet(this, _SolAccountProvider_config, "f").createAccounts.timeoutMs);
+    const account = await (0, utils_1.withTimeout)(createAccount({ entropySource, derivationPath }), this.config.createAccounts.timeoutMs);
     // Ensure entropy is present before type assertion validation
     account.options.entropy = {
         type: keyring_api_2.KeyringAccountEntropyTypeOption.Mnemonic,

package/dist/providers/SolAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\n\nexport type SolAccountProviderConfig = {\n  discovery: {\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    timeoutMs: number;\n  };\n};\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana' as const;\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static NAME = SOL_ACCOUNT_PROVIDER_NAME;\n\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  readonly #config: SolAccountProviderConfig;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n    this.#config = config;\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n    const account = await withTimeout(\n      createAccount({ entropySource, derivationPath }),\n      this.#config.createAccounts.timeoutMs,\n    );\n\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      derivationPath,\n    });\n\n    return [account];\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [SolScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await Promise.all(\n      discoveredAccounts.map((d) =>\n        this.#createAccount({\n          entropySource,\n          groupIndex,\n          derivationPath: d.derivationPath,\n        }),\n      ),\n    );\n\n    return createdAccounts;\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport {\n  SnapAccountProvider,\n  type SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana' as const;\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static NAME = SOL_ACCOUNT_PROVIDER_NAME;\n\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = {\n      maxConcurrency: 3,\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n    const account = await withTimeout(\n      createAccount({ entropySource, derivationPath }),\n      this.config.createAccounts.timeoutMs,\n    );\n\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n      const account = await this.#createAccount({\n        entropySource,\n        groupIndex,\n        derivationPath,\n      });\n\n      return [account];\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [SolScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.config.discovery.maxAttempts,\n        backOffMs: this.config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await Promise.all(\n      discoveredAccounts.map((d) =>\n        this.#createAccount({\n          entropySource,\n          groupIndex,\n          derivationPath: d.derivationPath,\n        }),\n      ),\n    );\n\n    return createdAccounts;\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -2,18 +2,9 @@ import { type Bip44Account } from "@metamask/account-api";
 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 { MultichainAccountServiceMessenger } from "src/types";
-import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-export type SolAccountProviderConfig = {
-    discovery: {
-        maxAttempts: number;
-        timeoutMs: number;
-        backOffMs: number;
-    };
-    createAccounts: {
-        timeoutMs: number;
-    };
-};
+import { SnapAccountProvider, type SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { MultichainAccountServiceMessenger } from "../types.cjs";
+export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME: "Solana";
 export declare class SolAccountProvider extends SnapAccountProvider {
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAEnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAG5D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,cAAc,EAAE;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAAoB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,WAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;gBAOnE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IASH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAkC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAWrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAiC5C"}
+{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,kCAA8B;AAE/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,UAAoB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,WAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;gBAKnE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAUP;IAQH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAkC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAarC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAiC5C"}

package/dist/providers/SolAccountProvider.d.mts

@@ -2,18 +2,9 @@ import { type Bip44Account } from "@metamask/account-api";
 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 { MultichainAccountServiceMessenger } from "src/types";
-import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-export type SolAccountProviderConfig = {
-    discovery: {
-        maxAttempts: number;
-        timeoutMs: number;
-        backOffMs: number;
-    };
-    createAccounts: {
-        timeoutMs: number;
-    };
-};
+import { SnapAccountProvider, type SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { MultichainAccountServiceMessenger } from "../types.mjs";
+export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME: "Solana";
 export declare class SolAccountProvider extends SnapAccountProvider {
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAEnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAG5D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,cAAc,EAAE;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAAoB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,WAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;gBAOnE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IASH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAkC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAWrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAiC5C"}
+{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,kCAA8B;AAE/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,UAAoB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,WAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;gBAKnE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAUP;IAQH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAkC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAarC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAiC5C"}

package/dist/providers/SolAccountProvider.mjs

@@ -9,7 +9,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 _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_config, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount;
+var _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount;
 import { assertIsBip44Account } from "@metamask/account-api";
 import { SolScope } from "@metamask/keyring-api";
 import { KeyringAccountEntropyTypeOption, SolAccountType } from "@metamask/keyring-api";
@@ -21,6 +21,7 @@ import { withRetry, withTimeout } from "./utils.mjs";
 export const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 export class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger, config = {
+        maxConcurrency: 3,
         discovery: {
             timeoutMs: 2000,
             maxAttempts: 3,
@@ -30,12 +31,10 @@ export class SolAccountProvider extends SnapAccountProvider {
             timeoutMs: 3000,
         },
     }) {
-        super(SolAccountProvider.SOLANA_SNAP_ID, messenger);
+        super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config);
         _SolAccountProvider_instances.add(this);
         _SolAccountProvider_client.set(this, void 0);
-        _SolAccountProvider_config.set(this, void 0);
         __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SolAccountProvider.SOLANA_SNAP_ID), "f");
-        __classPrivateFieldSet(this, _SolAccountProvider_config, config, "f");
     }
     getName() {
         return SolAccountProvider.NAME;
@@ -45,18 +44,20 @@ export class SolAccountProvider extends SnapAccountProvider {
             account.metadata.keyring.type === KeyringTypes.snap);
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
-        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-            entropySource,
-            groupIndex,
-            derivationPath,
+        return this.withMaxConcurrency(async () => {
+            const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
+            const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+                entropySource,
+                groupIndex,
+                derivationPath,
+            });
+            return [account];
         });
-        return [account];
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
-        const discoveredAccounts = await withRetry(() => withTimeout(__classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([SolScope.Mainnet], entropySource, groupIndex), __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.timeoutMs), {
-            maxAttempts: __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.maxAttempts,
-            backOffMs: __classPrivateFieldGet(this, _SolAccountProvider_config, "f").discovery.backOffMs,
+        const discoveredAccounts = await withRetry(() => withTimeout(__classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([SolScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+            maxAttempts: this.config.discovery.maxAttempts,
+            backOffMs: this.config.discovery.backOffMs,
         });
         if (!discoveredAccounts.length) {
             return [];
@@ -69,7 +70,7 @@ export class SolAccountProvider extends SnapAccountProvider {
         return createdAccounts;
     }
 }
-_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_config = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new KeyringClient({
         send: async (request) => {
             const response = await this.messenger.call('SnapController:handleRequest', {
@@ -83,7 +84,7 @@ _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_config = new Wea
     });
 }, _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount({ entropySource, groupIndex, derivationPath, }) {
     const createAccount = await this.getRestrictedSnapAccountCreator();
-    const account = await withTimeout(createAccount({ entropySource, derivationPath }), __classPrivateFieldGet(this, _SolAccountProvider_config, "f").createAccounts.timeoutMs);
+    const account = await withTimeout(createAccount({ entropySource, derivationPath }), this.config.createAccounts.timeoutMs);
     // Ensure entropy is present before type assertion validation
     account.options.entropy = {
         type: KeyringAccountEntropyTypeOption.Mnemonic,

package/dist/providers/SolAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\n\nexport type SolAccountProviderConfig = {\n  discovery: {\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    timeoutMs: number;\n  };\n};\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana' as const;\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static NAME = SOL_ACCOUNT_PROVIDER_NAME;\n\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  readonly #config: SolAccountProviderConfig;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n    this.#config = config;\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n    const account = await withTimeout(\n      createAccount({ entropySource, derivationPath }),\n      this.#config.createAccounts.timeoutMs,\n    );\n\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await this.#createAccount({\n      entropySource,\n      groupIndex,\n      derivationPath,\n    });\n\n    return [account];\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [SolScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await Promise.all(\n      discoveredAccounts.map((d) =>\n        this.#createAccount({\n          entropySource,\n          groupIndex,\n          derivationPath: d.derivationPath,\n        }),\n      ),\n    );\n\n    return createdAccounts;\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport {\n  SnapAccountProvider,\n  type SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana' as const;\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static NAME = SOL_ACCOUNT_PROVIDER_NAME;\n\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = {\n      maxConcurrency: 3,\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount({\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n    const account = await withTimeout(\n      createAccount({ entropySource, derivationPath }),\n      this.config.createAccounts.timeoutMs,\n    );\n\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    assertIsBip44Account(account);\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n      const account = await this.#createAccount({\n        entropySource,\n        groupIndex,\n        derivationPath,\n      });\n\n      return [account];\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [SolScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.config.discovery.maxAttempts,\n        backOffMs: this.config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await Promise.all(\n      discoveredAccounts.map((d) =>\n        this.#createAccount({\n          entropySource,\n          groupIndex,\n          derivationPath: d.derivationPath,\n        }),\n      ),\n    );\n\n    return createdAccounts;\n  }\n}\n"]}

package/dist/providers/TrxAccountProvider.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 _TrxAccountProvider_instances, _TrxAccountProvider_client, _TrxAccountProvider_config, _TrxAccountProvider_getKeyringClientFromSnapId;
+var _TrxAccountProvider_instances, _TrxAccountProvider_client, _TrxAccountProvider_getKeyringClientFromSnapId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrxAccountProvider = exports.TRX_ACCOUNT_PROVIDER_NAME = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -32,12 +32,10 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
             timeoutMs: 3000,
         },
     }) {
-        super(TrxAccountProvider.TRX_SNAP_ID, messenger);
+        super(TrxAccountProvider.TRX_SNAP_ID, messenger, config);
         _TrxAccountProvider_instances.add(this);
         _TrxAccountProvider_client.set(this, void 0);
-        _TrxAccountProvider_config.set(this, void 0);
         __classPrivateFieldSet(this, _TrxAccountProvider_client, __classPrivateFieldGet(this, _TrxAccountProvider_instances, "m", _TrxAccountProvider_getKeyringClientFromSnapId).call(this, TrxAccountProvider.TRX_SNAP_ID), "f");
-        __classPrivateFieldSet(this, _TrxAccountProvider_config, config, "f");
     }
     getName() {
         return TrxAccountProvider.NAME;
@@ -47,20 +45,22 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
     async createAccounts({ entropySource, groupIndex: index, }) {
-        const createAccount = await this.getRestrictedSnapAccountCreator();
-        const account = await (0, utils_1.withTimeout)(createAccount({
-            entropySource,
-            index,
-            addressType: keyring_api_1.TrxAccountType.Eoa,
-            scope: keyring_api_1.TrxScope.Mainnet,
-        }), __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").createAccounts.timeoutMs);
-        (0, account_api_1.assertIsBip44Account)(account);
-        return [account];
+        return this.withMaxConcurrency(async () => {
+            const createAccount = await this.getRestrictedSnapAccountCreator();
+            const account = await (0, utils_1.withTimeout)(createAccount({
+                entropySource,
+                index,
+                addressType: keyring_api_1.TrxAccountType.Eoa,
+                scope: keyring_api_1.TrxScope.Mainnet,
+            }), this.config.createAccounts.timeoutMs);
+            (0, account_api_1.assertIsBip44Account)(account);
+            return [account];
+        });
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
-        const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(__classPrivateFieldGet(this, _TrxAccountProvider_client, "f").discoverAccounts([keyring_api_1.TrxScope.Mainnet], entropySource, groupIndex), __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.timeoutMs), {
-            maxAttempts: __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.maxAttempts,
-            backOffMs: __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.backOffMs,
+        const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(__classPrivateFieldGet(this, _TrxAccountProvider_client, "f").discoverAccounts([keyring_api_1.TrxScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+            maxAttempts: this.config.discovery.maxAttempts,
+            backOffMs: this.config.discovery.backOffMs,
         });
         if (!discoveredAccounts.length) {
             return [];
@@ -73,7 +73,7 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     }
 }
 exports.TrxAccountProvider = TrxAccountProvider;
-_TrxAccountProvider_client = new WeakMap(), _TrxAccountProvider_config = new WeakMap(), _TrxAccountProvider_instances = new WeakSet(), _TrxAccountProvider_getKeyringClientFromSnapId = function _TrxAccountProvider_getKeyringClientFromSnapId(snapId) {
+_TrxAccountProvider_client = new WeakMap(), _TrxAccountProvider_instances = new WeakSet(), _TrxAccountProvider_getKeyringClientFromSnapId = function _TrxAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new keyring_snap_client_1.KeyringClient({
         send: async (request) => {
             const response = await this.messenger.call('SnapController:handleRequest', {

package/dist/providers/TrxAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"TrxAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { TrxAccountType, TrxScope } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\n\nexport type TrxAccountProviderConfig = {\n  discovery: {\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    timeoutMs: number;\n  };\n};\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron' as const;\n\nexport class TrxAccountProvider extends SnapAccountProvider {\n  static NAME = TRX_ACCOUNT_PROVIDER_NAME;\n\n  static TRX_SNAP_ID = 'npm:@metamask/tron-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  readonly #config: TrxAccountProviderConfig;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      TrxAccountProvider.TRX_SNAP_ID,\n    );\n    this.#config = config;\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === TrxAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex: index,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    const account = await withTimeout(\n      createAccount({\n        entropySource,\n        index,\n        addressType: TrxAccountType.Eoa,\n        scope: TrxScope.Mainnet,\n      }),\n      this.#config.createAccounts.timeoutMs,\n    );\n\n    assertIsBip44Account(account);\n    return [account];\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [TrxScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await this.createAccounts({\n      entropySource,\n      groupIndex,\n    });\n\n    return createdAccounts;\n  }\n}\n"]}
+{"version":3,"file":"TrxAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { TrxAccountType, TrxScope } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport {\n  SnapAccountProvider,\n  type SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type TrxAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron' as const;\n\nexport class TrxAccountProvider extends SnapAccountProvider {\n  static NAME = TRX_ACCOUNT_PROVIDER_NAME;\n\n  static TRX_SNAP_ID = 'npm:@metamask/tron-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger, config);\n    this.#client = this.#getKeyringClientFromSnapId(\n      TrxAccountProvider.TRX_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === TrxAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex: index,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const createAccount = await this.getRestrictedSnapAccountCreator();\n\n      const account = await withTimeout(\n        createAccount({\n          entropySource,\n          index,\n          addressType: TrxAccountType.Eoa,\n          scope: TrxScope.Mainnet,\n        }),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      assertIsBip44Account(account);\n      return [account];\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [TrxScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.config.discovery.maxAttempts,\n        backOffMs: this.config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await this.createAccounts({\n      entropySource,\n      groupIndex,\n    });\n\n    return createdAccounts;\n  }\n}\n"]}

package/dist/providers/TrxAccountProvider.d.cts

@@ -2,18 +2,9 @@ import { type Bip44Account } from "@metamask/account-api";
 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 { MultichainAccountServiceMessenger } from "src/types";
-import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-export type TrxAccountProviderConfig = {
-    discovery: {
-        maxAttempts: number;
-        timeoutMs: number;
-        backOffMs: number;
-    };
-    createAccounts: {
-        timeoutMs: number;
-    };
-};
+import { SnapAccountProvider, type SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { MultichainAccountServiceMessenger } from "../types.cjs";
+export type TrxAccountProviderConfig = SnapAccountProviderConfig;
 export declare const TRX_ACCOUNT_PROVIDER_NAME: "Tron";
 export declare class TrxAccountProvider extends SnapAccountProvider {
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"TrxAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAEnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAG5D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,cAAc,EAAE;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAkB,CAAC;AAEzD,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAA8C;gBAO9D,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IASH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,EAAE,KAAK,GAClB,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAiBrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA4B5C"}
+{"version":3,"file":"TrxAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,kCAA8B;AAE/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,QAAkB,CAAC;AAEzD,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAA8C;gBAK9D,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IAQH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,EAAE,KAAK,GAClB,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAmBrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA4B5C"}

package/dist/providers/TrxAccountProvider.d.mts

@@ -2,18 +2,9 @@ import { type Bip44Account } from "@metamask/account-api";
 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 { MultichainAccountServiceMessenger } from "src/types";
-import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-export type TrxAccountProviderConfig = {
-    discovery: {
-        maxAttempts: number;
-        timeoutMs: number;
-        backOffMs: number;
-    };
-    createAccounts: {
-        timeoutMs: number;
-    };
-};
+import { SnapAccountProvider, type SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { MultichainAccountServiceMessenger } from "../types.mjs";
+export type TrxAccountProviderConfig = SnapAccountProviderConfig;
 export declare const TRX_ACCOUNT_PROVIDER_NAME: "Tron";
 export declare class TrxAccountProvider extends SnapAccountProvider {
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"TrxAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAEnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAG5D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,cAAc,EAAE;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAkB,CAAC;AAEzD,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAA8C;gBAO9D,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IASH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,EAAE,KAAK,GAClB,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAiBrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA4B5C"}
+{"version":3,"file":"TrxAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,YAAY,EAAE,8BAA8B;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,EACL,mBAAmB,EACnB,KAAK,yBAAyB,EAC/B,kCAA8B;AAE/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,QAAkB,CAAC;AAEzD,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,WAAW,SAA8C;gBAK9D,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBASP;IAQH,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,EAAE,KAAK,GAClB,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAmBrC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA4B5C"}

package/dist/providers/TrxAccountProvider.mjs

@@ -9,7 +9,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 _TrxAccountProvider_instances, _TrxAccountProvider_client, _TrxAccountProvider_config, _TrxAccountProvider_getKeyringClientFromSnapId;
+var _TrxAccountProvider_instances, _TrxAccountProvider_client, _TrxAccountProvider_getKeyringClientFromSnapId;
 import { assertIsBip44Account } from "@metamask/account-api";
 import { TrxAccountType, TrxScope } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
@@ -29,12 +29,10 @@ export class TrxAccountProvider extends SnapAccountProvider {
             timeoutMs: 3000,
         },
     }) {
-        super(TrxAccountProvider.TRX_SNAP_ID, messenger);
+        super(TrxAccountProvider.TRX_SNAP_ID, messenger, config);
         _TrxAccountProvider_instances.add(this);
         _TrxAccountProvider_client.set(this, void 0);
-        _TrxAccountProvider_config.set(this, void 0);
         __classPrivateFieldSet(this, _TrxAccountProvider_client, __classPrivateFieldGet(this, _TrxAccountProvider_instances, "m", _TrxAccountProvider_getKeyringClientFromSnapId).call(this, TrxAccountProvider.TRX_SNAP_ID), "f");
-        __classPrivateFieldSet(this, _TrxAccountProvider_config, config, "f");
     }
     getName() {
         return TrxAccountProvider.NAME;
@@ -44,20 +42,22 @@ export class TrxAccountProvider extends SnapAccountProvider {
             account.metadata.keyring.type === KeyringTypes.snap);
     }
     async createAccounts({ entropySource, groupIndex: index, }) {
-        const createAccount = await this.getRestrictedSnapAccountCreator();
-        const account = await withTimeout(createAccount({
-            entropySource,
-            index,
-            addressType: TrxAccountType.Eoa,
-            scope: TrxScope.Mainnet,
-        }), __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").createAccounts.timeoutMs);
-        assertIsBip44Account(account);
-        return [account];
+        return this.withMaxConcurrency(async () => {
+            const createAccount = await this.getRestrictedSnapAccountCreator();
+            const account = await withTimeout(createAccount({
+                entropySource,
+                index,
+                addressType: TrxAccountType.Eoa,
+                scope: TrxScope.Mainnet,
+            }), this.config.createAccounts.timeoutMs);
+            assertIsBip44Account(account);
+            return [account];
+        });
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
-        const discoveredAccounts = await withRetry(() => withTimeout(__classPrivateFieldGet(this, _TrxAccountProvider_client, "f").discoverAccounts([TrxScope.Mainnet], entropySource, groupIndex), __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.timeoutMs), {
-            maxAttempts: __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.maxAttempts,
-            backOffMs: __classPrivateFieldGet(this, _TrxAccountProvider_config, "f").discovery.backOffMs,
+        const discoveredAccounts = await withRetry(() => withTimeout(__classPrivateFieldGet(this, _TrxAccountProvider_client, "f").discoverAccounts([TrxScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+            maxAttempts: this.config.discovery.maxAttempts,
+            backOffMs: this.config.discovery.backOffMs,
         });
         if (!discoveredAccounts.length) {
             return [];
@@ -69,7 +69,7 @@ export class TrxAccountProvider extends SnapAccountProvider {
         return createdAccounts;
     }
 }
-_TrxAccountProvider_client = new WeakMap(), _TrxAccountProvider_config = new WeakMap(), _TrxAccountProvider_instances = new WeakSet(), _TrxAccountProvider_getKeyringClientFromSnapId = function _TrxAccountProvider_getKeyringClientFromSnapId(snapId) {
+_TrxAccountProvider_client = new WeakMap(), _TrxAccountProvider_instances = new WeakSet(), _TrxAccountProvider_getKeyringClientFromSnapId = function _TrxAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new KeyringClient({
         send: async (request) => {
             const response = await this.messenger.call('SnapController:handleRequest', {

package/dist/providers/TrxAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"TrxAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { TrxAccountType, TrxScope } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\n\nexport type TrxAccountProviderConfig = {\n  discovery: {\n    maxAttempts: number;\n    timeoutMs: number;\n    backOffMs: number;\n  };\n  createAccounts: {\n    timeoutMs: number;\n  };\n};\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron' as const;\n\nexport class TrxAccountProvider extends SnapAccountProvider {\n  static NAME = TRX_ACCOUNT_PROVIDER_NAME;\n\n  static TRX_SNAP_ID = 'npm:@metamask/tron-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  readonly #config: TrxAccountProviderConfig;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      TrxAccountProvider.TRX_SNAP_ID,\n    );\n    this.#config = config;\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === TrxAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex: index,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    const account = await withTimeout(\n      createAccount({\n        entropySource,\n        index,\n        addressType: TrxAccountType.Eoa,\n        scope: TrxScope.Mainnet,\n      }),\n      this.#config.createAccounts.timeoutMs,\n    );\n\n    assertIsBip44Account(account);\n    return [account];\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [TrxScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.#config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.#config.discovery.maxAttempts,\n        backOffMs: this.#config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await this.createAccounts({\n      entropySource,\n      groupIndex,\n    });\n\n    return createdAccounts;\n  }\n}\n"]}
+{"version":3,"file":"TrxAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account, type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { TrxAccountType, TrxScope } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport {\n  SnapAccountProvider,\n  type SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type TrxAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron' as const;\n\nexport class TrxAccountProvider extends SnapAccountProvider {\n  static NAME = TRX_ACCOUNT_PROVIDER_NAME;\n\n  static TRX_SNAP_ID = 'npm:@metamask/tron-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = {\n      discovery: {\n        timeoutMs: 2000,\n        maxAttempts: 3,\n        backOffMs: 1000,\n      },\n      createAccounts: {\n        timeoutMs: 3000,\n      },\n    },\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger, config);\n    this.#client = this.#getKeyringClientFromSnapId(\n      TrxAccountProvider.TRX_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\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  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === TrxAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex: index,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const createAccount = await this.getRestrictedSnapAccountCreator();\n\n      const account = await withTimeout(\n        createAccount({\n          entropySource,\n          index,\n          addressType: TrxAccountType.Eoa,\n          scope: TrxScope.Mainnet,\n        }),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      assertIsBip44Account(account);\n      return [account];\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await withRetry(\n      () =>\n        withTimeout(\n          this.#client.discoverAccounts(\n            [TrxScope.Mainnet],\n            entropySource,\n            groupIndex,\n          ),\n          this.config.discovery.timeoutMs,\n        ),\n      {\n        maxAttempts: this.config.discovery.maxAttempts,\n        backOffMs: this.config.discovery.backOffMs,\n      },\n    );\n\n    if (!discoveredAccounts.length) {\n      return [];\n    }\n\n    const createdAccounts = await this.createAccounts({\n      entropySource,\n      groupIndex,\n    });\n\n    return createdAccounts;\n  }\n}\n"]}

package/dist/utils.cjs

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toRejectedErrorMessage = void 0;
+const toRejectedErrorMessage = (prefix, results) => {
+    let errorMessage = `${prefix}:`;
+    for (const r of results) {
+        if (r.status === 'rejected') {
+            errorMessage += `\n- ${r.reason}`;
+        }
+    }
+    return errorMessage;
+};
+exports.toRejectedErrorMessage = toRejectedErrorMessage;
+//# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,sBAAsB,GAAG,CACpC,MAAc,EACd,OAAuC,EACvC,EAAE;IACF,IAAI,YAAY,GAAG,GAAG,MAAM,GAAG,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,EAAE;YAC3B,YAAY,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;SACnC;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAXW,QAAA,sBAAsB,0BAWjC","sourcesContent":["export const toRejectedErrorMessage = <Result>(\n  prefix: string,\n  results: PromiseSettledResult<Result>[],\n) => {\n  let errorMessage = `${prefix}:`;\n  for (const r of results) {\n    if (r.status === 'rejected') {\n      errorMessage += `\\n- ${r.reason}`;\n    }\n  }\n  return errorMessage;\n};\n"]}