@metamask-previews/multichain-account-service 0.3.0-preview-0910ff0 → 0.3.0-preview-43d47013

package/dist/providers/EvmAccountProvider.d.cts

@@ -1,7 +1,73 @@
 import type { Bip44Account } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import { BaseAccountProvider } from "./BaseAccountProvider.cjs";
 export declare class EvmAccountProvider extends BaseAccountProvider {
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<({
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-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" | "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;
+            };
+        };
+    })[]>;
+    discoverAndCreateAccounts(_: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<never[]>;
 }
 //# sourceMappingURL=EvmAccountProvider.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAG1D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAMrE"}
+{"version":3,"file":"EvmAccountProvider.d.cts","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,mBAAmB,EACpB,kCAA8B;AAgB/B,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiCK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/EvmAccountProvider.d.mts

@@ -1,7 +1,73 @@
 import type { Bip44Account } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import { BaseAccountProvider } from "./BaseAccountProvider.mjs";
 export declare class EvmAccountProvider extends BaseAccountProvider {
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<({
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-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" | "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;
+            };
+        };
+    })[]>;
+    discoverAndCreateAccounts(_: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<never[]>;
 }
 //# 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;AAG1D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAMrE"}
+{"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,mBAAmB,EACpB,kCAA8B;AAgB/B,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiCK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/EvmAccountProvider.mjs

@@ -1,10 +1,45 @@
 import { EthAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
-import { BaseAccountProvider } from "./BaseAccountProvider.mjs";
+import { assertIsBip44Account, BaseAccountProvider } from "./BaseAccountProvider.mjs";
+/**
+ * Asserts an internal account exists.
+ *
+ * @param account - The internal account to check.
+ * @throws An error if the internal account does not exist.
+ */
+function assertInternalAccountExists(account) {
+    if (!account) {
+        throw new Error('Internal account does not exist');
+    }
+}
 export class EvmAccountProvider extends BaseAccountProvider {
     isAccountCompatible(account) {
         return (account.type === EthAccountType.Eoa &&
             account.metadata.keyring.type === KeyringTypes.hd);
     }
+    async createAccounts({ entropySource, groupIndex, }) {
+        const [address] = await this.withKeyring({ id: entropySource }, async ({ keyring }) => {
+            const accounts = await keyring.getAccounts();
+            if (groupIndex < accounts.length) {
+                // Nothing new to create, we just re-use the existing accounts here,
+                return [accounts[groupIndex]];
+            }
+            // For now, we don't allow for gap, so if we need to create a new
+            // account, this has to be the next one.
+            if (groupIndex !== accounts.length) {
+                throw new Error('Trying to create too many accounts');
+            }
+            // Create next account (and returns their addresses).
+            return await keyring.addAccounts(1);
+        });
+        const account = this.messenger.call('AccountsController:getAccountByAddress', address);
+        // We MUST have the associated internal account.
+        assertInternalAccountExists(account);
+        assertIsBip44Account(account);
+        return [account];
+    }
+    async discoverAndCreateAccounts(_) {
+        return []; // TODO: Implement account discovery.
+    }
 }
 //# 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":"AACA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AACvD,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAG5D,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IACzD,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;CACF","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport { EthAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { BaseAccountProvider } from './BaseAccountProvider';\n\nexport class EvmAccountProvider extends BaseAccountProvider {\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"]}
+{"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,oBAAoB,EACpB,mBAAmB,EACpB,kCAA8B;AAE/B;;;;;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,mBAAmB;IACzD,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;QACrC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,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  assertIsBip44Account,\n  BaseAccountProvider,\n} from './BaseAccountProvider';\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 BaseAccountProvider {\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    assertIsBip44Account(account);\n\n    return [account];\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.cjs

@@ -1,15 +1,54 @@
 "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 _SolAccountProvider_instances, _a, _SolAccountProvider_createAccount;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolAccountProvider = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const BaseAccountProvider_1 = require("./BaseAccountProvider.cjs");
 class SolAccountProvider extends BaseAccountProvider_1.BaseAccountProvider {
+    constructor() {
+        super(...arguments);
+        _SolAccountProvider_instances.add(this);
+    }
     isAccountCompatible(account) {
         return (account.type === keyring_api_1.SolAccountType.DataAccount &&
             account.metadata.keyring.type === keyring_controller_1.KeyringTypes.snap);
     }
+    async createAccounts({ entropySource, groupIndex, }) {
+        // TODO: Use the new keyring API `createAccounts` method with the "bip-44:derive-index"
+        // type once ready.
+        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+            entropySource,
+            derivationPath: `m/44'/501'/${groupIndex}'/0'`,
+        });
+        return [account];
+    }
+    async discoverAndCreateAccounts(_) {
+        return []; // TODO: Implement account discovery.
+    }
 }
 exports.SolAccountProvider = SolAccountProvider;
+_a = SolAccountProvider, _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount(opts) {
+    // NOTE: We're not supposed to make the keyring instance escape `withKeyring` but
+    // we have to use the `SnapKeyring` instance to be able to create Solana account
+    // without triggering UI confirmation.
+    // Also, creating account that way won't invalidate the Snap keyring state. The
+    // account will get created and persisted properly with the Snap account creation
+    // flow "asynchronously" (with `notify:accountCreated`).
+    const createAccount = await this.withKeyring({ type: keyring_controller_1.KeyringTypes.snap }, async ({ keyring }) => keyring.createAccount.bind(keyring));
+    // Create account without any confirmation nor selecting it.
+    const account = await createAccount(_a.SOLANA_SNAP_ID, opts, {
+        displayAccountNameSuggestion: false,
+        displayConfirmation: false,
+        setSelectedAccount: false,
+    });
+    (0, BaseAccountProvider_1.assertIsBip44Account)(account);
+    return account;
+};
 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":";;;AACA,uDAAuD;AACvD,qEAA4D;AAI5D,mEAA4D;AAE5D,MAAa,kBAAmB,SAAQ,yCAAmB;IAGzD,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;;AARH,gDASC;AARQ,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport { SolAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { BaseAccountProvider } from './BaseAccountProvider';\n\nexport class SolAccountProvider extends BaseAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\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"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAGA,uDAAuD;AACvD,qEAA4D;AAI5D,mEAG+B;AAE/B,MAAa,kBAAmB,SAAQ,yCAAmB;IAA3D;;;IAkEA,CAAC;IA/DC,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;IAmCD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,wEAAe,MAAnB,IAAI,EAAgB;YACxC,aAAa;YACb,cAAc,EAAE,cAAc,UAAU,MAAM;SAC/C,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;;AAjEH,gDAkEC;4GAxDC,KAAK,4CAAgB,IAGpB;IACC,iFAAiF;IACjF,gFAAgF;IAChF,sCAAsC;IACtC,+EAA+E;IAC/E,iFAAiF;IACjF,wDAAwD;IACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAG1C,EAAE,IAAI,EAAE,iCAAY,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACnD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CACpC,CAAC;IAEF,4DAA4D;IAC5D,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,EAAkB,CAAC,cAAc,EACjC,IAAI,EACJ;QACE,4BAA4B,EAAE,KAAK;QACnC,mBAAmB,EAAE,KAAK;QAC1B,kBAAkB,EAAE,KAAK;KAC1B,CACF,CAAC;IAEF,IAAA,0CAAoB,EAAC,OAAO,CAAC,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAxCM,iCAAc,GAAG,kCAA4C,AAA/C,CAAgD","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport { SolAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport {\n  assertIsBip44Account,\n  BaseAccountProvider,\n} from './BaseAccountProvider';\n\nexport class SolAccountProvider extends BaseAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount(opts: {\n    entropySource: EntropySourceId;\n    derivationPath: `m/${string}`;\n  }) {\n    // NOTE: We're not supposed to make the keyring instance escape `withKeyring` but\n    // we have to use the `SnapKeyring` instance to be able to create Solana account\n    // without triggering UI confirmation.\n    // Also, creating account that way won't invalidate the Snap keyring state. The\n    // account will get created and persisted properly with the Snap account creation\n    // flow \"asynchronously\" (with `notify:accountCreated`).\n    const createAccount = await this.withKeyring<\n      SnapKeyring,\n      SnapKeyring['createAccount']\n    >({ type: KeyringTypes.snap }, async ({ keyring }) =>\n      keyring.createAccount.bind(keyring),\n    );\n\n    // Create account without any confirmation nor selecting it.\n    const account = await createAccount(\n      SolAccountProvider.SOLANA_SNAP_ID,\n      opts,\n      {\n        displayAccountNameSuggestion: false,\n        displayConfirmation: false,\n        setSelectedAccount: false,\n      },\n    );\n\n    assertIsBip44Account(account);\n\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const account = await this.#createAccount({\n      entropySource,\n      derivationPath: `m/44'/501'/${groupIndex}'/0'`,\n    });\n\n    return [account];\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -1,9 +1,36 @@
-import type { Bip44Account } from "@metamask/account-api";
+import { type Bip44Account } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { BaseAccountProvider } from "./BaseAccountProvider.cjs";
 export declare class SolAccountProvider extends BaseAccountProvider {
+    #private;
     static SOLANA_SNAP_ID: SnapId;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<{
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account" | "any:account";
+        id: string;
+        options: Record<string, import("@metamask/snaps-sdk").Json> & {
+            entropy?: {
+                type: "mnemonic";
+                id: string;
+                derivationPath: string;
+                groupIndex: number;
+            } | {
+                type: "private-key";
+            } | undefined;
+            exportable?: boolean | undefined;
+        };
+        address: string;
+        scopes: `${string}:${string}`[];
+        methods: string[];
+    }>[]>;
+    discoverAndCreateAccounts(_: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<never[]>;
 }
 //# 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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAG1D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,cAAc,SAAgD;IAErE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAMrE"}
+{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAEL,mBAAmB,EACpB,kCAA8B;AAE/B,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,cAAc,SAAgD;IAErE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAwC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;IAWK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/SolAccountProvider.d.mts

@@ -1,9 +1,36 @@
-import type { Bip44Account } from "@metamask/account-api";
+import { type Bip44Account } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { SnapId } from "@metamask/snaps-sdk";
 import { BaseAccountProvider } from "./BaseAccountProvider.mjs";
 export declare class SolAccountProvider extends BaseAccountProvider {
+    #private;
     static SOLANA_SNAP_ID: SnapId;
     isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    createAccounts({ entropySource, groupIndex, }: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<Bip44Account<{
+        type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account" | "any:account";
+        id: string;
+        options: Record<string, import("@metamask/snaps-sdk").Json> & {
+            entropy?: {
+                type: "mnemonic";
+                id: string;
+                derivationPath: string;
+                groupIndex: number;
+            } | {
+                type: "private-key";
+            } | undefined;
+            exportable?: boolean | undefined;
+        };
+        address: string;
+        scopes: `${string}:${string}`[];
+        methods: string[];
+    }>[]>;
+    discoverAndCreateAccounts(_: {
+        entropySource: EntropySourceId;
+        groupIndex: number;
+    }): Promise<never[]>;
 }
 //# 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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAG1D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,qBAAa,kBAAmB,SAAQ,mBAAmB;IACzD,MAAM,CAAC,cAAc,SAAgD;IAErE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAMrE"}
+{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,8BAA8B;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAG7D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,EAEL,mBAAmB,EACpB,kCAA8B;AAE/B,qBAAa,kBAAmB,SAAQ,mBAAmB;;IACzD,MAAM,CAAC,cAAc,SAAgD;IAErE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;IAwC9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;IAWK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/SolAccountProvider.mjs

@@ -1,11 +1,50 @@
+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 _SolAccountProvider_instances, _a, _SolAccountProvider_createAccount;
 import { SolAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
-import { BaseAccountProvider } from "./BaseAccountProvider.mjs";
+import { assertIsBip44Account, BaseAccountProvider } from "./BaseAccountProvider.mjs";
 export class SolAccountProvider extends BaseAccountProvider {
+    constructor() {
+        super(...arguments);
+        _SolAccountProvider_instances.add(this);
+    }
     isAccountCompatible(account) {
         return (account.type === SolAccountType.DataAccount &&
             account.metadata.keyring.type === KeyringTypes.snap);
     }
+    async createAccounts({ entropySource, groupIndex, }) {
+        // TODO: Use the new keyring API `createAccounts` method with the "bip-44:derive-index"
+        // type once ready.
+        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+            entropySource,
+            derivationPath: `m/44'/501'/${groupIndex}'/0'`,
+        });
+        return [account];
+    }
+    async discoverAndCreateAccounts(_) {
+        return []; // TODO: Implement account discovery.
+    }
 }
+_a = SolAccountProvider, _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount(opts) {
+    // NOTE: We're not supposed to make the keyring instance escape `withKeyring` but
+    // we have to use the `SnapKeyring` instance to be able to create Solana account
+    // without triggering UI confirmation.
+    // Also, creating account that way won't invalidate the Snap keyring state. The
+    // account will get created and persisted properly with the Snap account creation
+    // flow "asynchronously" (with `notify:accountCreated`).
+    const createAccount = await this.withKeyring({ type: KeyringTypes.snap }, async ({ keyring }) => keyring.createAccount.bind(keyring));
+    // Create account without any confirmation nor selecting it.
+    const account = await createAccount(_a.SOLANA_SNAP_ID, opts, {
+        displayAccountNameSuggestion: false,
+        displayConfirmation: false,
+        setSelectedAccount: false,
+    });
+    assertIsBip44Account(account);
+    return account;
+};
 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":"AACA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AACvD,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAI5D,OAAO,EAAE,mBAAmB,EAAE,kCAA8B;AAE5D,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IAGzD,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;;AAPM,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport { SolAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport { BaseAccountProvider } from './BaseAccountProvider';\n\nexport class SolAccountProvider extends BaseAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\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"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;;;;AAGA,OAAO,EAAE,cAAc,EAAE,8BAA8B;AACvD,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAI5D,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACpB,kCAA8B;AAE/B,MAAM,OAAO,kBAAmB,SAAQ,mBAAmB;IAA3D;;;IAkEA,CAAC;IA/DC,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;IAmCD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,wEAAe,MAAnB,IAAI,EAAgB;YACxC,aAAa;YACb,cAAc,EAAE,cAAc,UAAU,MAAM;SAC/C,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,CAG/B;QACC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAClD,CAAC;;4GAvDD,KAAK,4CAAgB,IAGpB;IACC,iFAAiF;IACjF,gFAAgF;IAChF,sCAAsC;IACtC,+EAA+E;IAC/E,iFAAiF;IACjF,wDAAwD;IACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAG1C,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACnD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CACpC,CAAC;IAEF,4DAA4D;IAC5D,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,EAAkB,CAAC,cAAc,EACjC,IAAI,EACJ;QACE,4BAA4B,EAAE,KAAK;QACnC,mBAAmB,EAAE,KAAK;QAC1B,kBAAkB,EAAE,KAAK;KAC1B,CACF,CAAC;IAEF,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAxCM,iCAAc,GAAG,kCAA4C,AAA/C,CAAgD","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport { SolAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\n\nimport {\n  assertIsBip44Account,\n  BaseAccountProvider,\n} from './BaseAccountProvider';\n\nexport class SolAccountProvider extends BaseAccountProvider {\n  static SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\n  isAccountCompatible(account: Bip44Account<InternalAccount>): boolean {\n    return (\n      account.type === SolAccountType.DataAccount &&\n      account.metadata.keyring.type === (KeyringTypes.snap as string)\n    );\n  }\n\n  async #createAccount(opts: {\n    entropySource: EntropySourceId;\n    derivationPath: `m/${string}`;\n  }) {\n    // NOTE: We're not supposed to make the keyring instance escape `withKeyring` but\n    // we have to use the `SnapKeyring` instance to be able to create Solana account\n    // without triggering UI confirmation.\n    // Also, creating account that way won't invalidate the Snap keyring state. The\n    // account will get created and persisted properly with the Snap account creation\n    // flow \"asynchronously\" (with `notify:accountCreated`).\n    const createAccount = await this.withKeyring<\n      SnapKeyring,\n      SnapKeyring['createAccount']\n    >({ type: KeyringTypes.snap }, async ({ keyring }) =>\n      keyring.createAccount.bind(keyring),\n    );\n\n    // Create account without any confirmation nor selecting it.\n    const account = await createAccount(\n      SolAccountProvider.SOLANA_SNAP_ID,\n      opts,\n      {\n        displayAccountNameSuggestion: false,\n        displayConfirmation: false,\n        setSelectedAccount: false,\n      },\n    );\n\n    assertIsBip44Account(account);\n\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    // TODO: Use the new keyring API `createAccounts` method with the \"bip-44:derive-index\"\n    // type once ready.\n    const account = await this.#createAccount({\n      entropySource,\n      derivationPath: `m/44'/501'/${groupIndex}'/0'`,\n    });\n\n    return [account];\n  }\n\n  async discoverAndCreateAccounts(_: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    return []; // TODO: Implement account discovery.\n  }\n}\n"]}

package/dist/tests/accounts.cjs

@@ -12,10 +12,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _MockAccountBuilder_account;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockAccountBuilder = exports.MOCK_HARDWARE_ACCOUNT_1 = exports.MOCK_SNAP_ACCOUNT_2 = exports.MOCK_SNAP_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.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;
 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 = [
     keyring_api_1.EthMethod.PersonalSign,
     keyring_api_1.EthMethod.Sign,
@@ -97,7 +98,7 @@ exports.MOCK_HD_ACCOUNT_2 = {
         nameLastUpdatedAt: 0,
     },
 };
-exports.MOCK_SNAP_ACCOUNT_1 = {
+exports.MOCK_SOL_ACCOUNT_1 = {
     id: 'mock-snap-id-1',
     address: 'aabbccdd',
     options: {
@@ -111,15 +112,72 @@ exports.MOCK_SNAP_ACCOUNT_1 = {
     },
     methods: SOL_METHODS,
     type: keyring_api_1.SolAccountType.DataAccount,
-    scopes: [keyring_api_1.SolScope.Mainnet],
+    scopes: [keyring_api_1.SolScope.Mainnet, keyring_api_1.SolScope.Testnet, keyring_api_1.SolScope.Devnet],
     metadata: {
-        name: 'Snap Account 1',
+        name: 'Solana Account 1',
         keyring: { type: keyring_controller_1.KeyringTypes.snap },
         snap: exports.MOCK_SNAP_1,
         importTime: 0,
         lastSelected: 0,
     },
 };
+exports.MOCK_BTC_P2WPKH_ACCOUNT_1 = {
+    id: 'b0f030d8-e101-4b5a-a3dd-13f8ca8ec1db',
+    type: keyring_api_1.BtcAccountType.P2wpkh,
+    methods: [keyring_api_1.BtcMethod.SendBitcoin],
+    address: 'bc1qx8ls07cy8j8nrluy2u0xwn7gh8fxg0rg4s8zze',
+    options: {
+        entropy: {
+            type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+            // NOTE: shares entropy with MOCK_HD_ACCOUNT_2
+            id: exports.MOCK_HD_KEYRING_2.metadata.id,
+            groupIndex: 0,
+            derivationPath: '',
+        },
+    },
+    scopes: [keyring_api_1.BtcScope.Mainnet],
+    metadata: {
+        name: 'Bitcoin Native Segwit Account 1',
+        importTime: 0,
+        keyring: {
+            type: 'Snap keyring',
+        },
+        snap: {
+            id: 'mock-btc-snap-id',
+            enabled: true,
+            name: 'Mock Bitcoin Snap',
+        },
+    },
+};
+exports.MOCK_BTC_P2TR_ACCOUNT_1 = {
+    id: 'a20c2e1a-6ff6-40ba-b8e0-ccdb6f9933bb',
+    type: keyring_api_1.BtcAccountType.P2tr,
+    methods: [keyring_api_1.BtcMethod.SendBitcoin],
+    address: 'tb1p5cyxnuxmeuwuvkwfem96lxx9wex9kkf4mt9ll6q60jfsnrzqg4sszkqjnh',
+    options: {
+        entropy: {
+            type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+            // NOTE: shares entropy with MOCK_HD_ACCOUNT_2
+            id: exports.MOCK_HD_KEYRING_2.metadata.id,
+            groupIndex: 0,
+            derivationPath: '',
+        },
+    },
+    scopes: [keyring_api_1.BtcScope.Testnet],
+    metadata: {
+        name: 'Bitcoin Taproot Account 1',
+        importTime: 0,
+        keyring: {
+            type: 'Snap keyring',
+        },
+        snap: {
+            id: 'mock-btc-snap-id',
+            enabled: true,
+            name: 'Mock Bitcoin Snap',
+        },
+    },
+};
+exports.MOCK_SNAP_ACCOUNT_1 = exports.MOCK_SOL_ACCOUNT_1;
 exports.MOCK_SNAP_ACCOUNT_2 = {
     id: 'mock-snap-id-2',
     address: '0x789',
@@ -135,6 +193,8 @@ exports.MOCK_SNAP_ACCOUNT_2 = {
         lastSelected: 0,
     },
 };
+exports.MOCK_SNAP_ACCOUNT_3 = exports.MOCK_BTC_P2WPKH_ACCOUNT_1;
+exports.MOCK_SNAP_ACCOUNT_4 = exports.MOCK_BTC_P2TR_ACCOUNT_1;
 exports.MOCK_HARDWARE_ACCOUNT_1 = {
     id: 'mock-hardware-id-1',
     address: '0xABC',
@@ -162,6 +222,14 @@ class MockAccountBuilder {
         __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").id = id;
         return this;
     }
+    withUuid() {
+        __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").id = (0, uuid_1.v4)();
+        return this;
+    }
+    withAddressSuffix(suffix) {
+        __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").address += suffix;
+        return this;
+    }
     withEntropySource(entropySource) {
         if ((0, account_api_1.isBip44Account)(__classPrivateFieldGet(this, _MockAccountBuilder_account, "f"))) {
             __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").options.entropy.id = entropySource;
@@ -180,4 +248,21 @@ class MockAccountBuilder {
 }
 exports.MockAccountBuilder = MockAccountBuilder;
 _MockAccountBuilder_account = new WeakMap();
+exports.MOCK_WALLET_1_ENTROPY_SOURCE = exports.MOCK_ENTROPY_SOURCE_1;
+exports.MOCK_WALLET_1_EVM_ACCOUNT = MockAccountBuilder.from(exports.MOCK_HD_ACCOUNT_1)
+    .withEntropySource(exports.MOCK_WALLET_1_ENTROPY_SOURCE)
+    .withGroupIndex(0)
+    .get();
+exports.MOCK_WALLET_1_SOL_ACCOUNT = MockAccountBuilder.from(exports.MOCK_SOL_ACCOUNT_1)
+    .withEntropySource(exports.MOCK_WALLET_1_ENTROPY_SOURCE)
+    .withGroupIndex(0)
+    .get();
+exports.MOCK_WALLET_1_BTC_P2WPKH_ACCOUNT = MockAccountBuilder.from(exports.MOCK_BTC_P2WPKH_ACCOUNT_1)
+    .withEntropySource(exports.MOCK_WALLET_1_ENTROPY_SOURCE)
+    .withGroupIndex(0)
+    .get();
+exports.MOCK_WALLET_1_BTC_P2TR_ACCOUNT = MockAccountBuilder.from(exports.MOCK_BTC_P2TR_ACCOUNT_1)
+    .withEntropySource(exports.MOCK_WALLET_1_ENTROPY_SOURCE)
+    .withGroupIndex(0)
+    .get();
 //# sourceMappingURL=accounts.cjs.map