@metamask-previews/multichain-account-service 0.6.0-preview-93dcb549 → 0.6.0-preview-974a6a01

package/dist/providers/EvmAccountProvider.d.mts

@@ -1,9 +1,17 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { Provider } from "@metamask/network-controller";
 import { BaseBip44AccountProvider } from "./BaseBip44AccountProvider.mjs";
 export declare class EvmAccountProvider extends BaseBip44AccountProvider {
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    getName(): string;
+    /**
+     * Get the Evm provider.
+     *
+     * @returns The Evm provider.
+     */
+    getEvmProvider(): Provider;
     createAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
@@ -56,9 +64,77 @@ export declare class EvmAccountProvider extends BaseBip44AccountProvider {
         scopes: `${string}:${string}`[];
         methods: string[];
     }>[]>;
-    discoverAndCreateAccounts(_: {
+    /**
+     * Discover and create accounts for the Evm provider.
+     *
+     * NOTE: This method should only be called on a newly created wallet.
+     * There should be already one existing account on this associated entropy source.
+     *
+     * @param opts - The options for the discovery and creation of accounts.
+     * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the Evm provider.
+     */
+    discoverAndCreateAccounts(opts: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): Promise<never[]>;
+    }): Promise<({
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account" | "tron:eoa" | "any:account";
+        id: string;
+        options: Record<string, import("@metamask/utils").Json> & {
+            entropy?: {
+                type: "mnemonic";
+                id: string;
+                derivationPath: string;
+                groupIndex: number;
+            } | {
+                type: "private-key";
+            } | undefined;
+            exportable?: boolean | undefined;
+        };
+        metadata: {
+            name: string;
+            importTime: number;
+            keyring: {
+                type: string;
+            };
+            nameLastUpdatedAt?: number | undefined;
+            snap?: {
+                name: string;
+                id: string;
+                enabled: boolean;
+            } | undefined;
+            lastSelected?: number | undefined;
+        };
+        address: string;
+        scopes: `${string}:${string}`[];
+        methods: string[];
+    } & {
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account" | "tron:eoa" | "any:account";
+        id: string;
+        options: Record<string, import("@metamask/utils").Json> & {
+            entropy?: {
+                type: "mnemonic";
+                id: string;
+                derivationPath: string;
+                groupIndex: number;
+            } | {
+                type: "private-key";
+            } | undefined;
+            exportable?: boolean | undefined;
+        };
+        address: string;
+        scopes: `${string}:${string}`[];
+        methods: string[];
+    } & {
+        options: {
+            entropy: {
+                type: "mnemonic";
+                id: string;
+                derivationPath: string;
+                groupIndex: number;
+            };
+        };
+    })[]>;
 }
 //# sourceMappingURL=EvmAccountProvider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AAGxC,OAAO,EAEL,wBAAwB,EACzB,uCAAmC;AAgBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}
+{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,qCAAqC;AAG7D,OAAO,EAGL,wBAAwB,EACzB,uCAAmC;AAgBpC,qBAAa,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAOpE,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,cAAc,IAAI,QAAQ;IAYpB,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmCD;;;;;;;;;;OAUG;IACG,yBAAyB,CAAC,IAAI,EAAE;QACpC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCF"}

package/dist/providers/EvmAccountProvider.mjs

@@ -1,6 +1,6 @@
 import { EthAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
-import { assertAreBip44Accounts, BaseBip44AccountProvider } from "./BaseBip44AccountProvider.mjs";
+import { assertAreBip44Accounts, assertIsBip44Account, BaseBip44AccountProvider } from "./BaseBip44AccountProvider.mjs";
 /**
  * Asserts an internal account exists.
  *
@@ -17,6 +17,19 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         return (account.type === EthAccountType.Eoa &&
             account.metadata.keyring.type === KeyringTypes.hd);
     }
+    getName() {
+        return 'EVM';
+    }
+    /**
+     * Get the Evm provider.
+     *
+     * @returns The Evm provider.
+     */
+    getEvmProvider() {
+        const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', '0x1');
+        const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
+        return provider;
+    }
     async createAccounts({ entropySource, groupIndex, }) {
         const [address] = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
             const accounts = await keyring.getAccounts();
@@ -39,8 +52,44 @@ export class EvmAccountProvider extends BaseBip44AccountProvider {
         assertAreBip44Accounts(accountsArray);
         return accountsArray;
     }
-    async discoverAndCreateAccounts(_) {
-        return []; // TODO: Implement account discovery.
+    /**
+     * Discover and create accounts for the Evm provider.
+     *
+     * NOTE: This method should only be called on a newly created wallet.
+     * There should be already one existing account on this associated entropy source.
+     *
+     * @param opts - The options for the discovery and creation of accounts.
+     * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.
+     * @param opts.groupIndex - The index of the group to create the accounts for.
+     * @returns The accounts for the Evm provider.
+     */
+    async discoverAndCreateAccounts(opts) {
+        const provider = this.getEvmProvider();
+        const { entropySource, groupIndex } = opts;
+        const [address, didCreate] = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
+            const existing = await keyring.getAccounts();
+            if (groupIndex < existing.length) {
+                return [existing[groupIndex], false];
+            }
+            const [added] = await keyring.addAccounts(1);
+            return [added, true];
+        });
+        const countHex = (await provider.request({
+            method: 'eth_getTransactionCount',
+            params: [address, 'latest'],
+        }));
+        const count = parseInt(countHex, 16);
+        // We don't want to remove the account if it's the first one.
+        if (count === 0 && didCreate && groupIndex !== 0) {
+            await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
+                keyring.removeAccount?.(address);
+            });
+            return [];
+        }
+        const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+        assertInternalAccountExists(account);
+        assertIsBip44Account(account);
+        return [account];
     }
 }
 //# sourceMappingURL=EvmAccountProvider.mjs.map

package/dist/providers/EvmAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AACvD,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAO5D,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACzB,uCAAmC;AAEpC;;;;;GAKG;AACH,SAAS,2BAA2B,CAClC,OAAoC;IAEpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;AACH,CAAC;AAED,MAAM,OAAO,kBAAmB,SAAQ,wBAAwB;IAC9D,mBAAmB,CAAC,OAAsC;QACxD,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,EAAa,CAC9D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CACtC,EAAE,EAAE,EAAE,aAAa,EAAE,EACrB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAC7C,IAAI,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE;gBAChC,oEAAoE;gBACpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;aAC/B;YAED,iEAAiE;YACjE,wCAAwC;YACxC,IAAI,UAAU,KAAK,QAAQ,CAAC,MAAM,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACvD;YAED,qDAAqD;YACrD,OAAO,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACjC,wCAAwC,EACxC,OAAO,CACR,CAAC;QAEF,gDAAgD;QAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAEtC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;CACF","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\n\n/**\n * Asserts an internal account exists.\n *\n * @param account - The internal account to check.\n * @throws An error if the internal account does not exist.\n */\nfunction assertInternalAccountExists(\n  account: InternalAccount | undefined,\n): asserts account is InternalAccount {\n  if (!account) {\n    throw new Error('Internal account does not exist');\n  }\n}\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === EthAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.hd as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const [address] = await this.withKeyring<EthKeyring, Hex[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const accounts = await keyring.getAccounts();\n        if (groupIndex < accounts.length) {\n          // Nothing new to create, we just re-use the existing accounts here,\n          return [accounts[groupIndex]];\n        }\n\n        // For now, we don't allow for gap, so if we need to create a new\n        // account, this has to be the next one.\n        if (groupIndex !== accounts.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        // Create next account (and returns their addresses).\n        return await keyring.addAccounts(1);\n      },\n    );\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { Provider } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  assertAreBip44Accounts,\n  assertIsBip44Account,\n  BaseBip44AccountProvider,\n} from './BaseBip44AccountProvider';\n\n/**\n * Asserts an internal account exists.\n *\n * @param account - The internal account to check.\n * @throws An error if the internal account does not exist.\n */\nfunction assertInternalAccountExists(\n  account: InternalAccount | undefined,\n): asserts account is InternalAccount {\n  if (!account) {\n    throw new Error('Internal account does not exist');\n  }\n}\n\nexport class EvmAccountProvider extends BaseBip44AccountProvider {\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === EthAccountType.Eoa &&\n      account.metadata.keyring.type === (KeyringTypes.hd as string)\n    );\n  }\n\n  getName(): string {\n    return 'EVM';\n  }\n\n  /**\n   * Get the Evm provider.\n   *\n   * @returns The Evm provider.\n   */\n  getEvmProvider(): Provider {\n    const networkClientId = this.messenger.call(\n      'NetworkController:findNetworkClientIdByChainId',\n      '0x1',\n    );\n    const { provider } = this.messenger.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    return provider;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const [address] = await this.withKeyring<EthKeyring, Hex[]>(\n      { id: entropySource },\n      async ({ keyring }) => {\n        const accounts = await keyring.getAccounts();\n        if (groupIndex < accounts.length) {\n          // Nothing new to create, we just re-use the existing accounts here,\n          return [accounts[groupIndex]];\n        }\n\n        // For now, we don't allow for gap, so if we need to create a new\n        // account, this has to be the next one.\n        if (groupIndex !== accounts.length) {\n          throw new Error('Trying to create too many accounts');\n        }\n\n        // Create next account (and returns their addresses).\n        return await keyring.addAccounts(1);\n      },\n    );\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    const accountsArray = [account];\n    assertAreBip44Accounts(accountsArray);\n\n    return accountsArray;\n  }\n\n  /**\n   * Discover and create accounts for the Evm provider.\n   *\n   * NOTE: This method should only be called on a newly created wallet.\n   * There should be already one existing account on this associated entropy source.\n   *\n   * @param opts - The options for the discovery and creation of accounts.\n   * @param opts.entropySource - The entropy source to use for the discovery and creation of accounts.\n   * @param opts.groupIndex - The index of the group to create the accounts for.\n   * @returns The accounts for the Evm provider.\n   */\n  async discoverAndCreateAccounts(opts: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const provider = this.getEvmProvider();\n    const { entropySource, groupIndex } = opts;\n\n    const [address, didCreate] = await this.withKeyring<\n      EthKeyring,\n      [Hex, boolean]\n    >({ id: entropySource }, async ({ keyring }) => {\n      const existing = await keyring.getAccounts();\n      if (groupIndex < existing.length) {\n        return [existing[groupIndex], false];\n      }\n      const [added] = await keyring.addAccounts(1);\n      return [added, true];\n    });\n\n    const countHex = (await provider.request({\n      method: 'eth_getTransactionCount',\n      params: [address, 'latest'],\n    })) as Hex;\n    const count = parseInt(countHex, 16);\n\n    // We don't want to remove the account if it's the first one.\n    if (count === 0 && didCreate && groupIndex !== 0) {\n      await this.withKeyring<EthKeyring>(\n        { id: entropySource },\n        async ({ keyring }) => {\n          keyring.removeAccount?.(address);\n        },\n      );\n      return [];\n    }\n\n    const account = this.messenger.call(\n      'AccountsController:getAccountByAddress',\n      address,\n    );\n    assertInternalAccountExists(account);\n    assertIsBip44Account(account);\n    return [account];\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.cjs

@@ -1,16 +1,37 @@
 "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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolAccountProvider = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
+const keyring_api_2 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
+const keyring_snap_client_1 = require("@metamask/keyring-snap-client");
+const snaps_utils_1 = require("@metamask/snaps-utils");
 const BaseBip44AccountProvider_1 = require("./BaseBip44AccountProvider.cjs");
 const SnapAccountProvider_1 = require("./SnapAccountProvider.cjs");
 class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
     constructor(messenger) {
         super(SolAccountProvider.SOLANA_SNAP_ID, messenger);
+        _SolAccountProvider_instances.add(this);
+        _SolAccountProvider_client.set(this, void 0);
+        __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SolAccountProvider.SOLANA_SNAP_ID), "f");
+    }
+    getName() {
+        return 'Solana';
     }
     isAccountCompatible(account) {
-        return (account.type === keyring_api_1.SolAccountType.DataAccount &&
+        return (account.type === keyring_api_2.SolAccountType.DataAccount &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
     async createAccounts({ entropySource, groupIndex, }) {
@@ -27,7 +48,7 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         // so we "inject" them (the `AccountsController` does a similar thing
         // for the moment).
         account.options.entropy = {
-            type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+            type: keyring_api_2.KeyringAccountEntropyTypeOption.Mnemonic,
             id: entropySource,
             groupIndex,
             derivationPath,
@@ -36,10 +57,28 @@ class SolAccountProvider extends SnapAccountProvider_1.SnapAccountProvider {
         (0, BaseBip44AccountProvider_1.assertAreBip44Accounts)(accounts);
         return accounts;
     }
-    async discoverAndCreateAccounts(_) {
-        return []; // TODO: Implement account discovery.
+    async discoverAndCreateAccounts({ entropySource, groupIndex, }) {
+        const discoveredAccounts = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([keyring_api_1.SolScope.Mainnet], entropySource, groupIndex);
+        // Solana Snap always returns one discovered account.
+        if (discoveredAccounts.length === 1) {
+            return this.createAccounts({ entropySource, groupIndex });
+        }
+        return Promise.resolve([]);
     }
 }
 exports.SolAccountProvider = SolAccountProvider;
+_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+    return new keyring_snap_client_1.KeyringClient({
+        send: async (request) => {
+            const response = await this.messenger.call('SnapController:handleRequest', {
+                snapId: snapId,
+                origin: 'metamask',
+                handler: snaps_utils_1.HandlerType.OnKeyringRequest,
+                request,
+            });
+            return response;
+        },
+    });
+};
 SolAccountProvider.SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 //# sourceMappingURL=SolAccountProvider.cjs.map

package/dist/providers/SolAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;AAEA,uDAG+B;AAC/B,qEAA4D;AAK5D,6EAAoE;AACpE,mEAA4D;AAE5D,MAAa,kBAAmB,SAAQ,yCAAmB;IAGzD,YAAY,SAA4C;QACtD,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACtD,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAEnE,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;YAClC,aAAa;YACb,cAAc;SACf,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qEAAqE;QACrE,mBAAmB;QACnB,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,6CAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc;SACf,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAA,iDAAsB,EAAC,QAAQ,CAAC,CAAC;QAEjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;;AArDH,gDAsDC;AArDQ,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { assertAreBip44Accounts } from './BaseBip44AccountProvider';\nimport { SnapAccountProvider } from './SnapAccountProvider';\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    // Create account without any confirmation nor selecting it.\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await createAccount({\n      entropySource,\n      derivationPath,\n    });\n\n    // Solana Snap does not use BIP-44 typed options for the moment\n    // so we \"inject\" them (the `AccountsController` does a similar thing\n    // for the moment).\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    const accounts = [account];\n    assertAreBip44Accounts(accounts);\n\n    return accounts;\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,uDAAiD;AACjD,uDAG+B;AAC/B,qEAA4D;AAE5D,uEAA8D;AAE9D,uDAAoD;AAIpD,6EAAoE;AACpE,mEAA4D;AAE5D,MAAa,kBAAmB,SAAQ,yCAAmB;IAKzD,YAAY,SAA4C;QACtD,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;;QAH7C,6CAAuB;QAI9B,uBAAA,IAAI,8BAAW,uBAAA,IAAI,qFAA4B,MAAhC,IAAI,EACjB,kBAAkB,CAAC,cAAc,CAClC,MAAA,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,QAAQ,CAAC;IAClB,CAAC;IAmBD,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAEnE,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;YAClC,aAAa;YACb,cAAc;SACf,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qEAAqE;QACrE,mBAAmB;QACnB,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,6CAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc;SACf,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAA,iDAAsB,EAAC,QAAQ,CAAC,CAAC;QAEjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GAIX;QACC,MAAM,kBAAkB,GAAG,MAAM,uBAAA,IAAI,kCAAQ,CAAC,gBAAgB,CAC5D,CAAC,sBAAQ,CAAC,OAAO,CAAC,EAClB,aAAa,EACb,UAAU,CACX,CAAC;QAEF,qDAAqD;QACrD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;;AA7FH,gDA8FC;oMA9E6B,MAAc;IACxC,OAAO,IAAI,mCAAa,CAAC;QACvB,IAAI,EAAE,KAAK,EAAE,OAAuB,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACxC,8BAA8B,EAC9B;gBACE,MAAM,EAAE,MAAgB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,yBAAW,CAAC,gBAAgB;gBACrC,OAAO;aACR,CACF,CAAC;YACF,OAAO,QAAgB,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA9BM,iCAAc,GAAG,kCAA4C,AAA/C,CAAgD","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { assertAreBip44Accounts } from './BaseBip44AccountProvider';\nimport { SnapAccountProvider } from './SnapAccountProvider';\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return 'Solana';\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\n        const response = await this.messenger.call(\n          'SnapController:handleRequest',\n          {\n            snapId: snapId as SnapId,\n            origin: 'metamask',\n            handler: HandlerType.OnKeyringRequest,\n            request,\n          },\n        );\n        return response as Json;\n      },\n    });\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    // Create account without any confirmation nor selecting it.\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await createAccount({\n      entropySource,\n      derivationPath,\n    });\n\n    // Solana Snap does not use BIP-44 typed options for the moment\n    // so we \"inject\" them (the `AccountsController` does a similar thing\n    // for the moment).\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    const accounts = [account];\n    assertAreBip44Accounts(accounts);\n\n    return accounts;\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet],\n      entropySource,\n      groupIndex,\n    );\n\n    // Solana Snap always returns one discovered account.\n    if (discoveredAccounts.length === 1) {\n      return this.createAccounts({ entropySource, groupIndex });\n    }\n\n    return Promise.resolve([]);\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -5,14 +5,16 @@ import type { SnapId } from "@metamask/snaps-sdk";
 import type { MultichainAccountServiceMessenger } from "src/types";
 import { SnapAccountProvider } from "./SnapAccountProvider.cjs";
 export declare class SolAccountProvider extends SnapAccountProvider {
+    #private;
     static SOLANA_SNAP_ID: SnapId;
     constructor(messenger: MultichainAccountServiceMessenger);
+    getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
     createAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;
-    discoverAndCreateAccounts(_: {
+    discoverAndCreateAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAGnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,cAAc,SAAgD;gBAEzD,SAAS,EAAE,iCAAiC;IAIxD,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA4BrC,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAG5C"}
+{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAGnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,cAAc,SAAgD;gBAIzD,SAAS,EAAE,iCAAiC;IAOxD,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA4BrC,yBAAyB,CAAC,EAC9B,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;CAc5C"}

package/dist/providers/SolAccountProvider.d.mts

@@ -5,14 +5,16 @@ import type { SnapId } from "@metamask/snaps-sdk";
 import type { MultichainAccountServiceMessenger } from "src/types";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
 export declare class SolAccountProvider extends SnapAccountProvider {
+    #private;
     static SOLANA_SNAP_ID: SnapId;
     constructor(messenger: MultichainAccountServiceMessenger);
+    getName(): string;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
     createAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;
-    discoverAndCreateAccounts(_: {
+    discoverAndCreateAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
     }): Promise<Bip44Account<KeyringAccount>[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAGnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,cAAc,SAAgD;gBAEzD,SAAS,EAAE,iCAAiC;IAIxD,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA4BrC,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;CAG5C"}
+{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAO7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAGlD,OAAO,KAAK,EAAE,iCAAiC,EAAE,kBAAkB;AAGnE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,cAAc,SAAgD;gBAIzD,SAAS,EAAE,iCAAiC;IAOxD,OAAO,IAAI,MAAM;IAqBjB,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA4BrC,yBAAyB,CAAC,EAC9B,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;CAc5C"}

package/dist/providers/SolAccountProvider.mjs

@@ -1,10 +1,31 @@
+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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _SolAccountProvider_instances, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId;
+import { SolScope } from "@metamask/keyring-api";
 import { KeyringAccountEntropyTypeOption, SolAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
+import { KeyringClient } from "@metamask/keyring-snap-client";
+import { HandlerType } from "@metamask/snaps-utils";
 import { assertAreBip44Accounts } from "./BaseBip44AccountProvider.mjs";
 import { SnapAccountProvider } from "./SnapAccountProvider.mjs";
 export class SolAccountProvider extends SnapAccountProvider {
     constructor(messenger) {
         super(SolAccountProvider.SOLANA_SNAP_ID, messenger);
+        _SolAccountProvider_instances.add(this);
+        _SolAccountProvider_client.set(this, void 0);
+        __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SolAccountProvider.SOLANA_SNAP_ID), "f");
+    }
+    getName() {
+        return 'Solana';
     }
     isAccountCompatible(account) {
         return (account.type === SolAccountType.DataAccount &&
@@ -33,9 +54,27 @@ export class SolAccountProvider extends SnapAccountProvider {
         assertAreBip44Accounts(accounts);
         return accounts;
     }
-    async discoverAndCreateAccounts(_) {
-        return []; // TODO: Implement account discovery.
+    async discoverAndCreateAccounts({ entropySource, groupIndex, }) {
+        const discoveredAccounts = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([SolScope.Mainnet], entropySource, groupIndex);
+        // Solana Snap always returns one discovered account.
+        if (discoveredAccounts.length === 1) {
+            return this.createAccounts({ entropySource, groupIndex });
+        }
+        return Promise.resolve([]);
     }
 }
+_SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+    return new KeyringClient({
+        send: async (request) => {
+            const response = await this.messenger.call('SnapController:handleRequest', {
+                snapId: snapId,
+                origin: 'metamask',
+                handler: HandlerType.OnKeyringRequest,
+                request,
+            });
+            return response;
+        },
+    });
+};
 SolAccountProvider.SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 //# sourceMappingURL=SolAccountProvider.mjs.map

package/dist/providers/SolAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,+BAA+B,EAC/B,cAAc,EACf,8BAA8B;AAC/B,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAK5D,OAAO,EAAE,sBAAsB,EAAE,uCAAmC;AACpE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IAGzD,YAAY,SAA4C;QACtD,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACtD,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAEnE,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;YAClC,aAAa;YACb,cAAc;SACf,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qEAAqE;QACrE,mBAAmB;QACnB,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,+BAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc;SACf,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAEjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;;AApDM,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { assertAreBip44Accounts } from './BaseBip44AccountProvider';\nimport { SnapAccountProvider } from './SnapAccountProvider';\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    // Create account without any confirmation nor selecting it.\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await createAccount({\n      entropySource,\n      derivationPath,\n    });\n\n    // Solana Snap does not use BIP-44 typed options for the moment\n    // so we \"inject\" them (the `AccountsController` does a similar thing\n    // for the moment).\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    const accounts = [account];\n    assertAreBip44Accounts(accounts);\n\n    return accounts;\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AACjD,OAAO,EACL,+BAA+B,EAC/B,cAAc,EACf,8BAA8B;AAC/B,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAE5D,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAE9D,OAAO,EAAE,WAAW,EAAE,8BAA8B;AAIpD,OAAO,EAAE,sBAAsB,EAAE,uCAAmC;AACpE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IAKzD,YAAY,SAA4C;QACtD,KAAK,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;;QAH7C,6CAAuB;QAI9B,uBAAA,IAAI,8BAAW,uBAAA,IAAI,qFAA4B,MAAhC,IAAI,EACjB,kBAAkB,CAAC,cAAc,CAClC,MAAA,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,QAAQ,CAAC;IAClB,CAAC;IAmBD,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAEnE,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;YAClC,aAAa;YACb,cAAc;SACf,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qEAAqE;QACrE,mBAAmB;QACnB,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG;YACxB,IAAI,EAAE,+BAA+B,CAAC,QAAQ;YAC9C,EAAE,EAAE,aAAa;YACjB,UAAU;YACV,cAAc;SACf,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAEjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GAIX;QACC,MAAM,kBAAkB,GAAG,MAAM,uBAAA,IAAI,kCAAQ,CAAC,gBAAgB,CAC5D,CAAC,QAAQ,CAAC,OAAO,CAAC,EAClB,aAAa,EACb,UAAU,CACX,CAAC;QAEF,qDAAqD;QACrD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;;oMA7E2B,MAAc;IACxC,OAAO,IAAI,aAAa,CAAC;QACvB,IAAI,EAAE,KAAK,EAAE,OAAuB,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CACxC,8BAA8B,EAC9B;gBACE,MAAM,EAAE,MAAgB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,WAAW,CAAC,gBAAgB;gBACrC,OAAO;aACR,CACF,CAAC;YACF,OAAO,QAAgB,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA9BM,iCAAc,GAAG,kCAA4C,AAA/C,CAAgD","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\nimport type { MultichainAccountServiceMessenger } from 'src/types';\n\nimport { assertAreBip44Accounts } from './BaseBip44AccountProvider';\nimport { SnapAccountProvider } from './SnapAccountProvider';\n\nexport class SolAccountProvider extends SnapAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    super(SolAccountProvider.SOLANA_SNAP_ID, messenger);\n    this.#client = this.#getKeyringClientFromSnapId(\n      SolAccountProvider.SOLANA_SNAP_ID,\n    );\n  }\n\n  getName(): string {\n    return 'Solana';\n  }\n\n  #getKeyringClientFromSnapId(snapId: string): KeyringClient {\n    return new KeyringClient({\n      send: async (request: JsonRpcRequest) => {\n        const response = await this.messenger.call(\n          'SnapController:handleRequest',\n          {\n            snapId: snapId as SnapId,\n            origin: 'metamask',\n            handler: HandlerType.OnKeyringRequest,\n            request,\n          },\n        );\n        return response as Json;\n      },\n    });\n  }\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const createAccount = await this.getRestrictedSnapAccountCreator();\n\n    // Create account without any confirmation nor selecting it.\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const derivationPath = `m/44'/501'/${groupIndex}'/0'`;\n    const account = await createAccount({\n      entropySource,\n      derivationPath,\n    });\n\n    // Solana Snap does not use BIP-44 typed options for the moment\n    // so we \"inject\" them (the `AccountsController` does a similar thing\n    // for the moment).\n    account.options.entropy = {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: entropySource,\n      groupIndex,\n      derivationPath,\n    };\n\n    const accounts = [account];\n    assertAreBip44Accounts(accounts);\n\n    return accounts;\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): Promise<Bip44Account<KeyringAccount>[]> {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet],\n      entropySource,\n      groupIndex,\n    );\n\n    // Solana Snap always returns one discovered account.\n    if (discoveredAccounts.length === 1) {\n      return this.createAccounts({ entropySource, groupIndex });\n    }\n\n    return Promise.resolve([]);\n  }\n}\n"]}

package/dist/tests/accounts.cjs

@@ -12,12 +12,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _MockAccountBuilder_account;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockAsInternalAccount = exports.MOCK_WALLET_1_BTC_P2TR_ACCOUNT = exports.MOCK_WALLET_1_BTC_P2WPKH_ACCOUNT = exports.MOCK_WALLET_1_SOL_ACCOUNT = exports.MOCK_WALLET_1_EVM_ACCOUNT = exports.MOCK_WALLET_1_ENTROPY_SOURCE = exports.MockAccountBuilder = exports.MOCK_HARDWARE_ACCOUNT_1 = exports.MOCK_SNAP_ACCOUNT_4 = exports.MOCK_SNAP_ACCOUNT_3 = exports.MOCK_SNAP_ACCOUNT_2 = exports.MOCK_SNAP_ACCOUNT_1 = exports.MOCK_BTC_P2TR_ACCOUNT_1 = exports.MOCK_BTC_P2WPKH_ACCOUNT_1 = exports.MOCK_SOL_ACCOUNT_1 = exports.MOCK_HD_ACCOUNT_2 = exports.MOCK_HD_ACCOUNT_1 = exports.MOCK_HD_KEYRING_2 = exports.MOCK_HD_KEYRING_1 = exports.MOCK_ENTROPY_SOURCE_2 = exports.MOCK_ENTROPY_SOURCE_1 = exports.MOCK_SNAP_2 = exports.MOCK_SNAP_1 = void 0;
+exports.mockAsInternalAccount = exports.MOCK_WALLET_1_BTC_P2TR_ACCOUNT = exports.MOCK_WALLET_1_BTC_P2WPKH_ACCOUNT = exports.MOCK_WALLET_1_SOL_ACCOUNT = exports.MOCK_WALLET_1_EVM_ACCOUNT = exports.MOCK_WALLET_1_ENTROPY_SOURCE = exports.MockAccountBuilder = exports.MOCK_HARDWARE_ACCOUNT_1 = exports.MOCK_SNAP_ACCOUNT_4 = exports.MOCK_SNAP_ACCOUNT_3 = exports.MOCK_SNAP_ACCOUNT_2 = exports.MOCK_SNAP_ACCOUNT_1 = exports.MOCK_BTC_P2TR_ACCOUNT_1 = exports.MOCK_BTC_P2WPKH_ACCOUNT_1 = exports.MOCK_SOL_DISCOVERED_ACCOUNT_1 = exports.MOCK_SOL_ACCOUNT_1 = exports.MOCK_HD_ACCOUNT_2 = exports.MOCK_HD_ACCOUNT_1 = exports.MOCK_HD_KEYRING_2 = exports.MOCK_HD_KEYRING_1 = exports.MOCK_ENTROPY_SOURCE_2 = exports.MOCK_ENTROPY_SOURCE_1 = exports.MOCK_SNAP_2 = exports.MOCK_SNAP_1 = exports.ETH_EOA_METHODS = 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 uuid_1 = require("uuid");
-const ETH_EOA_METHODS = [
+exports.ETH_EOA_METHODS = [
     keyring_api_1.EthMethod.PersonalSign,
     keyring_api_1.EthMethod.Sign,
     keyring_api_1.EthMethod.SignTransaction,
@@ -65,7 +65,7 @@ exports.MOCK_HD_ACCOUNT_1 = {
             derivationPath: '',
         },
     },
-    methods: [...ETH_EOA_METHODS],
+    methods: [...exports.ETH_EOA_METHODS],
     type: keyring_api_1.EthAccountType.Eoa,
     scopes: [keyring_api_1.EthScope.Eoa],
     metadata: {
@@ -87,7 +87,7 @@ exports.MOCK_HD_ACCOUNT_2 = {
             derivationPath: '',
         },
     },
-    methods: [...ETH_EOA_METHODS],
+    methods: [...exports.ETH_EOA_METHODS],
     type: keyring_api_1.EthAccountType.Eoa,
     scopes: [keyring_api_1.EthScope.Eoa],
     metadata: {
@@ -121,6 +121,11 @@ exports.MOCK_SOL_ACCOUNT_1 = {
         lastSelected: 0,
     },
 };
+exports.MOCK_SOL_DISCOVERED_ACCOUNT_1 = {
+    type: 'bip44',
+    scopes: [keyring_api_1.SolScope.Mainnet],
+    derivationPath: `m/44'/501'/0'/0'`,
+};
 exports.MOCK_BTC_P2WPKH_ACCOUNT_1 = {
     id: 'b0f030d8-e101-4b5a-a3dd-13f8ca8ec1db',
     type: keyring_api_1.BtcAccountType.P2wpkh,
@@ -182,7 +187,7 @@ exports.MOCK_SNAP_ACCOUNT_2 = {
     id: 'mock-snap-id-2',
     address: '0x789',
     options: {},
-    methods: [...ETH_EOA_METHODS],
+    methods: [...exports.ETH_EOA_METHODS],
     type: keyring_api_1.EthAccountType.Eoa,
     scopes: [keyring_api_1.EthScope.Eoa],
     metadata: {
@@ -199,7 +204,7 @@ exports.MOCK_HARDWARE_ACCOUNT_1 = {
     id: 'mock-hardware-id-1',
     address: '0xABC',
     options: {},
-    methods: [...ETH_EOA_METHODS],
+    methods: [...exports.ETH_EOA_METHODS],
     type: keyring_api_1.EthAccountType.Eoa,
     scopes: [keyring_api_1.EthScope.Eoa],
     metadata: {

package/dist/tests/accounts.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.cjs","sourceRoot":"","sources":["../../src/tests/accounts.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable jsdoc/require-jsdoc */\nimport type { Bip44Account } from '@metamask/account-api';\nimport { isBip44Account } from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport {\n  BtcAccountType,\n  BtcMethod,\n  BtcScope,\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolMethod,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { v4 as uuid } from 'uuid';\n\nconst ETH_EOA_METHODS = [\n  EthMethod.PersonalSign,\n  EthMethod.Sign,\n  EthMethod.SignTransaction,\n  EthMethod.SignTypedDataV1,\n  EthMethod.SignTypedDataV3,\n  EthMethod.SignTypedDataV4,\n] as const;\n\nconst SOL_METHODS = Object.values(SolMethod);\n\nexport const MOCK_SNAP_1 = {\n  id: 'local:mock-snap-id-1',\n  name: 'Mock Snap 1',\n  enabled: true,\n  manifest: {\n    proposedName: 'Mock Snap 1',\n  },\n};\n\nexport const MOCK_SNAP_2 = {\n  id: 'local:mock-snap-id-2',\n  name: 'Mock Snap 2',\n  enabled: true,\n  manifest: {\n    proposedName: 'Mock Snap 2',\n  },\n};\n\nexport const MOCK_ENTROPY_SOURCE_1 = 'mock-keyring-id-1';\nexport const MOCK_ENTROPY_SOURCE_2 = 'mock-keyring-id-2';\n\nexport const MOCK_HD_KEYRING_1 = {\n  type: KeyringTypes.hd,\n  metadata: { id: MOCK_ENTROPY_SOURCE_1, name: 'HD Keyring 1' },\n  accounts: ['0x123'],\n};\n\nexport const MOCK_HD_KEYRING_2 = {\n  type: KeyringTypes.hd,\n  metadata: { id: MOCK_ENTROPY_SOURCE_2, name: 'HD Keyring 2' },\n  accounts: ['0x456'],\n};\n\nexport const MOCK_HD_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'mock-id-1',\n  address: '0x123',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: MOCK_HD_KEYRING_1.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Account 1',\n    keyring: { type: KeyringTypes.hd },\n    importTime: 0,\n    lastSelected: 0,\n    nameLastUpdatedAt: 0,\n  },\n};\n\nexport const MOCK_HD_ACCOUNT_2: Bip44Account<InternalAccount> = {\n  id: 'mock-id-2',\n  address: '0x456',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Account 2',\n    keyring: { type: KeyringTypes.hd },\n    importTime: 0,\n    lastSelected: 0,\n    nameLastUpdatedAt: 0,\n  },\n};\n\nexport const MOCK_SOL_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'mock-snap-id-1',\n  address: 'aabbccdd',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: SOL_METHODS,\n  type: SolAccountType.DataAccount,\n  scopes: [SolScope.Mainnet, SolScope.Testnet, SolScope.Devnet],\n  metadata: {\n    name: 'Solana Account 1',\n    keyring: { type: KeyringTypes.snap },\n    snap: MOCK_SNAP_1,\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport const MOCK_BTC_P2WPKH_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'b0f030d8-e101-4b5a-a3dd-13f8ca8ec1db',\n  type: BtcAccountType.P2wpkh,\n  methods: [BtcMethod.SendBitcoin],\n  address: 'bc1qx8ls07cy8j8nrluy2u0xwn7gh8fxg0rg4s8zze',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  scopes: [BtcScope.Mainnet],\n  metadata: {\n    name: 'Bitcoin Native Segwit Account 1',\n    importTime: 0,\n    keyring: {\n      type: 'Snap keyring',\n    },\n    snap: {\n      id: 'mock-btc-snap-id',\n      enabled: true,\n      name: 'Mock Bitcoin Snap',\n    },\n  },\n};\n\nexport const MOCK_BTC_P2TR_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'a20c2e1a-6ff6-40ba-b8e0-ccdb6f9933bb',\n  type: BtcAccountType.P2tr,\n  methods: [BtcMethod.SendBitcoin],\n  address: 'tb1p5cyxnuxmeuwuvkwfem96lxx9wex9kkf4mt9ll6q60jfsnrzqg4sszkqjnh',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  scopes: [BtcScope.Testnet],\n  metadata: {\n    name: 'Bitcoin Taproot Account 1',\n    importTime: 0,\n    keyring: {\n      type: 'Snap keyring',\n    },\n    snap: {\n      id: 'mock-btc-snap-id',\n      enabled: true,\n      name: 'Mock Bitcoin Snap',\n    },\n  },\n};\n\nexport const MOCK_SNAP_ACCOUNT_1 = MOCK_SOL_ACCOUNT_1;\n\nexport const MOCK_SNAP_ACCOUNT_2: InternalAccount = {\n  id: 'mock-snap-id-2',\n  address: '0x789',\n  options: {},\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Snap Acc 2',\n    keyring: { type: KeyringTypes.snap },\n    snap: MOCK_SNAP_2,\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport const MOCK_SNAP_ACCOUNT_3 = MOCK_BTC_P2WPKH_ACCOUNT_1;\nexport const MOCK_SNAP_ACCOUNT_4 = MOCK_BTC_P2TR_ACCOUNT_1;\n\nexport const MOCK_HARDWARE_ACCOUNT_1: InternalAccount = {\n  id: 'mock-hardware-id-1',\n  address: '0xABC',\n  options: {},\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Hardware Acc 1',\n    keyring: { type: KeyringTypes.ledger },\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport class MockAccountBuilder<Account extends KeyringAccount> {\n  readonly #account: Account;\n\n  constructor(account: Account) {\n    // Make a deep-copy to avoid mutating the same ref.\n    this.#account = JSON.parse(JSON.stringify(account));\n  }\n\n  static from<Account extends KeyringAccount>(\n    account: Account,\n  ): MockAccountBuilder<Account> {\n    return new MockAccountBuilder(account);\n  }\n\n  withId(id: InternalAccount['id']) {\n    this.#account.id = id;\n    return this;\n  }\n\n  withUuid() {\n    this.#account.id = uuid();\n    return this;\n  }\n\n  withAddressSuffix(suffix: string) {\n    this.#account.address += suffix;\n    return this;\n  }\n\n  withEntropySource(entropySource: EntropySourceId) {\n    if (isBip44Account(this.#account)) {\n      this.#account.options.entropy.id = entropySource;\n    }\n    return this;\n  }\n\n  withGroupIndex(groupIndex: number) {\n    if (isBip44Account(this.#account)) {\n      this.#account.options.entropy.groupIndex = groupIndex;\n    }\n    return this;\n  }\n\n  get() {\n    return this.#account;\n  }\n}\n\nexport const MOCK_WALLET_1_ENTROPY_SOURCE = MOCK_ENTROPY_SOURCE_1;\n\nexport const MOCK_WALLET_1_EVM_ACCOUNT = MockAccountBuilder.from(\n  MOCK_HD_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_SOL_ACCOUNT = MockAccountBuilder.from(\n  MOCK_SOL_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_BTC_P2WPKH_ACCOUNT = MockAccountBuilder.from(\n  MOCK_BTC_P2WPKH_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_BTC_P2TR_ACCOUNT = MockAccountBuilder.from(\n  MOCK_BTC_P2TR_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\n\nexport function mockAsInternalAccount(\n  account: KeyringAccount,\n): InternalAccount {\n  return {\n    ...account,\n    metadata: {\n      name: 'Mocked Account',\n      importTime: Date.now(),\n      keyring: {\n        type: 'mock-keyring-type',\n      },\n    },\n  };\n}\n"]}
+{"version":3,"file":"accounts.cjs","sourceRoot":"","sources":["../../src/tests/accounts.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable jsdoc/require-jsdoc */\nimport type { Bip44Account } from '@metamask/account-api';\nimport { isBip44Account } from '@metamask/account-api';\nimport type {\n  DiscoveredAccount,\n  EntropySourceId,\n  KeyringAccount,\n} from '@metamask/keyring-api';\nimport {\n  BtcAccountType,\n  BtcMethod,\n  BtcScope,\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  KeyringAccountEntropyTypeOption,\n  SolAccountType,\n  SolMethod,\n  SolScope,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { v4 as uuid } from 'uuid';\n\nexport const ETH_EOA_METHODS = [\n  EthMethod.PersonalSign,\n  EthMethod.Sign,\n  EthMethod.SignTransaction,\n  EthMethod.SignTypedDataV1,\n  EthMethod.SignTypedDataV3,\n  EthMethod.SignTypedDataV4,\n] as const;\n\nconst SOL_METHODS = Object.values(SolMethod);\n\nexport const MOCK_SNAP_1 = {\n  id: 'local:mock-snap-id-1',\n  name: 'Mock Snap 1',\n  enabled: true,\n  manifest: {\n    proposedName: 'Mock Snap 1',\n  },\n};\n\nexport const MOCK_SNAP_2 = {\n  id: 'local:mock-snap-id-2',\n  name: 'Mock Snap 2',\n  enabled: true,\n  manifest: {\n    proposedName: 'Mock Snap 2',\n  },\n};\n\nexport const MOCK_ENTROPY_SOURCE_1 = 'mock-keyring-id-1';\nexport const MOCK_ENTROPY_SOURCE_2 = 'mock-keyring-id-2';\n\nexport const MOCK_HD_KEYRING_1 = {\n  type: KeyringTypes.hd,\n  metadata: { id: MOCK_ENTROPY_SOURCE_1, name: 'HD Keyring 1' },\n  accounts: ['0x123'],\n};\n\nexport const MOCK_HD_KEYRING_2 = {\n  type: KeyringTypes.hd,\n  metadata: { id: MOCK_ENTROPY_SOURCE_2, name: 'HD Keyring 2' },\n  accounts: ['0x456'],\n};\n\nexport const MOCK_HD_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'mock-id-1',\n  address: '0x123',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: MOCK_HD_KEYRING_1.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Account 1',\n    keyring: { type: KeyringTypes.hd },\n    importTime: 0,\n    lastSelected: 0,\n    nameLastUpdatedAt: 0,\n  },\n};\n\nexport const MOCK_HD_ACCOUNT_2: Bip44Account<InternalAccount> = {\n  id: 'mock-id-2',\n  address: '0x456',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Account 2',\n    keyring: { type: KeyringTypes.hd },\n    importTime: 0,\n    lastSelected: 0,\n    nameLastUpdatedAt: 0,\n  },\n};\n\nexport const MOCK_SOL_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'mock-snap-id-1',\n  address: 'aabbccdd',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  methods: SOL_METHODS,\n  type: SolAccountType.DataAccount,\n  scopes: [SolScope.Mainnet, SolScope.Testnet, SolScope.Devnet],\n  metadata: {\n    name: 'Solana Account 1',\n    keyring: { type: KeyringTypes.snap },\n    snap: MOCK_SNAP_1,\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport const MOCK_SOL_DISCOVERED_ACCOUNT_1: DiscoveredAccount = {\n  type: 'bip44',\n  scopes: [SolScope.Mainnet],\n  derivationPath: `m/44'/501'/0'/0'`,\n};\n\nexport const MOCK_BTC_P2WPKH_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'b0f030d8-e101-4b5a-a3dd-13f8ca8ec1db',\n  type: BtcAccountType.P2wpkh,\n  methods: [BtcMethod.SendBitcoin],\n  address: 'bc1qx8ls07cy8j8nrluy2u0xwn7gh8fxg0rg4s8zze',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  scopes: [BtcScope.Mainnet],\n  metadata: {\n    name: 'Bitcoin Native Segwit Account 1',\n    importTime: 0,\n    keyring: {\n      type: 'Snap keyring',\n    },\n    snap: {\n      id: 'mock-btc-snap-id',\n      enabled: true,\n      name: 'Mock Bitcoin Snap',\n    },\n  },\n};\n\nexport const MOCK_BTC_P2TR_ACCOUNT_1: Bip44Account<InternalAccount> = {\n  id: 'a20c2e1a-6ff6-40ba-b8e0-ccdb6f9933bb',\n  type: BtcAccountType.P2tr,\n  methods: [BtcMethod.SendBitcoin],\n  address: 'tb1p5cyxnuxmeuwuvkwfem96lxx9wex9kkf4mt9ll6q60jfsnrzqg4sszkqjnh',\n  options: {\n    entropy: {\n      type: KeyringAccountEntropyTypeOption.Mnemonic,\n      // NOTE: shares entropy with MOCK_HD_ACCOUNT_2\n      id: MOCK_HD_KEYRING_2.metadata.id,\n      groupIndex: 0,\n      derivationPath: '',\n    },\n  },\n  scopes: [BtcScope.Testnet],\n  metadata: {\n    name: 'Bitcoin Taproot Account 1',\n    importTime: 0,\n    keyring: {\n      type: 'Snap keyring',\n    },\n    snap: {\n      id: 'mock-btc-snap-id',\n      enabled: true,\n      name: 'Mock Bitcoin Snap',\n    },\n  },\n};\n\nexport const MOCK_SNAP_ACCOUNT_1 = MOCK_SOL_ACCOUNT_1;\n\nexport const MOCK_SNAP_ACCOUNT_2: InternalAccount = {\n  id: 'mock-snap-id-2',\n  address: '0x789',\n  options: {},\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Snap Acc 2',\n    keyring: { type: KeyringTypes.snap },\n    snap: MOCK_SNAP_2,\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport const MOCK_SNAP_ACCOUNT_3 = MOCK_BTC_P2WPKH_ACCOUNT_1;\nexport const MOCK_SNAP_ACCOUNT_4 = MOCK_BTC_P2TR_ACCOUNT_1;\n\nexport const MOCK_HARDWARE_ACCOUNT_1: InternalAccount = {\n  id: 'mock-hardware-id-1',\n  address: '0xABC',\n  options: {},\n  methods: [...ETH_EOA_METHODS],\n  type: EthAccountType.Eoa,\n  scopes: [EthScope.Eoa],\n  metadata: {\n    name: 'Hardware Acc 1',\n    keyring: { type: KeyringTypes.ledger },\n    importTime: 0,\n    lastSelected: 0,\n  },\n};\n\nexport class MockAccountBuilder<Account extends KeyringAccount> {\n  readonly #account: Account;\n\n  constructor(account: Account) {\n    // Make a deep-copy to avoid mutating the same ref.\n    this.#account = JSON.parse(JSON.stringify(account));\n  }\n\n  static from<Account extends KeyringAccount>(\n    account: Account,\n  ): MockAccountBuilder<Account> {\n    return new MockAccountBuilder(account);\n  }\n\n  withId(id: InternalAccount['id']) {\n    this.#account.id = id;\n    return this;\n  }\n\n  withUuid() {\n    this.#account.id = uuid();\n    return this;\n  }\n\n  withAddressSuffix(suffix: string) {\n    this.#account.address += suffix;\n    return this;\n  }\n\n  withEntropySource(entropySource: EntropySourceId) {\n    if (isBip44Account(this.#account)) {\n      this.#account.options.entropy.id = entropySource;\n    }\n    return this;\n  }\n\n  withGroupIndex(groupIndex: number) {\n    if (isBip44Account(this.#account)) {\n      this.#account.options.entropy.groupIndex = groupIndex;\n    }\n    return this;\n  }\n\n  get() {\n    return this.#account;\n  }\n}\n\nexport const MOCK_WALLET_1_ENTROPY_SOURCE = MOCK_ENTROPY_SOURCE_1;\n\nexport const MOCK_WALLET_1_EVM_ACCOUNT = MockAccountBuilder.from(\n  MOCK_HD_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_SOL_ACCOUNT = MockAccountBuilder.from(\n  MOCK_SOL_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_BTC_P2WPKH_ACCOUNT = MockAccountBuilder.from(\n  MOCK_BTC_P2WPKH_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\nexport const MOCK_WALLET_1_BTC_P2TR_ACCOUNT = MockAccountBuilder.from(\n  MOCK_BTC_P2TR_ACCOUNT_1,\n)\n  .withEntropySource(MOCK_WALLET_1_ENTROPY_SOURCE)\n  .withGroupIndex(0)\n  .get();\n\nexport function mockAsInternalAccount(\n  account: KeyringAccount,\n): InternalAccount {\n  return {\n    ...account,\n    metadata: {\n      name: 'Mocked Account',\n      importTime: Date.now(),\n      keyring: {\n        type: 'mock-keyring-type',\n      },\n    },\n  };\n}\n"]}

package/dist/tests/accounts.d.cts

@@ -1,7 +1,9 @@
 import type { Bip44Account } from "@metamask/account-api";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import type { DiscoveredAccount, EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import { EthMethod } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
+export declare const ETH_EOA_METHODS: readonly [EthMethod.PersonalSign, EthMethod.Sign, EthMethod.SignTransaction, EthMethod.SignTypedDataV1, EthMethod.SignTypedDataV3, EthMethod.SignTypedDataV4];
 export declare const MOCK_SNAP_1: {
     id: string;
     name: string;
@@ -39,6 +41,7 @@ export declare const MOCK_HD_KEYRING_2: {
 export declare const MOCK_HD_ACCOUNT_1: Bip44Account<InternalAccount>;
 export declare const MOCK_HD_ACCOUNT_2: Bip44Account<InternalAccount>;
 export declare const MOCK_SOL_ACCOUNT_1: Bip44Account<InternalAccount>;
+export declare const MOCK_SOL_DISCOVERED_ACCOUNT_1: DiscoveredAccount;
 export declare const MOCK_BTC_P2WPKH_ACCOUNT_1: Bip44Account<InternalAccount>;
 export declare const MOCK_BTC_P2TR_ACCOUNT_1: Bip44Account<InternalAccount>;
 export declare const MOCK_SNAP_ACCOUNT_1: Bip44Account<{