@metamask/multichain-account-service 11.1.0 → 13.0.0

package/dist/providers/SnapKeyringClient.d.cts

@@ -0,0 +1,51 @@
+import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import { KeyringClient } from "@metamask/keyring-snap-client";
+import type { CaipChainId } from "@metamask/utils";
+/**
+ * Transport used by both the v1 and v2 keyring clients. Matches the object the
+ * {@link KeyringClient} constructor expects.
+ */
+export type Sender = ConstructorParameters<typeof KeyringClient>[0];
+type DiscoveredAccount = Awaited<ReturnType<KeyringClient['discoverAccounts']>>[number];
+/**
+ * Thin abstraction over the v1 and v2 keyring RPC clients so that provider call
+ * sites (account re-sync and v1 discovery) don't have to branch on the keyring
+ * protocol version. The v1 and v2 clients expose different method names (e.g.
+ * v1 `listAccounts` vs v2 `getAccounts`), and v2 has no `discoverAccounts` — v2
+ * discovery flows through `createAccounts({ bip44:discover })` on the bridge
+ * keyring instead.
+ */
+export type SnapKeyringClient = {
+    /**
+     * Returns the accounts the Snap currently holds.
+     */
+    getAccounts(): Promise<KeyringAccount[]>;
+    /**
+     * Deletes an account by id from the Snap.
+     *
+     * @param id - The id of the account to delete.
+     */
+    deleteAccount(id: string): Promise<void>;
+    /**
+     * Discovers accounts for the given entropy source and group index.
+     *
+     * Only supported on the v1 client; the v2 client throws, since v2 discovery
+     * goes through `createAccounts({ bip44:discover })`.
+     *
+     * @param scopes - The scopes to discover accounts on.
+     * @param entropySource - The entropy source to discover accounts for.
+     * @param groupIndex - The group index to discover accounts for.
+     */
+    discoverAccounts(scopes: CaipChainId[], entropySource: EntropySourceId, groupIndex: number): Promise<DiscoveredAccount[]>;
+};
+/**
+ * Builds a version-agnostic {@link SnapKeyringClient} backed by either the v1
+ * or v2 keyring client, based on the Snap's declared capabilities.
+ *
+ * @param sender - The transport used to talk to the Snap.
+ * @param isV2 - Whether to back the client with the v2 keyring client.
+ * @returns A {@link SnapKeyringClient}.
+ */
+export declare function createSnapKeyringClient(sender: Sender, isV2: boolean): SnapKeyringClient;
+export {};
+//# sourceMappingURL=SnapKeyringClient.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SnapKeyringClient.d.cts","sourceRoot":"","sources":["../../src/providers/SnapKeyringClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAC7E,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAEnD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpE,KAAK,iBAAiB,GAAG,OAAO,CAC9B,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAC9C,CAAC,MAAM,CAAC,CAAC;AAEV;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAEzC;;;;OAIG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;;;;;;;OASG;IACH,gBAAgB,CACd,MAAM,EAAE,WAAW,EAAE,EACrB,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,GACZ,iBAAiB,CAuBnB"}

package/dist/providers/SnapKeyringClient.d.mts

@@ -0,0 +1,51 @@
+import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import { KeyringClient } from "@metamask/keyring-snap-client";
+import type { CaipChainId } from "@metamask/utils";
+/**
+ * Transport used by both the v1 and v2 keyring clients. Matches the object the
+ * {@link KeyringClient} constructor expects.
+ */
+export type Sender = ConstructorParameters<typeof KeyringClient>[0];
+type DiscoveredAccount = Awaited<ReturnType<KeyringClient['discoverAccounts']>>[number];
+/**
+ * Thin abstraction over the v1 and v2 keyring RPC clients so that provider call
+ * sites (account re-sync and v1 discovery) don't have to branch on the keyring
+ * protocol version. The v1 and v2 clients expose different method names (e.g.
+ * v1 `listAccounts` vs v2 `getAccounts`), and v2 has no `discoverAccounts` — v2
+ * discovery flows through `createAccounts({ bip44:discover })` on the bridge
+ * keyring instead.
+ */
+export type SnapKeyringClient = {
+    /**
+     * Returns the accounts the Snap currently holds.
+     */
+    getAccounts(): Promise<KeyringAccount[]>;
+    /**
+     * Deletes an account by id from the Snap.
+     *
+     * @param id - The id of the account to delete.
+     */
+    deleteAccount(id: string): Promise<void>;
+    /**
+     * Discovers accounts for the given entropy source and group index.
+     *
+     * Only supported on the v1 client; the v2 client throws, since v2 discovery
+     * goes through `createAccounts({ bip44:discover })`.
+     *
+     * @param scopes - The scopes to discover accounts on.
+     * @param entropySource - The entropy source to discover accounts for.
+     * @param groupIndex - The group index to discover accounts for.
+     */
+    discoverAccounts(scopes: CaipChainId[], entropySource: EntropySourceId, groupIndex: number): Promise<DiscoveredAccount[]>;
+};
+/**
+ * Builds a version-agnostic {@link SnapKeyringClient} backed by either the v1
+ * or v2 keyring client, based on the Snap's declared capabilities.
+ *
+ * @param sender - The transport used to talk to the Snap.
+ * @param isV2 - Whether to back the client with the v2 keyring client.
+ * @returns A {@link SnapKeyringClient}.
+ */
+export declare function createSnapKeyringClient(sender: Sender, isV2: boolean): SnapKeyringClient;
+export {};
+//# sourceMappingURL=SnapKeyringClient.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SnapKeyringClient.d.mts","sourceRoot":"","sources":["../../src/providers/SnapKeyringClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAC7E,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAEnD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpE,KAAK,iBAAiB,GAAG,OAAO,CAC9B,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAC9C,CAAC,MAAM,CAAC,CAAC;AAEV;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAEzC;;;;OAIG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;;;;;;;OASG;IACH,gBAAgB,CACd,MAAM,EAAE,WAAW,EAAE,EACrB,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,GACZ,iBAAiB,CAuBnB"}

package/dist/providers/SnapKeyringClient.mjs

@@ -0,0 +1,31 @@
+import { KeyringClient } from "@metamask/keyring-snap-client";
+import { KeyringClient as KeyringClientV2 } from "@metamask/keyring-snap-client/v2";
+/**
+ * Builds a version-agnostic {@link SnapKeyringClient} backed by either the v1
+ * or v2 keyring client, based on the Snap's declared capabilities.
+ *
+ * @param sender - The transport used to talk to the Snap.
+ * @param isV2 - Whether to back the client with the v2 keyring client.
+ * @returns A {@link SnapKeyringClient}.
+ */
+export function createSnapKeyringClient(sender, isV2) {
+    if (isV2) {
+        const client = new KeyringClientV2(sender);
+        return {
+            getAccounts: async () => client.getAccounts(),
+            deleteAccount: async (id) => client.deleteAccount(id),
+            discoverAccounts: async () => {
+                // v2 discovery is driven by `createAccounts({ bip44:discover })` through
+                // the bridge keyring, so the client is never used for discovery here.
+                throw new Error('discoverAccounts is not supported on the v2 keyring client');
+            },
+        };
+    }
+    const client = new KeyringClient(sender);
+    return {
+        getAccounts: async () => client.listAccounts(),
+        deleteAccount: async (id) => client.deleteAccount(id),
+        discoverAccounts: async (scopes, entropySource, groupIndex) => client.discoverAccounts(scopes, entropySource, groupIndex),
+    };
+}
+//# sourceMappingURL=SnapKeyringClient.mjs.map

package/dist/providers/SnapKeyringClient.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"SnapKeyringClient.mjs","sourceRoot":"","sources":["../../src/providers/SnapKeyringClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAC9D,OAAO,EAAE,aAAa,IAAI,eAAe,EAAE,yCAAyC;AAmDpF;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CACrC,MAAc,EACd,IAAa;IAEb,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO;YACL,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7C,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACrD,gBAAgB,EAAE,KAAK,IAAkC,EAAE;gBACzD,yEAAyE;gBACzE,sEAAsE;gBACtE,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO;QACL,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QAC9C,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QACrD,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,CAC5D,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,CAAC;KAC7D,CAAC;AACJ,CAAC","sourcesContent":["import type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport { KeyringClient as KeyringClientV2 } from '@metamask/keyring-snap-client/v2';\nimport type { CaipChainId } from '@metamask/utils';\n\n/**\n * Transport used by both the v1 and v2 keyring clients. Matches the object the\n * {@link KeyringClient} constructor expects.\n */\nexport type Sender = ConstructorParameters<typeof KeyringClient>[0];\n\ntype DiscoveredAccount = Awaited<\n  ReturnType<KeyringClient['discoverAccounts']>\n>[number];\n\n/**\n * Thin abstraction over the v1 and v2 keyring RPC clients so that provider call\n * sites (account re-sync and v1 discovery) don't have to branch on the keyring\n * protocol version. The v1 and v2 clients expose different method names (e.g.\n * v1 `listAccounts` vs v2 `getAccounts`), and v2 has no `discoverAccounts` — v2\n * discovery flows through `createAccounts({ bip44:discover })` on the bridge\n * keyring instead.\n */\nexport type SnapKeyringClient = {\n  /**\n   * Returns the accounts the Snap currently holds.\n   */\n  getAccounts(): Promise<KeyringAccount[]>;\n\n  /**\n   * Deletes an account by id from the Snap.\n   *\n   * @param id - The id of the account to delete.\n   */\n  deleteAccount(id: string): Promise<void>;\n\n  /**\n   * Discovers accounts for the given entropy source and group index.\n   *\n   * Only supported on the v1 client; the v2 client throws, since v2 discovery\n   * goes through `createAccounts({ bip44:discover })`.\n   *\n   * @param scopes - The scopes to discover accounts on.\n   * @param entropySource - The entropy source to discover accounts for.\n   * @param groupIndex - The group index to discover accounts for.\n   */\n  discoverAccounts(\n    scopes: CaipChainId[],\n    entropySource: EntropySourceId,\n    groupIndex: number,\n  ): Promise<DiscoveredAccount[]>;\n};\n\n/**\n * Builds a version-agnostic {@link SnapKeyringClient} backed by either the v1\n * or v2 keyring client, based on the Snap's declared capabilities.\n *\n * @param sender - The transport used to talk to the Snap.\n * @param isV2 - Whether to back the client with the v2 keyring client.\n * @returns A {@link SnapKeyringClient}.\n */\nexport function createSnapKeyringClient(\n  sender: Sender,\n  isV2: boolean,\n): SnapKeyringClient {\n  if (isV2) {\n    const client = new KeyringClientV2(sender);\n    return {\n      getAccounts: async () => client.getAccounts(),\n      deleteAccount: async (id) => client.deleteAccount(id),\n      discoverAccounts: async (): Promise<DiscoveredAccount[]> => {\n        // v2 discovery is driven by `createAccounts({ bip44:discover })` through\n        // the bridge keyring, so the client is never used for discovery here.\n        throw new Error(\n          'discoverAccounts is not supported on the v2 keyring client',\n        );\n      },\n    };\n  }\n\n  const client = new KeyringClient(sender);\n  return {\n    getAccounts: async () => client.listAccounts(),\n    deleteAccount: async (id) => client.deleteAccount(id),\n    discoverAccounts: async (scopes, entropySource, groupIndex) =>\n      client.discoverAccounts(scopes, entropySource, groupIndex),\n  };\n}\n"]}

package/dist/providers/SolAccountProvider.cjs

@@ -11,9 +11,7 @@ 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 analytics_1 = require("../analytics/index.cjs");
-const traces_1 = require("../analytics/traces.cjs");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
-const utils_1 = require("./utils.cjs");
 exports.SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -24,7 +22,6 @@ exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
-        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
     resyncAccounts: {
@@ -35,13 +32,9 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger, config = exports.SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = analytics_1.traceFallback) {
         super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);
         _SolAccountProvider_instances.add(this);
-        this.capabilities = {
-            scopes: [keyring_api_1.SolScope.Mainnet, keyring_api_1.SolScope.Devnet, keyring_api_1.SolScope.Testnet],
-            bip44: {
-                deriveIndex: true,
-                deriveIndexRange: true,
-            },
-        };
+        // TODO: Remove once the Snap is fully v2 — discovery is then driven by the
+        // Snap's own supported scopes via `createAccounts({ bip44:discover })`.
+        this.v1DiscoveryScopes = [keyring_api_1.SolScope.Mainnet];
     }
     getName() {
         return SolAccountProvider.NAME;
@@ -50,12 +43,6 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.SolAccountType.DataAccount &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
-    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 = {
@@ -67,35 +54,6 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         (0, account_api_1.assertIsBip44Account)(account);
         return account;
     }
-    async discoverAccounts({ entropySource, groupIndex, }) {
-        return this.withSnap(async ({ client, keyring }) => {
-            return await super.trace({
-                name: traces_1.TraceName.SnapDiscoverAccounts,
-                data: {
-                    provider: this.getName(),
-                },
-            }, async () => {
-                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), {
-                    maxAttempts: this.config.discovery.maxAttempts,
-                    backOffMs: this.config.discovery.backOffMs,
-                });
-                if (!discoveredAccounts.length) {
-                    return [];
-                }
-                // 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,
-                });
-            });
-        });
-    }
 }
 exports.SolAccountProvider = SolAccountProvider;
 _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getDerivationPath = function _SolAccountProvider_getDerivationPath(groupIndex) {

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 { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\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"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAA6D;AAG7D,uDAI+B;AAE/B,qEAA4D;AAK5D,sDAA6C;AAE7C,mEAA4D;AAK/C,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,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAa,kBAAmB,SAAQ,yCAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,2CAAmC,EACtE,QAAuB,yBAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;;QATrE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,sBAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,WAAW;YAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,iCAAY,CAAC,IAAe,CAChE,CAAC;IACJ,CAAC;IAMkB,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;;AAlDH,gDAmDC;sIAvBoB,UAAkB;IACnC,OAAO,cAAc,UAAU,MAAM,CAAC;AACxC,CAAC;AA7BM,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 {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport type { EntropySourceId, KeyringAccount } 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';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type { SnapAccountProviderConfig } from './SnapAccountProvider';\n\nexport type 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  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  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [SolScope.Mainnet];\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 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"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -1,12 +1,12 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { KeyringCapabilities } from "@metamask/keyring-api/v2";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
+import type { CaipChainId } from "@metamask/utils";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
 export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME = "Solana";
 export declare const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig;
@@ -14,21 +14,13 @@ export declare class SolAccountProvider extends SnapAccountProvider {
     #private;
     static NAME: string;
     static SOLANA_SNAP_ID: SnapId;
-    readonly capabilities: KeyringCapabilities;
+    protected readonly v1DiscoveryScopes: CaipChainId[];
     constructor(messenger: MultichainAccountServiceMessenger, config?: SolAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    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;
-    }): Promise<Bip44Account<KeyringAccount>[]>;
 }
 //# sourceMappingURL=SolAccountProvider.d.cts.map

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,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAAiC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAG/B,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"}
+{"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;AAMhE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAIrE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAWjD,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;CAahC"}

package/dist/providers/SolAccountProvider.d.mts

@@ -1,12 +1,12 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { KeyringCapabilities } from "@metamask/keyring-api/v2";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
+import type { CaipChainId } from "@metamask/utils";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
+import type { SnapAccountProviderConfig } from "./SnapAccountProvider.mjs";
 export type SolAccountProviderConfig = SnapAccountProviderConfig;
 export declare const SOL_ACCOUNT_PROVIDER_NAME = "Solana";
 export declare const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG: SnapAccountProviderConfig;
@@ -14,21 +14,13 @@ export declare class SolAccountProvider extends SnapAccountProvider {
     #private;
     static NAME: string;
     static SOLANA_SNAP_ID: SnapId;
-    readonly capabilities: KeyringCapabilities;
+    protected readonly v1DiscoveryScopes: CaipChainId[];
     constructor(messenger: MultichainAccountServiceMessenger, config?: SolAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    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;
-    }): Promise<Bip44Account<KeyringAccount>[]>;
 }
 //# sourceMappingURL=SolAccountProvider.d.mts.map

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,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAAiC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAIlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EAC1B,kCAA8B;AAG/B,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"}
+{"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;AAMhE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAClE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAC5D,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,MAAM,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAEjE,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAElD,eAAO,MAAM,mCAAmC,EAAE,yBAcjD,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,IAAI,SAA6B;IAExC,MAAM,CAAC,cAAc,SAAgD;IAIrE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAsB;gBAGvE,SAAS,EAAE,iCAAiC,EAC5C,MAAM,GAAE,wBAA8D,EACtE,KAAK,GAAE,aAA6B;IAKtC,OAAO,IAAI,MAAM;IAIjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;cAWjD,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;CAahC"}

package/dist/providers/SolAccountProvider.mjs

@@ -5,12 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SolAccountProvider_instances, _SolAccountProvider_getDerivationPath;
 import { assertIsBip44Account } from "@metamask/account-api";
-import { AccountCreationType, KeyringAccountEntropyTypeOption, SolAccountType, SolScope } from "@metamask/keyring-api";
+import { KeyringAccountEntropyTypeOption, SolAccountType, SolScope } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { traceFallback } from "../analytics/index.mjs";
-import { TraceName } from "../analytics/traces.mjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
-import { withRetry, withTimeout } from "./utils.mjs";
 export const SOL_ACCOUNT_PROVIDER_NAME = 'Solana';
 export const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -21,7 +19,6 @@ export const SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
-        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
     resyncAccounts: {
@@ -32,13 +29,9 @@ export class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger, config = SOL_ACCOUNT_PROVIDER_DEFAULT_CONFIG, trace = traceFallback) {
         super(SolAccountProvider.SOLANA_SNAP_ID, messenger, config, trace);
         _SolAccountProvider_instances.add(this);
-        this.capabilities = {
-            scopes: [SolScope.Mainnet, SolScope.Devnet, SolScope.Testnet],
-            bip44: {
-                deriveIndex: true,
-                deriveIndexRange: true,
-            },
-        };
+        // TODO: Remove once the Snap is fully v2 — discovery is then driven by the
+        // Snap's own supported scopes via `createAccounts({ bip44:discover })`.
+        this.v1DiscoveryScopes = [SolScope.Mainnet];
     }
     getName() {
         return SolAccountProvider.NAME;
@@ -47,12 +40,6 @@ export class SolAccountProvider extends SnapAccountProvider {
         return (account.type === SolAccountType.DataAccount &&
             account.metadata.keyring.type === KeyringTypes.snap);
     }
-    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 = {
@@ -64,35 +51,6 @@ export class SolAccountProvider extends SnapAccountProvider {
         assertIsBip44Account(account);
         return account;
     }
-    async discoverAccounts({ entropySource, groupIndex, }) {
-        return this.withSnap(async ({ client, keyring }) => {
-            return await super.trace({
-                name: TraceName.SnapDiscoverAccounts,
-                data: {
-                    provider: this.getName(),
-                },
-            }, async () => {
-                if (!this.config.discovery.enabled) {
-                    return [];
-                }
-                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 [];
-                }
-                // 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,
-                });
-            });
-        });
-    }
 }
 _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getDerivationPath = function _SolAccountProvider_getDerivationPath(groupIndex) {
     return `m/44'/501'/${groupIndex}'/0'`;

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 { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\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"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,oBAAoB,EAAE,8BAA8B;AAG7D,OAAO,EACL,+BAA+B,EAC/B,cAAc,EACd,QAAQ,EACT,8BAA8B;AAE/B,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAK5D,OAAO,EAAE,aAAa,EAAE,+BAAqB;AAE7C,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAK5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,QAAQ,CAAC;AAElD,MAAM,CAAC,MAAM,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,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,mCAAmC,EACtE,QAAuB,aAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;;QATrE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,WAAW;YAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,IAAe,CAChE,CAAC;IACJ,CAAC;IAMkB,cAAc,CAC/B,OAAuB,EACvB,EACE,aAAa,EACb,UAAU,GAC6C;QAEzD,6DAA6D;QAC7D,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,+BAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc,EAAE,uBAAA,IAAI,4EAAmB,MAAvB,IAAI,EAAoB,UAAU,CAAC;SACpD,CAAC;QAEF,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,OAAO,CAAC;IACjB,CAAC;;sIAtBkB,UAAkB;IACnC,OAAO,cAAc,UAAU,MAAM,CAAC;AACxC,CAAC;AA7BM,uBAAI,GAAG,yBAAyB,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 {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolScope,\n} from '@metamask/keyring-api';\nimport type { EntropySourceId, KeyringAccount } 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';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type { SnapAccountProviderConfig } from './SnapAccountProvider';\n\nexport type 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  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  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [SolScope.Mainnet];\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 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"]}

package/dist/providers/TrxAccountProvider.cjs

@@ -4,9 +4,7 @@ exports.TrxAccountProvider = exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = expor
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const analytics_1 = require("../analytics/index.cjs");
-const traces_1 = require("../analytics/traces.cjs");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
-const utils_1 = require("./utils.cjs");
 exports.TRX_ACCOUNT_PROVIDER_NAME = 'Tron';
 exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
     maxConcurrency: 3,
@@ -17,7 +15,6 @@ exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
         backOffMs: 1000,
     },
     createAccounts: {
-        batched: false, // For now, the Snap is not fully v2 compliant.
         timeoutMs: 3000,
     },
     resyncAccounts: {
@@ -27,13 +24,9 @@ exports.TRX_ACCOUNT_PROVIDER_DEFAULT_CONFIG = {
 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);
-        this.capabilities = {
-            scopes: [keyring_api_1.TrxScope.Mainnet, keyring_api_1.TrxScope.Shasta],
-            bip44: {
-                deriveIndex: true,
-                deriveIndexRange: true,
-            },
-        };
+        // TODO: Remove once the Snap is fully v2 — discovery is then driven by the
+        // Snap's own supported scopes via `createAccounts({ bip44:discover })`.
+        this.v1DiscoveryScopes = [keyring_api_1.TrxScope.Mainnet];
     }
     getName() {
         return TrxAccountProvider.NAME;
@@ -42,40 +35,6 @@ class TrxAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         return (account.type === keyring_api_1.TrxAccountType.Eoa &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
-    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, }) {
-        return this.withSnap(async ({ client, keyring }) => {
-            return await super.trace({
-                name: traces_1.TraceName.SnapDiscoverAccounts,
-                data: {
-                    provider: this.getName(),
-                },
-            }, async () => {
-                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), {
-                    maxAttempts: this.config.discovery.maxAttempts,
-                    backOffMs: this.config.discovery.backOffMs,
-                });
-                if (!discoveredAccounts.length) {
-                    return [];
-                }
-                return await this.createBip44Accounts(keyring, {
-                    type: keyring_api_1.AccountCreationType.Bip44DeriveIndex,
-                    entropySource,
-                    groupIndex,
-                });
-            });
-        });
-    }
 }
 exports.TrxAccountProvider = TrxAccountProvider;
 TrxAccountProvider.NAME = exports.TRX_ACCOUNT_PROVIDER_NAME;

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 type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  AccountCreationType,\n  TrxAccountType,\n  TrxScope,\n} from '@metamask/keyring-api';\nimport type { KeyringCapabilities } from '@metamask/keyring-api/v2';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { traceFallback } from '../analytics';\nimport { TraceName } from '../analytics/traces';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type {\n  RestrictedSnapKeyring,\n  SnapAccountProviderConfig,\n} from './SnapAccountProvider';\nimport { withRetry, withTimeout } from './utils';\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"]}
+{"version":3,"file":"TrxAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/TrxAccountProvider.ts"],"names":[],"mappings":";;;AAEA,uDAAiE;AACjE,qEAA4D;AAK5D,sDAA6C;AAE7C,mEAA4D;AAK/C,QAAA,yBAAyB,GAAG,MAAM,CAAC;AAEnC,QAAA,mCAAmC,GAA6B;IAC3E,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,SAAS,EAAE,IAAI;KAChB;IACD,cAAc,EAAE;QACd,2BAA2B,EAAE,IAAI;KAClC;CACF,CAAC;AAEF,MAAa,kBAAmB,SAAQ,yCAAmB;IASzD,YACE,SAA4C,EAC5C,SAAmC,2CAAmC,EACtE,QAAuB,yBAAa;QAEpC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QATlE,2EAA2E;QAC3E,wEAAwE;QACrD,sBAAiB,GAAkB,CAAC,sBAAQ,CAAC,OAAO,CAAC,CAAC;IAQzE,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,iCAAY,CAAC,IAAe,CAChE,CAAC;IACJ,CAAC;;AA1BH,gDA2BC;AA1BQ,uBAAI,GAAG,iCAAyB,AAA5B,CAA6B;AAEjC,8BAAW,GAAG,gCAA0C,AAA7C,CAA8C","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { TraceCallback } from '@metamask/controller-utils';\nimport { TrxAccountType, TrxScope } 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';\nimport type { CaipChainId } from '@metamask/utils';\n\nimport { traceFallback } from '../analytics';\nimport type { MultichainAccountServiceMessenger } from '../types';\nimport { SnapAccountProvider } from './SnapAccountProvider';\nimport type { SnapAccountProviderConfig } from './SnapAccountProvider';\n\nexport type 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  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  // TODO: Remove once the Snap is fully v2 — discovery is then driven by the\n  // Snap's own supported scopes via `createAccounts({ bip44:discover })`.\n  protected readonly v1DiscoveryScopes: CaipChainId[] = [TrxScope.Mainnet];\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"]}

package/dist/providers/TrxAccountProvider.d.cts

@@ -1,29 +1,20 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { TraceCallback } from "@metamask/controller-utils";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { KeyringCapabilities } from "@metamask/keyring-api/v2";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
+import type { CaipChainId } from "@metamask/utils";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
-import type { RestrictedSnapKeyring, SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
+import type { SnapAccountProviderConfig } from "./SnapAccountProvider.cjs";
 export type 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 {
     static NAME: string;
     static TRX_SNAP_ID: SnapId;
-    readonly capabilities: KeyringCapabilities;
+    protected readonly v1DiscoveryScopes: CaipChainId[];
     constructor(messenger: MultichainAccountServiceMessenger, config?: TrxAccountProviderConfig, trace?: TraceCallback);
     getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
-    protected createAccountV1(keyring: RestrictedSnapKeyring, { entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<KeyringAccount>;
-    discoverAccounts({ entropySource, groupIndex, }: {
-        entropySource: EntropySourceId;
-        groupIndex: number;
-    }): Promise<Bip44Account<KeyringAccount>[]>;
 }
 //# sourceMappingURL=TrxAccountProvider.d.cts.map