@metamask-previews/multichain-account-controller 0.0.0-preview-0e455278 → 0.0.0-preview-3c8bcc82

package/dist/providers/EvmAccountProvider.mjs

@@ -38,18 +38,13 @@ export class EvmAccountProvider {
             if (groupIndex !== accounts.length) {
                 throw new Error('Trying to create too many accounts');
             }
-            // Create new accounts (and returns their addresses).
-            // NOTE: We need the `+ 1` here since we use the "number of accounts"
-            // in `addAccounts`, so:
-            // - 1 means, 1 account  -> index 0
-            // - 2 means, 2 accounts -> index 0 and 1
-            // - etc...
-            return await keyring.addAccounts(groupIndex + 1);
+            // Create next account (and returns their addresses).
+            return await keyring.addAccounts(1);
         });
         const account = __classPrivateFieldGet(this, _EvmAccountProvider_messenger, "f").call('AccountsController:getAccountByAddress', address);
         // We MUST have the associated internal account.
         assertInternalAccountExists(account);
-        return [account];
+        return [account.id];
     }
     async discoverAndCreateAccounts({ entropySource, groupIndex, }) {
         // TODO: Move account discovery here (for EVM).
@@ -59,17 +54,18 @@ export class EvmAccountProvider {
         return [];
     }
     getAccounts({ entropySource, groupIndex, }) {
-        return __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccounts).call(this).filter((account) => {
+        return __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccounts).call(this, (account) => {
             return (account.options.entropySource === entropySource &&
                 account.options.index === groupIndex);
-        });
+        }).map((account) => account.id);
     }
-    getEntropySources() {
-        const entropySources = new Set();
-        for (const account of __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccounts).call(this)) {
-            entropySources.add(account.options.entropySource);
+    getAccount(id) {
+        // TODO: Maybe just use a proper find for faster lookup?
+        const [found] = __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_getAccounts).call(this, (account) => account.id === id);
+        if (!found) {
+            throw new Error(`Unable to find EVM account: ${id}`);
         }
-        return Array.from(entropySources);
+        return found;
     }
 }
 _EvmAccountProvider_messenger = new WeakMap(), _EvmAccountProvider_instances = new WeakSet(), _EvmAccountProvider_withKeyring = async function _EvmAccountProvider_withKeyring(selector, operation) {
@@ -78,7 +74,7 @@ _EvmAccountProvider_messenger = new WeakMap(), _EvmAccountProvider_instances = n
         metadata,
     }));
     return result;
-}, _EvmAccountProvider_getAccounts = function _EvmAccountProvider_getAccounts() {
+}, _EvmAccountProvider_getAccounts = function _EvmAccountProvider_getAccounts(filter = () => true) {
     return __classPrivateFieldGet(this, _EvmAccountProvider_messenger, "f")
         .call('AccountsController:listMultichainAccounts')
         .filter((account) => {
@@ -97,7 +93,7 @@ _EvmAccountProvider_messenger = new WeakMap(), _EvmAccountProvider_instances = n
             console.warn("! Found an HD account with no index: account won't be associated to its wallet.");
             return false;
         }
-        return true;
+        return filter(account);
     }); // Safe, we did check for options fields during filtering.
 };
 //# 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":";;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAwB,8BAA8B;AAC7E,OAAO,EACL,YAAY,EAGb,qCAAqC;AAStC,yEAAyE;AACzE,MAAM,eAAe,GAAG,CAAC,CAAC;AAS1B,+CAA+C;AAC/C,SAAS,2BAA2B,CAClC,OAAoC;IAEpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;AACH,CAAC;AAED,MAAM,OAAO,kBAAkB;IAG7B,YAAY,SAA+C;;QAFlD,gDAAiD;QAGxD,uBAAA,IAAI,iCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IA4BD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,uBAAA,IAAI,sEAAa,MAAjB,IAAI,EAC1B,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,qEAAqE;YACrE,wBAAwB;YACxB,mCAAmC;YACnC,yCAAyC;YACzC,WAAW;YACX,OAAO,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,uBAAA,IAAI,qCAAW,CAAC,IAAI,CAClC,wCAAwC,EACxC,OAAO,CACR,CAAC;QAEF,gDAAgD;QAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAErC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GAIX;QACC,+CAA+C;QAE/C,IAAI,UAAU,GAAG,eAAe,EAAE;YAChC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;SACjE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAkCD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GAIX;QACC,OAAO,uBAAA,IAAI,sEAAa,MAAjB,IAAI,CAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAC5C,OAAO,CACL,OAAO,CAAC,OAAO,CAAC,aAAa,KAAK,aAAa;gBAC/C,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,UAAU,CACrC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB;QACf,MAAM,cAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;QAElD,KAAK,MAAM,OAAO,IAAI,uBAAA,IAAI,sEAAa,MAAjB,IAAI,CAAe,EAAE;YACzC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SACnD;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;CACF;gIA5IC,KAAK,0CAIH,QAAyB,EACzB,SAM6B;IAE7B,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,qCAAW,CAAC,IAAI,CACvC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;QACR,OAAO,EAAE,OAA0B;QACnC,QAAQ;KACT,CAAC,CACL,CAAC;IAEF,OAAO,MAAwB,CAAC;AAClC,CAAC;IA6DC,OAAO,uBAAA,IAAI,qCAAW;SACnB,IAAI,CAAC,2CAA2C,CAAC;SACjD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAClB,0DAA0D;QAC1D,IACE,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,EAAa,EAC7D;YACA,OAAO,KAAK,CAAC;SACd;QAED,iHAAiH;QACjH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE;YAClC,OAAO,CAAC,IAAI,CACV,0FAA0F,CAC3F,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,2DAA2D;QAC3D,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE;YACvC,OAAO,CAAC,IAAI,CACV,iFAAiF,CAClF,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAyB,CAAC,CAAC,0DAA0D;AAC1F,CAAC","sourcesContent":["import { EthAccountType, type EntropySourceId } from '@metamask/keyring-api';\nimport {\n  KeyringTypes,\n  type KeyringMetadata,\n  type KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\n// Max index used by discovery (until we move the proper discovery here).\nconst MAX_GROUP_INDEX = 1;\n\ntype EoaInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\n// eslint-disable-next-line jsdoc/require-jsdoc\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 implements AccountProvider {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n  }\n\n  async #withKeyring<\n    SelectedKeyring extends EthKeyring = EthKeyring,\n    CallbackResult = void,\n  >(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const [address] = await this.#withKeyring(\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 new accounts (and returns their addresses).\n        // NOTE: We need the `+ 1` here since we use the \"number of accounts\"\n        // in `addAccounts`, so:\n        // - 1 means, 1 account  -> index 0\n        // - 2 means, 2 accounts -> index 0 and 1\n        // - etc...\n        return await keyring.addAccounts(groupIndex + 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    return [account];\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    // TODO: Move account discovery here (for EVM).\n\n    if (groupIndex < MAX_GROUP_INDEX) {\n      return await this.createAccounts({ entropySource, groupIndex });\n    }\n    return [];\n  }\n\n  #getAccounts(): EoaInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== EthAccountType.Eoa ||\n          account.metadata.keyring.type !== (KeyringTypes.hd as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found an HD account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found an HD account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return true;\n      }) as EoaInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): InternalAccount[] {\n    return this.#getAccounts().filter((account) => {\n      return (\n        account.options.entropySource === entropySource &&\n        account.options.index === groupIndex\n      );\n    });\n  }\n\n  getEntropySources(): EntropySourceId[] {\n    const entropySources = new Set<EntropySourceId>();\n\n    for (const account of this.#getAccounts()) {\n      entropySources.add(account.options.entropySource);\n    }\n\n    return Array.from(entropySources);\n  }\n}\n"]}
+{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAwB,8BAA8B;AAC7E,OAAO,EACL,YAAY,EAGb,qCAAqC;AAStC,yEAAyE;AACzE,MAAM,eAAe,GAAG,CAAC,CAAC;AAS1B,+CAA+C;AAC/C,SAAS,2BAA2B,CAClC,OAAoC;IAEpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;AACH,CAAC;AAED,MAAM,OAAO,kBAAkB;IAG7B,YAAY,SAA+C;;QAFlD,gDAAiD;QAGxD,uBAAA,IAAI,iCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IA4BD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,uBAAA,IAAI,sEAAa,MAAjB,IAAI,EAC1B,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,uBAAA,IAAI,qCAAW,CAAC,IAAI,CAClC,wCAAwC,EACxC,OAAO,CACR,CAAC;QAEF,gDAAgD;QAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAErC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GAIX;QACC,+CAA+C;QAE/C,IAAI,UAAU,GAAG,eAAe,EAAE;YAChC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;SACjE;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAoCD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GAIX;QACC,OAAO,uBAAA,IAAI,sEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE;YACnC,OAAO,CACL,OAAO,CAAC,OAAO,CAAC,aAAa,KAAK,aAAa;gBAC/C,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,UAAU,CACrC,CAAC;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,UAAU,CAAC,EAAa;QACtB,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,sEAAa,MAAjB,IAAI,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAC;SACtD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;gIA1IC,KAAK,0CAIH,QAAyB,EACzB,SAM6B;IAE7B,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,qCAAW,CAAC,IAAI,CACvC,+BAA+B,EAC/B,QAAQ,EACR,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CACxB,SAAS,CAAC;QACR,OAAO,EAAE,OAA0B;QACnC,QAAQ;KACT,CAAC,CACL,CAAC;IAEF,OAAO,MAAwB,CAAC;AAClC,CAAC,6EAwDC,SAAgD,GAAG,EAAE,CAAC,IAAI;IAE1D,OAAO,uBAAA,IAAI,qCAAW;SACnB,IAAI,CAAC,2CAA2C,CAAC;SACjD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAClB,0DAA0D;QAC1D,IACE,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;YACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,EAAa,EAC7D;YACA,OAAO,KAAK,CAAC;SACd;QAED,iHAAiH;QACjH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE;YAClC,OAAO,CAAC,IAAI,CACV,0FAA0F,CAC3F,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,2DAA2D;QAC3D,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE;YACvC,OAAO,CAAC,IAAI,CACV,iFAAiF,CAClF,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAyB,CAAC,CAAC,0DAA0D;AAC1F,CAAC","sourcesContent":["import type { AccountId } from '@metamask/accounts-controller';\nimport { EthAccountType, type EntropySourceId } from '@metamask/keyring-api';\nimport {\n  KeyringTypes,\n  type KeyringMetadata,\n  type KeyringSelector,\n} from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\n// Max index used by discovery (until we move the proper discovery here).\nconst MAX_GROUP_INDEX = 1;\n\ntype EoaInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\n// eslint-disable-next-line jsdoc/require-jsdoc\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 implements AccountProvider<InternalAccount> {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n  }\n\n  async #withKeyring<\n    SelectedKeyring extends EthKeyring = EthKeyring,\n    CallbackResult = void,\n  >(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const [address] = await this.#withKeyring(\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    return [account.id];\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    // TODO: Move account discovery here (for EVM).\n\n    if (groupIndex < MAX_GROUP_INDEX) {\n      return await this.createAccounts({ entropySource, groupIndex });\n    }\n    return [];\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): EoaInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== EthAccountType.Eoa ||\n          account.metadata.keyring.type !== (KeyringTypes.hd as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found an HD account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found an HD account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return filter(account);\n      }) as EoaInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): AccountId[] {\n    return this.#getAccounts((account) => {\n      return (\n        account.options.entropySource === entropySource &&\n        account.options.index === groupIndex\n      );\n    }).map((account) => account.id);\n  }\n\n  getAccount(id: AccountId): InternalAccount {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find EVM account: ${id}`);\n    }\n\n    return found;\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.cjs

@@ -17,12 +17,6 @@ const keyring_api_1 = 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");
-// eslint-disable-next-line jsdoc/require-jsdoc
-function assertInternalAccountExists(account) {
-    if (!account) {
-        throw new Error('Internal account does not exist');
-    }
-}
 const SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 class SolAccountProvider {
     constructor(messenger) {
@@ -34,28 +28,31 @@ class SolAccountProvider {
         __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SOLANA_SNAP_ID), "f");
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+        const id = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
             entropySource,
             derivationPath: `m/44'/501'/${groupIndex}'/0'`,
         });
-        return [account];
+        return [id];
     }
     async discoverAndCreateAccounts({ entropySource, groupIndex, }) {
         const discoveredAccounts = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([keyring_api_1.SolScope.Mainnet, keyring_api_1.SolScope.Testnet], entropySource, groupIndex);
         return await Promise.all(discoveredAccounts.map(async ({ derivationPath }) => await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, { entropySource, derivationPath })));
     }
     getAccounts({ entropySource, groupIndex, }) {
-        return __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this).filter((account) => {
+        return __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this)
+            .filter((account) => {
             return (account.options.entropySource === entropySource &&
                 account.options.index === groupIndex);
-        });
+        })
+            .map((account) => account.id);
     }
-    getEntropySources() {
-        const entropySources = new Set();
-        for (const account of __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this)) {
-            entropySources.add(account.options.entropySource);
+    getAccount(id) {
+        // TODO: Maybe just use a proper find for faster lookup?
+        const [found] = __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this, (account) => account.id === id);
+        if (!found) {
+            throw new Error(`Unable to find Solana account: ${id}`);
         }
-        return Array.from(entropySources);
+        return found;
     }
 }
 exports.SolAccountProvider = SolAccountProvider;
@@ -88,30 +85,10 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
     const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {
         displayAccountNameSuggestion: false,
         displayConfirmation: false,
+        setSelectedAccount: false,
     });
-    // FIXME: This part of the flow is truly async, so when the `KeyringClient`
-    // returns the `KeyringAccount`, its `InternalAccount` won't be "ready"
-    // right away. For now we just re-create a fake `InternalAccount` and
-    // we might have to rely solely on `account.id`.
-    // Actually get the associated `InternalAccount`.
-    // const account = this.#messenger.call(
-    //  'AccountsController:getAccount',
-    //  keyringAccount.id,
-    // );
-    const account = {
-        ...keyringAccount,
-        metadata: {
-            name: `Solana account -- ${keyringAccount.options.index}`,
-            importTime: 0,
-            keyring: {
-                type: keyring_controller_1.KeyringTypes.snap,
-            },
-        },
-    };
-    // We MUST have the associated internal account.
-    assertInternalAccountExists(account);
-    return account;
-}, _SolAccountProvider_getAccounts = function _SolAccountProvider_getAccounts() {
+    return keyringAccount.id;
+}, _SolAccountProvider_getAccounts = function _SolAccountProvider_getAccounts(filter = () => true) {
     return __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f")
         .call('AccountsController:listMultichainAccounts')
         .filter((account) => {
@@ -130,7 +107,7 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
             console.warn("! Found a Solana account with no index: account won't be associated to its wallet.");
             return false;
         }
-        return true;
+        return filter(account);
     }); // Safe, we did check for options fields during filtering.
 };
 //# 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":"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","sourcesContent":["import type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\ntype SolInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\n// eslint-disable-next-line jsdoc/require-jsdoc\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\nconst SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\nexport class SolAccountProvider implements AccountProvider {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n\n    // TODO: Change this once we introduce 1 Snap keyring per Snaps.\n    this.#client = this.#getKeyringClientFromSnapId(SOLANA_SNAP_ID);\n  }\n\n  async #withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\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 Promise<Json>;\n      },\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    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {\n      displayAccountNameSuggestion: false,\n      displayConfirmation: false,\n    });\n\n    // FIXME: This part of the flow is truly async, so when the `KeyringClient`\n    // returns the `KeyringAccount`, its `InternalAccount` won't be \"ready\"\n    // right away. For now we just re-create a fake `InternalAccount` and\n    // we might have to rely solely on `account.id`.\n\n    // Actually get the associated `InternalAccount`.\n    // const account = this.#messenger.call(\n    //  'AccountsController:getAccount',\n    //  keyringAccount.id,\n    // );\n\n    const account: InternalAccount = {\n      ...keyringAccount,\n      metadata: {\n        name: `Solana account -- ${keyringAccount.options.index}`,\n        importTime: 0,\n        keyring: {\n          type: KeyringTypes.snap,\n        },\n      },\n    };\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\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,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet, SolScope.Testnet],\n      entropySource,\n      groupIndex,\n    );\n\n    return await Promise.all(\n      discoveredAccounts.map(\n        async ({ derivationPath }) =>\n          await this.#createAccount({ entropySource, derivationPath }),\n      ),\n    );\n  }\n\n  #getAccounts(): SolInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== SolAccountType.DataAccount ||\n          account.metadata.keyring.type !== (KeyringTypes.snap as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found a Solana account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found a Solana account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return true;\n      }) as SolInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): InternalAccount[] {\n    return this.#getAccounts().filter((account) => {\n      return (\n        account.options.entropySource === entropySource &&\n        account.options.index === groupIndex\n      );\n    });\n  }\n\n  getEntropySources(): EntropySourceId[] {\n    const entropySources = new Set<EntropySourceId>();\n\n    for (const account of this.#getAccounts()) {\n      entropySources.add(account.options.entropySource);\n    }\n\n    return Array.from(entropySources);\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountId } from '@metamask/accounts-controller';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\ntype SolInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\nconst SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\nexport class SolAccountProvider implements AccountProvider<InternalAccount> {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n\n    // TODO: Change this once we introduce 1 Snap keyring per Snaps.\n    this.#client = this.#getKeyringClientFromSnapId(SOLANA_SNAP_ID);\n  }\n\n  async #withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\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 Promise<Json>;\n      },\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    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {\n      displayAccountNameSuggestion: false,\n      displayConfirmation: false,\n      setSelectedAccount: false,\n    });\n\n    return keyringAccount.id;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const id = await this.#createAccount({\n      entropySource,\n      derivationPath: `m/44'/501'/${groupIndex}'/0'`,\n    });\n\n    return [id];\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet, SolScope.Testnet],\n      entropySource,\n      groupIndex,\n    );\n\n    return await Promise.all(\n      discoveredAccounts.map(\n        async ({ derivationPath }) =>\n          await this.#createAccount({ entropySource, derivationPath }),\n      ),\n    );\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): SolInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== SolAccountType.DataAccount ||\n          account.metadata.keyring.type !== (KeyringTypes.snap as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found a Solana account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found a Solana account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return filter(account);\n      }) as SolInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): AccountId[] {\n    return this.#getAccounts()\n      .filter((account) => {\n        return (\n          account.options.entropySource === entropySource &&\n          account.options.index === groupIndex\n        );\n      })\n      .map((account) => account.id);\n  }\n\n  getAccount(id: AccountId): InternalAccount {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find Solana account: ${id}`);\n    }\n\n    return found;\n  }\n}\n"]}

package/dist/providers/SolAccountProvider.d.cts

@@ -1,65 +1,23 @@
+import type { AccountId } from "@metamask/accounts-controller";
 import { type EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { AccountProvider } from "@metamask/multichain-account-api";
-import type { Json } from "@metamask/utils";
 import type { MultichainAccountControllerMessenger } from "../types.cjs";
-export declare class SolAccountProvider implements AccountProvider {
+export declare class SolAccountProvider implements AccountProvider<InternalAccount> {
     #private;
     constructor(messenger: MultichainAccountControllerMessenger);
     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, Json>;
-        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[];
-    }[]>;
+    }): Promise<string[]>;
     discoverAndCreateAccounts({ 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, Json>;
-        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[];
-    }[]>;
+    }): Promise<string[]>;
     getAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): InternalAccount[];
-    getEntropySources(): EntropySourceId[];
+    }): AccountId[];
+    getAccount(id: AccountId): InternalAccount;
 }
 //# sourceMappingURL=SolAccountProvider.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAM/B,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,IAAI,EAAkB,wBAAwB;AAE5D,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAmBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAK5C,SAAS,EAAE,oCAAoC;IAiGrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IASK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IA+CD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,eAAe,EAAE;IASrB,iBAAiB,IAAI,eAAe,EAAE;CASvC"}
+{"version":3,"file":"SolAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sCAAsC;AAE/D,OAAO,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAKxE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAWrE,qBAAa,kBAAmB,YAAW,eAAe,CAAC,eAAe,CAAC;;gBAK7D,SAAS,EAAE,oCAAoC;IAyErD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;IASK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;IAiDD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,SAAS,EAAE;IAWf,UAAU,CAAC,EAAE,EAAE,SAAS,GAAG,eAAe;CAU3C"}

package/dist/providers/SolAccountProvider.d.mts

@@ -1,65 +1,23 @@
+import type { AccountId } from "@metamask/accounts-controller";
 import { type EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { AccountProvider } from "@metamask/multichain-account-api";
-import type { Json } from "@metamask/utils";
 import type { MultichainAccountControllerMessenger } from "../types.mjs";
-export declare class SolAccountProvider implements AccountProvider {
+export declare class SolAccountProvider implements AccountProvider<InternalAccount> {
     #private;
     constructor(messenger: MultichainAccountControllerMessenger);
     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, Json>;
-        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[];
-    }[]>;
+    }): Promise<string[]>;
     discoverAndCreateAccounts({ 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, Json>;
-        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[];
-    }[]>;
+    }): Promise<string[]>;
     getAccounts({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): InternalAccount[];
-    getEntropySources(): EntropySourceId[];
+    }): AccountId[];
+    getAccount(id: AccountId): InternalAccount;
 }
 //# sourceMappingURL=SolAccountProvider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAM/B,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,IAAI,EAAkB,wBAAwB;AAE5D,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAmBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAK5C,SAAS,EAAE,oCAAoC;IAiGrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IASK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IA+CD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,eAAe,EAAE;IASrB,iBAAiB,IAAI,eAAe,EAAE;CASvC"}
+{"version":3,"file":"SolAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sCAAsC;AAE/D,OAAO,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAKxE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAWrE,qBAAa,kBAAmB,YAAW,eAAe,CAAC,eAAe,CAAC;;gBAK7D,SAAS,EAAE,oCAAoC;IAyErD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;IASK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;IAiDD,WAAW,CAAC,EACV,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,SAAS,EAAE;IAWf,UAAU,CAAC,EAAE,EAAE,SAAS,GAAG,eAAe;CAU3C"}

package/dist/providers/SolAccountProvider.mjs

@@ -14,12 +14,6 @@ import { SolAccountType, SolScope } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { KeyringClient } from "@metamask/keyring-snap-client";
 import { HandlerType } from "@metamask/snaps-utils";
-// eslint-disable-next-line jsdoc/require-jsdoc
-function assertInternalAccountExists(account) {
-    if (!account) {
-        throw new Error('Internal account does not exist');
-    }
-}
 const SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 export class SolAccountProvider {
     constructor(messenger) {
@@ -31,28 +25,31 @@ export class SolAccountProvider {
         __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, SOLANA_SNAP_ID), "f");
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const account = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
+        const id = await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, {
             entropySource,
             derivationPath: `m/44'/501'/${groupIndex}'/0'`,
         });
-        return [account];
+        return [id];
     }
     async discoverAndCreateAccounts({ entropySource, groupIndex, }) {
         const discoveredAccounts = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").discoverAccounts([SolScope.Mainnet, SolScope.Testnet], entropySource, groupIndex);
         return await Promise.all(discoveredAccounts.map(async ({ derivationPath }) => await __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_createAccount).call(this, { entropySource, derivationPath })));
     }
     getAccounts({ entropySource, groupIndex, }) {
-        return __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this).filter((account) => {
+        return __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this)
+            .filter((account) => {
             return (account.options.entropySource === entropySource &&
                 account.options.index === groupIndex);
-        });
+        })
+            .map((account) => account.id);
     }
-    getEntropySources() {
-        const entropySources = new Set();
-        for (const account of __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this)) {
-            entropySources.add(account.options.entropySource);
+    getAccount(id) {
+        // TODO: Maybe just use a proper find for faster lookup?
+        const [found] = __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getAccounts).call(this, (account) => account.id === id);
+        if (!found) {
+            throw new Error(`Unable to find Solana account: ${id}`);
         }
-        return Array.from(entropySources);
+        return found;
     }
 }
 _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_withKeyring = async function _SolAccountProvider_withKeyring(selector, operation) {
@@ -84,30 +81,10 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
     const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {
         displayAccountNameSuggestion: false,
         displayConfirmation: false,
+        setSelectedAccount: false,
     });
-    // FIXME: This part of the flow is truly async, so when the `KeyringClient`
-    // returns the `KeyringAccount`, its `InternalAccount` won't be "ready"
-    // right away. For now we just re-create a fake `InternalAccount` and
-    // we might have to rely solely on `account.id`.
-    // Actually get the associated `InternalAccount`.
-    // const account = this.#messenger.call(
-    //  'AccountsController:getAccount',
-    //  keyringAccount.id,
-    // );
-    const account = {
-        ...keyringAccount,
-        metadata: {
-            name: `Solana account -- ${keyringAccount.options.index}`,
-            importTime: 0,
-            keyring: {
-                type: KeyringTypes.snap,
-            },
-        },
-    };
-    // We MUST have the associated internal account.
-    assertInternalAccountExists(account);
-    return account;
-}, _SolAccountProvider_getAccounts = function _SolAccountProvider_getAccounts() {
+    return keyringAccount.id;
+}, _SolAccountProvider_getAccounts = function _SolAccountProvider_getAccounts(filter = () => true) {
     return __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f")
         .call('AccountsController:listMultichainAccounts')
         .filter((account) => {
@@ -126,7 +103,7 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
             console.warn("! Found a Solana account with no index: account won't be associated to its wallet.");
             return false;
         }
-        return true;
+        return filter(account);
     }); // Safe, we did check for options fields during filtering.
 };
 //# 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":"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","sourcesContent":["import type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type {\n  EthKeyring,\n  InternalAccount,\n} from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\ntype SolInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\n// eslint-disable-next-line jsdoc/require-jsdoc\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\nconst SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\nexport class SolAccountProvider implements AccountProvider {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n\n    // TODO: Change this once we introduce 1 Snap keyring per Snaps.\n    this.#client = this.#getKeyringClientFromSnapId(SOLANA_SNAP_ID);\n  }\n\n  async #withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\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 Promise<Json>;\n      },\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    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {\n      displayAccountNameSuggestion: false,\n      displayConfirmation: false,\n    });\n\n    // FIXME: This part of the flow is truly async, so when the `KeyringClient`\n    // returns the `KeyringAccount`, its `InternalAccount` won't be \"ready\"\n    // right away. For now we just re-create a fake `InternalAccount` and\n    // we might have to rely solely on `account.id`.\n\n    // Actually get the associated `InternalAccount`.\n    // const account = this.#messenger.call(\n    //  'AccountsController:getAccount',\n    //  keyringAccount.id,\n    // );\n\n    const account: InternalAccount = {\n      ...keyringAccount,\n      metadata: {\n        name: `Solana account -- ${keyringAccount.options.index}`,\n        importTime: 0,\n        keyring: {\n          type: KeyringTypes.snap,\n        },\n      },\n    };\n\n    // We MUST have the associated internal account.\n    assertInternalAccountExists(account);\n\n    return account;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\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,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet, SolScope.Testnet],\n      entropySource,\n      groupIndex,\n    );\n\n    return await Promise.all(\n      discoveredAccounts.map(\n        async ({ derivationPath }) =>\n          await this.#createAccount({ entropySource, derivationPath }),\n      ),\n    );\n  }\n\n  #getAccounts(): SolInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== SolAccountType.DataAccount ||\n          account.metadata.keyring.type !== (KeyringTypes.snap as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found a Solana account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found a Solana account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return true;\n      }) as SolInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): InternalAccount[] {\n    return this.#getAccounts().filter((account) => {\n      return (\n        account.options.entropySource === entropySource &&\n        account.options.index === groupIndex\n      );\n    });\n  }\n\n  getEntropySources(): EntropySourceId[] {\n    const entropySources = new Set<EntropySourceId>();\n\n    for (const account of this.#getAccounts()) {\n      entropySources.add(account.options.entropySource);\n    }\n\n    return Array.from(entropySources);\n  }\n}\n"]}
+{"version":3,"file":"SolAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/SolAccountProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountId } from '@metamask/accounts-controller';\nimport type { SnapKeyring } from '@metamask/eth-snap-keyring';\nimport {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type {\n  KeyringMetadata,\n  KeyringSelector,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { AccountProvider } from '@metamask/multichain-account-api';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type { Json, JsonRpcRequest } from '@metamask/utils';\n\nimport type { MultichainAccountControllerMessenger } from '../types';\n\ntype SolInternalAccount = InternalAccount & {\n  options: {\n    index: number;\n    entropySource: EntropySourceId;\n  };\n};\n\nconst SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap' as SnapId;\n\nexport class SolAccountProvider implements AccountProvider<InternalAccount> {\n  readonly #messenger: MultichainAccountControllerMessenger;\n\n  readonly #client: KeyringClient;\n\n  constructor(messenger: MultichainAccountControllerMessenger) {\n    this.#messenger = messenger;\n\n    // TODO: Change this once we introduce 1 Snap keyring per Snaps.\n    this.#client = this.#getKeyringClientFromSnapId(SOLANA_SNAP_ID);\n  }\n\n  async #withKeyring<SelectedKeyring, CallbackResult = void>(\n    selector: KeyringSelector,\n    operation: ({\n      keyring,\n      metadata,\n    }: {\n      keyring: SelectedKeyring;\n      metadata: KeyringMetadata;\n    }) => Promise<CallbackResult>,\n  ): Promise<CallbackResult> {\n    const result = await this.#messenger.call(\n      'KeyringController:withKeyring',\n      selector,\n      ({ keyring, metadata }) =>\n        operation({\n          keyring: keyring as SelectedKeyring,\n          metadata,\n        }),\n    );\n\n    return result as CallbackResult;\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 Promise<Json>;\n      },\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    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {\n      displayAccountNameSuggestion: false,\n      displayConfirmation: false,\n      setSelectedAccount: false,\n    });\n\n    return keyringAccount.id;\n  }\n\n  async createAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const id = await this.#createAccount({\n      entropySource,\n      derivationPath: `m/44'/501'/${groupIndex}'/0'`,\n    });\n\n    return [id];\n  }\n\n  async discoverAndCreateAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }) {\n    const discoveredAccounts = await this.#client.discoverAccounts(\n      [SolScope.Mainnet, SolScope.Testnet],\n      entropySource,\n      groupIndex,\n    );\n\n    return await Promise.all(\n      discoveredAccounts.map(\n        async ({ derivationPath }) =>\n          await this.#createAccount({ entropySource, derivationPath }),\n      ),\n    );\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): SolInternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts')\n      .filter((account) => {\n        // We only check for EOA accounts for multichain accounts.\n        if (\n          account.type !== SolAccountType.DataAccount ||\n          account.metadata.keyring.type !== (KeyringTypes.snap as string)\n        ) {\n          return false;\n        }\n\n        // TODO: Maybe use superstruct to validate the structure of HD account since they are not strongly-typed for now?\n        if (!account.options.entropySource) {\n          console.warn(\n            \"! Found a Solana account with no entropy source: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        // TODO: We need to add this index for native accounts too!\n        if (account.options.index === undefined) {\n          console.warn(\n            \"! Found a Solana account with no index: account won't be associated to its wallet.\",\n          );\n          return false;\n        }\n\n        return filter(account);\n      }) as SolInternalAccount[]; // Safe, we did check for options fields during filtering.\n  }\n\n  getAccounts({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): AccountId[] {\n    return this.#getAccounts()\n      .filter((account) => {\n        return (\n          account.options.entropySource === entropySource &&\n          account.options.index === groupIndex\n        );\n      })\n      .map((account) => account.id);\n  }\n\n  getAccount(id: AccountId): InternalAccount {\n    // TODO: Maybe just use a proper find for faster lookup?\n    const [found] = this.#getAccounts((account) => account.id === id);\n\n    if (!found) {\n      throw new Error(`Unable to find Solana account: ${id}`);\n    }\n\n    return found;\n  }\n}\n"]}

package/dist/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type { KeyringControllerWithKeyringAction } from '@metamask/keyring-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\n/**\n * All actions that {@link MultichainAccountController} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountControllerActions = never;\n/**\n * All events that {@link MultichainAccountController} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountControllerEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountController}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountController}\n * subscribes to.\n */\nexport type AllowedEvents = never;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountController} needs to access.\n */\nexport type MultichainAccountControllerMessenger = RestrictedMessenger<\n  'MultichainAccountController',\n  MultichainAccountControllerActions | AllowedActions,\n  MultichainAccountControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerGetAccountAction,\n  AccountsControllerGetAccountByAddressAction,\n  AccountsControllerListMultichainAccountsAction,\n} from '@metamask/accounts-controller';\nimport type { RestrictedMessenger } from '@metamask/base-controller';\nimport type {\n  KeyringControllerGetStateAction,\n  KeyringControllerWithKeyringAction,\n} from '@metamask/keyring-controller';\nimport type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';\n\n/**\n * All actions that {@link MultichainAccountController} registers so that other\n * modules can call them.\n */\nexport type MultichainAccountControllerActions = never;\n/**\n * All events that {@link MultichainAccountController} publishes so that other modules\n * can subscribe to them.\n */\nexport type MultichainAccountControllerEvents = never;\n\n/**\n * All actions registered by other modules that {@link MultichainAccountController}\n * calls.\n */\nexport type AllowedActions =\n  | AccountsControllerListMultichainAccountsAction\n  | AccountsControllerGetAccountAction\n  | AccountsControllerGetAccountByAddressAction\n  | SnapControllerHandleSnapRequestAction\n  | KeyringControllerWithKeyringAction\n  | KeyringControllerGetStateAction;\n\n/**\n * All events published by other modules that {@link MultichainAccountController}\n * subscribes to.\n */\nexport type AllowedEvents = never;\n\n/**\n * The messenger restricted to actions and events that\n * {@link MultichainAccountController} needs to access.\n */\nexport type MultichainAccountControllerMessenger = RestrictedMessenger<\n  'MultichainAccountController',\n  MultichainAccountControllerActions | AllowedActions,\n  MultichainAccountControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n"]}

package/dist/types.d.cts

@@ -1,6 +1,6 @@
 import type { AccountsControllerGetAccountAction, AccountsControllerGetAccountByAddressAction, AccountsControllerListMultichainAccountsAction } from "@metamask/accounts-controller";
 import type { RestrictedMessenger } from "@metamask/base-controller";
-import type { KeyringControllerWithKeyringAction } from "@metamask/keyring-controller";
+import type { KeyringControllerGetStateAction, KeyringControllerWithKeyringAction } from "@metamask/keyring-controller";
 import type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from "@metamask/snaps-controllers";
 /**
  * All actions that {@link MultichainAccountController} registers so that other
@@ -16,7 +16,7 @@ export type MultichainAccountControllerEvents = never;
  * All actions registered by other modules that {@link MultichainAccountController}
  * calls.
  */
-export type AllowedActions = AccountsControllerListMultichainAccountsAction | AccountsControllerGetAccountAction | AccountsControllerGetAccountByAddressAction | SnapControllerHandleSnapRequestAction | KeyringControllerWithKeyringAction;
+export type AllowedActions = AccountsControllerListMultichainAccountsAction | AccountsControllerGetAccountAction | AccountsControllerGetAccountByAddressAction | SnapControllerHandleSnapRequestAction | KeyringControllerWithKeyringAction | KeyringControllerGetStateAction;
 /**
  * All events published by other modules that {@link MultichainAccountController}
  * subscribes to.

package/dist/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kCAAkC,EAClC,2CAA2C,EAC3C,8CAA8C,EAC/C,sCAAsC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,kCAAkC;AACrE,OAAO,KAAK,EAAE,kCAAkC,EAAE,qCAAqC;AACvF,OAAO,KAAK,EAAE,iBAAiB,IAAI,qCAAqC,EAAE,oCAAoC;AAE9G;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,KAAK,CAAC;AACvD;;;GAGG;AACH,MAAM,MAAM,iCAAiC,GAAG,KAAK,CAAC;AAEtD;;;GAGG;AACH,MAAM,MAAM,cAAc,GACtB,8CAA8C,GAC9C,kCAAkC,GAClC,2CAA2C,GAC3C,qCAAqC,GACrC,kCAAkC,CAAC;AAEvC;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC;;;GAGG;AACH,MAAM,MAAM,oCAAoC,GAAG,mBAAmB,CACpE,6BAA6B,EAC7B,kCAAkC,GAAG,cAAc,EACnD,iCAAiC,GAAG,aAAa,EACjD,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kCAAkC,EAClC,2CAA2C,EAC3C,8CAA8C,EAC/C,sCAAsC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,kCAAkC;AACrE,OAAO,KAAK,EACV,+BAA+B,EAC/B,kCAAkC,EACnC,qCAAqC;AACtC,OAAO,KAAK,EAAE,iBAAiB,IAAI,qCAAqC,EAAE,oCAAoC;AAE9G;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,KAAK,CAAC;AACvD;;;GAGG;AACH,MAAM,MAAM,iCAAiC,GAAG,KAAK,CAAC;AAEtD;;;GAGG;AACH,MAAM,MAAM,cAAc,GACtB,8CAA8C,GAC9C,kCAAkC,GAClC,2CAA2C,GAC3C,qCAAqC,GACrC,kCAAkC,GAClC,+BAA+B,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC;;;GAGG;AACH,MAAM,MAAM,oCAAoC,GAAG,mBAAmB,CACpE,6BAA6B,EAC7B,kCAAkC,GAAG,cAAc,EACnD,iCAAiC,GAAG,aAAa,EACjD,cAAc,CAAC,MAAM,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC"}