@metamask-previews/multichain-account-service 0.3.0-preview-43d47013 → 0.3.0-preview-98faf75a

package/dist/providers/SolAccountProvider.cjs

@@ -1,31 +1,44 @@
 "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, }) {
+        // 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.
         // 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, {
+        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
+        const account = await createAccount(SolAccountProvider.SOLANA_SNAP_ID, {
             entropySource,
-            derivationPath: `m/44'/501'/${groupIndex}'/0'`,
+            derivationPath,
+        }, {
+            displayAccountNameSuggestion: false,
+            displayConfirmation: false,
+            setSelectedAccount: false,
         });
+        // Solana Snap does not use BIP-44 typed options for the moment
+        // so we "inject" them (the `AccountsController` does a similar thing
+        // for the moment).
+        account.options.entropy = {
+            type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+            id: entropySource,
+            groupIndex,
+            derivationPath,
+        };
+        (0, BaseAccountProvider_1.assertIsBip44Account)(account);
         return [account];
     }
     async discoverAndCreateAccounts(_) {
@@ -33,22 +46,5 @@ class SolAccountProvider extends BaseAccountProvider_1.BaseAccountProvider {
     }
 }
 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":";;;;;;;;;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"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":";;;AAGA,uDAG+B;AAC/B,qEAA4D;AAI5D,mEAG+B;AAE/B,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,iFAAiF;QACjF,gFAAgF;QAChF,sCAAsC;QACtC,+EAA+E;QAC/E,iFAAiF;QACjF,wDAAwD;QACxD,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;QAEF,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,kBAAkB,CAAC,cAAc,EACjC;YACE,aAAa;YACb,cAAc;SACf,EACD;YACE,4BAA4B,EAAE,KAAK;YACnC,mBAAmB,EAAE,KAAK;YAC1B,kBAAkB,EAAE,KAAK;SAC1B,CACF,CAAC;QAEF,+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,IAAA,0CAAoB,EAAC,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;;AAnEH,gDAoEC;AAnEQ,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { EntropySourceId } 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';\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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\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    // 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      SolAccountProvider.SOLANA_SNAP_ID,\n      {\n        entropySource,\n        derivationPath,\n      },\n      {\n        displayAccountNameSuggestion: false,\n        displayConfirmation: false,\n        setSelectedAccount: false,\n      },\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    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.d.cts

@@ -4,7 +4,6 @@ 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, }: {

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;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"}
+{"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;AAM7D,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;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;IA8CK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/SolAccountProvider.d.mts

@@ -4,7 +4,6 @@ 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, }: {

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;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"}
+{"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;AAM7D,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;IAO9D,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;IA8CK,yBAAyB,CAAC,CAAC,EAAE;QACjC,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;CAGF"}

package/dist/providers/SolAccountProvider.mjs

@@ -1,50 +1,46 @@
-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 { KeyringAccountEntropyTypeOption, SolAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 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, }) {
+        // 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.
         // 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, {
+        const derivationPath = `m/44'/501'/${groupIndex}'/0'`;
+        const account = await createAccount(SolAccountProvider.SOLANA_SNAP_ID, {
             entropySource,
-            derivationPath: `m/44'/501'/${groupIndex}'/0'`,
+            derivationPath,
+        }, {
+            displayAccountNameSuggestion: false,
+            displayConfirmation: false,
+            setSelectedAccount: false,
         });
+        // Solana Snap does not use BIP-44 typed options for the moment
+        // so we "inject" them (the `AccountsController` does a similar thing
+        // for the moment).
+        account.options.entropy = {
+            type: KeyringAccountEntropyTypeOption.Mnemonic,
+            id: entropySource,
+            groupIndex,
+            derivationPath,
+        };
+        assertIsBip44Account(account);
         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":";;;;;;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"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,+BAA+B,EAC/B,cAAc,EACf,8BAA8B;AAC/B,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAI5D,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACpB,kCAA8B;AAE/B,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;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,iFAAiF;QACjF,gFAAgF;QAChF,sCAAsC;QACtC,+EAA+E;QAC/E,iFAAiF;QACjF,wDAAwD;QACxD,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;QAEF,4DAA4D;QAC5D,uFAAuF;QACvF,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,UAAU,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,kBAAkB,CAAC,cAAc,EACjC;YACE,aAAa;YACb,cAAc;SACf,EACD;YACE,4BAA4B,EAAE,KAAK;YACnC,mBAAmB,EAAE,KAAK;YAC1B,kBAAkB,EAAE,KAAK;SAC1B,CACF,CAAC;QAEF,+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,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;;AAlEM,iCAAc,GAAG,kCAA4C,CAAC","sourcesContent":["import { type Bip44Account } from '@metamask/account-api';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport type { EntropySourceId } 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';\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 createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\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    // 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      SolAccountProvider.SOLANA_SNAP_ID,\n      {\n        entropySource,\n        derivationPath,\n      },\n      {\n        displayAccountNameSuggestion: false,\n        displayConfirmation: false,\n        setSelectedAccount: false,\n      },\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    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/multichain-account-service",
-  "version": "0.3.0-preview-43d47013",
+  "version": "0.3.0-preview-98faf75a",
   "description": "Service to manage multichain accounts",
   "keywords": [
     "MetaMask",