@metamask-previews/multichain-account-service 0.2.1-preview-0cb117e2 → 0.2.1-preview-7509efdb

package/CHANGELOG.md

@@ -7,16 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add multichain account/wallet syncs ([#6165](https://github.com/MetaMask/core/pull/6165))
-  - Those are getting sync'd during `AccountsController:account{Added,Removed}` events.
-- Add actions `MultichainAccountService:getMultichain{Account,Accounts,AccountWallet,AccountWallets}` ([#6193](https://github.com/MetaMask/core/pull/6193))
-
-### Changed
-
-- **BREAKING:** Add `@metamask/account-api` peer dependency ([#6115](https://github.com/MetaMask/core/pull/6115)), ([#6146](https://github.com/MetaMask/core/pull/6146))
-
 ## [0.2.1]
 
 ### Fixed
@@ -33,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add `MultichainAccountService` ([#6141](https://github.com/MetaMask/core/pull/6141)), ([#6165](https://github.com/MetaMask/core/pull/6165))
+- Add `MultichainAccountService` ([#6141](https://github.com/MetaMask/core/pull/6141))
   - This service manages multichain accounts/wallets.
 
 [Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@0.2.1...HEAD

package/dist/MultichainAccountService.cjs

@@ -10,14 +10,23 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MultichainAccountService_instances, _MultichainAccountService_messenger, _MultichainAccountService_providers, _MultichainAccountService_wallets, _MultichainAccountService_accountIdToContext, _MultichainAccountService_handleOnAccountAdded, _MultichainAccountService_handleOnAccountRemoved, _MultichainAccountService_getWallet;
+var _MultichainAccountService_instances, _MultichainAccountService_messenger, _MultichainAccountService_providers, _MultichainAccountService_wallets, _MultichainAccountService_setMultichainAccountWallets, _MultichainAccountService_getWallet;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultichainAccountService = exports.serviceName = void 0;
+exports.MultichainAccountService = void 0;
 const account_api_1 = require("@metamask/account-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const EvmAccountProvider_1 = require("./providers/EvmAccountProvider.cjs");
 const SolAccountProvider_1 = require("./providers/SolAccountProvider.cjs");
-exports.serviceName = 'MultichainAccountService';
+const serviceName = 'MultichainAccountService';
+/**
+ * Select keyrings from keyring controller state.
+ *
+ * @param state - The keyring controller state.
+ * @returns The keyrings.
+ */
+function selectKeyringControllerKeyrings(state) {
+    return state.keyrings;
+}
 /**
  * Service to expose multichain accounts capabilities.
  */
@@ -34,84 +43,29 @@ class MultichainAccountService {
         _MultichainAccountService_messenger.set(this, void 0);
         _MultichainAccountService_providers.set(this, void 0);
         _MultichainAccountService_wallets.set(this, void 0);
-        _MultichainAccountService_accountIdToContext.set(this, void 0);
         /**
          * The name of the service.
          */
-        this.name = exports.serviceName;
+        this.name = serviceName;
         __classPrivateFieldSet(this, _MultichainAccountService_messenger, messenger, "f");
         __classPrivateFieldSet(this, _MultichainAccountService_wallets, new Map(), "f");
-        __classPrivateFieldSet(this, _MultichainAccountService_accountIdToContext, new Map(), "f");
         // TODO: Rely on keyring capabilities once the keyring API is used by all keyrings.
         __classPrivateFieldSet(this, _MultichainAccountService_providers, [
             new EvmAccountProvider_1.EvmAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
             new SolAccountProvider_1.SolAccountProvider(__classPrivateFieldGet(this, _MultichainAccountService_messenger, "f")),
         ], "f");
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccount', (...args) => this.getMultichainAccount(...args));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccounts', (...args) => this.getMultichainAccounts(...args));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallet', (...args) => this.getMultichainAccountWallet(...args));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallets', (...args) => this.getMultichainAccountWallets(...args));
     }
     /**
      * Initialize the service and constructs the internal reprensentation of
      * multichain accounts and wallets.
      */
     init() {
-        // Create initial wallets.
-        const { keyrings } = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:getState');
-        for (const keyring of keyrings) {
-            if (keyring.type === keyring_controller_1.KeyringTypes.hd) {
-                // Only HD keyrings have an entropy source/SRP.
-                const entropySource = keyring.metadata.id;
-                // This will automatically "associate" all multichain accounts for that wallet
-                // (based on the accounts owned by each account providers).
-                const wallet = new account_api_1.MultichainAccountWallet({
-                    entropySource,
-                    providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
-                });
-                __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
-                // Reverse mapping between account ID and their multichain wallet/account:
-                for (const multichainAccount of wallet.getMultichainAccounts()) {
-                    for (const account of multichainAccount.getAccounts()) {
-                        __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
-                            wallet,
-                            multichainAccount,
-                        });
-                    }
-                }
-            }
-        }
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").subscribe('AccountsController:accountAdded', (account) => __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_handleOnAccountAdded).call(this, account));
-        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").subscribe('AccountsController:accountRemoved', (id) => __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_handleOnAccountRemoved).call(this, id));
-    }
-    /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
-     *
-     * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
-     */
-    getMultichainAccountAndWallet(id) {
-        return __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").get(id);
-    }
-    /**
-     * Gets a reference to the multichain account wallet matching this entropy source.
-     *
-     * @param options - Options.
-     * @param options.entropySource - The entropy source of the multichain account.
-     * @throws If none multichain account match this entropy.
-     * @returns A reference to the multichain account wallet.
-     */
-    getMultichainAccountWallet({ entropySource, }) {
-        return __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource);
-    }
-    /**
-     * Gets an array of all multichain account wallets.
-     *
-     * @returns An array of all multichain account wallets.
-     */
-    getMultichainAccountWallets() {
-        return Array.from(__classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").values());
+        // Gather all entropy sources first.
+        const state = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:getState');
+        __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_setMultichainAccountWallets).call(this, state.keyrings);
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").subscribe('KeyringController:stateChange', (keyrings) => {
+            __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_setMultichainAccountWallets).call(this, keyrings);
+        }, selectKeyringControllerKeyrings);
     }
     /**
      * Gets a reference to the multichain account matching this entropy source and group index.
@@ -142,56 +96,25 @@ class MultichainAccountService {
     }
 }
 exports.MultichainAccountService = MultichainAccountService;
-_MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_providers = new WeakMap(), _MultichainAccountService_wallets = new WeakMap(), _MultichainAccountService_accountIdToContext = new WeakMap(), _MultichainAccountService_instances = new WeakSet(), _MultichainAccountService_handleOnAccountAdded = function _MultichainAccountService_handleOnAccountAdded(account) {
-    // We completely omit non-BIP-44 accounts!
-    if (!(0, account_api_1.isBip44Account)(account)) {
-        return;
-    }
-    let sync = true;
-    let wallet = __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").get((0, account_api_1.toMultichainAccountWalletId)(account.options.entropy.id));
-    if (!wallet) {
-        // That's a new wallet.
-        wallet = new account_api_1.MultichainAccountWallet({
-            entropySource: account.options.entropy.id,
-            providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
-        });
-        __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
-        // If that's a new wallet wallet. There's nothing to "force-sync".
-        sync = false;
-    }
-    let multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
-    if (!multichainAccount) {
-        // This new account is a new multichain account, let the wallet know
-        // it has to re-sync with its providers.
-        if (sync) {
-            wallet.sync();
-        }
-        multichainAccount = wallet.getMultichainAccount(account.options.entropy.groupIndex);
-        // If that's a new multichain account. There's nothing to "force-sync".
-        sync = false;
-    }
-    // We have to check against `undefined` in case `getMultichainAccount` is
-    // not able to find this multichain account (which should not be possible...)
-    if (multichainAccount) {
-        if (sync) {
-            multichainAccount.sync();
+_MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_providers = new WeakMap(), _MultichainAccountService_wallets = new WeakMap(), _MultichainAccountService_instances = new WeakSet(), _MultichainAccountService_setMultichainAccountWallets = function _MultichainAccountService_setMultichainAccountWallets(keyrings) {
+    for (const keyring of keyrings) {
+        if (keyring.type === keyring_controller_1.KeyringTypes.hd) {
+            // Only HD keyrings have an entropy source/SRP.
+            const entropySource = keyring.metadata.id;
+            // Do not re-create wallets if they exists. Even if a keyrings got new accounts, this
+            // will be handled by the `*AccountProvider`s which are always in-sync with their
+            // keyrings and controllers (like the `AccountsController`).
+            if (!__classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").has((0, account_api_1.toMultichainAccountWalletId)(entropySource))) {
+                // This will automatically "associate" all multichain accounts for that wallet
+                // (based on the accounts owned by each account providers).
+                const wallet = new account_api_1.MultichainAccountWallet({
+                    entropySource,
+                    providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
+                });
+                __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
+            }
         }
-        // Same here, this account should have been already grouped in that
-        // multichain account.
-        __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
-            wallet,
-            multichainAccount,
-        });
-    }
-}, _MultichainAccountService_handleOnAccountRemoved = function _MultichainAccountService_handleOnAccountRemoved(id) {
-    // Force sync of the appropriate wallet if an account got removed.
-    const found = __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").get(id);
-    if (found) {
-        const { wallet } = found;
-        wallet.sync();
     }
-    // Safe to call delete even if the `id` was not referencing a BIP-44 account.
-    __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").delete(id);
 }, _MultichainAccountService_getWallet = function _MultichainAccountService_getWallet(entropySource) {
     const wallet = __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").get((0, account_api_1.toMultichainAccountWalletId)(entropySource));
     if (!wallet) {

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  MultichainAccountWallet,\n  toMultichainAccountWalletId,\n  type MultichainAccount,\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 { 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  multichainAccount: MultichainAccount<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:getMultichainAccount',\n      (...args) => this.getMultichainAccount(...args),\n    );\n    this.#messenger.registerActionHandler(\n      'MultichainAccountService:getMultichainAccounts',\n      (...args) => this.getMultichainAccounts(...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 multichainAccount of wallet.getMultichainAccounts()) {\n          for (const account of multichainAccount.getAccounts()) {\n            this.#accountIdToContext.set(account.id, {\n              wallet,\n              multichainAccount,\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 multichainAccount = wallet.getMultichainAccount(\n      account.options.entropy.groupIndex,\n    );\n    if (!multichainAccount) {\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      multichainAccount = wallet.getMultichainAccount(\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 (multichainAccount) {\n      if (sync) {\n        multichainAccount.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        multichainAccount,\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 a reference to the wallet and multichain account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns An object with references to the wallet and multichain account associated for\n   * that account ID, or undefined if this account ID is not part of any.\n   */\n  getMultichainAccountAndWallet(\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 matching this entropy source and 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  getMultichainAccount({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccount<Bip44Account<InternalAccount>> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccount(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 accounts 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  getMultichainAccounts({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccount<Bip44Account<InternalAccount>>[] {\n    return this.#getWallet(entropySource).getMultichainAccounts();\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} from '@metamask/account-api';\nimport {\n  MultichainAccountWallet,\n  toMultichainAccountWalletId,\n  type MultichainAccount,\n} from '@metamask/account-api';\nimport type { EntropySourceId } from '@metamask/keyring-api';\nimport type {\n  KeyringControllerState,\n  KeyringObject,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { EvmAccountProvider } from './providers/EvmAccountProvider';\nimport { SolAccountProvider } from './providers/SolAccountProvider';\nimport type { MultichainAccountServiceMessenger } from './types';\n\nconst serviceName = 'MultichainAccountService';\n\n/**\n * The options that {@link MultichainAccountService} takes.\n */\ntype MultichainAccountServiceOptions = {\n  messenger: MultichainAccountServiceMessenger;\n};\n\n/**\n * Select keyrings from keyring controller state.\n *\n * @param state - The keyring controller state.\n * @returns The keyrings.\n */\nfunction selectKeyringControllerKeyrings(state: KeyringControllerState) {\n  return state.keyrings;\n}\n\n/**\n * Service to expose multichain accounts capabilities.\n */\nexport class MultichainAccountService {\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #providers: AccountProvider<InternalAccount>[];\n\n  readonly #wallets: Map<\n    MultichainAccountWalletId,\n    MultichainAccountWallet<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    // 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\n  /**\n   * Initialize the service and constructs the internal reprensentation of\n   * multichain accounts and wallets.\n   */\n  init(): void {\n    // Gather all entropy sources first.\n    const state = this.#messenger.call('KeyringController:getState');\n    this.#setMultichainAccountWallets(state.keyrings);\n\n    this.#messenger.subscribe(\n      'KeyringController:stateChange',\n      (keyrings) => {\n        this.#setMultichainAccountWallets(keyrings);\n      },\n      selectKeyringControllerKeyrings,\n    );\n  }\n\n  #setMultichainAccountWallets(keyrings: KeyringObject[]) {\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        // Do not re-create wallets if they exists. Even if a keyrings got new accounts, this\n        // will be handled by the `*AccountProvider`s which are always in-sync with their\n        // keyrings and controllers (like the `AccountsController`).\n        if (!this.#wallets.has(toMultichainAccountWalletId(entropySource))) {\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\n          this.#wallets.set(wallet.id, wallet);\n        }\n      }\n    }\n  }\n\n  #getWallet(\n    entropySource: EntropySourceId,\n  ): MultichainAccountWallet<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 a reference to the multichain account matching this entropy source and 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  getMultichainAccount({\n    entropySource,\n    groupIndex,\n  }: {\n    entropySource: EntropySourceId;\n    groupIndex: number;\n  }): MultichainAccount<InternalAccount> {\n    const multichainAccount =\n      this.#getWallet(entropySource).getMultichainAccount(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 accounts 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  getMultichainAccounts({\n    entropySource,\n  }: {\n    entropySource: EntropySourceId;\n  }): MultichainAccount<InternalAccount>[] {\n    return this.#getWallet(entropySource).getMultichainAccounts();\n  }\n}\n"]}

package/dist/MultichainAccountService.d.cts

@@ -1,20 +1,14 @@
-import type { Bip44Account } from "@metamask/account-api";
-import { MultichainAccountWallet, type MultichainAccount } from "@metamask/account-api";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import { type MultichainAccount } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { MultichainAccountServiceMessenger } from "./types.cjs";
-export declare const serviceName = "MultichainAccountService";
+declare const serviceName = "MultichainAccountService";
 /**
  * The options that {@link MultichainAccountService} takes.
  */
 type MultichainAccountServiceOptions = {
     messenger: MultichainAccountServiceMessenger;
 };
-/** Reverse mapping object used to map account IDs and their wallet/multichain account. */
-type AccountContext<Account extends Bip44Account<KeyringAccount>> = {
-    wallet: MultichainAccountWallet<Account>;
-    multichainAccount: MultichainAccount<Account>;
-};
 /**
  * Service to expose multichain accounts capabilities.
  */
@@ -37,31 +31,6 @@ export declare class MultichainAccountService {
      * multichain accounts and wallets.
      */
     init(): void;
-    /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
-     *
-     * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
-     */
-    getMultichainAccountAndWallet(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
-    /**
-     * Gets a reference to the multichain account wallet matching this entropy source.
-     *
-     * @param options - Options.
-     * @param options.entropySource - The entropy source of the multichain account.
-     * @throws If none multichain account match this entropy.
-     * @returns A reference to the multichain account wallet.
-     */
-    getMultichainAccountWallet({ entropySource, }: {
-        entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
-    /**
-     * Gets an array of all multichain account wallets.
-     *
-     * @returns An array of all multichain account wallets.
-     */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
     /**
      * Gets a reference to the multichain account matching this entropy source and group index.
      *
@@ -74,7 +43,7 @@ export declare class MultichainAccountService {
     getMultichainAccount({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccount<Bip44Account<InternalAccount>>;
+    }): MultichainAccount<InternalAccount>;
     /**
      * Gets all multichain accounts for a given entropy source.
      *
@@ -85,7 +54,7 @@ export declare class MultichainAccountService {
      */
     getMultichainAccounts({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccount<Bip44Account<InternalAccount>>[];
+    }): MultichainAccount<InternalAccount>[];
 }
 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;AAC/B,OAAO,EAEL,uBAAuB,EAEvB,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,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,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CAC/C,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,6BAA6B,CAC3B,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;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWpD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAGvD"}
+{"version":3,"file":"MultichainAccountService.d.cts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAM7D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,QAAA,MAAM,WAAW,6BAA6B,CAAC;AAE/C;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAYF;;GAEG;AACH,qBAAa,wBAAwB;;IAUnC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IAU1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAmDZ;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,eAAe,CAAC;IAWtC;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,eAAe,CAAC,EAAE;CAGzC"}

package/dist/MultichainAccountService.d.mts

@@ -1,20 +1,14 @@
-import type { Bip44Account } from "@metamask/account-api";
-import { MultichainAccountWallet, type MultichainAccount } from "@metamask/account-api";
-import type { EntropySourceId, KeyringAccount } from "@metamask/keyring-api";
+import { type MultichainAccount } from "@metamask/account-api";
+import type { EntropySourceId } from "@metamask/keyring-api";
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { MultichainAccountServiceMessenger } from "./types.mjs";
-export declare const serviceName = "MultichainAccountService";
+declare const serviceName = "MultichainAccountService";
 /**
  * The options that {@link MultichainAccountService} takes.
  */
 type MultichainAccountServiceOptions = {
     messenger: MultichainAccountServiceMessenger;
 };
-/** Reverse mapping object used to map account IDs and their wallet/multichain account. */
-type AccountContext<Account extends Bip44Account<KeyringAccount>> = {
-    wallet: MultichainAccountWallet<Account>;
-    multichainAccount: MultichainAccount<Account>;
-};
 /**
  * Service to expose multichain accounts capabilities.
  */
@@ -37,31 +31,6 @@ export declare class MultichainAccountService {
      * multichain accounts and wallets.
      */
     init(): void;
-    /**
-     * Gets a reference to the wallet and multichain account for a given account ID.
-     *
-     * @param id - Account ID.
-     * @returns An object with references to the wallet and multichain account associated for
-     * that account ID, or undefined if this account ID is not part of any.
-     */
-    getMultichainAccountAndWallet(id: InternalAccount['id']): AccountContext<Bip44Account<InternalAccount>> | undefined;
-    /**
-     * Gets a reference to the multichain account wallet matching this entropy source.
-     *
-     * @param options - Options.
-     * @param options.entropySource - The entropy source of the multichain account.
-     * @throws If none multichain account match this entropy.
-     * @returns A reference to the multichain account wallet.
-     */
-    getMultichainAccountWallet({ entropySource, }: {
-        entropySource: EntropySourceId;
-    }): MultichainAccountWallet<Bip44Account<InternalAccount>>;
-    /**
-     * Gets an array of all multichain account wallets.
-     *
-     * @returns An array of all multichain account wallets.
-     */
-    getMultichainAccountWallets(): MultichainAccountWallet<Bip44Account<InternalAccount>>[];
     /**
      * Gets a reference to the multichain account matching this entropy source and group index.
      *
@@ -74,7 +43,7 @@ export declare class MultichainAccountService {
     getMultichainAccount({ entropySource, groupIndex, }: {
         entropySource: EntropySourceId;
         groupIndex: number;
-    }): MultichainAccount<Bip44Account<InternalAccount>>;
+    }): MultichainAccount<InternalAccount>;
     /**
      * Gets all multichain accounts for a given entropy source.
      *
@@ -85,7 +54,7 @@ export declare class MultichainAccountService {
      */
     getMultichainAccounts({ entropySource, }: {
         entropySource: EntropySourceId;
-    }): MultichainAccount<Bip44Account<InternalAccount>>[];
+    }): MultichainAccount<InternalAccount>[];
 }
 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;AAC/B,OAAO,EAEL,uBAAuB,EAEvB,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,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,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CAC/C,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,6BAA6B,CAC3B,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;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAWpD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,EAAE;CAGvD"}
+{"version":3,"file":"MultichainAccountService.d.mts","sourceRoot":"","sources":["../src/MultichainAccountService.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,iBAAiB,EACvB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAM7D,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,QAAA,MAAM,WAAW,6BAA6B,CAAC;AAE/C;;GAEG;AACH,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,iCAAiC,CAAC;CAC9C,CAAC;AAYF;;GAEG;AACH,qBAAa,wBAAwB;;IAUnC;;OAEG;IACH,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,EAAE,+BAA+B;IAU1D;;;OAGG;IACH,IAAI,IAAI,IAAI;IAmDZ;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EACnB,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB,CAAC,eAAe,CAAC;IAWtC;;;;;;;OAOG;IACH,qBAAqB,CAAC,EACpB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,eAAe,CAAC;KAChC,GAAG,iBAAiB,CAAC,eAAe,CAAC,EAAE;CAGzC"}