@metamask/multichain-account-service 11.1.0 → 13.0.0

package/CHANGELOG.md

@@ -7,6 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.0.0]
+
+### Changed
+
+- Bump `@metamask/accounts-controller` from `^39.0.4` to `^39.0.5` ([#9470](https://github.com/MetaMask/core/pull/9470))
+
+### Removed
+
+- **BREAKING:** Removed use of v1 `createAccount` entirely ([#9460](https://github.com/MetaMask/core/pull/9460))
+  - All BIP-44 Snaps are expected to implement `createAccounts` (v1 or v2).
+  - The old v1 `createAccount` flow had some undesired side-effetcs sometimes (e.g auto-selecting a non-EVM account after being created, which is not compatible with our new group model).
+
+## [12.0.0]
+
+### Added
+
+- Capability-gated v1/v2 keyring client selection for Snap account providers ([#9377](https://github.com/MetaMask/core/pull/9377))
+  - Providers resolve a Snap's capabilities via `SnapAccountService:getCapabilities` and route account creation and discovery through the v1 or v2 keyring client accordingly (a Snap that declares BIP-44 capabilities is treated as v2).
+  - Account discovery for v2 Snaps that declare `bip44.discover` flows through `createAccounts({ bip44:discover })`; v1 Snaps keep using the `discoverAccounts` client method.
+- Adds `MultichainAccountGroup.isProviderAligned(provider)` to check alignment per provider ([#9269](https://github.com/MetaMask/core/pull/9269))
+
+### Changed
+
+- **BREAKING:** Remove `batched` from `SnapAccountProviderConfig['createAccounts']` ([#9377](https://github.com/MetaMask/core/pull/9377))
+  - Batching is now derived from the Snap's capabilities (v2 Snaps that declare `bip44` use the `createAccounts` flow, since they expose no singular `createAccount`) instead of static config.
+- **BREAKING:** Now requires `SnapAccountService:getCapabilities` action ([#9377](https://github.com/MetaMask/core/pull/9377))
+- **BREAKING:** `RestrictedSnapKeyring.createAccount` has been replaced by `RestrictedSnapKeyring.v1`, which is `undefined` for v2-only Snaps ([#9390](https://github.com/MetaMask/core/pull/9390))
+  - Any subclass implementing `SnapAccountProvider.createAccountV1` must now check `keyring.v1` guard followed by `keyring.v1.createAccount(options)`.
+- Wallet alignment now only creates the missing `(provider, group index)` pairs instead of re-creating the whole range for every provider, avoiding redundant `createAccounts` calls (and their traces) ([#9269](https://github.com/MetaMask/core/pull/9269))
+- Bump `@metamask/accounts-controller` from `^39.0.3` to `^39.0.4` ([#9349](https://github.com/MetaMask/core/pull/9349))
+- Bump `@metamask/messenger` from `^1.2.0` to `^2.0.0` ([#9392](https://github.com/MetaMask/core/pull/9392))
+- Bump `@metamask/eth-snap-keyring` from `^22.3.0` to `^23.0.0` ([#9390](https://github.com/MetaMask/core/pull/9390))
+- Bump `@metamask/keyring-api` from `^23.3.0` to `^23.5.0` ([#9390](https://github.com/MetaMask/core/pull/9390))
+- Bump `@metamask/keyring-snap-client` from `^9.0.2` to `^9.2.0` ([#9390](https://github.com/MetaMask/core/pull/9390))
+- Bump `@metamask/snap-account-service` from `^1.0.0` to `^2.0.0` ([#9429](https://github.com/MetaMask/core/pull/9429))
+
 ## [11.1.0]
 
 ### Added
@@ -547,7 +583,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `MultichainAccountService` ([#6141](https://github.com/MetaMask/core/pull/6141), [#6165](https://github.com/MetaMask/core/pull/6165))
   - This service manages multichain accounts/wallets.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@11.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@13.0.0...HEAD
+[13.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@12.0.0...@metamask/multichain-account-service@13.0.0
+[12.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@11.1.0...@metamask/multichain-account-service@12.0.0
 [11.1.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@11.0.0...@metamask/multichain-account-service@11.1.0
 [11.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@10.0.3...@metamask/multichain-account-service@11.0.0
 [10.0.3]: https://github.com/MetaMask/core/compare/@metamask/multichain-account-service@10.0.2...@metamask/multichain-account-service@10.0.3

package/dist/MultichainAccountGroup.cjs

@@ -177,10 +177,23 @@ class MultichainAccountGroup {
      * @returns `true` when all providers are aligned for this group.
      */
     isAligned() {
-        return __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f").every((provider) => provider.isAligned({
+        return __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f").every((provider) => this.isProviderAligned(provider));
+    }
+    /**
+     * Check whether a single provider has an aligned account in this group.
+     *
+     * A provider is aligned when the account IDs it contributed to this group are
+     * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances
+     * always report `true`.
+     *
+     * @param provider - The provider to check.
+     * @returns `true` when the provider is aligned for this group.
+     */
+    isProviderAligned(provider) {
+        return provider.isAligned({
             entropySource: __classPrivateFieldGet(this, _MultichainAccountGroup_wallet, "f").entropySource,
             groupIndex: __classPrivateFieldGet(this, _MultichainAccountGroup_groupIndex, "f"),
-        }, __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider) ?? []));
+        }, __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider) ?? []);
     }
 }
 exports.MultichainAccountGroup = MultichainAccountGroup;

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 { projectLogger as log, createModuleLogger } from './logger';\nimport type { ServiceState, StateKeys } from './MultichainAccountService';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\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  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\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    this.#initialized = true;\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    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    }\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   * Check whether every provider has an aligned account in this group.\n   *\n   * A group is aligned when every registered provider reports that the\n   * account IDs it contributed to this group are non-empty and owned by it.\n   * Disabled {@link AccountProviderWrapper} instances always report `true`.\n   *\n   * @returns `true` when all providers are aligned for this group.\n   */\n  isAligned(): boolean {\n    return this.#providers.every((provider) =>\n      provider.isAligned(\n        {\n          entropySource: this.#wallet.entropySource,\n          groupIndex: this.#groupIndex,\n        },\n        this.#providerToAccounts.get(provider) ?? [],\n      ),\n    );\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 { projectLogger as log, createModuleLogger } from './logger';\nimport type { ServiceState, StateKeys } from './MultichainAccountService';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\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  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\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    this.#initialized = true;\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    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    }\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   * Check whether every provider has an aligned account in this group.\n   *\n   * A group is aligned when every registered provider reports that the\n   * account IDs it contributed to this group are non-empty and owned by it.\n   * Disabled {@link AccountProviderWrapper} instances always report `true`.\n   *\n   * @returns `true` when all providers are aligned for this group.\n   */\n  isAligned(): boolean {\n    return this.#providers.every((provider) =>\n      this.isProviderAligned(provider),\n    );\n  }\n\n  /**\n   * Check whether a single provider has an aligned account in this group.\n   *\n   * A provider is aligned when the account IDs it contributed to this group are\n   * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances\n   * always report `true`.\n   *\n   * @param provider - The provider to check.\n   * @returns `true` when the provider is aligned for this group.\n   */\n  isProviderAligned(provider: Bip44AccountProvider<Account>): boolean {\n    return provider.isAligned(\n      {\n        entropySource: this.#wallet.entropySource,\n        groupIndex: this.#groupIndex,\n      },\n      this.#providerToAccounts.get(provider) ?? [],\n    );\n  }\n}\n"]}

package/dist/MultichainAccountGroup.d.cts

@@ -105,5 +105,16 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
      * @returns `true` when all providers are aligned for this group.
      */
     isAligned(): boolean;
+    /**
+     * Check whether a single provider has an aligned account in this group.
+     *
+     * A provider is aligned when the account IDs it contributed to this group are
+     * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances
+     * always report `true`.
+     *
+     * @param provider - The provider to check.
+     * @returns `true` when the provider is aligned for this group.
+     */
+    isProviderAligned(provider: Bip44AccountProvider<Account>): boolean;
 }
 //# sourceMappingURL=MultichainAccountGroup.d.cts.map

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;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,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;;gBAyBxC,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;IA6CD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAQlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAapC;;;;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;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;CAWrB"}
+{"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;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,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;;gBAyBxC,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;IA6CD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAQlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAapC;;;;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;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;IAMpB;;;;;;;;;OASG;IACH,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO;CASpE"}

package/dist/MultichainAccountGroup.d.mts

@@ -105,5 +105,16 @@ export declare class MultichainAccountGroup<Account extends Bip44Account<Keyring
      * @returns `true` when all providers are aligned for this group.
      */
     isAligned(): boolean;
+    /**
+     * Check whether a single provider has an aligned account in this group.
+     *
+     * A provider is aligned when the account IDs it contributed to this group are
+     * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances
+     * always report `true`.
+     *
+     * @param provider - The provider to check.
+     * @returns `true` when the provider is aligned for this group.
+     */
+    isProviderAligned(provider: Bip44AccountProvider<Account>): boolean;
 }
 //# sourceMappingURL=MultichainAccountGroup.d.mts.map

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;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,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;;gBAyBxC,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;IA6CD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAQlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAapC;;;;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;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;CAWrB"}
+{"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;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,uCAAmC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAkC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAEjE,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;;gBAyBxC,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;IA6CD;;;;OAIG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAQlC;;;;OAIG;IACH,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAapC;;;;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;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;IAMpB;;;;;;;;;OASG;IACH,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO;CASpE"}

package/dist/MultichainAccountGroup.mjs

@@ -174,10 +174,23 @@ export class MultichainAccountGroup {
      * @returns `true` when all providers are aligned for this group.
      */
     isAligned() {
-        return __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f").every((provider) => provider.isAligned({
+        return __classPrivateFieldGet(this, _MultichainAccountGroup_providers, "f").every((provider) => this.isProviderAligned(provider));
+    }
+    /**
+     * Check whether a single provider has an aligned account in this group.
+     *
+     * A provider is aligned when the account IDs it contributed to this group are
+     * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances
+     * always report `true`.
+     *
+     * @param provider - The provider to check.
+     * @returns `true` when the provider is aligned for this group.
+     */
+    isProviderAligned(provider) {
+        return provider.isAligned({
             entropySource: __classPrivateFieldGet(this, _MultichainAccountGroup_wallet, "f").entropySource,
             groupIndex: __classPrivateFieldGet(this, _MultichainAccountGroup_groupIndex, "f"),
-        }, __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider) ?? []));
+        }, __classPrivateFieldGet(this, _MultichainAccountGroup_providerToAccounts, "f").get(provider) ?? []);
     }
 }
 _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) {

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 { projectLogger as log, createModuleLogger } from './logger';\nimport type { ServiceState, StateKeys } from './MultichainAccountService';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\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  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\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    this.#initialized = true;\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    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    }\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   * Check whether every provider has an aligned account in this group.\n   *\n   * A group is aligned when every registered provider reports that the\n   * account IDs it contributed to this group are non-empty and owned by it.\n   * Disabled {@link AccountProviderWrapper} instances always report `true`.\n   *\n   * @returns `true` when all providers are aligned for this group.\n   */\n  isAligned(): boolean {\n    return this.#providers.every((provider) =>\n      provider.isAligned(\n        {\n          entropySource: this.#wallet.entropySource,\n          groupIndex: this.#groupIndex,\n        },\n        this.#providerToAccounts.get(provider) ?? [],\n      ),\n    );\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 { projectLogger as log, createModuleLogger } from './logger';\nimport type { ServiceState, StateKeys } from './MultichainAccountService';\nimport type { MultichainAccountWallet } from './MultichainAccountWallet';\nimport type { Bip44AccountProvider } from './providers';\nimport type { MultichainAccountServiceMessenger } from './types';\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  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\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    this.#initialized = true;\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    if (this.#initialized) {\n      this.#messenger.publish(\n        'MultichainAccountService:multichainAccountGroupUpdated',\n        this,\n      );\n    }\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   * Check whether every provider has an aligned account in this group.\n   *\n   * A group is aligned when every registered provider reports that the\n   * account IDs it contributed to this group are non-empty and owned by it.\n   * Disabled {@link AccountProviderWrapper} instances always report `true`.\n   *\n   * @returns `true` when all providers are aligned for this group.\n   */\n  isAligned(): boolean {\n    return this.#providers.every((provider) =>\n      this.isProviderAligned(provider),\n    );\n  }\n\n  /**\n   * Check whether a single provider has an aligned account in this group.\n   *\n   * A provider is aligned when the account IDs it contributed to this group are\n   * non-empty and owned by it. Disabled {@link AccountProviderWrapper} instances\n   * always report `true`.\n   *\n   * @param provider - The provider to check.\n   * @returns `true` when the provider is aligned for this group.\n   */\n  isProviderAligned(provider: Bip44AccountProvider<Account>): boolean {\n    return provider.isAligned(\n      {\n        entropySource: this.#wallet.entropySource,\n        groupIndex: this.#groupIndex,\n      },\n      this.#providerToAccounts.get(provider) ?? [],\n    );\n  }\n}\n"]}

package/dist/MultichainAccountWallet.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MultichainAccountWallet_instances, _MultichainAccountWallet_lock, _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accountGroups, _MultichainAccountWallet_messenger, _MultichainAccountWallet_trace, _MultichainAccountWallet_log, _MultichainAccountWallet_initialized, _MultichainAccountWallet_status, _MultichainAccountWallet_withLock, _MultichainAccountWallet_getProviders, _MultichainAccountWallet_createAccountsRangeForProvider, _MultichainAccountWallet_createOrUpdateMultichainAccountGroup, _MultichainAccountWallet_buildGroupStateForRange, _MultichainAccountWallet_createMultichainAccountGroupsRange, _MultichainAccountWallet_alignAccountsForRange, _MultichainAccountWallet_createMultichainAccountGroups;
+var _MultichainAccountWallet_instances, _MultichainAccountWallet_lock, _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accountGroups, _MultichainAccountWallet_messenger, _MultichainAccountWallet_trace, _MultichainAccountWallet_log, _MultichainAccountWallet_initialized, _MultichainAccountWallet_status, _MultichainAccountWallet_withLock, _MultichainAccountWallet_getProviders, _MultichainAccountWallet_createAccountsRangeForProvider, _MultichainAccountWallet_createOrUpdateMultichainAccountGroup, _MultichainAccountWallet_buildGroupState, _MultichainAccountWallet_getUnalignedSubRangesForProvider, _MultichainAccountWallet_createMultichainAccountGroupsRange, _MultichainAccountWallet_alignAccountsForRange, _MultichainAccountWallet_createMultichainAccountGroups;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultichainAccountWallet = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -464,34 +464,40 @@ async function _MultichainAccountWallet_createAccountsRangeForProvider(provider,
         }
     }
     return group;
-}, _MultichainAccountWallet_buildGroupStateForRange = 
+}, _MultichainAccountWallet_buildGroupState = 
 /**
- * Build group state for a range of group indices by calling all providers in parallel.
+ * Build group state by calling all providers in parallel.
  *
  * This is a non-locking shared core used by both creation and alignment paths.
+ * Each provider is asked which contiguous sub-ranges of group indices it needs
+ * accounts created for via `getSubRanges`, so callers can skip indices that are
+ * already satisfied (e.g. during alignment).
  *
- * @param from - Starting group index (inclusive).
- * @param to - Ending group index (inclusive).
  * @param providers - The providers to create accounts for.
+ * @param getSubRanges - Resolver returning the sub-ranges to create for a
+ * given provider. Returning an empty array means the provider is skipped.
  * @returns The collected group state and any provider failure messages.
  */
-async function _MultichainAccountWallet_buildGroupStateForRange(from, to, providers) {
+async function _MultichainAccountWallet_buildGroupState(providers, getSubRanges) {
     const groupStateByGroupIndex = new Map();
     const results = await Promise.allSettled(providers.map(async (provider) => {
         const providerName = provider.getName();
-        const accounts = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_createAccountsRangeForProvider).call(this, provider, from, to);
-        accounts.forEach((account) => {
-            const { groupIndex } = account.options.entropy;
-            let groupState = groupStateByGroupIndex.get(groupIndex);
-            if (!groupState) {
-                groupState = {};
-                groupStateByGroupIndex.set(groupIndex, groupState);
-            }
-            if (!groupState[providerName]) {
-                groupState[providerName] = [];
-            }
-            groupState[providerName].push(account.id);
-        });
+        const subRanges = getSubRanges(provider);
+        for (const { from, to } of subRanges) {
+            const accounts = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_createAccountsRangeForProvider).call(this, provider, from, to);
+            accounts.forEach((account) => {
+                const { groupIndex } = account.options.entropy;
+                let groupState = groupStateByGroupIndex.get(groupIndex);
+                if (!groupState) {
+                    groupState = {};
+                    groupStateByGroupIndex.set(groupIndex, groupState);
+                }
+                if (!groupState[providerName]) {
+                    groupState[providerName] = [];
+                }
+                groupState[providerName].push(account.id);
+            });
+        }
     }));
     const failures = providers.reduce((messages, provider, index) => {
         const result = results[index];
@@ -501,6 +507,24 @@ async function _MultichainAccountWallet_buildGroupStateForRange(from, to, provid
         return messages;
     }, []);
     return { groupStateByGroupIndex, failures };
+}, _MultichainAccountWallet_getUnalignedSubRangesForProvider = function _MultichainAccountWallet_getUnalignedSubRangesForProvider(provider, from, to) {
+    const subRanges = [];
+    let runStart;
+    for (let groupIndex = from; groupIndex <= to; groupIndex++) {
+        const group = this.getMultichainAccountGroup(groupIndex);
+        const aligned = group ? group.isProviderAligned(provider) : false;
+        if (!aligned) {
+            runStart ?? (runStart = groupIndex);
+        }
+        else if (runStart !== undefined) {
+            subRanges.push({ from: runStart, to: groupIndex - 1 });
+            runStart = undefined;
+        }
+    }
+    if (runStart !== undefined) {
+        subRanges.push({ from: runStart, to });
+    }
+    return subRanges;
 }, _MultichainAccountWallet_createMultichainAccountGroupsRange = 
 /**
  * Internal method to create a range of multichain account groups.
@@ -531,7 +555,7 @@ async function _MultichainAccountWallet_createMultichainAccountGroupsRange({ fro
         // Create new groups now.
         if (from <= to) {
             __classPrivateFieldGet(this, _MultichainAccountWallet_log, "f").call(this, `Creating groups from index ${from} to ${to}...`);
-            const { groupStateByGroupIndex, failures } = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_buildGroupStateForRange).call(this, from, to, providers);
+            const { groupStateByGroupIndex, failures } = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_buildGroupState).call(this, providers, () => [{ from, to }]);
             // Check for provider failures — always treated as hard errors.
             if (failures.length) {
                 throw new Error(failures.reduce((message, failure) => `${message}\n- ${failure}`, 'Unable to create some accounts. Providers threw the following errors:'));
@@ -575,7 +599,7 @@ async function _MultichainAccountWallet_alignAccountsForRange({ from, to }, prov
             ...options.trace?.data,
         },
     }, async () => {
-        const { groupStateByGroupIndex, failures } = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_buildGroupStateForRange).call(this, from, to, providers);
+        const { groupStateByGroupIndex, failures } = await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_buildGroupState).call(this, providers, (provider) => __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_getUnalignedSubRangesForProvider).call(this, provider, from, to));
         if (failures.length) {
             const error = failures.reduce((message, failure) => `${message}\n- ${failure}`, 'Unable to align some accounts. Providers threw the following errors:');
             console.warn(error);