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

package/dist/providers/EvmAccountProvider.cjs

@@ -30,17 +30,25 @@ class EvmAccountProvider {
         __classPrivateFieldSet(this, _EvmAccountProvider_messenger, messenger, "f");
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const addresses = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_withKeyring).call(this, { id: entropySource }, async ({ keyring }) => {
+        const [address] = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_withKeyring).call(this, { id: entropySource }, async ({ keyring }) => {
             const accounts = await keyring.getAccounts();
-            if (groupIndex <= accounts.length) {
+            if (groupIndex < accounts.length) {
                 // Nothing new to create, we just re-use the existing accounts here,
                 return [accounts[groupIndex]];
             }
+            // For now, we don't allow for gap, so if we need to create a new
+            // account, this has to be the next one.
+            if (groupIndex !== accounts.length) {
+                throw new Error('Trying to create too many accounts');
+            }
             // Create new accounts (and returns their addresses).
-            return await keyring.addAccounts(groupIndex);
+            // 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);
         });
-        // Only use the account associated for that index.
-        const address = addresses[groupIndex];
         const account = __classPrivateFieldGet(this, _EvmAccountProvider_messenger, "f").call('AccountsController:getAccountByAddress', address);
         // We MUST have the associated internal account.
         assertInternalAccountExists(account);

package/dist/providers/EvmAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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';\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 addresses = 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        // Create new accounts (and returns their addresses).\n        return await keyring.addAccounts(groupIndex);\n      },\n    );\n\n    // Only use the account associated for that index.\n    const address = addresses[groupIndex];\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.cjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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"]}

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AACxE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAqBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAG5C,SAAS,EAAE,oCAAoC;IA8BrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IA4BK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAyCD,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":"EvmAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAqBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAG5C,SAAS,EAAE,oCAAoC;IA8BrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAqCK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAyCD,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AACxE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAqBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAG5C,SAAS,EAAE,oCAAoC;IA8BrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IA4BK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAyCD,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":"EvmAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,8BAA8B;AAM7E,OAAO,KAAK,EAEV,eAAe,EAChB,uCAAuC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAqBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAG5C,SAAS,EAAE,oCAAoC;IA8BrD,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAqCK,yBAAyB,CAAC,EAC9B,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;IAyCD,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"}

package/dist/providers/EvmAccountProvider.mjs

@@ -27,17 +27,25 @@ export class EvmAccountProvider {
         __classPrivateFieldSet(this, _EvmAccountProvider_messenger, messenger, "f");
     }
     async createAccounts({ entropySource, groupIndex, }) {
-        const addresses = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_withKeyring).call(this, { id: entropySource }, async ({ keyring }) => {
+        const [address] = await __classPrivateFieldGet(this, _EvmAccountProvider_instances, "m", _EvmAccountProvider_withKeyring).call(this, { id: entropySource }, async ({ keyring }) => {
             const accounts = await keyring.getAccounts();
-            if (groupIndex <= accounts.length) {
+            if (groupIndex < accounts.length) {
                 // Nothing new to create, we just re-use the existing accounts here,
                 return [accounts[groupIndex]];
             }
+            // For now, we don't allow for gap, so if we need to create a new
+            // account, this has to be the next one.
+            if (groupIndex !== accounts.length) {
+                throw new Error('Trying to create too many accounts');
+            }
             // Create new accounts (and returns their addresses).
-            return await keyring.addAccounts(groupIndex);
+            // 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);
         });
-        // Only use the account associated for that index.
-        const address = addresses[groupIndex];
         const account = __classPrivateFieldGet(this, _EvmAccountProvider_messenger, "f").call('AccountsController:getAccountByAddress', address);
         // We MUST have the associated internal account.
         assertInternalAccountExists(account);

package/dist/providers/EvmAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"EvmAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/EvmAccountProvider.ts"],"names":[],"mappings":"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","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';\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 addresses = 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        // Create new accounts (and returns their addresses).\n        return await keyring.addAccounts(groupIndex);\n      },\n    );\n\n    // Only use the account associated for that index.\n    const address = addresses[groupIndex];\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":"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","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"]}

package/dist/providers/SolAccountProvider.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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, _SolAccountProvider_messenger, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount, _SolAccountProvider_getAccounts;
+var _SolAccountProvider_instances, _SolAccountProvider_messenger, _SolAccountProvider_client, _SolAccountProvider_withKeyring, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount, _SolAccountProvider_getAccounts;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolAccountProvider = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
@@ -23,14 +23,15 @@ function assertInternalAccountExists(account) {
         throw new Error('Internal account does not exist');
     }
 }
+const SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 class SolAccountProvider {
     constructor(messenger) {
         _SolAccountProvider_instances.add(this);
         _SolAccountProvider_messenger.set(this, void 0);
         _SolAccountProvider_client.set(this, void 0);
         __classPrivateFieldSet(this, _SolAccountProvider_messenger, messenger, "f");
-        // TODO: Change this once we introduce 1 Snap keyring per Snaps
-        __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, 'npm:@metamask/solana-wallet-snap'), "f");
+        // TODO: Change this once we introduce 1 Snap keyring per Snaps.
+        __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, {
@@ -58,7 +59,13 @@ class SolAccountProvider {
     }
 }
 exports.SolAccountProvider = SolAccountProvider;
-_SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+_SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_withKeyring = async function _SolAccountProvider_withKeyring(selector, operation) {
+    const result = await __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('KeyringController:withKeyring', selector, ({ keyring, metadata }) => operation({
+        keyring: keyring,
+        metadata,
+    }));
+    return result;
+}, _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new keyring_snap_client_1.KeyringClient({
         send: async (request) => {
             const response = await __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('SnapController:handleRequest', {
@@ -71,9 +78,36 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
         },
     });
 }, _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount(opts) {
-    const keyringAccount = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").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 __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_withKeyring).call(this, { type: keyring_controller_1.KeyringTypes.snap }, async ({ keyring }) => keyring.createAccount.bind(keyring));
+    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {
+        displayAccountNameSuggestion: false,
+        displayConfirmation: 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 = __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('AccountsController:getAccount', keyringAccount.id);
+    // 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;

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 {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { 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';\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\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(\n      'npm:@metamask/solana-wallet-snap',\n    );\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    const keyringAccount = await this.#client.createAccount(opts);\n\n    // Actually get the associated `InternalAccount`.\n    const account = this.#messenger.call(\n      'AccountsController:getAccount',\n      keyringAccount.id,\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 { 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"]}

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,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,IAAI,EAAkB,wBAAwB;AAC5D,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAkBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAK5C,SAAS,EAAE,oCAAoC;IA4CrD,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":"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"}

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,EAGL,KAAK,eAAe,EACrB,8BAA8B;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,IAAI,EAAkB,wBAAwB;AAC5D,OAAO,KAAK,EAAE,oCAAoC,EAAE,qBAAiB;AAkBrE,qBAAa,kBAAmB,YAAW,eAAe;;gBAK5C,SAAS,EAAE,oCAAoC;IA4CrD,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":"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"}

package/dist/providers/SolAccountProvider.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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, _SolAccountProvider_messenger, _SolAccountProvider_client, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount, _SolAccountProvider_getAccounts;
+var _SolAccountProvider_instances, _SolAccountProvider_messenger, _SolAccountProvider_client, _SolAccountProvider_withKeyring, _SolAccountProvider_getKeyringClientFromSnapId, _SolAccountProvider_createAccount, _SolAccountProvider_getAccounts;
 import { SolAccountType, SolScope } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { KeyringClient } from "@metamask/keyring-snap-client";
@@ -20,14 +20,15 @@ function assertInternalAccountExists(account) {
         throw new Error('Internal account does not exist');
     }
 }
+const SOLANA_SNAP_ID = 'npm:@metamask/solana-wallet-snap';
 export class SolAccountProvider {
     constructor(messenger) {
         _SolAccountProvider_instances.add(this);
         _SolAccountProvider_messenger.set(this, void 0);
         _SolAccountProvider_client.set(this, void 0);
         __classPrivateFieldSet(this, _SolAccountProvider_messenger, messenger, "f");
-        // TODO: Change this once we introduce 1 Snap keyring per Snaps
-        __classPrivateFieldSet(this, _SolAccountProvider_client, __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_getKeyringClientFromSnapId).call(this, 'npm:@metamask/solana-wallet-snap'), "f");
+        // TODO: Change this once we introduce 1 Snap keyring per Snaps.
+        __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, {
@@ -54,7 +55,13 @@ export class SolAccountProvider {
         return Array.from(entropySources);
     }
 }
-_SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
+_SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new WeakMap(), _SolAccountProvider_instances = new WeakSet(), _SolAccountProvider_withKeyring = async function _SolAccountProvider_withKeyring(selector, operation) {
+    const result = await __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('KeyringController:withKeyring', selector, ({ keyring, metadata }) => operation({
+        keyring: keyring,
+        metadata,
+    }));
+    return result;
+}, _SolAccountProvider_getKeyringClientFromSnapId = function _SolAccountProvider_getKeyringClientFromSnapId(snapId) {
     return new KeyringClient({
         send: async (request) => {
             const response = await __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('SnapController:handleRequest', {
@@ -67,9 +74,36 @@ _SolAccountProvider_messenger = new WeakMap(), _SolAccountProvider_client = new
         },
     });
 }, _SolAccountProvider_createAccount = async function _SolAccountProvider_createAccount(opts) {
-    const keyringAccount = await __classPrivateFieldGet(this, _SolAccountProvider_client, "f").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 __classPrivateFieldGet(this, _SolAccountProvider_instances, "m", _SolAccountProvider_withKeyring).call(this, { type: KeyringTypes.snap }, async ({ keyring }) => keyring.createAccount.bind(keyring));
+    const keyringAccount = await createAccount(SOLANA_SNAP_ID, opts, {
+        displayAccountNameSuggestion: false,
+        displayConfirmation: 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 = __classPrivateFieldGet(this, _SolAccountProvider_messenger, "f").call('AccountsController:getAccount', keyringAccount.id);
+    // 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;

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 {\n  SolAccountType,\n  SolScope,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport type { 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';\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\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(\n      'npm:@metamask/solana-wallet-snap',\n    );\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    const keyringAccount = await this.#client.createAccount(opts);\n\n    // Actually get the associated `InternalAccount`.\n    const account = this.#messenger.call(\n      'AccountsController:getAccount',\n      keyringAccount.id,\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":";;;;;;;;;;;;AACA,OAAO,EACL,cAAc,EACd,QAAQ,EAET,8BAA8B;AAK/B,OAAO,EAAE,YAAY,EAAE,qCAAqC;AAK5D,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAG9D,OAAO,EAAE,WAAW,EAAE,8BAA8B;AAYpD,+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,cAAc,GAAG,kCAA4C,CAAC;AACpE,MAAM,OAAO,kBAAkB;IAK7B,YAAY,SAA+C;;QAJlD,gDAAiD;QAEjD,6CAAuB;QAG9B,uBAAA,IAAI,iCAAc,SAAS,MAAA,CAAC;QAE5B,gEAAgE;QAChE,uBAAA,IAAI,8BAAW,uBAAA,IAAI,qFAA4B,MAAhC,IAAI,EAA6B,cAAc,CAAC,MAAA,CAAC;IAClE,CAAC;IA4FD,KAAK,CAAC,cAAc,CAAC,EACnB,aAAa,EACb,UAAU,GAIX;QACC,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,EAC9B,aAAa,EACb,UAAU,GAIX;QACC,MAAM,kBAAkB,GAAG,MAAM,uBAAA,IAAI,kCAAQ,CAAC,gBAAgB,CAC5D,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EACpC,aAAa,EACb,UAAU,CACX,CAAC;QAEF,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,kBAAkB,CAAC,GAAG,CACpB,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAC3B,MAAM,uBAAA,IAAI,wEAAe,MAAnB,IAAI,EAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAC/D,CACF,CAAC;IACJ,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;4KAtLC,KAAK,0CACH,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,2GAE2B,MAAc;IACxC,OAAO,IAAI,aAAa,CAAC;QACvB,IAAI,EAAE,KAAK,EAAE,OAAuB,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,MAAM,uBAAA,IAAI,qCAAW,CAAC,IAAI,CACzC,8BAA8B,EAC9B;gBACE,MAAM,EAAE,MAAgB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,WAAW,CAAC,gBAAgB;gBACrC,OAAO;aACR,CACF,CAAC;YACF,OAAO,QAAyB,CAAC;QACnC,CAAC;KACF,CAAC,CAAC;AACL,CAAC,sCAED,KAAK,4CAAgB,IAGpB;IACC,iFAAiF;IACjF,gFAAgF;IAChF,sCAAsC;IACtC,+EAA+E;IAC/E,iFAAiF;IACjF,wDAAwD;IACxD,MAAM,aAAa,GAAG,MAAM,uBAAA,IAAI,sEAAa,MAAjB,IAAI,EAG9B,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,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE;QAC/D,4BAA4B,EAAE,KAAK;QACnC,mBAAmB,EAAE,KAAK;KAC3B,CAAC,CAAC;IAEH,2EAA2E;IAC3E,uEAAuE;IACvE,qEAAqE;IACrE,gDAAgD;IAEhD,iDAAiD;IACjD,wCAAwC;IACxC,oCAAoC;IACpC,sBAAsB;IACtB,KAAK;IAEL,MAAM,OAAO,GAAoB;QAC/B,GAAG,cAAc;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,qBAAqB,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YACzD,UAAU,EAAE,CAAC;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,YAAY,CAAC,IAAI;aACxB;SACF;KACF,CAAC;IAEF,gDAAgD;IAChD,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAErC,OAAO,OAAO,CAAC;AACjB,CAAC;IAuCC,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,WAAW;YAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAM,YAAY,CAAC,IAAe,EAC/D;YACA,OAAO,KAAK,CAAC;SACd;QAED,iHAAiH;QACjH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE;YAClC,OAAO,CAAC,IAAI,CACV,6FAA6F,CAC9F,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,2DAA2D;QAC3D,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE;YACvC,OAAO,CAAC,IAAI,CACV,oFAAoF,CACrF,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAyB,CAAC,CAAC,0DAA0D;AAC1F,CAAC","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"]}

package/dist/tests/accounts.cjs

@@ -0,0 +1,170 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __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 _MockAccountBuilder_account;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockAccountBuilder = exports.MOCK_HARDWARE_ACCOUNT_1 = exports.MOCK_SNAP_ACCOUNT_2 = exports.MOCK_SNAP_ACCOUNT_1 = exports.MOCK_HD_ACCOUNT_2 = exports.MOCK_HD_ACCOUNT_1 = exports.MOCK_HD_KEYRING_2 = exports.MOCK_HD_KEYRING_1 = exports.MOCK_ENTROPY_SOURCE_2 = exports.MOCK_ENTROPY_SOURCE_1 = exports.MOCK_SNAP_2 = exports.MOCK_SNAP_1 = void 0;
+const keyring_api_1 = require("@metamask/keyring-api");
+const keyring_controller_1 = require("@metamask/keyring-controller");
+const uuid_1 = require("uuid");
+const ETH_EOA_METHODS = [
+    keyring_api_1.EthMethod.PersonalSign,
+    keyring_api_1.EthMethod.Sign,
+    keyring_api_1.EthMethod.SignTransaction,
+    keyring_api_1.EthMethod.SignTypedDataV1,
+    keyring_api_1.EthMethod.SignTypedDataV3,
+    keyring_api_1.EthMethod.SignTypedDataV4,
+];
+const SOL_METHODS = Object.values(keyring_api_1.SolMethod);
+exports.MOCK_SNAP_1 = {
+    id: 'local:mock-snap-id-1',
+    name: 'Mock Snap 1',
+    enabled: true,
+    manifest: {
+        proposedName: 'Mock Snap 1',
+    },
+};
+exports.MOCK_SNAP_2 = {
+    id: 'local:mock-snap-id-2',
+    name: 'Mock Snap 2',
+    enabled: true,
+    manifest: {
+        proposedName: 'Mock Snap 2',
+    },
+};
+exports.MOCK_ENTROPY_SOURCE_1 = 'mock-keyring-id-1';
+exports.MOCK_ENTROPY_SOURCE_2 = 'mock-keyring-id-2';
+exports.MOCK_HD_KEYRING_1 = {
+    type: keyring_controller_1.KeyringTypes.hd,
+    metadata: { id: exports.MOCK_ENTROPY_SOURCE_1, name: 'HD Keyring 1' },
+    accounts: ['0x123'],
+};
+exports.MOCK_HD_KEYRING_2 = {
+    type: keyring_controller_1.KeyringTypes.hd,
+    metadata: { id: exports.MOCK_ENTROPY_SOURCE_2, name: 'HD Keyring 2' },
+    accounts: ['0x456'],
+};
+exports.MOCK_HD_ACCOUNT_1 = {
+    id: 'mock-id-1',
+    address: '0x123',
+    options: {
+        entropySource: exports.MOCK_HD_KEYRING_1.metadata.id,
+        index: 0,
+    },
+    methods: [...ETH_EOA_METHODS],
+    type: keyring_api_1.EthAccountType.Eoa,
+    scopes: [keyring_api_1.EthScope.Eoa],
+    metadata: {
+        name: 'Account 1',
+        keyring: { type: keyring_controller_1.KeyringTypes.hd },
+        importTime: 0,
+        lastSelected: 0,
+        nameLastUpdatedAt: 0,
+    },
+};
+exports.MOCK_HD_ACCOUNT_2 = {
+    id: 'mock-id-2',
+    address: '0x456',
+    options: {
+        entropySource: exports.MOCK_HD_KEYRING_2.metadata.id,
+        index: 0,
+    },
+    methods: [...ETH_EOA_METHODS],
+    type: keyring_api_1.EthAccountType.Eoa,
+    scopes: [keyring_api_1.EthScope.Eoa],
+    metadata: {
+        name: 'Account 2',
+        keyring: { type: keyring_controller_1.KeyringTypes.hd },
+        importTime: 0,
+        lastSelected: 0,
+        nameLastUpdatedAt: 0,
+    },
+};
+exports.MOCK_SNAP_ACCOUNT_1 = {
+    id: 'mock-snap-id-1',
+    address: 'aabbccdd',
+    options: {
+        entropySource: exports.MOCK_HD_KEYRING_2.metadata.id,
+        index: 0,
+    },
+    methods: SOL_METHODS,
+    type: keyring_api_1.SolAccountType.DataAccount,
+    scopes: [keyring_api_1.SolScope.Mainnet],
+    metadata: {
+        name: 'Snap Account 1',
+        keyring: { type: keyring_controller_1.KeyringTypes.snap },
+        snap: exports.MOCK_SNAP_1,
+        importTime: 0,
+        lastSelected: 0,
+    },
+};
+exports.MOCK_SNAP_ACCOUNT_2 = {
+    id: 'mock-snap-id-2',
+    address: '0x789',
+    options: {},
+    methods: [...ETH_EOA_METHODS],
+    type: keyring_api_1.EthAccountType.Eoa,
+    scopes: [keyring_api_1.EthScope.Eoa],
+    metadata: {
+        name: 'Snap Acc 2',
+        keyring: { type: keyring_controller_1.KeyringTypes.snap },
+        snap: exports.MOCK_SNAP_2,
+        importTime: 0,
+        lastSelected: 0,
+    },
+};
+exports.MOCK_HARDWARE_ACCOUNT_1 = {
+    id: 'mock-hardware-id-1',
+    address: '0xABC',
+    options: {},
+    methods: [...ETH_EOA_METHODS],
+    type: keyring_api_1.EthAccountType.Eoa,
+    scopes: [keyring_api_1.EthScope.Eoa],
+    metadata: {
+        name: 'Hardware Acc 1',
+        keyring: { type: keyring_controller_1.KeyringTypes.ledger },
+        importTime: 0,
+        lastSelected: 0,
+    },
+};
+class MockAccountBuilder {
+    constructor(account) {
+        _MockAccountBuilder_account.set(this, void 0);
+        // Make a deep-copy to avoid mutating the same ref.
+        __classPrivateFieldSet(this, _MockAccountBuilder_account, JSON.parse(JSON.stringify(account)), "f");
+    }
+    static from(account) {
+        return new MockAccountBuilder(account);
+    }
+    static toKeyringAccount(account) {
+        const { metadata, ...keyringAccount } = account;
+        return keyringAccount;
+    }
+    withUuuid() {
+        __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").id = (0, uuid_1.v4)();
+        return this;
+    }
+    withEntropySource(entropySource) {
+        __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").options.entropySource = entropySource;
+        return this;
+    }
+    withGroupIndex(groupIndex) {
+        __classPrivateFieldGet(this, _MockAccountBuilder_account, "f").options.index = groupIndex;
+        return this;
+    }
+    get() {
+        return __classPrivateFieldGet(this, _MockAccountBuilder_account, "f");
+    }
+}
+exports.MockAccountBuilder = MockAccountBuilder;
+_MockAccountBuilder_account = new WeakMap();
+//# sourceMappingURL=accounts.cjs.map