@metamask-previews/multichain-account-service 5.0.0-preview-4a66b658 → 5.0.0-preview-1137ade3

package/CHANGELOG.md

@@ -7,17 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- **BREAKING** A performance refactor was made around all the classes in this package ([#6654](https://github.com/MetaMask/core/pull/6654))
-  - Add logic in the `createMultichainAccountWallet` method in `MultichainAccountService` so that it can handle all entry points: importing an SRP, recovering a vault and creating a new vault.
-  - Add a `getAccountIds` method which returns all the account ids pertaining to a group.
-  - Add an `addAccounts` method on the `BaseBip44AccountProvider` class which keeps track of all the account IDs that pertain to it.
-
-### Changed
-
-- Bump `@metamask/accounts-controller` from `^35.0.0` to `^35.0.2` ([#7604](https://github.com/MetaMask/core/pull/7604), [#7642](https://github.com/MetaMask/core/pull/7642))
-
 ## [5.0.0]
 
 ### Added
@@ -119,22 +108,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **BREAKING** A performance refactor was made around all the classes in this package ([#6654](https://github.com/MetaMask/core/pull/6654))
-  - The `MultichainAccountService` is refactored to construct a top level service state for its `init` function, this state is passed down to the `MultichainAccountWallet` and `MultichainAccountGroup` classes in slices for them to construct their internal states.
-  - Additional state is generated at the entry points where it needs to be updated i.e. `createMultichainAccountGroup`, `discoverAccounts` and `alignAccounts`.
-  - We no longer prevent group creation if some providers' `createAccounts` calls fail during group creation, only if they all fail.
-  - The `getAccounts` method in the `BaseBip44AccountProvider` class no longer relies on fetching the entire list of internal accounts from the `AccountsController`, instead it gets the specific accounts that it stores in its internal accounts list.
-  - The `EvmAccountProvider` no longer fetches from the `AccountController` to get an account for its ID, we deterministically get the associated account ID through `getUUIDFromAddressOfNormalAccount`.
-  - The `EvmAccountProvider` now uses the `getAccount` method from the `AccountsController` when fetching an account after account creation as it is more efficient.
 - Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
 
-### Removed
-
-- **BREAKING** A performance refactor was made around all the classes in this package ([#6654](https://github.com/MetaMask/core/pull/6654))
-  - Remove `#handleOnAccountAdded` and `#handleOnAccountRemoved` methods in `MultichainAccountService` due to internal state being updated within the service.
-  - Remove `getAccountContext` (and associated map) in the `MultichainAccountService` as the service no longer uses that method.
-  - Remove the `sync` method in favor of the sole `init` method for both `MultichainAccountWallet` and `MultichainAccountGroup`.
-
 ## [1.6.1]
 
 ### Changed

package/dist/MultichainAccountGroup.cjs

@@ -10,20 +10,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_instances, _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized, _MultichainAccountGroup_clearAccountToProviderState, _MultichainAccountGroup_setState;
+var _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultichainAccountGroup = void 0;
 const account_api_1 = require("@metamask/account-api");
 const account_api_2 = require("@metamask/account-api");
 const logger_1 = require("./logger.cjs");
-const providers_1 = require("./providers/index.cjs");
 const utils_1 = require("./utils.cjs");
 /**
  * A multichain account group that holds multiple accounts.
  */
 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);
@@ -32,6 +30,7 @@ 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, (0, account_api_2.toMultichainAccountGroupId)(wallet.id, groupIndex), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_groupIndex, groupIndex, "f");
@@ -41,26 +40,41 @@ class MultichainAccountGroup {
         __classPrivateFieldSet(this, _MultichainAccountGroup_providerToAccounts, new Map(), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_accountToProvider, new Map(), "f");
         __classPrivateFieldSet(this, _MultichainAccountGroup_log, (0, logger_1.createModuleLogger)(logger_1.projectLogger, `[${__classPrivateFieldGet(this, _MultichainAccountGroup_id, "f")}]`), "f");
+        this.sync();
+        __classPrivateFieldSet(this, _MultichainAccountGroup_initialized, true, "f");
     }
     /**
-     * Initialize the multichain account group and construct the internal representation of accounts.
-     *
-     * @param groupState - The group state.
-     */
-    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.
+     * Force multichain account synchronization.
      *
-     * @param groupState - The group state.
+     * This can be used if account providers got new accounts that the multichain
+     * account doesn't know about.
      */
-    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...');
+    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');
     }
     /**
      * Gets the multichain account group ID.
@@ -123,14 +137,6 @@ 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.
      *
@@ -172,26 +178,19 @@ 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 = await provider.alignAccounts({
-                    entropySource: this.wallet.entropySource,
-                    groupIndex: this.groupIndex,
-                });
-                const isDisabled = (0, providers_1.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) {
+                const accounts = __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider);
+                if (!accounts || accounts.length === 0) {
                     __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `Found missing accounts for account provider "${provider.getName()}", creating them now...`);
-                    __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").set(provider, accounts);
-                    for (const accountId of accounts) {
-                        __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").set(accountId, provider);
-                    }
+                    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;
                 }
-                return accounts;
+                return Promise.resolve();
             }
             catch (error) {
                 // istanbul ignore next
@@ -204,23 +203,8 @@ class MultichainAccountGroup {
                 throw error;
             }
         }));
-        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}`;
+        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`;
             __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `${logger_1.WARNING_PREFIX} ${message}`);
             console.warn(message);
         }
@@ -228,28 +212,5 @@ class MultichainAccountGroup {
     }
 }
 exports.MultichainAccountGroup = MultichainAccountGroup;
-_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");
-    }
-};
+_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();
 //# sourceMappingURL=MultichainAccountGroup.cjs.map

package/dist/MultichainAccountGroup.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountGroup.cjs","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"]}
+{"version":3,"file":"MultichainAccountGroup.cjs","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"]}

package/dist/MultichainAccountGroup.d.cts

@@ -3,11 +3,9 @@ import type { MultichainAccountGroupId, MultichainAccountGroup as MultichainAcco
 import type { Bip44Account } from "@metamask/account-api";
 import type { AccountSelector } from "@metamask/account-api";
 import type { KeyringAccount } from "@metamask/keyring-api";
-import type { ServiceState, StateKeys } from "./MultichainAccountService.cjs";
 import type { MultichainAccountWallet } from "./MultichainAccountWallet.cjs";
 import type { Bip44AccountProvider } from "./providers/index.cjs";
 import type { MultichainAccountServiceMessenger } from "./types.cjs";
-export type GroupState = ServiceState[StateKeys['entropySource']][StateKeys['groupIndex']];
 /**
  * A multichain account group that holds multiple accounts.
  */
@@ -20,17 +18,12 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
         messenger: MultichainAccountServiceMessenger;
     });
     /**
-     * Initialize the multichain account group and construct the internal representation of accounts.
+     * Force multichain account synchronization.
      *
-     * @param groupState - The group state.
+     * This can be used if account providers got new accounts that the multichain
+     * account doesn't know about.
      */
-    init(groupState: GroupState): void;
-    /**
-     * Update the group state.
-     *
-     * @param groupState - The group state.
-     */
-    update(groupState: GroupState): void;
+    sync(): void;
     /**
      * Gets the multichain account group ID.
      *
@@ -67,12 +60,6 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
      * @returns The accounts.
      */
     getAccounts(): Account[];
-    /**
-     * Gets the account IDs for this multichain account.
-     *
-     * @returns The account IDs.
-     */
-    getAccountIds(): Account['id'][];
     /**
      * Gets the account for a given account ID.
      *

package/dist/MultichainAccountGroup.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountGroup.d.cts","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,8BAA8B;AAE5E,OAAO,KAAK,EACV,wBAAwB,EACxB,sBAAsB,IAAI,gCAAgC,EAC3D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAQ5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AAExD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAGjE,MAAM,MAAM,UAAU,GACpB,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,qBAAa,sBAAsB,CACjC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,gCAAgC,CAAC,OAAO,CAAC;;gBA0BxC,EACV,UAAU,EACV,MAAM,EACN,SAAS,EACT,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAsDD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMpC;;;;OAIG;IACH,IAAI,EAAE,IAAI,wBAAwB,CAEjC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,gBAAgB,CAAC,iBAAiB,CAE7C;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAKtB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAmBxB;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;IAIhC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAYlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAI5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;IAIrD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CA4ErC"}
+{"version":3,"file":"MultichainAccountGroup.d.cts","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,8BAA8B;AAE5E,OAAO,KAAK,EACV,wBAAwB,EACxB,sBAAsB,IAAI,gCAAgC,EAC3D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAQ5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAGjE;;GAEG;AACH,qBAAa,sBAAsB,CACjC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,gCAAgC,CAAC,OAAO,CAAC;;gBA2BxC,EACV,UAAU,EACV,MAAM,EACN,SAAS,EACT,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAeD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAqCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,wBAAwB,CAEjC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,gBAAgB,CAAC,iBAAiB,CAE7C;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAKtB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAmBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAWlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAI5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;IAIrD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAgDrC"}

package/dist/MultichainAccountGroup.d.mts

@@ -3,11 +3,9 @@ import type { MultichainAccountGroupId, MultichainAccountGroup as MultichainAcco
 import type { Bip44Account } from "@metamask/account-api";
 import type { AccountSelector } from "@metamask/account-api";
 import type { KeyringAccount } from "@metamask/keyring-api";
-import type { ServiceState, StateKeys } from "./MultichainAccountService.mjs";
 import type { MultichainAccountWallet } from "./MultichainAccountWallet.mjs";
 import type { Bip44AccountProvider } from "./providers/index.mjs";
 import type { MultichainAccountServiceMessenger } from "./types.mjs";
-export type GroupState = ServiceState[StateKeys['entropySource']][StateKeys['groupIndex']];
 /**
  * A multichain account group that holds multiple accounts.
  */
@@ -20,17 +18,12 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
         messenger: MultichainAccountServiceMessenger;
     });
     /**
-     * Initialize the multichain account group and construct the internal representation of accounts.
+     * Force multichain account synchronization.
      *
-     * @param groupState - The group state.
+     * This can be used if account providers got new accounts that the multichain
+     * account doesn't know about.
      */
-    init(groupState: GroupState): void;
-    /**
-     * Update the group state.
-     *
-     * @param groupState - The group state.
-     */
-    update(groupState: GroupState): void;
+    sync(): void;
     /**
      * Gets the multichain account group ID.
      *
@@ -67,12 +60,6 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
      * @returns The accounts.
      */
     getAccounts(): Account[];
-    /**
-     * Gets the account IDs for this multichain account.
-     *
-     * @returns The account IDs.
-     */
-    getAccountIds(): Account['id'][];
     /**
      * Gets the account for a given account ID.
      *

package/dist/MultichainAccountGroup.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountGroup.d.mts","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,8BAA8B;AAE5E,OAAO,KAAK,EACV,wBAAwB,EACxB,sBAAsB,IAAI,gCAAgC,EAC3D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAQ5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AAExD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAGjE,MAAM,MAAM,UAAU,GACpB,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,qBAAa,sBAAsB,CACjC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,gCAAgC,CAAC,OAAO,CAAC;;gBA0BxC,EACV,UAAU,EACV,MAAM,EACN,SAAS,EACT,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAsDD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMpC;;;;OAIG;IACH,IAAI,EAAE,IAAI,wBAAwB,CAEjC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,gBAAgB,CAAC,iBAAiB,CAE7C;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAKtB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAmBxB;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;IAIhC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAYlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAI5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;IAIrD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CA4ErC"}
+{"version":3,"file":"MultichainAccountGroup.d.mts","sourceRoot":"","sources":["../src/MultichainAccountGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,8BAA8B;AAE5E,OAAO,KAAK,EACV,wBAAwB,EACxB,sBAAsB,IAAI,gCAAgC,EAC3D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAQ5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAGjE;;GAEG;AACH,qBAAa,sBAAsB,CACjC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,gCAAgC,CAAC,OAAO,CAAC;;gBA2BxC,EACV,UAAU,EACV,MAAM,EACN,SAAS,EACT,SAAS,GACV,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACzC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAeD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAqCZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,wBAAwB,CAEjC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,gBAAgB,CAAC,iBAAiB,CAE7C;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAE7C;IAED;;;;OAIG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;OAIG;IACH,WAAW,IAAI,OAAO;IAKtB;;;;OAIG;IACH,WAAW,IAAI,OAAO,EAAE;IAmBxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,SAAS;IAWlD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,SAAS;IAI5D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE;IAIrD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAgDrC"}

package/dist/MultichainAccountGroup.mjs

@@ -9,18 +9,16 @@ 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_instances, _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized, _MultichainAccountGroup_clearAccountToProviderState, _MultichainAccountGroup_setState;
+var _MultichainAccountGroup_id, _MultichainAccountGroup_wallet, _MultichainAccountGroup_groupIndex, _MultichainAccountGroup_providers, _MultichainAccountGroup_providerToAccounts, _MultichainAccountGroup_accountToProvider, _MultichainAccountGroup_messenger, _MultichainAccountGroup_log, _MultichainAccountGroup_initialized;
 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);
@@ -29,6 +27,7 @@ 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");
@@ -38,26 +37,41 @@ 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");
     }
     /**
-     * Initialize the multichain account group and construct the internal representation of accounts.
-     *
-     * @param groupState - The group state.
-     */
-    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.
+     * Force multichain account synchronization.
      *
-     * @param groupState - The group state.
+     * This can be used if account providers got new accounts that the multichain
+     * account doesn't know about.
      */
-    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...');
+    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');
     }
     /**
      * Gets the multichain account group ID.
@@ -120,14 +134,6 @@ 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.
      *
@@ -169,26 +175,19 @@ 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 = 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) {
+                const accounts = __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider);
+                if (!accounts || accounts.length === 0) {
                     __classPrivateFieldGet(this, _MultichainAccountGroup_log, "f").call(this, `Found missing accounts for account provider "${provider.getName()}", creating them now...`);
-                    __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").set(provider, accounts);
-                    for (const accountId of accounts) {
-                        __classPrivateFieldGet(this, _MultichainAccountGroup_accountToProvider, "f").set(accountId, provider);
-                    }
+                    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;
                 }
-                return accounts;
+                return Promise.resolve();
             }
             catch (error) {
                 // istanbul ignore next
@@ -201,51 +200,13 @@ export class MultichainAccountGroup {
                 throw error;
             }
         }));
-        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}`;
+        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`;
             __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_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");
-    }
-};
+_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();
 //# sourceMappingURL=MultichainAccountGroup.mjs.map