@metamask-previews/multichain-account-service 0.3.0-preview-a811c5b7 → 0.3.0-preview-79b0b08

package/CHANGELOG.md

@@ -7,12 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Export `MultichainAccountWallet` and `MultichainAccountGroup` types ([#6220](https://github.com/MetaMask/core/pull/6220))
+
 ### Changed
 
+- **BREAKING:** Use `KeyringAccount` instead of `InternalAccount` ([#6227](https://github.com/MetaMask/core/pull/6227))
 - **BREAKING:** Bump peer dependency `@metamask/account-api` from `^0.3.0` to `^0.6.0` ([#6214](https://github.com/MetaMask/core/pull/6214)), ([#6216](https://github.com/MetaMask/core/pull/6216))
-- **BREAKING:** Rename `MultichainAccount` to `MultichainAccountGroup` ([#6216](https://github.com/MetaMask/core/pull/6216))
+- **BREAKING:** Rename `MultichainAccount` to `MultichainAccountGroup` ([#6216](https://github.com/MetaMask/core/pull/6216)), ([#6219](https://github.com/MetaMask/core/pull/6219))
   - The naming was confusing and since a `MultichainAccount` is also an `AccountGroup` it makes sense to have the suffix there too.
-- **BREAKING:** Rename `getMultichainAccount*` to `getMultichainAccountGroup*` ([#6216](https://github.com/MetaMask/core/pull/6216))
+- **BREAKING:** Rename `getMultichainAccount*` to `getMultichainAccountGroup*` ([#6216](https://github.com/MetaMask/core/pull/6216)), ([#6219](https://github.com/MetaMask/core/pull/6219))
   - The naming was confusing and since a `MultichainAccount` is also an `AccountGroup` it makes sense to have the suffix there too.
 
 ## [0.3.0]

package/dist/MultichainAccountService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.cjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  MultichainAccountWalletId,\n  AccountProvider,\n  Bip44Account,\n} from '@metamask/account-api';\nimport {\n  isBip44Account,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountGroup } from './MultichainAccountGroup';\nimport { MultichainAccountWallet } from './MultichainAccountWallet';\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  group: MultichainAccountGroup<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<InternalAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<InternalAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<InternalAccount>['id'],\n    AccountContext<Bip44Account<InternalAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroup',\n      (...args) => this.getMultichainAccountGroup(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroups',\n      (...args) => this.getMultichainAccountGroups(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const group of wallet.getMultichainAccountGroups()) {\n          for (const account of group.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              group,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: InternalAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let group = wallet.getMultichainAccountGroup(\n      account.options.entropy.groupIndex,\n    );\n    if (!group) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      group = wallet.getMultichainAccountGroup(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (group) {\n      if (sync) {\n        group.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        group,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: InternalAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets the account's context which contains its multichain wallet and\n   * multichain account group references.\n   *\n   * @param id - Account ID.\n   * @returns The account context if any, undefined otherwise.\n   */\n  getAccountContext(\n    id: InternalAccount['id'],\n  ): AccountContext<Bip44Account<InternalAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<InternalAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account group matching this entropy source\n   * and a group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccountGroup({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccountGroup<Bip44Account<InternalAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccountGroup(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain account groups for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccountGroups({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountGroup<Bip44Account<InternalAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccountGroups();\n  }\n}\n"]}
+{"version":3,"file":"MultichainAccountService.cjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  MultichainAccountWalletId,\n  AccountProvider,\n  Bip44Account,\n} from '@metamask/account-api';\nimport {\n  isBip44Account,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\n\nimport type { MultichainAccountGroup } from './MultichainAccountGroup';\nimport { MultichainAccountWallet } from './MultichainAccountWallet';\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  group: MultichainAccountGroup<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<KeyringAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<KeyringAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<KeyringAccount>['id'],\n    AccountContext<Bip44Account<KeyringAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroup',\n      (...args) => this.getMultichainAccountGroup(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroups',\n      (...args) => this.getMultichainAccountGroups(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const group of wallet.getMultichainAccountGroups()) {\n          for (const account of group.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              group,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: KeyringAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let group = wallet.getMultichainAccountGroup(\n      account.options.entropy.groupIndex,\n    );\n    if (!group) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      group = wallet.getMultichainAccountGroup(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (group) {\n      if (sync) {\n        group.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        group,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: KeyringAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets the account's context which contains its multichain wallet and\n   * multichain account group references.\n   *\n   * @param id - Account ID.\n   * @returns The account context if any, undefined otherwise.\n   */\n  getAccountContext(\n    id: KeyringAccount['id'],\n  ): AccountContext<Bip44Account<KeyringAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<KeyringAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account group matching this entropy source\n   * and a group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccountGroup({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccountGroup(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain account groups for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccountGroups({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccountGroups();\n  }\n}\n"]}

package/dist/MultichainAccountService.d.cts

@@ -1,6 +1,5 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { MultichainAccountGroup } from "./MultichainAccountGroup.cjs";
 import { MultichainAccountWallet } from "./MultichainAccountWallet.cjs";
 import type { MultichainAccountServiceMessenger } from "./types.cjs";
@@ -45,7 +44,7 @@ export declare class MultichainAccountService {
      * @param id - Account ID.
      * @returns The account context if any, undefined otherwise.
      */
-    getAccountContext(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
+    getAccountContext(id: KeyringAccount['id']): AccountContext<Bip44Account<KeyringAccount>> | undefined;
     /**
      * Gets a reference to the multichain account wallet matching this entropy source.
      *
@@ -56,13 +55,13 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountWallet({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
+    }): MultichainAccountWallet<Bip44Account<KeyringAccount>>;
     /**
      * Gets an array of all multichain account wallets.
      *
      * @returns An array of all multichain account wallets.
      */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
+    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<KeyringAccount>>[];
     /**
      * Gets a reference to the multichain account group matching this entropy source
      * and a group index.
@@ -76,7 +75,7 @@ export declare class MultichainAccountService {
     getMultichainAccountGroup({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccountGroup<Bip44Account<InternalAccount>>;
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>;
     /**
      * Gets all multichain account groups for a given entropy source.
      *
@@ -87,7 +86,7 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountGroups({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountGroup<Bip44Account<InternalAccount>>[];
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[];
 }
 export {};
 //# sourceMappingURL=MultichainAccountService.d.cts.map

package/dist/MultichainAccountService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.d.cts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GACxB,cAAc,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GAAG,SAAS;IAI5D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAI1D;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,eAAe,CAAC,CAC9B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWzD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAG5D"}
+{"version":3,"file":"MultichainAccountService.d.cts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,GACvB,cAAc,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,GAAG,SAAS;IAI3D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAIzD;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,cAAc,CAAC,CAC7B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAWxD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE;CAG3D"}

package/dist/MultichainAccountService.d.mts

@@ -1,6 +1,5 @@
 import type { Bip44Account } from "@metamask/account-api";
 import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 import { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
 import type { MultichainAccountServiceMessenger } from "./types.mjs";
@@ -45,7 +44,7 @@ export declare class MultichainAccountService {
      * @param id - Account ID.
      * @returns The account context if any, undefined otherwise.
      */
-    getAccountContext(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
+    getAccountContext(id: KeyringAccount['id']): AccountContext<Bip44Account<KeyringAccount>> | undefined;
     /**
      * Gets a reference to the multichain account wallet matching this entropy source.
      *
@@ -56,13 +55,13 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountWallet({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
+    }): MultichainAccountWallet<Bip44Account<KeyringAccount>>;
     /**
      * Gets an array of all multichain account wallets.
      *
      * @returns An array of all multichain account wallets.
      */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
+    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<KeyringAccount>>[];
     /**
      * Gets a reference to the multichain account group matching this entropy source
      * and a group index.
@@ -76,7 +75,7 @@ export declare class MultichainAccountService {
     getMultichainAccountGroup({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccountGroup<Bip44Account<InternalAccount>>;
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>;
     /**
      * Gets all multichain account groups for a given entropy source.
      *
@@ -87,7 +86,7 @@ export declare class MultichainAccountService {
      */
     getMultichainAccountGroups({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccountGroup<Bip44Account<InternalAccount>>[];
+    }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[];
 }
 export {};
 //# sourceMappingURL=MultichainAccountService.d.mts.map

package/dist/MultichainAccountService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.d.mts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GACxB,cAAc,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GAAG,SAAS;IAI5D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAI1D;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,eAAe,CAAC,CAC9B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWzD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAG5D"}
+{"version":3,"file":"MultichainAccountService.d.mts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACb,8BAA8B;AAK/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAG7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,qCAAiC;AACvE,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AAGpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAEtD;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAEF,0FAA0F;AAC1F,KAAK,cAAc,CAAC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,IAAI;IAClE,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAwB;;IAenC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IA4B1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAwHZ;;;;;;OAMG;IACH,iBAAiB,CACf,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,GACvB,cAAc,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,GAAG,SAAS;IAI3D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,uBAAuB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAIzD;;;;OAIG;IACH,2BAA2B,IAAI,uBAAuB,CACpD,YAAY,CAAC,cAAc,CAAC,CAC7B,EAAE;IAIH;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EACxB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAWxD;;;;;;;OAOG;IACH,0BAA0B,CAAC,EACzB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,sBAAsB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EAAE;CAG3D"}

package/dist/MultichainAccountService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountService.mjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  MultichainAccountWalletId,\n  AccountProvider,\n  Bip44Account,\n} from '@metamask/account-api';\nimport {\n  isBip44Account,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountGroup } from './MultichainAccountGroup';\nimport { MultichainAccountWallet } from './MultichainAccountWallet';\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  group: MultichainAccountGroup<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<InternalAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<InternalAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<InternalAccount>['id'],\n    AccountContext<Bip44Account<InternalAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroup',\n      (...args) => this.getMultichainAccountGroup(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroups',\n      (...args) => this.getMultichainAccountGroups(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const group of wallet.getMultichainAccountGroups()) {\n          for (const account of group.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              group,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: InternalAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let group = wallet.getMultichainAccountGroup(\n      account.options.entropy.groupIndex,\n    );\n    if (!group) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      group = wallet.getMultichainAccountGroup(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (group) {\n      if (sync) {\n        group.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        group,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: InternalAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets the account's context which contains its multichain wallet and\n   * multichain account group references.\n   *\n   * @param id - Account ID.\n   * @returns The account context if any, undefined otherwise.\n   */\n  getAccountContext(\n    id: InternalAccount['id'],\n  ): AccountContext<Bip44Account<InternalAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<InternalAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<InternalAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account group matching this entropy source\n   * and a group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccountGroup({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccountGroup<Bip44Account<InternalAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccountGroup(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain account groups for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccountGroups({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountGroup<Bip44Account<InternalAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccountGroups();\n  }\n}\n"]}
+{"version":3,"file":"MultichainAccountService.mjs","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  MultichainAccountWalletId,\n  AccountProvider,\n  Bip44Account,\n} from '@metamask/account-api';\nimport {\n  isBip44Account,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\n\nimport type { MultichainAccountGroup } from './MultichainAccountGroup';\nimport { MultichainAccountWallet } from './MultichainAccountWallet';\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nexport const serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/** Reverse mapping object used to map account IDs and their wallet/multichain account. */\ntype AccountContext<Account extends Bip44Account<KeyringAccount>> = {\n  wallet: MultichainAccountWallet<Account>;\n  group: MultichainAccountGroup<Account>;\n};\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<Bip44Account<KeyringAccount>>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<Bip44Account<KeyringAccount>>\n  >;\n\n  readonly #accountIdToContext: Map<\n    Bip44Account<KeyringAccount>['id'],\n    AccountContext<Bip44Account<KeyringAccount>>\n  >;\n\n  /**\n   * The name of the service.\n   */\n  name: typeof serviceName = serviceName;\n\n  /**\n   * Constructs a new MultichainAccountService.\n   *\n   * @param options - The options.\n   * @param options.messenger - The messenger suited to this\n   * MultichainAccountService.\n   */\n  constructor({ messenger }: MultichainAccountServiceOptions) {\n    this.#messenger = messenger;\n    this.#wallets = new Map();\n    this.#accountIdToContext = new Map();\n    // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.\n    this.#providers = [\n      new EvmAccountProvider(this.#messenger),\n      new SolAccountProvider(this.#messenger),\n    ];\n\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroup',\n      (...args) => this.getMultichainAccountGroup(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountGroups',\n      (...args) => this.getMultichainAccountGroups(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallet',\n      (...args) => this.getMultichainAccountWallet(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccountWallets',\n      (...args) => this.getMultichainAccountWallets(...args),\n    );\n  }\n\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Create initial wallets.\n    const { keyrings } = this.#messenger.call('KeyringController:getState');\n    for (const keyring of keyrings) {\n      if (keyring.type === (KeyringTypes.hd as string)) {\n        // Only HD keyrings have an entropy source/SRP.\n        const entropySource = keyring.metadata.id;\n\n        // This will automatically \"associate\" all multichain accounts for that wallet\n        // (based on the accounts owned by each account providers).\n        const wallet = new MultichainAccountWallet({\n          entropySource,\n          providers: this.#providers,\n        });\n        this.#wallets.set(wallet.id, wallet);\n\n        // Reverse mapping between account ID and their multichain wallet/account:\n        for (const group of wallet.getMultichainAccountGroups()) {\n          for (const account of group.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              group,\n            });\n          }\n        }\n      }\n    }\n\n    this.#messenger.subscribe('AccountsController:accountAdded', (account) =>\n      this.#handleOnAccountAdded(account),\n    );\n    this.#messenger.subscribe('AccountsController:accountRemoved', (id) =>\n      this.#handleOnAccountRemoved(id),\n    );\n  }\n\n  #handleOnAccountAdded(account: KeyringAccount): void {\n    // We completely omit non-BIP-44 accounts!\n    if (!isBip44Account(account)) {\n      return;\n    }\n\n    let sync = true;\n\n    let wallet = this.#wallets.get(\n      toMultichainAccountWalletId(account.options.entropy.id),\n    );\n    if (!wallet) {\n      // That's a new wallet.\n      wallet = new MultichainAccountWallet({\n        entropySource: account.options.entropy.id,\n        providers: this.#providers,\n      });\n      this.#wallets.set(wallet.id, wallet);\n\n      // If that's a new wallet wallet. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    let group = wallet.getMultichainAccountGroup(\n      account.options.entropy.groupIndex,\n    );\n    if (!group) {\n      // This new account is a new multichain account, let the wallet know\n      // it has to re-sync with its providers.\n      if (sync) {\n        wallet.sync();\n      }\n\n      group = wallet.getMultichainAccountGroup(\n        account.options.entropy.groupIndex,\n      );\n\n      // If that's a new multichain account. There's nothing to \"force-sync\".\n      sync = false;\n    }\n\n    // We have to check against `undefined` in case `getMultichainAccount` is\n    // not able to find this multichain account (which should not be possible...)\n    if (group) {\n      if (sync) {\n        group.sync();\n      }\n\n      // Same here, this account should have been already grouped in that\n      // multichain account.\n      this.#accountIdToContext.set(account.id, {\n        wallet,\n        group,\n      });\n    }\n  }\n\n  #handleOnAccountRemoved(id: KeyringAccount['id']): void {\n    // Force sync of the appropriate wallet if an account got removed.\n    const found = this.#accountIdToContext.get(id);\n    if (found) {\n      const { wallet } = found;\n\n      wallet.sync();\n    }\n\n    // Safe to call delete even if the `id` was not referencing a BIP-44 account.\n    this.#accountIdToContext.delete(id);\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    const wallet = this.#wallets.get(\n      toMultichainAccountWalletId(entropySource),\n    );\n\n    if (!wallet) {\n      throw new Error('Unknown wallet, no wallet matching this entropy source');\n    }\n\n    return wallet;\n  }\n\n  /**\n   * Gets the account's context which contains its multichain wallet and\n   * multichain account group references.\n   *\n   * @param id - Account ID.\n   * @returns The account context if any, undefined otherwise.\n   */\n  getAccountContext(\n    id: KeyringAccount['id'],\n  ): AccountContext<Bip44Account<KeyringAccount>> | undefined {\n    return this.#accountIdToContext.get(id);\n  }\n\n  /**\n   * Gets a reference to the multichain account wallet matching this entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @throws If none multichain account match this entropy.\n   * @returns A reference to the multichain account wallet.\n   */\n  getMultichainAccountWallet({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountWallet<Bip44Account<KeyringAccount>> {\n    return this.#getWallet(entropySource);\n  }\n\n  /**\n   * Gets an array of all multichain account wallets.\n   *\n   * @returns An array of all multichain account wallets.\n   */\n  getMultichainAccountWallets(): MultichainAccountWallet<\n    Bip44Account<KeyringAccount>\n  >[] {\n    return Array.from(this.#wallets.values());\n  }\n\n  /**\n   * Gets a reference to the multichain account group matching this entropy source\n   * and a group index.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source of the multichain account.\n   * @param options.groupIndex - The group index of the multichain account.\n   * @throws If none multichain account match this entropy source and group index.\n   * @returns A reference to the multichain account.\n   */\n  getMultichainAccountGroup({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccountGroup(groupIndex);\n\n    if (!multichainAccount) {\n      throw new Error(`No multichain account for index: ${groupIndex}`);\n    }\n\n    return multichainAccount;\n  }\n\n  /**\n   * Gets all multichain account groups for a given entropy source.\n   *\n   * @param options - Options.\n   * @param options.entropySource - The entropy source to query.\n   * @throws If no multichain accounts match this entropy source.\n   * @returns A list of all multichain accounts.\n   */\n  getMultichainAccountGroups({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccountGroup<Bip44Account<KeyringAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccountGroups();\n  }\n}\n"]}

package/dist/MultichainAccountWallet.cjs

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accounts;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toMultichainAccountWalletId = exports.MultichainAccountWallet = void 0;
+exports.MultichainAccountWallet = void 0;
 const account_api_1 = require("@metamask/account-api");
 const account_api_2 = require("@metamask/account-api");
 const account_api_3 = require("@metamask/account-api");
@@ -27,7 +27,7 @@ class MultichainAccountWallet {
         _MultichainAccountWallet_providers.set(this, void 0);
         _MultichainAccountWallet_entropySource.set(this, void 0);
         _MultichainAccountWallet_accounts.set(this, void 0);
-        __classPrivateFieldSet(this, _MultichainAccountWallet_id, toMultichainAccountWalletId(entropySource), "f");
+        __classPrivateFieldSet(this, _MultichainAccountWallet_id, (0, account_api_1.toMultichainAccountWalletId)(entropySource), "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_providers, providers, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_entropySource, entropySource, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_accounts, new Map(), "f");
@@ -141,14 +141,4 @@ class MultichainAccountWallet {
 }
 exports.MultichainAccountWallet = MultichainAccountWallet;
 _MultichainAccountWallet_id = new WeakMap(), _MultichainAccountWallet_providers = new WeakMap(), _MultichainAccountWallet_entropySource = new WeakMap(), _MultichainAccountWallet_accounts = new WeakMap();
-/**
- * Gets the multichain account wallet ID from its entropy source.
- *
- * @param entropySource - Entropy source ID of that wallet.
- * @returns The multichain account wallet ID.
- */
-function toMultichainAccountWalletId(entropySource) {
-    return `${account_api_3.AccountWalletType.Entropy}:${entropySource}`;
-}
-exports.toMultichainAccountWalletId = toMultichainAccountWalletId;
 //# sourceMappingURL=MultichainAccountWallet.cjs.map

package/dist/MultichainAccountWallet.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.cjs","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Bip44Account,\n  MultichainAccountWalletId,\n  MultichainAccountWallet as MultichainAccountWalletDefinition,\n} from '@metamask/account-api';\nimport type { AccountGroupId } from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport {\n  getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId,\n  isMultichainAccountGroupId,\n} from '@metamask/account-api';\nimport { toDefaultAccountGroupId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountWalletDefinition<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccountGroup<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccountGroup<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [groupIndex, multichainAccount] of this.#accounts.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accounts.delete(groupIndex);\n      }\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet type, which is always {@link AccountWalletType.Entropy}.\n   *\n   * @returns The multichain account wallet type.\n   */\n  get type(): AccountWalletType.Entropy {\n    return AccountWalletType.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(\n    id: AccountGroupId,\n  ): MultichainAccountGroup<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountGroupId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccountGroup<Account>[] {\n    return this.getMultichainAccountGroups();\n  }\n\n  /**\n   * Gets multichain account group for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccountGroup(\n    groupIndex: number,\n  ): MultichainAccountGroup<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain account groups.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccountGroups(): MultichainAccountGroup<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletType.Entropy}:${entropySource}`;\n}\n"]}
+{"version":3,"file":"MultichainAccountWallet.cjs","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Bip44Account,\n  MultichainAccountWalletId,\n  MultichainAccountWallet as MultichainAccountWalletDefinition,\n} from '@metamask/account-api';\nimport type { AccountGroupId } from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport {\n  getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId,\n  isMultichainAccountGroupId,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport { toDefaultAccountGroupId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountWalletDefinition<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccountGroup<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccountGroup<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [groupIndex, multichainAccount] of this.#accounts.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accounts.delete(groupIndex);\n      }\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet type, which is always {@link AccountWalletType.Entropy}.\n   *\n   * @returns The multichain account wallet type.\n   */\n  get type(): AccountWalletType.Entropy {\n    return AccountWalletType.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(\n    id: AccountGroupId,\n  ): MultichainAccountGroup<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountGroupId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccountGroup<Account>[] {\n    return this.getMultichainAccountGroups();\n  }\n\n  /**\n   * Gets multichain account group for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccountGroup(\n    groupIndex: number,\n  ): MultichainAccountGroup<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain account groups.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccountGroups(): MultichainAccountGroup<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n"]}

package/dist/MultichainAccountWallet.d.cts

@@ -67,11 +67,4 @@ export declare class MultichainAccountWallet<Account extends Bip44Account<Keyrin
      */
     getMultichainAccountGroups(): MultichainAccountGroup<Account>[];
 }
-/**
- * Gets the multichain account wallet ID from its entropy source.
- *
- * @param entropySource - Entropy source ID of that wallet.
- * @returns The multichain account wallet ID.
- */
-export declare function toMultichainAccountWalletId(entropySource: EntropySourceId): MultichainAccountWalletId;
 //# sourceMappingURL=MultichainAccountWallet.d.cts.map

package/dist/MultichainAccountWallet.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.d.cts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAM7D,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAElE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAUzC,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAmCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;CAGhE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}
+{"version":3,"file":"MultichainAccountWallet.d.cts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAO7D,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAElE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAUzC,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAmCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;CAGhE"}

package/dist/MultichainAccountWallet.d.mts

@@ -67,11 +67,4 @@ export declare class MultichainAccountWallet<Account extends Bip44Account<Keyrin
      */
     getMultichainAccountGroups(): MultichainAccountGroup<Account>[];
 }
-/**
- * Gets the multichain account wallet ID from its entropy source.
- *
- * @param entropySource - Entropy source ID of that wallet.
- * @returns The multichain account wallet ID.
- */
-export declare function toMultichainAccountWalletId(entropySource: EntropySourceId): MultichainAccountWalletId;
 //# sourceMappingURL=MultichainAccountWallet.d.mts.map

package/dist/MultichainAccountWallet.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.d.mts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAM7D,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAElE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAUzC,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAmCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;CAGhE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,GAC7B,yBAAyB,CAE3B"}
+{"version":3,"file":"MultichainAccountWallet.d.mts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAO7D,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAElE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAUzC,EACV,SAAS,EACT,aAAa,GACd,EAAE;QACD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,aAAa,EAAE,eAAe,CAAC;KAChC;IAUD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAmCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;CAGhE"}

package/dist/MultichainAccountWallet.mjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accounts;
-import { getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId, isMultichainAccountGroupId } from "@metamask/account-api";
+import { getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId, isMultichainAccountGroupId, toMultichainAccountWalletId } from "@metamask/account-api";
 import { toDefaultAccountGroupId } from "@metamask/account-api";
 import { AccountWalletType } from "@metamask/account-api";
 import { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
@@ -137,13 +137,4 @@ export class MultichainAccountWallet {
     }
 }
 _MultichainAccountWallet_id = new WeakMap(), _MultichainAccountWallet_providers = new WeakMap(), _MultichainAccountWallet_entropySource = new WeakMap(), _MultichainAccountWallet_accounts = new WeakMap();
-/**
- * Gets the multichain account wallet ID from its entropy source.
- *
- * @param entropySource - Entropy source ID of that wallet.
- * @returns The multichain account wallet ID.
- */
-export function toMultichainAccountWalletId(entropySource) {
-    return `${AccountWalletType.Entropy}:${entropySource}`;
-}
 //# sourceMappingURL=MultichainAccountWallet.mjs.map

package/dist/MultichainAccountWallet.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.mjs","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Bip44Account,\n  MultichainAccountWalletId,\n  MultichainAccountWallet as MultichainAccountWalletDefinition,\n} from '@metamask/account-api';\nimport type { AccountGroupId } from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport {\n  getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId,\n  isMultichainAccountGroupId,\n} from '@metamask/account-api';\nimport { toDefaultAccountGroupId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountWalletDefinition<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccountGroup<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccountGroup<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [groupIndex, multichainAccount] of this.#accounts.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accounts.delete(groupIndex);\n      }\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet type, which is always {@link AccountWalletType.Entropy}.\n   *\n   * @returns The multichain account wallet type.\n   */\n  get type(): AccountWalletType.Entropy {\n    return AccountWalletType.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(\n    id: AccountGroupId,\n  ): MultichainAccountGroup<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountGroupId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccountGroup<Account>[] {\n    return this.getMultichainAccountGroups();\n  }\n\n  /**\n   * Gets multichain account group for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccountGroup(\n    groupIndex: number,\n  ): MultichainAccountGroup<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain account groups.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccountGroups(): MultichainAccountGroup<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n\n/**\n * Gets the multichain account wallet ID from its entropy source.\n *\n * @param entropySource - Entropy source ID of that wallet.\n * @returns The multichain account wallet ID.\n */\nexport function toMultichainAccountWalletId(\n  entropySource: EntropySourceId,\n): MultichainAccountWalletId {\n  return `${AccountWalletType.Entropy}:${entropySource}`;\n}\n"]}
+{"version":3,"file":"MultichainAccountWallet.mjs","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Bip44Account,\n  MultichainAccountWalletId,\n  MultichainAccountWallet as MultichainAccountWalletDefinition,\n} from '@metamask/account-api';\nimport type { AccountGroupId } from '@metamask/account-api';\nimport type { AccountProvider } from '@metamask/account-api';\nimport {\n  getGroupIndexFromMultichainAccountId as getGroupIndexFromMultichainAccountGroupId,\n  isMultichainAccountGroupId,\n  toMultichainAccountWalletId,\n} from '@metamask/account-api';\nimport { toDefaultAccountGroupId } from '@metamask/account-api';\nimport { AccountWalletType } from '@metamask/account-api';\nimport {\n  type EntropySourceId,\n  type KeyringAccount,\n} from '@metamask/keyring-api';\n\nimport { MultichainAccountGroup } from './MultichainAccountGroup';\n\n/**\n * A multichain account wallet that holds multiple multichain accounts (one multichain account per\n * group index).\n */\nexport class MultichainAccountWallet<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountWalletDefinition<Account>\n{\n  readonly #id: MultichainAccountWalletId;\n\n  readonly #providers: AccountProvider<Account>[];\n\n  readonly #entropySource: EntropySourceId;\n\n  readonly #accounts: Map<number, MultichainAccountGroup<Account>>;\n\n  constructor({\n    providers,\n    entropySource,\n  }: {\n    providers: AccountProvider<Account>[];\n    entropySource: EntropySourceId;\n  }) {\n    this.#id = toMultichainAccountWalletId(entropySource);\n    this.#providers = providers;\n    this.#entropySource = entropySource;\n    this.#accounts = new Map();\n\n    // Initial synchronization.\n    this.sync();\n  }\n\n  /**\n   * Force wallet synchronization.\n   *\n   * This can be used if account providers got new accounts that the wallet\n   * doesn't know about.\n   */\n  sync(): void {\n    for (const provider of this.#providers) {\n      for (const account of provider.getAccounts()) {\n        const { entropy } = account.options;\n\n        // Filter for this wallet only.\n        if (entropy.id !== this.entropySource) {\n          continue;\n        }\n\n        // This multichain account might exists already.\n        let multichainAccount = this.#accounts.get(entropy.groupIndex);\n        if (!multichainAccount) {\n          multichainAccount = new MultichainAccountGroup<Account>({\n            groupIndex: entropy.groupIndex,\n            wallet: this,\n            providers: this.#providers,\n          });\n\n          this.#accounts.set(entropy.groupIndex, multichainAccount);\n        }\n      }\n    }\n\n    // Now force-sync all remaining multichain accounts.\n    for (const [groupIndex, multichainAccount] of this.#accounts.entries()) {\n      multichainAccount.sync();\n\n      // Clean up old multichain accounts.\n      if (!multichainAccount.hasAccounts()) {\n        this.#accounts.delete(groupIndex);\n      }\n    }\n  }\n\n  /**\n   * Gets the multichain account wallet ID.\n   *\n   * @returns The multichain account wallet ID.\n   */\n  get id(): MultichainAccountWalletId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account wallet type, which is always {@link AccountWalletType.Entropy}.\n   *\n   * @returns The multichain account wallet type.\n   */\n  get type(): AccountWalletType.Entropy {\n    return AccountWalletType.Entropy;\n  }\n\n  /**\n   * Gets the multichain account wallet entropy source.\n   *\n   * @returns The multichain account wallet entropy source.\n   */\n  get entropySource(): EntropySourceId {\n    return this.#entropySource;\n  }\n\n  /**\n   * Gets multichain account for a given ID.\n   * The default group ID will default to the multichain account with index 0.\n   *\n   * @param id - Account group ID.\n   * @returns Account group.\n   */\n  getAccountGroup(\n    id: AccountGroupId,\n  ): MultichainAccountGroup<Account> | undefined {\n    // We consider the \"default case\" to be mapped to index 0.\n    if (id === toDefaultAccountGroupId(this.id)) {\n      return this.#accounts.get(0);\n    }\n\n    // If it is not a valid ID, we cannot extract the group index\n    // from it, so we fail fast.\n    if (!isMultichainAccountGroupId(id)) {\n      return undefined;\n    }\n\n    const groupIndex = getGroupIndexFromMultichainAccountGroupId(id);\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain accounts. Similar to {@link MultichainAccountWallet.getMultichainAccountGroups}.\n   *\n   * @returns The multichain accounts.\n   */\n  getAccountGroups(): MultichainAccountGroup<Account>[] {\n    return this.getMultichainAccountGroups();\n  }\n\n  /**\n   * Gets multichain account group for a given index.\n   *\n   * @param groupIndex - Multichain account index.\n   * @returns The multichain account associated with the given index.\n   */\n  getMultichainAccountGroup(\n    groupIndex: number,\n  ): MultichainAccountGroup<Account> | undefined {\n    return this.#accounts.get(groupIndex);\n  }\n\n  /**\n   * Gets all multichain account groups.\n   *\n   * @returns The multichain accounts.\n   */\n  getMultichainAccountGroups(): MultichainAccountGroup<Account>[] {\n    return Array.from(this.#accounts.values()); // TODO: Prevent copy here.\n  }\n}\n"]}

package/dist/index.cjs

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultichainAccountService = void 0;
+exports.MultichainAccountService = exports.MultichainAccountGroup = exports.MultichainAccountWallet = void 0;
+var MultichainAccountWallet_1 = require("./MultichainAccountWallet.cjs");
+Object.defineProperty(exports, "MultichainAccountWallet", { enumerable: true, get: function () { return MultichainAccountWallet_1.MultichainAccountWallet; } });
+var MultichainAccountGroup_1 = require("./MultichainAccountGroup.cjs");
+Object.defineProperty(exports, "MultichainAccountGroup", { enumerable: true, get: function () { return MultichainAccountGroup_1.MultichainAccountGroup; } });
 var MultichainAccountService_1 = require("./MultichainAccountService.cjs");
 Object.defineProperty(exports, "MultichainAccountService", { enumerable: true, get: function () { return MultichainAccountService_1.MultichainAccountService; } });
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,yEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountWallet } from './MultichainAccountWallet';\nexport { MultichainAccountGroup } from './MultichainAccountGroup';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}

package/dist/index.d.cts

@@ -1,3 +1,5 @@
 export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountGroupAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountGroupsAction, } from "./types.cjs";
+export { MultichainAccountWallet } from "./MultichainAccountWallet.cjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.cjs";
 export { MultichainAccountService } from "./MultichainAccountService.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}

package/dist/index.d.mts

@@ -1,3 +1,5 @@
 export type { MultichainAccountServiceActions, MultichainAccountServiceEvents, MultichainAccountServiceMessenger, MultichainAccountServiceGetMultichainAccountGroupAction, MultichainAccountServiceGetMultichainAccountWalletAction, MultichainAccountServiceGetMultichainAccountWalletsAction, MultichainAccountServiceGetMultichainAccountGroupsAction, } from "./types.mjs";
+export { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 export { MultichainAccountService } from "./MultichainAccountService.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,+BAA+B,EAC/B,8BAA8B,EAC9B,iCAAiC,EACjC,uDAAuD,EACvD,wDAAwD,EACxD,yDAAyD,EACzD,wDAAwD,GACzD,oBAAgB;AACjB,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC"}

package/dist/index.mjs

@@ -1,2 +1,4 @@
+export { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
+export { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 export { MultichainAccountService } from "./MultichainAccountService.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,wBAAwB,EAAE,uCAAmC","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,sCAAkC;AACpE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC","sourcesContent":["export type {\n  MultichainAccountServiceActions,\n  MultichainAccountServiceEvents,\n  MultichainAccountServiceMessenger,\n  MultichainAccountServiceGetMultichainAccountGroupAction,\n  MultichainAccountServiceGetMultichainAccountWalletAction,\n  MultichainAccountServiceGetMultichainAccountWalletsAction,\n  MultichainAccountServiceGetMultichainAccountGroupsAction,\n} from './types';\nexport { MultichainAccountWallet } from './MultichainAccountWallet';\nexport { MultichainAccountGroup } from './MultichainAccountGroup';\nexport { MultichainAccountService } from './MultichainAccountService';\n"]}

package/dist/providers/BaseAccountProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAI+B;AAK/B,MAAsB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,EAAyB;QAClC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,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,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;AAhDD,kDAgDC;6HAtCG,SAAgD,GAAG,EAAE,CAAC,IAAI;IAE1D,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,IAAA,4BAAc,EAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<InternalAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): Bip44Account<InternalAccount>[] {\n    const accounts: Bip44Account<InternalAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<InternalAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(id: InternalAccount['id']): Bip44Account<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 account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n}\n"]}
+{"version":3,"file":"BaseAccountProvider.cjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uDAI+B;AAK/B,MAAsB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CACR,EAAsC;QAEtC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,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,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;AAlDD,kDAkDC;6HAxCG,SAA+C,GAAG,EAAE,CAAC,IAAI;IAEzD,MAAM,QAAQ,GAAmC,EAAE,CAAC;IAEpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,IAAA,4BAAc,EAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { KeyringAccount } from '@metamask/keyring-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<KeyringAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: KeyringAccount) => boolean = () => true,\n  ): Bip44Account<KeyringAccount>[] {\n    const accounts: Bip44Account<KeyringAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<KeyringAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(\n    id: Bip44Account<KeyringAccount>['id'],\n  ): Bip44Account<KeyringAccount> {\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 account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n}\n"]}

package/dist/providers/BaseAccountProvider.d.cts

@@ -1,12 +1,12 @@
 import { type AccountProvider, type Bip44Account } from "@metamask/account-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { KeyringAccount } from "@metamask/keyring-api";
 import type { MultichainAccountServiceMessenger } from "../types.cjs";
-export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<InternalAccount>> {
+export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<KeyringAccount>> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     constructor(messenger: MultichainAccountServiceMessenger);
-    getAccounts(): Bip44Account<InternalAccount>[];
-    getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount>;
-    abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    getAccounts(): Bip44Account<KeyringAccount>[];
+    getAccount(id: Bip44Account<KeyringAccount>['id']): Bip44Account<KeyringAccount>;
+    abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
 }
 //# sourceMappingURL=BaseAccountProvider.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;;IAEzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,eAAe,CAAC,EAAE;IAI9C,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC;IAWpE,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAC9E"}
+{"version":3,"file":"BaseAccountProvider.d.cts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAE5D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;;IAExD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE;IAI7C,UAAU,CACR,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GACrC,YAAY,CAAC,cAAc,CAAC;IAW/B,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO;CAC7E"}

package/dist/providers/BaseAccountProvider.d.mts

@@ -1,12 +1,12 @@
 import { type AccountProvider, type Bip44Account } from "@metamask/account-api";
-import type { InternalAccount } from "@metamask/keyring-internal-api";
+import type { KeyringAccount } from "@metamask/keyring-api";
 import type { MultichainAccountServiceMessenger } from "../types.mjs";
-export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<InternalAccount>> {
+export declare abstract class BaseAccountProvider implements AccountProvider<Bip44Account<KeyringAccount>> {
     #private;
     protected readonly messenger: MultichainAccountServiceMessenger;
     constructor(messenger: MultichainAccountServiceMessenger);
-    getAccounts(): Bip44Account<InternalAccount>[];
-    getAccount(id: InternalAccount['id']): Bip44Account<InternalAccount>;
-    abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;
+    getAccounts(): Bip44Account<KeyringAccount>[];
+    getAccount(id: Bip44Account<KeyringAccount>['id']): Bip44Account<KeyringAccount>;
+    abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;
 }
 //# sourceMappingURL=BaseAccountProvider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;;IAEzD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,eAAe,CAAC,EAAE;IAI9C,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC;IAWpE,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,OAAO;CAC9E"}
+{"version":3,"file":"BaseAccountProvider.d.mts","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAE5D,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAiB;AAElE,8BAAsB,mBACpB,YAAW,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;;IAExD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;gBAEpD,SAAS,EAAE,iCAAiC;IA2BxD,WAAW,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE;IAI7C,UAAU,CACR,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GACrC,YAAY,CAAC,cAAc,CAAC;IAW/B,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO;CAC7E"}

package/dist/providers/BaseAccountProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,cAAc,EAGf,8BAA8B;AAK/B,MAAM,OAAgB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,EAAyB;QAClC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,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,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;6HAtCG,SAAgD,GAAG,EAAE,CAAC,IAAI;IAE1D,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,cAAc,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<InternalAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: InternalAccount) => boolean = () => true,\n  ): Bip44Account<InternalAccount>[] {\n    const accounts: Bip44Account<InternalAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<InternalAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(id: InternalAccount['id']): Bip44Account<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 account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<InternalAccount>): boolean;\n}\n"]}
+{"version":3,"file":"BaseAccountProvider.mjs","sourceRoot":"","sources":["../../src/providers/BaseAccountProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,cAAc,EAGf,8BAA8B;AAK/B,MAAM,OAAgB,mBAAmB;IAKvC,YAAY,SAA4C;;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAyBD,WAAW;QACT,OAAO,uBAAA,IAAI,wEAAa,MAAjB,IAAI,CAAe,CAAC;IAC7B,CAAC;IAED,UAAU,CACR,EAAsC;QAEtC,wDAAwD;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,uBAAA,IAAI,wEAAa,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,2BAA2B,EAAE,EAAE,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;6HAxCG,SAA+C,GAAG,EAAE,CAAC,IAAI;IAEzD,MAAM,QAAQ,GAAmC,EAAE,CAAC;IAEpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;IACvC,2EAA2E;IAC3E,yEAAyE;IACzE,kDAAkD;IAClD,2CAA2C,CAC5C,EAAE;QACD,IACE,cAAc,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,EACf;YACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {\n  isBip44Account,\n  type AccountProvider,\n  type Bip44Account,\n} from '@metamask/account-api';\nimport type { KeyringAccount } from '@metamask/keyring-api';\n\nimport type { MultichainAccountServiceMessenger } from '../types';\n\nexport abstract class BaseAccountProvider\n  implements AccountProvider<Bip44Account<KeyringAccount>>\n{\n  protected readonly messenger: MultichainAccountServiceMessenger;\n\n  constructor(messenger: MultichainAccountServiceMessenger) {\n    this.messenger = messenger;\n  }\n\n  #getAccounts(\n    filter: (account: KeyringAccount) => boolean = () => true,\n  ): Bip44Account<KeyringAccount>[] {\n    const accounts: Bip44Account<KeyringAccount>[] = [];\n\n    for (const account of this.messenger.call(\n      // NOTE: Even though the name is misleading, this only fetches all internal\n      // accounts, including EVM and non-EVM. We might wanna change this action\n      // name once we fully support multichain accounts.\n      'AccountsController:listMultichainAccounts',\n    )) {\n      if (\n        isBip44Account(account) &&\n        this.isAccountCompatible(account) &&\n        filter(account)\n      ) {\n        accounts.push(account);\n      }\n    }\n\n    return accounts;\n  }\n\n  getAccounts(): Bip44Account<KeyringAccount>[] {\n    return this.#getAccounts();\n  }\n\n  getAccount(\n    id: Bip44Account<KeyringAccount>['id'],\n  ): Bip44Account<KeyringAccount> {\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 account: ${id}`);\n    }\n\n    return found;\n  }\n\n  abstract isAccountCompatible(account: Bip44Account<KeyringAccount>): boolean;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/multichain-account-service",
-  "version": "0.3.0-preview-a811c5b7",
+  "version": "0.3.0-preview-79b0b08",
   "description": "Service to manage multichain accounts",
   "keywords": [
     "MetaMask",