@metamask-previews/multichain-account-service 4.1.0-preview-a9886279 → 5.0.0-preview-6a568504

package/dist/MultichainAccountGroup.mjs

@@ -9,16 +9,18 @@ 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 _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized;
+var _MultichainAccountGroup_instances, _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized, _MultichainAccountGroup_clearAccountToProviderState, _MultichainAccountGroup_setState;
 import { AccountGroupType, select, selectOne } from "@metamask/account-api";
 import { toMultichainAccountGroupId } from "@metamask/account-api";
 import { projectLogger as log, createModuleLogger, WARNING_PREFIX } from "./logger.mjs";
+import { isAccountProviderWrapper } from "./providers/index.mjs";
 import { createSentryError } from "./utils.mjs";
 /**
  * A multichain account group that holds multiple accounts.
  */
 export class MultichainAccountGroup {
     constructor({ groupIndex, wallet, providers, messenger, }) {
+        _MultichainAccountGroup_instances.add(this);
         _MultichainAccountGroup_id.set(this, void 0);
         _MultichainAccountGroup_wallet.set(this, void 0);
         _MultichainAccountGroup_groupIndex.set(this, void 0);
@@ -27,7 +29,6 @@ export class MultichainAccountGroup {
         _MultichainAccountGroup_accountToProvider.set(this, void 0);
         _MultichainAccountGroup_messenger.set(this, void 0);
         _MultichainAccountGroup_log.set(this, void 0);
-        // eslint-disable-next-line @typescript-eslint/prefer-readonly
         _MultichainAccountGroup_initialized.set(this, false);
         __classPrivateFieldSet(this, _MultichainAccountGroup_id, toMultichainAccountGroupId(wallet.id, groupIndex), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_groupIndex, groupIndex, "f");
@@ -37,41 +38,26 @@ export class MultichainAccountGroup {
         __classPrivateFieldSet(this, _MultichainAccountGroup_providerToAccounts, new Map(), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_accountToProvider, new Map(), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_log, createModuleLogger(log, `[${__classPrivateFieldGet(this, _MultichainAccountGroup_id, "f")}]`), "f");
-        this.sync();
-        __classPrivateFieldSet(this, _MultichainAccountGroup_initialized, true, "f");
     }
     /**
-     * Force multichain account synchronization.
+     * Initialize the multichain account group and construct the internal representation of accounts.
      *
-     * This can be used if account providers got new accounts that the multichain
-     * account doesn't know about.
+     * @param groupState - The group state.
      */
-    sync() {
-        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Synchronizing with account providers...');
-        // Clear reverse mapping and re-construct it entirely based on the refreshed
-        // list of accounts from each providers.
-        __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").clear();
-        for (const provider of __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f")) {
-            // Filter account only for that index.
-            const accounts = [];
-            for (const account of provider.getAccounts()) {
-                if (account.options.entropy.id === this.wallet.entropySource &&
-                    account.options.entropy.groupIndex === this.groupIndex) {
-                    // We only use IDs to always fetch the latest version of accounts.
-                    accounts.push(account.id);
-                }
-            }
-            __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").set(provider, accounts);
-            // Reverse-mapping for fast indexing.
-            for (const id of accounts) {
-                __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").set(id, provider);
-            }
-        }
-        // Emit update event when group is synced (only if initialized)
-        if (__classPrivateFieldGet(this, _MultichainAccountGroup_initialized, "f")) {
-            __classPrivateFieldGet(this, _MultichainAccountGroup_messenger, "f").publish('MultichainAccountService:multichainAccountGroupUpdated', this);
-        }
-        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Synchronized');
+    init(groupState) {
+        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Initializing group state...');
+        __classPrivateFieldGet(this, _MultichainAccountGroup_instances, "m", _MultichainAccountGroup_setState).call(this, groupState);
+        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Finished initializing group state...');
+    }
+    /**
+     * Update the group state.
+     *
+     * @param groupState - The group state.
+     */
+    update(groupState) {
+        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Updating group state...');
+        __classPrivateFieldGet(this, _MultichainAccountGroup_instances, "m", _MultichainAccountGroup_setState).call(this, groupState);
+        __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Finished updating group state...');
     }
     /**
      * Gets the multichain account group ID.
@@ -134,6 +120,14 @@ export class MultichainAccountGroup {
         }
         return allAccounts;
     }
+    /**
+     * Gets the account IDs for this multichain account.
+     *
+     * @returns The account IDs.
+     */
+    getAccountIds() {
+        return [...__classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").keys()];
+    }
     /**
      * Gets the account for a given account ID.
      *
@@ -175,19 +169,26 @@ export class MultichainAccountGroup {
      */
     async alignAccounts() {
         __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Aligning accounts...');
+        __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").clear();
+        __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").clear();
         const results = await Promise.allSettled(__classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f").map(async (provider) => {
             try {
-                const accounts = __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider);
-                if (!accounts || accounts.length === 0) {
+                const accounts = await provider.alignAccounts({
+                    entropySource: this.wallet.entropySource,
+                    groupIndex: this.groupIndex,
+                });
+                const isDisabled = isAccountProviderWrapper(provider) && provider.isDisabled();
+                if (isDisabled) {
+                    __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `Account provider "${provider.getName()}" is disabled, skipping alignment...`);
+                }
+                else if (accounts.length > 0) {
                     __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `Found missing accounts for account provider "${provider.getName()}", creating them now...`);
-                    const created = await provider.createAccounts({
-                        entropySource: this.wallet.entropySource,
-                        groupIndex: this.groupIndex,
-                    });
-                    __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `Created ${created.length} accounts`);
-                    return created;
+                    __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").set(provider, accounts);
+                    for (const accountId of accounts) {
+                        __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").set(accountId, provider);
+                    }
                 }
-                return Promise.resolve();
+                return accounts;
             }
             catch (error) {
                 // istanbul ignore next
@@ -200,13 +201,51 @@ export class MultichainAccountGroup {
                 throw error;
             }
         }));
-        if (results.some((result) => result.status === 'rejected')) {
-            const message = `Failed to fully align multichain account group for entropy ID: ${this.wallet.entropySource} and group index: ${this.groupIndex}, some accounts might be missing`;
+        let failureMessage = '';
+        let failureCount = 0;
+        const groupState = results.reduce((state, result, idx) => {
+            if (result.status === 'fulfilled' && result.value.length) {
+                state[__classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f")[idx].getName()] = result.value;
+            }
+            else if (result.status === 'rejected') {
+                failureCount += 1;
+                failureMessage += `\n- ${__classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f")[idx].getName()}: ${result.reason.message}`;
+            }
+            return state;
+        }, {});
+        // Update group state
+        this.update(groupState);
+        if (failureCount > 0) {
+            const hasMultipleFailures = failureCount > 1;
+            const message = `Failed to fully align multichain account group for entropy ID: ${this.wallet.entropySource} and group index: ${this.groupIndex}, some accounts might be missing. ${hasMultipleFailures ? 'Providers' : 'Provider'} threw the following ${hasMultipleFailures ? 'errors' : 'error'}:${failureMessage}`;
             __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `${WARNING_PREFIX} ${message}`);
             console.warn(message);
         }
         __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, 'Aligned');
     }
 }
-_MultichainAccountGroup_id = new WeakMap(), _MultichainAccountGroup_wallet = new WeakMap(), _MultichainAccountGroup_groupIndex = new WeakMap(), _MultichainAccountGroup_providers = new WeakMap(), _MultichainAccountGroup_providerToAccounts = new WeakMap(), _MultichainAccountGroup_accountToProvider = new WeakMap(), _MultichainAccountGroup_messenger = new WeakMap(), _MultichainAccountGroup_log = new WeakMap(), _MultichainAccountGroup_initialized = new WeakMap();
+_MultichainAccountGroup_id = new WeakMap(), _MultichainAccountGroup_wallet = new WeakMap(), _MultichainAccountGroup_groupIndex = new WeakMap(), _MultichainAccountGroup_providers = new WeakMap(), _MultichainAccountGroup_providerToAccounts = new WeakMap(), _MultichainAccountGroup_accountToProvider = new WeakMap(), _MultichainAccountGroup_messenger = new WeakMap(), _MultichainAccountGroup_log = new WeakMap(), _MultichainAccountGroup_initialized = new WeakMap(), _MultichainAccountGroup_instances = new WeakSet(), _MultichainAccountGroup_clearAccountToProviderState = function _MultichainAccountGroup_clearAccountToProviderState(provider) {
+    __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").forEach((accountProvider, id) => {
+        if (accountProvider === provider) {
+            __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").delete(id);
+        }
+    });
+}, _MultichainAccountGroup_setState = function _MultichainAccountGroup_setState(groupState) {
+    for (const provider of __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f")) {
+        const accountIds = groupState[provider.getName()];
+        if (accountIds) {
+            __classPrivateFieldGet(this, _MultichainAccountGroup_instances, "m", _MultichainAccountGroup_clearAccountToProviderState).call(this, provider);
+            __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").set(provider, accountIds);
+            for (const accountId of accountIds) {
+                __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").set(accountId, provider);
+            }
+        }
+    }
+    if (__classPrivateFieldGet(this, _MultichainAccountGroup_initialized, "f")) {
+        __classPrivateFieldGet(this, _MultichainAccountGroup_messenger, "f").publish('MultichainAccountService:multichainAccountGroupUpdated', this);
+    }
+    else {
+        __classPrivateFieldSet(this, _MultichainAccountGroup_initialized, true, "f");
+    }
+};
 //# sourceMappingURL=MultichainAccountGroup.mjs.map

package/dist/MultichainAccountGroup.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountGroup.mjs","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupType, select, selectOne } from '@metamask/account-api';\nimport { toMultichainAccountGroupId } from '@metamask/account-api';\nimport type {\n  MultichainAccountGroupId,\n  MultichainAccountGroup as MultichainAccountGroupDefinition,\n} from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { AccountSelector } from '@metamask/account-api';\nimport type { KeyringAccount } from '@metamask/keyring-api';\n\nimport type { Logger } from './logger';\nimport {\n  projectLogger as log,\n  createModuleLogger,\n  WARNING_PREFIX,\n} from './logger';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\nimport { createSentryError } from './utils';\n\n/**\n * A multichain account group that holds multiple accounts.\n */\nexport class MultichainAccountGroup<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountGroupDefinition<Account>\n{\n  readonly #id: MultichainAccountGroupId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #groupIndex: number;\n\n  readonly #providers: Bip44AccountProvider<Account>[];\n\n  readonly #providerToAccounts: Map<\n    Bip44AccountProvider<Account>,\n    Account['id'][]\n  >;\n\n  readonly #accountToProvider: Map<\n    Account['id'],\n    Bip44AccountProvider<Account>\n  >;\n\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #log: Logger;\n\n  // eslint-disable-next-line @typescript-eslint/prefer-readonly\n  #initialized = false;\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n    messenger,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: Bip44AccountProvider<Account>[];\n    messenger: MultichainAccountServiceMessenger;\n  }) {\n    this.#id = toMultichainAccountGroupId(wallet.id, groupIndex);\n    this.#groupIndex = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n    this.#messenger = messenger;\n    this.#providerToAccounts = new Map();\n    this.#accountToProvider = new Map();\n\n    this.#log = createModuleLogger(log, `[${this.#id}]`);\n\n    this.sync();\n    this.#initialized = true;\n  }\n\n  /**\n   * Force multichain account synchronization.\n   *\n   * This can be used if account providers got new accounts that the multichain\n   * account doesn't know about.\n   */\n  sync(): void {\n    this.#log('Synchronizing with account providers...');\n    // Clear reverse mapping and re-construct it entirely based on the refreshed\n    // list of accounts from each providers.\n    this.#accountToProvider.clear();\n\n    for (const provider of this.#providers) {\n      // Filter account only for that index.\n      const accounts = [];\n      for (const account of provider.getAccounts()) {\n        if (\n          account.options.entropy.id === this.wallet.entropySource &&\n          account.options.entropy.groupIndex === this.groupIndex\n        ) {\n          // We only use IDs to always fetch the latest version of accounts.\n          accounts.push(account.id);\n        }\n      }\n      this.#providerToAccounts.set(provider, accounts);\n\n      // Reverse-mapping for fast indexing.\n      for (const id of accounts) {\n        this.#accountToProvider.set(id, provider);\n      }\n    }\n\n    // Emit update event when group is synced (only if initialized)\n    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    }\n\n    this.#log('Synchronized');\n  }\n\n  /**\n   * Gets the multichain account group ID.\n   *\n   * @returns The multichain account group ID.\n   */\n  get id(): MultichainAccountGroupId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account group type.\n   *\n   * @returns The multichain account type.\n   */\n  get type(): AccountGroupType.MultichainAccount {\n    return AccountGroupType.MultichainAccount;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get groupIndex(): number {\n    return this.#groupIndex;\n  }\n\n  /**\n   * Checks if there's any underlying accounts for this multichain accounts.\n   *\n   * @returns True if there's any underlying accounts, false otherwise.\n   */\n  hasAccounts(): boolean {\n    // If there's anything in the reverse-map, it means we have some accounts.\n    return this.#accountToProvider.size > 0;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    const allAccounts: Account[] = [];\n\n    for (const [provider, accounts] of this.#providerToAccounts.entries()) {\n      for (const id of accounts) {\n        const account = provider.getAccount(id);\n\n        if (account) {\n          // If for some reason we cannot get this account from the provider, it\n          // might means it has been deleted or something, so we just filter it\n          // out.\n          allAccounts.push(account);\n        }\n      }\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    const provider = this.#accountToProvider.get(id);\n\n    // If there's nothing in the map, it means we tried to get an account\n    // that does not belong to this multichain account.\n    if (!provider) {\n      return undefined;\n    }\n    return provider.getAccount(id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    return selectOne(this.getAccounts(), selector);\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return select(this.getAccounts(), selector);\n  }\n\n  /**\n   * Align the multichain account group.\n   *\n   * This will create accounts for providers that don't have any accounts yet.\n   */\n  async alignAccounts(): Promise<void> {\n    this.#log('Aligning accounts...');\n\n    const results = await Promise.allSettled(\n      this.#providers.map(async (provider) => {\n        try {\n          const accounts = this.#providerToAccounts.get(provider);\n          if (!accounts || accounts.length === 0) {\n            this.#log(\n              `Found missing accounts for account provider \"${provider.getName()}\", creating them now...`,\n            );\n            const created = await provider.createAccounts({\n              entropySource: this.wallet.entropySource,\n              groupIndex: this.groupIndex,\n            });\n            this.#log(`Created ${created.length} accounts`);\n\n            return created;\n          }\n          return Promise.resolve();\n        } catch (error) {\n          // istanbul ignore next\n          this.#log(\n            `${WARNING_PREFIX} ${error instanceof Error ? error.message : String(error)}`,\n          );\n          const sentryError = createSentryError(\n            `Unable to align accounts with provider \"${provider.getName()}\"`,\n            error as Error,\n            {\n              groupIndex: this.groupIndex,\n              provider: provider.getName(),\n            },\n          );\n          this.#messenger.captureException?.(sentryError);\n          throw error;\n        }\n      }),\n    );\n\n    if (results.some((result) => result.status === 'rejected')) {\n      const message = `Failed to fully align multichain account group for entropy ID: ${this.wallet.entropySource} and group index: ${this.groupIndex}, some accounts might be missing`;\n\n      this.#log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n    }\n\n    this.#log('Aligned');\n  }\n}\n"]}
+{"version":3,"file":"MultichainAccountGroup.mjs","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupType, select, selectOne } from '@metamask/account-api';\nimport { toMultichainAccountGroupId } from '@metamask/account-api';\nimport type {\n  MultichainAccountGroupId,\n  MultichainAccountGroup as MultichainAccountGroupDefinition,\n} from '@metamask/account-api';\nimport type { Bip44Account } from '@metamask/account-api';\nimport type { AccountSelector } from '@metamask/account-api';\nimport type { KeyringAccount } from '@metamask/keyring-api';\n\nimport type { Logger } from './logger';\nimport {\n  projectLogger as log,\n  createModuleLogger,\n  WARNING_PREFIX,\n} from './logger';\nimport type { ServiceState, StateKeys } from './MultichainAccountService';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport { isAccountProviderWrapper } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\nimport { createSentryError } from './utils';\n\nexport type GroupState =\n  ServiceState[StateKeys['entropySource']][StateKeys['groupIndex']];\n\n/**\n * A multichain account group that holds multiple accounts.\n */\nexport class MultichainAccountGroup<\n  Account extends Bip44Account<KeyringAccount>,\n> implements MultichainAccountGroupDefinition<Account>\n{\n  readonly #id: MultichainAccountGroupId;\n\n  readonly #wallet: MultichainAccountWallet<Account>;\n\n  readonly #groupIndex: number;\n\n  readonly #providers: Bip44AccountProvider<Account>[];\n\n  readonly #providerToAccounts: Map<\n    Bip44AccountProvider<Account>,\n    Account['id'][]\n  >;\n\n  readonly #accountToProvider: Map<\n    Account['id'],\n    Bip44AccountProvider<Account>\n  >;\n\n  readonly #messenger: MultichainAccountServiceMessenger;\n\n  readonly #log: Logger;\n\n  #initialized = false;\n\n  constructor({\n    groupIndex,\n    wallet,\n    providers,\n    messenger,\n  }: {\n    groupIndex: number;\n    wallet: MultichainAccountWallet<Account>;\n    providers: Bip44AccountProvider<Account>[];\n    messenger: MultichainAccountServiceMessenger;\n  }) {\n    this.#id = toMultichainAccountGroupId(wallet.id, groupIndex);\n    this.#groupIndex = groupIndex;\n    this.#wallet = wallet;\n    this.#providers = providers;\n    this.#messenger = messenger;\n    this.#providerToAccounts = new Map();\n    this.#accountToProvider = new Map();\n\n    this.#log = createModuleLogger(log, `[${this.#id}]`);\n  }\n\n  /**\n   * Clear the account to provider state for a given provider.\n   *\n   * @param provider - The provider to clear the account to provider state for.\n   */\n  #clearAccountToProviderState(provider: Bip44AccountProvider<Account>): void {\n    this.#accountToProvider.forEach((accountProvider, id) => {\n      if (accountProvider === provider) {\n        this.#accountToProvider.delete(id);\n      }\n    });\n  }\n\n  /**\n   * Update the internal representation of accounts with the given group state.\n   *\n   * @param groupState - The group state.\n   */\n  #setState(groupState: GroupState): void {\n    for (const provider of this.#providers) {\n      const accountIds = groupState[provider.getName()];\n\n      if (accountIds) {\n        this.#clearAccountToProviderState(provider);\n        this.#providerToAccounts.set(provider, accountIds);\n\n        for (const accountId of accountIds) {\n          this.#accountToProvider.set(accountId, provider);\n        }\n      }\n    }\n\n    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    } else {\n      this.#initialized = true;\n    }\n  }\n\n  /**\n   * Initialize the multichain account group and construct the internal representation of accounts.\n   *\n   * @param groupState - The group state.\n   */\n  init(groupState: GroupState): void {\n    this.#log('Initializing group state...');\n    this.#setState(groupState);\n    this.#log('Finished initializing group state...');\n  }\n\n  /**\n   * Update the group state.\n   *\n   * @param groupState - The group state.\n   */\n  update(groupState: GroupState): void {\n    this.#log('Updating group state...');\n    this.#setState(groupState);\n    this.#log('Finished updating group state...');\n  }\n\n  /**\n   * Gets the multichain account group ID.\n   *\n   * @returns The multichain account group ID.\n   */\n  get id(): MultichainAccountGroupId {\n    return this.#id;\n  }\n\n  /**\n   * Gets the multichain account group type.\n   *\n   * @returns The multichain account type.\n   */\n  get type(): AccountGroupType.MultichainAccount {\n    return AccountGroupType.MultichainAccount;\n  }\n\n  /**\n   * Gets the multichain account's wallet reference (parent).\n   *\n   * @returns The multichain account's wallet.\n   */\n  get wallet(): MultichainAccountWallet<Account> {\n    return this.#wallet;\n  }\n\n  /**\n   * Gets the multichain account group index.\n   *\n   * @returns The multichain account group index.\n   */\n  get groupIndex(): number {\n    return this.#groupIndex;\n  }\n\n  /**\n   * Checks if there's any underlying accounts for this multichain accounts.\n   *\n   * @returns True if there's any underlying accounts, false otherwise.\n   */\n  hasAccounts(): boolean {\n    // If there's anything in the reverse-map, it means we have some accounts.\n    return this.#accountToProvider.size > 0;\n  }\n\n  /**\n   * Gets the accounts for this multichain account.\n   *\n   * @returns The accounts.\n   */\n  getAccounts(): Account[] {\n    const allAccounts: Account[] = [];\n\n    for (const [provider, accounts] of this.#providerToAccounts.entries()) {\n      for (const id of accounts) {\n        const account = provider.getAccount(id);\n\n        if (account) {\n          // If for some reason we cannot get this account from the provider, it\n          // might means it has been deleted or something, so we just filter it\n          // out.\n          allAccounts.push(account);\n        }\n      }\n    }\n\n    return allAccounts;\n  }\n\n  /**\n   * Gets the account IDs for this multichain account.\n   *\n   * @returns The account IDs.\n   */\n  getAccountIds(): Account['id'][] {\n    return [...this.#accountToProvider.keys()];\n  }\n\n  /**\n   * Gets the account for a given account ID.\n   *\n   * @param id - Account ID.\n   * @returns The account or undefined if not found.\n   */\n  getAccount(id: Account['id']): Account | undefined {\n    const provider = this.#accountToProvider.get(id);\n\n    // If there's nothing in the map, it means we tried to get an account\n    // that does not belong to this multichain account.\n    if (!provider) {\n      return undefined;\n    }\n\n    return provider.getAccount(id);\n  }\n\n  /**\n   * Query an account matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The account matching the selector or undefined if not matching.\n   * @throws If multiple accounts match the selector.\n   */\n  get(selector: AccountSelector<Account>): Account | undefined {\n    return selectOne(this.getAccounts(), selector);\n  }\n\n  /**\n   * Query accounts matching the selector.\n   *\n   * @param selector - Query selector.\n   * @returns The accounts matching the selector.\n   */\n  select(selector: AccountSelector<Account>): Account[] {\n    return select(this.getAccounts(), selector);\n  }\n\n  /**\n   * Align the multichain account group.\n   *\n   * This will create accounts for providers that don't have any accounts yet.\n   */\n  async alignAccounts(): Promise<void> {\n    this.#log('Aligning accounts...');\n\n    this.#providerToAccounts.clear();\n    this.#accountToProvider.clear();\n\n    const results = await Promise.allSettled(\n      this.#providers.map(async (provider) => {\n        try {\n          const accounts = await provider.alignAccounts({\n            entropySource: this.wallet.entropySource,\n            groupIndex: this.groupIndex,\n          });\n\n          const isDisabled =\n            isAccountProviderWrapper(provider) && provider.isDisabled();\n\n          if (isDisabled) {\n            this.#log(\n              `Account provider \"${provider.getName()}\" is disabled, skipping alignment...`,\n            );\n          } else if (accounts.length > 0) {\n            this.#log(\n              `Found missing accounts for account provider \"${provider.getName()}\", creating them now...`,\n            );\n            this.#providerToAccounts.set(provider, accounts);\n            for (const accountId of accounts) {\n              this.#accountToProvider.set(accountId, provider);\n            }\n          }\n\n          return accounts;\n        } catch (error) {\n          // istanbul ignore next\n          this.#log(\n            `${WARNING_PREFIX} ${error instanceof Error ? error.message : String(error)}`,\n          );\n          const sentryError = createSentryError(\n            `Unable to align accounts with provider \"${provider.getName()}\"`,\n            error as Error,\n            {\n              groupIndex: this.groupIndex,\n              provider: provider.getName(),\n            },\n          );\n          this.#messenger.captureException?.(sentryError);\n          throw error;\n        }\n      }),\n    );\n\n    let failureMessage = '';\n    let failureCount = 0;\n    const groupState = results.reduce<GroupState>((state, result, idx) => {\n      if (result.status === 'fulfilled' && result.value.length) {\n        state[this.#providers[idx].getName()] = result.value;\n      } else if (result.status === 'rejected') {\n        failureCount += 1;\n        failureMessage += `\\n- ${this.#providers[idx].getName()}: ${result.reason.message}`;\n      }\n      return state;\n    }, {});\n\n    // Update group state\n    this.update(groupState);\n\n    if (failureCount > 0) {\n      const hasMultipleFailures = failureCount > 1;\n      const message = `Failed to fully align multichain account group for entropy ID: ${this.wallet.entropySource} and group index: ${this.groupIndex}, some accounts might be missing. ${hasMultipleFailures ? 'Providers' : 'Provider'} threw the following ${hasMultipleFailures ? 'errors' : 'error'}:${failureMessage}`;\n\n      this.#log(`${WARNING_PREFIX} ${message}`);\n      console.warn(message);\n    }\n\n    this.#log('Aligned');\n  }\n}\n"]}

package/dist/MultichainAccountService.cjs

@@ -10,11 +10,10 @@ 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_watcher, _MultichainAccountService_providers, _MultichainAccountService_wallets, _MultichainAccountService_getStateKeys, _MultichainAccountService_constructServiceState, _MultichainAccountService_getWallet, _MultichainAccountService_getPrimaryEntropySourceId, _MultichainAccountService_createWalletByImport, _MultichainAccountService_createWalletByNewVault, _MultichainAccountService_createWalletByRestore;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultichainAccountService = exports.serviceName = void 0;
 const account_api_1 = require("@metamask/account-api");
-const key_tree_1 = require("@metamask/key-tree");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const utils_1 = require("@metamask/utils");
 const analytics_1 = require("./analytics/index.cjs");
@@ -25,6 +24,7 @@ const AccountProviderWrapper_1 = require("./providers/AccountProviderWrapper.cjs
 const EvmAccountProvider_1 = require("./providers/EvmAccountProvider.cjs");
 const SolAccountProvider_1 = require("./providers/SolAccountProvider.cjs");
 const SolAccountProvider_2 = require("./providers/SolAccountProvider.cjs");
+const SnapPlatformWatcher_1 = require("./snaps/SnapPlatformWatcher.cjs");
 const utils_2 = require("./utils.cjs");
 exports.serviceName = 'MultichainAccountService';
 /**
@@ -44,16 +44,15 @@ class MultichainAccountService {
     constructor({ messenger, providers = [], providerConfigs, config, }) {
         _MultichainAccountService_instances.add(this);
         _MultichainAccountService_messenger.set(this, void 0);
+        _MultichainAccountService_watcher.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;
         __classPrivateFieldSet(this, _MultichainAccountService_messenger, messenger, "f");
         __classPrivateFieldSet(this, _MultichainAccountService_wallets, new Map(), "f");
-        __classPrivateFieldSet(this, _MultichainAccountService_accountIdToContext, new Map(), "f");
         // Pass trace callback directly to preserve original 'this' context
         // This avoids binding the callback to the MultichainAccountService instance
         const traceCallback = config?.trace ?? analytics_1.traceFallback;
@@ -64,6 +63,7 @@ class MultichainAccountService {
             // Custom account providers that can be provided by the MetaMask client.
             ...providers,
         ], "f");
+        __classPrivateFieldSet(this, _MultichainAccountService_watcher, new SnapPlatformWatcher_1.SnapPlatformWatcher(messenger), "f");
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroup', (...args) => this.getMultichainAccountGroup(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountGroups', (...args) => this.getMultichainAccountGroups(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:getMultichainAccountWallet', (...args) => this.getMultichainAccountWallet(...args));
@@ -75,8 +75,8 @@ class MultichainAccountService {
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:alignWallet', (...args) => this.alignWallet(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:createMultichainAccountWallet', (...args) => this.createMultichainAccountWallet(...args));
         __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:resyncAccounts', (...args) => this.resyncAccounts(...args));
-        __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));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:removeMultichainAccountWallet', (...args) => this.removeMultichainAccountWallet(...args));
+        __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").registerActionHandler('MultichainAccountService:ensureCanUseSnapPlatform', (...args) => this.ensureCanUseSnapPlatform(...args));
     }
     /**
      * Initialize the service and constructs the internal reprensentation of
@@ -85,32 +85,22 @@ class MultichainAccountService {
     async init() {
         (0, logger_1.projectLogger)('Initializing...');
         __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").clear();
-        __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").clear();
-        // 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;
-                (0, logger_1.projectLogger)(`Adding new wallet for entropy: "${entropySource}"`);
-                // This will automatically "associate" all multichain accounts for that wallet
-                // (based on the accounts owned by each account providers).
-                const wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
-                    entropySource,
-                    providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
-                    messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
-                });
-                __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
-                // Reverse mapping between account ID and their multichain wallet/account:
-                for (const group of wallet.getMultichainAccountGroups()) {
-                    for (const account of group.getAccounts()) {
-                        __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
-                            wallet,
-                            group,
-                        });
-                    }
-                }
-            }
+        const { serviceState, providerState } = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_constructServiceState).call(this);
+        for (const provider of __classPrivateFieldGet(this, _MultichainAccountService_providers, "f")) {
+            const providerName = provider.getName();
+            // Initialize providers even if there are no accounts yet.
+            // Passing an empty array ensures providers start in a valid state.
+            const state = providerState[providerName] ?? [];
+            provider.init(state);
+        }
+        for (const entropySource of Object.keys(serviceState)) {
+            const wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
+                entropySource,
+                providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
+                messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
+            });
+            wallet.init(serviceState[entropySource]);
+            __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
         }
         (0, logger_1.projectLogger)('Initialized');
     }
@@ -152,15 +142,8 @@ class MultichainAccountService {
         }));
         (0, logger_1.projectLogger)('Providers got re-synced!');
     }
-    /**
-     * Gets the account's context which contains its multichain wallet and
-     * multichain account group references.
-     *
-     * @param id - Account ID.
-     * @returns The account context if any, undefined otherwise.
-     */
-    getAccountContext(id) {
-        return __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").get(id);
+    ensureCanUseSnapPlatform() {
+        return __classPrivateFieldGet(this, _MultichainAccountService_watcher, "f").ensureCanUseSnapPlatform();
     }
     /**
      * Gets a reference to the multichain account wallet matching this entropy source.
@@ -182,39 +165,52 @@ class MultichainAccountService {
         return Array.from(__classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").values());
     }
     /**
-     * Creates a new multichain account wallet with the given mnemonic.
+     * Creates a new multichain account wallet by either importing an existing mnemonic,
+     * creating a new vault and keychain, or restoring a vault and keyring.
      *
      * NOTE: This method should only be called in client code where a mutex lock is acquired.
-     * `discoverAndCreateAccounts` should be called after this method to discover and create accounts.
+     * `discoverAccounts` should be called after this method to discover and create accounts.
      *
-     * @param options - Options.
-     * @param options.mnemonic - The mnemonic to use to create the new wallet.
+     * @param params - The parameters to use to create the new wallet.
+     * @param params.mnemonic - The mnemonic to use to create the new wallet.
+     * @param params.password - The password to encrypt the vault with.
+     * @param params.type - The flow type to use to create the new wallet.
      * @throws If the mnemonic has already been imported.
      * @returns The new multichain account wallet.
      */
-    async createMultichainAccountWallet({ mnemonic, }) {
-        const existingKeyrings = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:getKeyringsByType', keyring_controller_1.KeyringTypes.hd);
-        const mnemonicAsBytes = (0, key_tree_1.mnemonicPhraseToBytes)(mnemonic);
-        const alreadyHasImportedSrp = existingKeyrings.some((keyring) => {
-            if (!keyring.mnemonic) {
-                return false;
-            }
-            return (0, utils_1.areUint8ArraysEqual)(keyring.mnemonic, mnemonicAsBytes);
-        });
-        if (alreadyHasImportedSrp) {
-            throw new Error('This Secret Recovery Phrase has already been imported.');
+    async createMultichainAccountWallet(params) {
+        let wallet;
+        if (params.type === 'import') {
+            wallet = await __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_createWalletByImport).call(this, params.mnemonic);
+        }
+        else if (params.type === 'create') {
+            wallet = await __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_createWalletByNewVault).call(this, params.password);
         }
-        (0, logger_1.projectLogger)(`Creating new wallet...`);
-        const result = await __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:addNewKeyring', keyring_controller_1.KeyringTypes.hd, { mnemonic });
-        const wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
-            providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
-            entropySource: result.id,
-            messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
-        });
+        else if (params.type === 'restore') {
+            wallet = await __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_createWalletByRestore).call(this, params.password, params.mnemonic);
+        }
+        (0, utils_1.assert)(wallet, 'Failed to create wallet.');
+        wallet.init({});
         __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").set(wallet.id, wallet);
         (0, logger_1.projectLogger)(`Wallet created: [${wallet.id}]`);
         return wallet;
     }
+    /**
+     * Removes a multichain account wallet.
+     *
+     * NOTE: This method should only be called in client code as a revert mechanism.
+     * At the point that this code is called, discovery shouldn't have been triggered.
+     * This is meant to be used in the scenario where a seed phrase backup is not successful.
+     *
+     * @param entropySource - The entropy source of the multichain account wallet.
+     * @param accountAddress - The address of the account to remove.
+     * @returns The removed multichain account wallet.
+     */
+    async removeMultichainAccountWallet(entropySource, accountAddress) {
+        const wallet = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getWallet).call(this, entropySource);
+        await __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:removeAccount', accountAddress);
+        __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").delete(wallet.id);
+    }
     /**
      * Gets a reference to the multichain account group matching this entropy source
      * and a group index.
@@ -309,64 +305,106 @@ 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) {
-        (0, logger_1.projectLogger)(`Adding new wallet for entropy: "${account.options.entropy.id}" (for account: "${account.id}")`);
-        // That's a new wallet.
-        wallet = new MultichainAccountWallet_1.MultichainAccountWallet({
-            entropySource: account.options.entropy.id,
-            providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
-            messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "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 group = wallet.getMultichainAccountGroup(account.options.entropy.groupIndex);
-    if (!group) {
-        // This new account is a new multichain account, let the wallet know
-        // it has to re-sync with its providers.
-        if (sync) {
-            wallet.sync();
+_MultichainAccountService_messenger = new WeakMap(), _MultichainAccountService_watcher = new WeakMap(), _MultichainAccountService_providers = new WeakMap(), _MultichainAccountService_wallets = new WeakMap(), _MultichainAccountService_instances = new WeakSet(), _MultichainAccountService_getStateKeys = function _MultichainAccountService_getStateKeys(account) {
+    for (const provider of __classPrivateFieldGet(this, _MultichainAccountService_providers, "f")) {
+        if ((0, account_api_1.isBip44Account)(account) && provider.isAccountCompatible(account)) {
+            return {
+                entropySource: account.options.entropy.id,
+                groupIndex: account.options.entropy.groupIndex,
+                providerName: provider.getName(),
+            };
         }
-        group = wallet.getMultichainAccountGroup(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 (group) {
-        if (sync) {
-            group.sync();
+    return null;
+}, _MultichainAccountService_constructServiceState = function _MultichainAccountService_constructServiceState() {
+    var _a, _b;
+    const accounts = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('AccountsController:listMultichainAccounts');
+    const serviceState = {};
+    const providerState = {};
+    for (const account of accounts) {
+        const keys = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getStateKeys).call(this, account);
+        if (keys) {
+            const { entropySource, groupIndex, providerName } = keys;
+            serviceState[entropySource] ?? (serviceState[entropySource] = {});
+            (_a = serviceState[entropySource])[groupIndex] ?? (_a[groupIndex] = {});
+            (_b = serviceState[entropySource][groupIndex])[providerName] ?? (_b[providerName] = []);
+            serviceState[entropySource][groupIndex][providerName].push(account.id);
+            providerState[providerName] ?? (providerState[providerName] = []);
+            providerState[providerName].push(account.id);
         }
-        // Same here, this account should have been already grouped in that
-        // multichain account.
-        __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").set(account.id, {
-            wallet,
-            group,
-        });
     }
-}, _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;
-        (0, logger_1.projectLogger)(`Re-synchronize wallet [${wallet.id}] since account "${id}" got removed`);
-        wallet.sync();
-    }
-    // Safe to call delete even if the `id` was not referencing a BIP-44 account.
-    __classPrivateFieldGet(this, _MultichainAccountService_accountIdToContext, "f").delete(id);
+    return { serviceState, providerState };
 }, _MultichainAccountService_getWallet = function _MultichainAccountService_getWallet(entropySource) {
     const wallet = __classPrivateFieldGet(this, _MultichainAccountService_wallets, "f").get((0, account_api_1.toMultichainAccountWalletId)(entropySource));
     if (!wallet) {
         throw new Error('Unknown wallet, no wallet matching this entropy source');
     }
     return wallet;
+}, _MultichainAccountService_getPrimaryEntropySourceId = function _MultichainAccountService_getPrimaryEntropySourceId() {
+    const { keyrings } = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:getState');
+    const primaryKeyring = keyrings.find((keyring) => keyring.type === 'HD Key Tree');
+    (0, utils_1.assert)(primaryKeyring, 'Primary keyring not found');
+    return primaryKeyring.metadata.id;
+}, _MultichainAccountService_createWalletByImport = 
+/**
+ * Creates a new multichain account wallet by importing an existing mnemonic.
+ *
+ * @param mnemonic - The mnemonic to use to create the new wallet.
+ * @returns The new multichain account wallet.
+ */
+async function _MultichainAccountService_createWalletByImport(mnemonic) {
+    (0, logger_1.projectLogger)(`Creating new wallet by importing an existing mnemonic...`);
+    const existingKeyrings = __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:getKeyringsByType', keyring_controller_1.KeyringTypes.hd);
+    const alreadyHasImportedSrp = existingKeyrings.some((keyring) => {
+        if (!keyring.mnemonic) {
+            return false;
+        }
+        return (0, utils_1.areUint8ArraysEqual)(keyring.mnemonic, mnemonic);
+    });
+    if (alreadyHasImportedSrp) {
+        throw new Error('This Secret Recovery Phrase has already been imported.');
+    }
+    const result = await __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:addNewKeyring', keyring_controller_1.KeyringTypes.hd, { mnemonic });
+    // The wallet is ripe for discovery
+    return new MultichainAccountWallet_1.MultichainAccountWallet({
+        providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
+        entropySource: result.id,
+        messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
+    });
+}, _MultichainAccountService_createWalletByNewVault = 
+/**
+ * Creates a new multichain account wallet by creating a new vault and keychain.
+ *
+ * @param password - The password to encrypt the vault with.
+ * @returns The new multichain account wallet.
+ */
+async function _MultichainAccountService_createWalletByNewVault(password) {
+    (0, logger_1.projectLogger)(`Creating new wallet by creating a new vault and keychain...`);
+    await __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:createNewVaultAndKeychain', password);
+    const entropySourceId = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getPrimaryEntropySourceId).call(this);
+    // The wallet is ripe for discovery
+    return new MultichainAccountWallet_1.MultichainAccountWallet({
+        providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
+        entropySource: entropySourceId,
+        messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
+    });
+}, _MultichainAccountService_createWalletByRestore = 
+/**
+ * Creates a new multichain account wallet by restoring a vault and keyring.
+ *
+ * @param password - The password to encrypt the vault with.
+ * @param mnemonic - The mnemonic to use to restore the new wallet.
+ * @returns The new multichain account wallet.
+ */
+async function _MultichainAccountService_createWalletByRestore(password, mnemonic) {
+    (0, logger_1.projectLogger)(`Creating new wallet by restoring vault and keyring...`);
+    await __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f").call('KeyringController:createNewVaultAndRestore', password, mnemonic);
+    const entropySourceId = __classPrivateFieldGet(this, _MultichainAccountService_instances, "m", _MultichainAccountService_getPrimaryEntropySourceId).call(this);
+    // The wallet is ripe for discovery
+    return new MultichainAccountWallet_1.MultichainAccountWallet({
+        providers: __classPrivateFieldGet(this, _MultichainAccountService_providers, "f"),
+        entropySource: entropySourceId,
+        messenger: __classPrivateFieldGet(this, _MultichainAccountService_messenger, "f"),
+    });
 };
 //# sourceMappingURL=MultichainAccountService.cjs.map