@metamask/multichain-account-service 7.0.0 → 8.0.0

package/dist/providers/SolAccountProvider.cjs

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SolAccountProvider_instances, _SolAccountProvider_createAccount;
+var _SolAccountProvider_instances, _SolAccountProvider_getDerivationPath;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolAccountProvider = exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = exports.SOL_ACCOUNT_PROVIDER_NAME = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -13,7 +13,7 @@ const keyring_controller_1 = require("@metamask/keyring-controller");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
 const utils_1 = require("./utils.cjs");
 const analytics_1 = require("../analytics/index.cjs");
-const traces_1 = require("../constants/traces.cjs");
+const traces_1 = require("../analytics/traces.cjs");
 exports.SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -24,8 +24,12 @@ exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
+        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
+    resyncAccounts: {
+        autoRemoveExtraSnapAccounts: true,
+    },
 };
 class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger, config = exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = analytics_1.traceFallback) {
@@ -35,6 +39,7 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
             scopes: [keyring_api_1.SolScope.Mainnet, keyring_api_1.SolScope.Devnet, keyring_api_1.SolScope.Testnet],
             bip44: {
                 deriveIndex: true,
+                deriveIndexRange: true,
             },
         };
     }
@@ -45,25 +50,23 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.SolAccountType.DataAccount &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
-    async createAccounts(options) {
-        (0, keyring_api_1.assertCreateAccountOptionIsSupported)(options, [
-            `${keyring_api_1.AccountCreationType.Bip44DeriveIndex}`,
-        ]);
-        const { entropySource, groupIndex } = options;
-        return this.withSnap(async ({ keyring }) => {
-            return this.withMaxConcurrency(async () => {
-                const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
-                const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-                    keyring,
-                    entropySource,
-                    groupIndex,
-                    derivationPath,
-                });
-                this.accounts.add(account.id);
-                return [account];
-            });
+    async createAccountV1(keyring, { entropySource, groupIndex, }) {
+        return keyring.createAccount({
+            entropySource,
+            derivationPath: __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getDerivationPath).call(this, groupIndex),
         });
     }
+    toBip44Account(account, { entropySource, groupIndex, }) {
+        // Ensure entropy is present before type assertion validation
+        account.options.entropy = {
+            type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+            id: entropySource,
+            groupIndex,
+            derivationPath: __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getDerivationPath).call(this, groupIndex),
+        };
+        (0, account_api_1.assertIsBip44Account)(account);
+        return account;
+    }
     async discoverAccounts({ entropySource, groupIndex, }) {
         return this.withSnap(async ({ client, keyring }) => {
             return await super.trace({
@@ -75,39 +78,28 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
                 if (!this.config.discovery.enabled) {
                     return [];
                 }
-                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(client.discoverAccounts([keyring_api_1.SolScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(() => client.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 [];
                 }
-                const createdAccounts = await Promise.all(discoveredAccounts.map((d) => __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-                    keyring,
+                // NOTE: We know the Solana Snap only return 1 account per group index during discovery. Also,
+                // we do not use the returned `derivationPath` on purpose. Instead we just create the account
+                // for this group index and that's all.
+                return await this.createBip44Accounts(keyring, {
+                    type: keyring_api_1.AccountCreationType.Bip44DeriveIndex,
                     entropySource,
                     groupIndex,
-                    derivationPath: d.derivationPath,
-                })));
-                for (const account of createdAccounts) {
-                    this.accounts.add(account.id);
-                }
-                return createdAccounts;
+                });
             });
         });
     }
 }
 exports.SolAccountProvider = SolAccountProvider;
-_SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount({ keyring, entropySource, groupIndex, derivationPath, }) {
-    const account = await (0, utils_1.withTimeout)(keyring.createAccount({ entropySource, derivationPath }), this.config.createAccounts.timeoutMs);
-    // Ensure entropy is present before type assertion validation
-    account.options.entropy = {
-        type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
-        id: entropySource,
-        groupIndex,
-        derivationPath,
-    };
-    (0, account_api_1.assertIsBip44Account)(account);
-    return account;
+_SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getDerivationPath = function _SolAccountProvider_getDerivationPath(groupIndex) {
+    return `m/44'/501'/${groupIndex}'/0'`;
 };
 SolAccountProvider.NAME = exports.SOL_ACCOUNT_PROVIDER_NAME;
 SolAccountProvider.SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';

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 } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';\n\nexport const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    timeoutMs: 3000,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\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    keyring,\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    keyring: RestrictedSnapKeyring;\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const account = await withTimeout(\n      keyring.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    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n    ]);\n\n    const { entropySource, groupIndex } = options;\n\n    return this.withSnap(async ({ keyring }) => {\n      return this.withMaxConcurrency(async () => {\n        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n        const account = await this.#createAccount({\n          keyring,\n          entropySource,\n          groupIndex,\n          derivationPath,\n        });\n\n        this.accounts.add(account.id);\n        return [account];\n      });\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                client.discoverAccounts(\n                  [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                keyring,\n                entropySource,\n                groupIndex,\n                derivationPath: d.derivationPath,\n              }),\n            ),\n          );\n\n          for (const account of createdAccounts) {\n            this.accounts.add(account.id);\n          }\n\n          return createdAccounts;\n        },\n      );\n    });\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAA6D;AAQ7D,uDAK+B;AAC/B,qEAA4D;AAI5D,mEAA4D;AAK5D,uCAAiD;AACjD,sDAA6C;AAC7C,oDAAgD;AAKnC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AAErC,QAAA,mCAAmC,GAA8B;IAC5E,cAAc,EAAE,CAAC;IACjB,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,OAAO,EAAE,KAAK,EAAE,+CAA+C;QAC/D,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAa,kBAAmB,SAAQ,yCAAmB;IAazD,YACE,SAA4C,EAC5C,SAAmC,2CAAmC,EACtE,QAAuB,yBAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;;QAb5D,iBAAY,GAAwB;YAC3C,MAAM,EAAE,CAAC,sBAAQ,CAAC,OAAO,EAAE,sBAAQ,CAAC,MAAM,EAAE,sBAAQ,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE;gBACL,WAAW,EAAE,IAAI;gBACjB,gBAAgB,EAAE,IAAI;aACvB;SACF,CAAC;IAQF,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,WAAW;YAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,iCAAY,CAAC,IAAe,CAChE,CAAC;IACJ,CAAC;IAMkB,KAAK,CAAC,eAAe,CACtC,OAA8B,EAC9B,EACE,aAAa,EACb,UAAU,GAC6C;QAEzD,OAAO,OAAO,CAAC,aAAa,CAAC;YAC3B,aAAa;YACb,cAAc,EAAE,uBAAA,IAAI,4EAAmB,MAAvB,IAAI,EAAoB,UAAU,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;IAEkB,cAAc,CAC/B,OAAuB,EACvB,EACE,aAAa,EACb,UAAU,GAC6C;QAEzD,6DAA6D;QAC7D,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,6CAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc,EAAE,uBAAA,IAAI,4EAAmB,MAAvB,IAAI,EAAoB,UAAU,CAAC;SACpD,CAAC;QAEF,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GAIX;QACC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACjD,OAAO,MAAM,KAAK,CAAC,KAAK,CACtB;gBACE,IAAI,EAAE,kBAAS,CAAC,oBAAoB;gBACpC,IAAI,EAAE;oBACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;iBACzB;aACF,EACD,KAAK,IAAI,EAAE;gBACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACnC,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,iBAAS,EACxC,GAAG,EAAE,CACH,IAAA,mBAAW,EACT,GAAG,EAAE,CACH,MAAM,CAAC,gBAAgB,CACrB,CAAC,sBAAQ,CAAC,OAAO,CAAC,EAClB,aAAa,EACb,UAAU,CACX,EACH,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAChC,EACH;oBACE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW;oBAC9C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS;iBAC3C,CACF,CAAC;gBAEF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;oBAC/B,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,8FAA8F;gBAC9F,6FAA6F;gBAC7F,uCAAuC;gBACvC,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE;oBAC7C,IAAI,EAAE,iCAAmB,CAAC,gBAAgB;oBAC1C,aAAa;oBACb,UAAU;iBACX,CAAC,CAAC;YACL,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAzHH,gDA0HC;sIA1FoB,UAAkB;IACnC,OAAO,cAAc,UAAU,MAAM,CAAC;AACxC,CAAC;AAjCM,uBAAI,GAAG,iCAAyB,AAA5B,CAA6B;AAEjC,iCAAc,GAAG,kCAA4C,AAA/C,CAAgD","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';\n\nexport const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    batched: false, // For now, the Snap is not fully v2 compliant.\n    timeoutMs: 3000,\n  },\n  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\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  #getDerivationPath(groupIndex: number): string {\n    return `m/44'/501'/${groupIndex}'/0'`;\n  }\n\n  protected override async createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    return keyring.createAccount({\n      entropySource,\n      derivationPath: this.#getDerivationPath(groupIndex),\n    });\n  }\n\n  protected override toBip44Account(\n    account: KeyringAccount,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Bip44Account<KeyringAccount> {\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath: this.#getDerivationPath(groupIndex),\n    };\n\n    assertIsBip44Account(account);\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    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    [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          // NOTE: We know the Solana Snap only return 1 account per group index during discovery. Also,\n          // we do not use the returned `derivationPath` on purpose. Instead we just create the account\n          // for this group index and that's all.\n          return await this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      );\n    });\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -1,10 +1,10 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { CreateAccountOptions, EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
+import type { EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-import type { SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
 export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME = "Solana";
@@ -17,7 +17,14 @@ export declare class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger: MultichainAccountServiceMessenger, config?: SolAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<KeyringAccount>;
+    protected toBip44Account(account: KeyringAccount, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Bip44Account<KeyringAccount>;
     discoverAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAS/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAErE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAKxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAmC9D,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAuBpC,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;CAsD5C"}
+{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAQ/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAejD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAErE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAW3C,eAAe,CACtC,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;cAOP,cAAc,CAC/B,OAAO,EAAE,cAAc,EACvB,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,YAAY,CAAC,cAAc,CAAC;IAczB,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA+C5C"}

package/dist/providers/SolAccountProvider.d.mts

@@ -1,10 +1,10 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { CreateAccountOptions, EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
+import type { EntropySourceId, KeyringAccount, KeyringCapabilities } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-import type { SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
 export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME = "Solana";
@@ -17,7 +17,14 @@ export declare class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger: MultichainAccountServiceMessenger, config?: SolAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<KeyringAccount>;
+    protected toBip44Account(account: KeyringAccount, { entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Bip44Account<KeyringAccount>;
     discoverAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAS/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAEV,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAWjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAErE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAKxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAmC9D,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAuBpC,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;CAsD5C"}
+{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,8BAA8B;AAQ/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAI/B,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAejD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAErE,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAMxC;gBAGA,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAW3C,eAAe,CACtC,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;cAOP,cAAc,CAC/B,OAAO,EAAE,cAAc,EACvB,EACE,aAAa,EACb,UAAU,GACX,EAAE;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GACxD,YAAY,CAAC,cAAc,CAAC;IAczB,gBAAgB,CAAC,EACrB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CA+C5C"}

package/dist/providers/SolAccountProvider.mjs

@@ -3,14 +3,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SolAccountProvider_instances, _SolAccountProvider_createAccount;
+var _SolAccountProvider_instances, _SolAccountProvider_getDerivationPath;
 import { assertIsBip44Account } from "@metamask/account-api";
-import { AccountCreationType, assertCreateAccountOptionIsSupported, KeyringAccountEntropyTypeOption, SolAccountType, SolScope } from "@metamask/keyring-api";
+import { AccountCreationType, KeyringAccountEntropyTypeOption, SolAccountType, SolScope } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
 import { withRetry, withTimeout } from "./utils.mjs";
 import { traceFallback } from "../analytics/index.mjs";
-import { TraceName } from "../constants/traces.mjs";
+import { TraceName } from "../analytics/traces.mjs";
 export const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 export const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -21,8 +21,12 @@ export const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
+        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
+    resyncAccounts: {
+        autoRemoveExtraSnapAccounts: true,
+    },
 };
 export class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger, config = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = traceFallback) {
@@ -32,6 +36,7 @@ export class SolAccountProvider extends SnapAccountProvider {
             scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],
             bip44: {
                 deriveIndex: true,
+                deriveIndexRange: true,
             },
         };
     }
@@ -42,25 +47,23 @@ export class SolAccountProvider extends SnapAccountProvider {
         return (account.type === SolAccountType.DataAccount &&
             account.metadata.keyring.type === KeyringTypes.snap);
     }
-    async createAccounts(options) {
-        assertCreateAccountOptionIsSupported(options, [
-            `${AccountCreationType.Bip44DeriveIndex}`,
-        ]);
-        const { entropySource, groupIndex } = options;
-        return this.withSnap(async ({ keyring }) => {
-            return this.withMaxConcurrency(async () => {
-                const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
-                const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-                    keyring,
-                    entropySource,
-                    groupIndex,
-                    derivationPath,
-                });
-                this.accounts.add(account.id);
-                return [account];
-            });
+    async createAccountV1(keyring, { entropySource, groupIndex, }) {
+        return keyring.createAccount({
+            entropySource,
+            derivationPath: __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getDerivationPath).call(this, groupIndex),
         });
     }
+    toBip44Account(account, { entropySource, groupIndex, }) {
+        // Ensure entropy is present before type assertion validation
+        account.options.entropy = {
+            type: KeyringAccountEntropyTypeOption.Mnemonic,
+            id: entropySource,
+            groupIndex,
+            derivationPath: __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getDerivationPath).call(this, groupIndex),
+        };
+        assertIsBip44Account(account);
+        return account;
+    }
     async discoverAccounts({ entropySource, groupIndex, }) {
         return this.withSnap(async ({ client, keyring }) => {
             return await super.trace({
@@ -72,38 +75,27 @@ export class SolAccountProvider extends SnapAccountProvider {
                 if (!this.config.discovery.enabled) {
                     return [];
                 }
-                const discoveredAccounts = await withRetry(() => withTimeout(client.discoverAccounts([SolScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+                const discoveredAccounts = await withRetry(() => withTimeout(() => client.discoverAccounts([SolScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
                     maxAttempts: this.config.discovery.maxAttempts,
                     backOffMs: this.config.discovery.backOffMs,
                 });
                 if (!discoveredAccounts.length) {
                     return [];
                 }
-                const createdAccounts = await Promise.all(discoveredAccounts.map((d) => __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
-                    keyring,
+                // NOTE: We know the Solana Snap only return 1 account per group index during discovery. Also,
+                // we do not use the returned `derivationPath` on purpose. Instead we just create the account
+                // for this group index and that's all.
+                return await this.createBip44Accounts(keyring, {
+                    type: AccountCreationType.Bip44DeriveIndex,
                     entropySource,
                     groupIndex,
-                    derivationPath: d.derivationPath,
-                })));
-                for (const account of createdAccounts) {
-                    this.accounts.add(account.id);
-                }
-                return createdAccounts;
+                });
             });
         });
     }
 }
-_SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount({ keyring, entropySource, groupIndex, derivationPath, }) {
-    const account = await withTimeout(keyring.createAccount({ entropySource, derivationPath }), this.config.createAccounts.timeoutMs);
-    // Ensure entropy is present before type assertion validation
-    account.options.entropy = {
-        type: KeyringAccountEntropyTypeOption.Mnemonic,
-        id: entropySource,
-        groupIndex,
-        derivationPath,
-    };
-    assertIsBip44Account(account);
-    return account;
+_SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getDerivationPath = function _SolAccountProvider_getDerivationPath(groupIndex) {
+    return `m/44'/501'/${groupIndex}'/0'`;
 };
 SolAccountProvider.NAME = SOL_ACCOUNT_PROVIDER_NAME;
 SolAccountProvider.SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';

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 } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';\n\nexport const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    timeoutMs: 3000,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\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    keyring,\n    entropySource,\n    groupIndex,\n    derivationPath,\n  }: {\n    keyring: RestrictedSnapKeyring;\n    entropySource: EntropySourceId;\n    groupIndex: number;\n    derivationPath: string;\n  }): Promise<Bip44Account<KeyringAccount>> {\n    const account = await withTimeout(\n      keyring.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    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n    ]);\n\n    const { entropySource, groupIndex } = options;\n\n    return this.withSnap(async ({ keyring }) => {\n      return this.withMaxConcurrency(async () => {\n        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n        const account = await this.#createAccount({\n          keyring,\n          entropySource,\n          groupIndex,\n          derivationPath,\n        });\n\n        this.accounts.add(account.id);\n        return [account];\n      });\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                client.discoverAccounts(\n                  [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                keyring,\n                entropySource,\n                groupIndex,\n                derivationPath: d.derivationPath,\n              }),\n            ),\n          );\n\n          for (const account of createdAccounts) {\n            this.accounts.add(account.id);\n          }\n\n          return createdAccounts;\n        },\n      );\n    });\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertIsBip44Account } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type SolAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';\n\nexport const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    batched: false, // For now, the Snap is not fully v2 compliant.\n    timeoutMs: 3000,\n  },\n  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: SolAccountProviderConfig = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return SolAccountProvider.NAME;\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  #getDerivationPath(groupIndex: number): string {\n    return `m/44'/501'/${groupIndex}'/0'`;\n  }\n\n  protected override async createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    return keyring.createAccount({\n      entropySource,\n      derivationPath: this.#getDerivationPath(groupIndex),\n    });\n  }\n\n  protected override toBip44Account(\n    account: KeyringAccount,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Bip44Account<KeyringAccount> {\n    // Ensure entropy is present before type assertion validation\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath: this.#getDerivationPath(groupIndex),\n    };\n\n    assertIsBip44Account(account);\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    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    [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          // NOTE: We know the Solana Snap only return 1 account per group index during discovery. Also,\n          // we do not use the returned `derivationPath` on purpose. Instead we just create the account\n          // for this group index and that's all.\n          return await this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      );\n    });\n  }\n}\n"]}

package/dist/providers/TrxAccountProvider.cjs

@@ -1,19 +1,12 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TrxAccountProvider_instances, _TrxAccountProvider_createAccounts;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrxAccountProvider = exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = exports.TRX_ACCOUNT_PROVIDER_NAME = void 0;
-const account_api_1 = require("@metamask/account-api");
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
 const utils_1 = require("./utils.cjs");
 const analytics_1 = require("../analytics/index.cjs");
-const traces_1 = require("../constants/traces.cjs");
+const traces_1 = require("../analytics/traces.cjs");
 exports.TRX_ACCOUNT_PROVIDER_NAME = 'Tron';
 exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -24,17 +17,21 @@ exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
+        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
+    resyncAccounts: {
+        autoRemoveExtraSnapAccounts: true,
+    },
 };
 class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger, config = exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = analytics_1.traceFallback) {
         super(TrxAccountProvider.TRX_SNAP_ID, messenger, config, trace);
-        _TrxAccountProvider_instances.add(this);
         this.capabilities = {
             scopes: [keyring_api_1.TrxScope.Mainnet, keyring_api_1.TrxScope.Shasta],
             bip44: {
                 deriveIndex: true,
+                deriveIndexRange: true,
             },
         };
     }
@@ -45,17 +42,12 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.TrxAccountType.Eoa &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
-    async createAccounts(options) {
-        (0, keyring_api_1.assertCreateAccountOptionIsSupported)(options, [
-            `${keyring_api_1.AccountCreationType.Bip44DeriveIndex}`,
-        ]);
-        const { entropySource, groupIndex } = options;
-        return this.withSnap(async ({ keyring }) => {
-            return __classPrivateFieldGet(this, _TrxAccountProvider_instances, "m", _TrxAccountProvider_createAccounts).call(this, {
-                keyring,
-                entropySource,
-                groupIndex,
-            });
+    createAccountV1(keyring, { entropySource, groupIndex, }) {
+        return keyring.createAccount({
+            entropySource,
+            index: groupIndex,
+            addressType: keyring_api_1.TrxAccountType.Eoa,
+            scope: keyring_api_1.TrxScope.Mainnet,
         });
     }
     async discoverAccounts({ entropySource, groupIndex, }) {
@@ -69,37 +61,23 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
                 if (!this.config.discovery.enabled) {
                     return [];
                 }
-                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(client.discoverAccounts([keyring_api_1.TrxScope.Mainnet], entropySource, groupIndex), this.config.discovery.timeoutMs), {
+                const discoveredAccounts = await (0, utils_1.withRetry)(() => (0, utils_1.withTimeout)(() => client.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 [];
                 }
-                const createdAccounts = await __classPrivateFieldGet(this, _TrxAccountProvider_instances, "m", _TrxAccountProvider_createAccounts).call(this, {
-                    keyring,
+                return await this.createBip44Accounts(keyring, {
+                    type: keyring_api_1.AccountCreationType.Bip44DeriveIndex,
                     entropySource,
                     groupIndex,
                 });
-                return createdAccounts;
             });
         });
     }
 }
 exports.TrxAccountProvider = TrxAccountProvider;
-_TrxAccountProvider_instances = new WeakSet(), _TrxAccountProvider_createAccounts = async function _TrxAccountProvider_createAccounts({ keyring, entropySource, groupIndex: index, }) {
-    return this.withMaxConcurrency(async () => {
-        const account = await (0, utils_1.withTimeout)(keyring.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);
-        this.accounts.add(account.id);
-        return [account];
-    });
-};
 TrxAccountProvider.NAME = exports.TRX_ACCOUNT_PROVIDER_NAME;
 TrxAccountProvider.TRX_SNAP_ID = 'npm:@metamask/tron-wallet-snap';
 //# sourceMappingURL=TrxAccountProvider.cjs.map

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 } from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  CreateAccountOptions,\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  assertCreateAccountOptionIsSupported,\n  TrxAccountType,\n  TrxScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../constants/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type TrxAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron';\n\nexport const TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG: TrxAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    timeoutMs: 3000,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [TrxScope.Mainnet, TrxScope.Shasta],\n    bip44: {\n      deriveIndex: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\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    keyring,\n    entropySource,\n    groupIndex: index,\n  }: {\n    keyring: RestrictedSnapKeyring;\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withMaxConcurrency(async () => {\n      const account = await withTimeout(\n        keyring.createAccount({\n          entropySource,\n          index,\n          addressType: TrxAccountType.Eoa,\n          scope: TrxScope.Mainnet,\n        }),\n        this.config.createAccounts.timeoutMs,\n      );\n\n      assertIsBip44Account(account);\n      this.accounts.add(account.id);\n      return [account];\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    assertCreateAccountOptionIsSupported(options, [\n      `${AccountCreationType.Bip44DeriveIndex}`,\n    ]);\n\n    const { entropySource, groupIndex } = options;\n\n    return this.withSnap(async ({ keyring }) => {\n      return this.#createAccounts({\n        keyring,\n        entropySource,\n        groupIndex,\n      });\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                client.discoverAccounts(\n                  [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            keyring,\n            entropySource,\n            groupIndex,\n          });\n\n          return createdAccounts;\n        },\n      );\n    });\n  }\n}\n"]}
+{"version":3,"file":"TrxAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type {\n  EntropySourceId,\n  KeyringAccount,\n  KeyringCapabilities,\n} from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  TrxAccountType,\n  TrxScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport type TrxAccountProviderConfig = SnapAccountProviderConfig;\n\nexport const TRX_ACCOUNT_PROVIDER_NAME = 'Tron';\n\nexport const TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG: TrxAccountProviderConfig = {\n  maxConcurrency: 3,\n  discovery: {\n    enabled: true,\n    timeoutMs: 2000,\n    maxAttempts: 3,\n    backOffMs: 1000,\n  },\n  createAccounts: {\n    batched: false, // For now, the Snap is not fully v2 compliant.\n    timeoutMs: 3000,\n  },\n  resyncAccounts: {\n    autoRemoveExtraSnapAccounts: true,\n  },\n};\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 capabilities: KeyringCapabilities = {\n    scopes: [TrxScope.Mainnet, TrxScope.Shasta],\n    bip44: {\n      deriveIndex: true,\n      deriveIndexRange: true,\n    },\n  };\n\n  constructor(\n    messenger: MultichainAccountServiceMessenger,\n    config: TrxAccountProviderConfig = TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG,\n    trace: TraceCallback = traceFallback,\n  ) {\n    super(TrxAccountProvider.TRX_SNAP_ID, messenger, config, trace);\n  }\n\n  getName(): string {\n    return TrxAccountProvider.NAME;\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  protected override createAccountV1(\n    keyring: RestrictedSnapKeyring,\n    {\n      entropySource,\n      groupIndex,\n    }: { entropySource: EntropySourceId; groupIndex: number },\n  ): Promise<KeyringAccount> {\n    return keyring.createAccount({\n      entropySource,\n      index: groupIndex,\n      addressType: TrxAccountType.Eoa,\n      scope: TrxScope.Mainnet,\n    });\n  }\n\n  async discoverAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withSnap(async ({ client, keyring }) => {\n      return await super.trace(\n        {\n          name: TraceName.SnapDiscoverAccounts,\n          data: {\n            provider: this.getName(),\n          },\n        },\n        async () => {\n          if (!this.config.discovery.enabled) {\n            return [];\n          }\n\n          const discoveredAccounts = await withRetry(\n            () =>\n              withTimeout(\n                () =>\n                  client.discoverAccounts(\n                    [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          return await this.createBip44Accounts(keyring, {\n            type: AccountCreationType.Bip44DeriveIndex,\n            entropySource,\n            groupIndex,\n          });\n        },\n      );\n    });\n  }\n}\n"]}

package/dist/providers/TrxAccountProvider.d.cts

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