@metamask-previews/multichain-account-service 0.7.0-preview-ea6406b3 → 0.7.0-preview-9a5f096

package/dist/MultichainAccountWallet.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.d.cts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAG/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAYjE;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC,CAAC;AAIF;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAiBzC,EACV,SAAS,EACT,aAAa,EACb,SAAS,GACV,EAAE;QACD,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,eAAe,CAAC;QAC/B,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAYD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAiDZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAI/D;;;;OAIG;IACH,iBAAiB,IAAI,MAAM;IAU3B;;;;;;OAMG;IACG,4BAA4B,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IA4F3C;;;;;OAKG;IACG,gCAAgC,IAAI,OAAO,CAC/C,sBAAsB,CAAC,OAAO,CAAC,CAChC;IAID;;;;OAIG;IACH,wBAAwB,IAAI,OAAO;IAInC;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAclC;;;;OAIG;IACG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnD;;;;OAIG;IACG,yBAAyB,IAAI,OAAO,CAAC,uBAAuB,CAAC;CA6EpE"}
+{"version":3,"file":"MultichainAccountWallet.d.cts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC5D,6BAA6B,EAC9B,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAI/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAgBjE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAmBzC,EACV,SAAS,EACT,aAAa,EACb,SAAS,GACV,EAAE;QACD,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,eAAe,CAAC;QAC/B,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAcD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAiDZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,6BAA6B,CAE1C;IAkCD;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAI/D;;;;OAIG;IACH,iBAAiB,IAAI,MAAM;IAU3B;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IA8F3C;;;;;OAKG;IACG,gCAAgC,IAAI,OAAO,CAC/C,sBAAsB,CAAC,OAAO,CAAC,CAChC;IAcD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAMpC;;;;;;OAMG;IACG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAyE7C"}

package/dist/MultichainAccountWallet.d.mts

@@ -1,16 +1,10 @@
 import { AccountWalletType } from "@metamask/account-api";
-import type { Bip44Account, MultichainAccountWalletId, MultichainAccountWallet as MultichainAccountWalletDefinition } from "@metamask/account-api";
+import type { Bip44Account, MultichainAccountWalletId, MultichainAccountWallet as MultichainAccountWalletDefinition, MultichainAccountWalletStatus } from "@metamask/account-api";
 import type { AccountGroupId } from "@metamask/account-api";
 import { type EntropySourceId, type KeyringAccount } from "@metamask/keyring-api";
 import { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 import type { NamedAccountProvider } from "./providers/index.mjs";
 import type { MultichainAccountServiceMessenger } from "./types.mjs";
-/**
- * The metrics resulting from account discovery.
- */
-export type AccountDiscoveryMetrics = {
-    [providerName: string]: number;
-};
 /**
  * A multichain account wallet that holds multiple multichain accounts (one multichain account per
  * group index).
@@ -47,6 +41,12 @@ export declare class MultichainAccountWallet<Account extends Bip44Account<Keyrin
      * @returns The multichain account wallet entropy source.
      */
     get entropySource(): EntropySourceId;
+    /**
+     * Gets the multichain account wallet current status.
+     *
+     * @returns The multichain account wallet current status.
+     */
+    get status(): MultichainAccountWalletStatus;
     /**
      * Gets multichain account for a given ID.
      * The default group ID will default to the multichain account with index 0.
@@ -83,6 +83,8 @@ export declare class MultichainAccountWallet<Account extends Bip44Account<Keyrin
     /**
      * Creates a multichain account group for a given group index.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @param groupIndex - The group index to use.
      * @throws If any of the account providers fails to create their accounts.
      * @returns The multichain account group for this group index.
@@ -96,26 +98,26 @@ export declare class MultichainAccountWallet<Account extends Bip44Account<Keyrin
      */
     createNextMultichainAccountGroup(): Promise<MultichainAccountGroup<Account>>;
     /**
-     * Gets whether alignment is currently in progress for this wallet.
+     * Align all accounts from each existing multichain account groups.
      *
-     * @returns True if alignment is in progress, false otherwise.
-     */
-    getIsAlignmentInProgress(): boolean;
-    /**
-     * Align all multichain account groups.
+     * NOTE: This operation WILL lock the wallet's mutex.
      */
-    alignGroups(): Promise<void>;
+    alignAccounts(): Promise<void>;
     /**
      * Align a specific multichain account group.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @param groupIndex - The group index to align.
      */
     alignGroup(groupIndex: number): Promise<void>;
     /**
      * Discover and create accounts for all providers.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @returns The discovered accounts for each provider.
      */
-    discoverAndCreateAccounts(): Promise<AccountDiscoveryMetrics>;
+    discoverAccounts(): Promise<Account[]>;
 }
 //# sourceMappingURL=MultichainAccountWallet.d.mts.map

package/dist/MultichainAccountWallet.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainAccountWallet.d.mts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC7D,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAG/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAYjE;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC,CAAC;AAIF;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAiBzC,EACV,SAAS,EACT,aAAa,EACb,SAAS,GACV,EAAE;QACD,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,eAAe,CAAC;QAC/B,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAYD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAiDZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAI/D;;;;OAIG;IACH,iBAAiB,IAAI,MAAM;IAU3B;;;;;;OAMG;IACG,4BAA4B,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IA4F3C;;;;;OAKG;IACG,gCAAgC,IAAI,OAAO,CAC/C,sBAAsB,CAAC,OAAO,CAAC,CAChC;IAID;;;;OAIG;IACH,wBAAwB,IAAI,OAAO;IAInC;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAclC;;;;OAIG;IACG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnD;;;;OAIG;IACG,yBAAyB,IAAI,OAAO,CAAC,uBAAuB,CAAC;CA6EpE"}
+{"version":3,"file":"MultichainAccountWallet.d.mts","sourceRoot":"","sources":["../src/MultichainAccountWallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,8BAA8B;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,uBAAuB,IAAI,iCAAiC,EAC5D,6BAA6B,EAC9B,8BAA8B;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,8BAA8B;AAI/B,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,8BAAoB;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAgB;AAgBjE;;;GAGG;AACH,qBAAa,uBAAuB,CAClC,OAAO,SAAS,YAAY,CAAC,cAAc,CAAC,CAC5C,YAAW,iCAAiC,CAAC,OAAO,CAAC;;gBAmBzC,EACV,SAAS,EACT,aAAa,EACb,SAAS,GACV,EAAE;QACD,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,eAAe,CAAC;QAC/B,SAAS,EAAE,iCAAiC,CAAC;KAC9C;IAcD;;;;;OAKG;IACH,IAAI,IAAI,IAAI;IAiDZ;;;;OAIG;IACH,IAAI,EAAE,IAAI,yBAAyB,CAElC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAEpC;IAED;;;;OAIG;IACH,IAAI,aAAa,IAAI,eAAe,CAEnC;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,6BAA6B,CAE1C;IAkCD;;;;;;OAMG;IACH,eAAe,CACb,EAAE,EAAE,cAAc,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAgB9C;;;;OAIG;IACH,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAIrD;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,GACjB,sBAAsB,CAAC,OAAO,CAAC,GAAG,SAAS;IAI9C;;;;OAIG;IACH,0BAA0B,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAI/D;;;;OAIG;IACH,iBAAiB,IAAI,MAAM;IAU3B;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IA8F3C;;;;;OAKG;IACG,gCAAgC,IAAI,OAAO,CAC/C,sBAAsB,CAAC,OAAO,CAAC,CAChC;IAcD;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAMpC;;;;;;OAMG;IACG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAyE7C"}

package/dist/MultichainAccountWallet.mjs

@@ -9,11 +9,12 @@ 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_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accountGroups, _MultichainAccountWallet_messenger, _MultichainAccountWallet_initialized, _MultichainAccountWallet_isAlignmentInProgress;
+var _MultichainAccountWallet_instances, _MultichainAccountWallet_lock, _MultichainAccountWallet_id, _MultichainAccountWallet_providers, _MultichainAccountWallet_entropySource, _MultichainAccountWallet_accountGroups, _MultichainAccountWallet_messenger, _MultichainAccountWallet_initialized, _MultichainAccountWallet_status, _MultichainAccountWallet_withLock, _MultichainAccountWallet_alignAccounts;
 import { getGroupIndexFromMultichainAccountGroupId, isMultichainAccountGroupId, toMultichainAccountWalletId } from "@metamask/account-api";
 import { toDefaultAccountGroupId } from "@metamask/account-api";
 import { AccountWalletType } from "@metamask/account-api";
 import { createProjectLogger } from "@metamask/utils";
+import { Mutex } from "async-mutex";
 import { MultichainAccountGroup } from "./MultichainAccountGroup.mjs";
 const log = createProjectLogger('multichain-account-service');
 /**
@@ -22,6 +23,8 @@ const log = createProjectLogger('multichain-account-service');
  */
 export class MultichainAccountWallet {
     constructor({ providers, entropySource, messenger, }) {
+        _MultichainAccountWallet_instances.add(this);
+        _MultichainAccountWallet_lock.set(this, new Mutex());
         _MultichainAccountWallet_id.set(this, void 0);
         _MultichainAccountWallet_providers.set(this, void 0);
         _MultichainAccountWallet_entropySource.set(this, void 0);
@@ -29,15 +32,17 @@ export class MultichainAccountWallet {
         _MultichainAccountWallet_messenger.set(this, void 0);
         // eslint-disable-next-line @typescript-eslint/prefer-readonly
         _MultichainAccountWallet_initialized.set(this, false);
-        _MultichainAccountWallet_isAlignmentInProgress.set(this, false);
+        _MultichainAccountWallet_status.set(this, void 0);
         __classPrivateFieldSet(this, _MultichainAccountWallet_id, toMultichainAccountWalletId(entropySource), "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_providers, providers, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_entropySource, entropySource, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_messenger, messenger, "f");
         __classPrivateFieldSet(this, _MultichainAccountWallet_accountGroups, new Map(), "f");
         // Initial synchronization (don't emit events during initialization).
+        __classPrivateFieldSet(this, _MultichainAccountWallet_status, 'uninitialized', "f");
         this.sync();
         __classPrivateFieldSet(this, _MultichainAccountWallet_initialized, true, "f");
+        __classPrivateFieldSet(this, _MultichainAccountWallet_status, 'ready', "f");
     }
     /**
      * Force wallet synchronization.
@@ -108,6 +113,14 @@ export class MultichainAccountWallet {
     get entropySource() {
         return __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f");
     }
+    /**
+     * Gets the multichain account wallet current status.
+     *
+     * @returns The multichain account wallet current status.
+     */
+    get status() {
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_status, "f");
+    }
     /**
      * Gets multichain account for a given ID.
      * The default group ID will default to the multichain account with index 0.
@@ -166,80 +179,84 @@ export class MultichainAccountWallet {
     /**
      * Creates a multichain account group for a given group index.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @param groupIndex - The group index to use.
      * @throws If any of the account providers fails to create their accounts.
      * @returns The multichain account group for this group index.
      */
     async createMultichainAccountGroup(groupIndex) {
-        const nextGroupIndex = this.getNextGroupIndex();
-        if (groupIndex > nextGroupIndex) {
-            throw new Error(`You cannot use a group index that is higher than the next available one: expected <=${nextGroupIndex}, got ${groupIndex}`);
-        }
-        let group = this.getMultichainAccountGroup(groupIndex);
-        if (group) {
-            // If the group already exists, we just `sync` it and returns the same
-            // reference.
-            group.sync();
-            return group;
-        }
-        const results = await Promise.allSettled(__classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f").map((provider) => provider.createAccounts({
-            entropySource: __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f"),
-            groupIndex,
-        })));
-        // --------------------------------------------------------------------------------
-        // READ THIS CAREFULLY:
-        //
-        // Since we're not "fully supporting multichain" for now, we still rely on single
-        // :accountCreated events to sync multichain account groups and wallets. Which means
-        // that even if of the provider fails, some accounts will still be created on some
-        // other providers and will become "available" on the `AccountsController`, like:
-        //
-        // 1. Creating a multichain account group for index 1
-        // 2. EvmAccountProvider.createAccounts returns the EVM account for index 1
-        //   * AccountsController WILL fire :accountCreated for this account
-        //   * This account WILL BE "available" on the AccountsController state
-        // 3. SolAccountProvider.createAccounts fails to create a Solana account for index 1
-        //   * AccountsController WON't fire :accountCreated for this account
-        //   * This account WON'T be "available" on the Account
-        // 4. MultichainAccountService will receive a :accountCreated for the EVM account from
-        // step 2 and will create a new multichain account group for index 1, but it won't
-        // receive any event for the Solana account of this group. Thus, this group won't be
-        // "aligned" (missing "blockchain account" on this group).
-        //
-        // --------------------------------------------------------------------------------
-        // If any of the provider failed to create their accounts, then we consider the
-        // multichain account group to have failed too.
-        if (results.some((result) => result.status === 'rejected')) {
-            // NOTE: Some accounts might still have been created on other account providers. We
-            // don't rollback them.
-            const error = `Unable to create multichain account group for index: ${groupIndex}`;
-            let warn = `${error}:`;
-            for (const result of results) {
-                if (result.status === 'rejected') {
-                    warn += `\n- ${result.reason}`;
-                }
+        return await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_withLock).call(this, 'in-progress:create-accounts', async () => {
+            const nextGroupIndex = this.getNextGroupIndex();
+            if (groupIndex > nextGroupIndex) {
+                throw new Error(`You cannot use a group index that is higher than the next available one: expected <=${nextGroupIndex}, got ${groupIndex}`);
             }
-            console.warn(warn);
-            throw new Error(error);
-        }
-        // Because of the :accountAdded automatic sync, we might already have created the
-        // group, so we first try to get it.
-        group = this.getMultichainAccountGroup(groupIndex);
-        if (!group) {
-            // If for some reason it's still not created, we're creating it explicitly now:
-            group = new MultichainAccountGroup({
-                wallet: this,
-                providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+            let group = this.getMultichainAccountGroup(groupIndex);
+            if (group) {
+                // If the group already exists, we just `sync` it and returns the same
+                // reference.
+                group.sync();
+                return group;
+            }
+            const results = await Promise.allSettled(__classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f").map((provider) => provider.createAccounts({
+                entropySource: __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f"),
                 groupIndex,
-                messenger: __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f"),
-            });
-        }
-        // Register the account to our internal map.
-        __classPrivateFieldGet(this, _MultichainAccountWallet_accountGroups, "f").set(groupIndex, group); // `group` cannot be undefined here.
-        if (__classPrivateFieldGet(this, _MultichainAccountWallet_initialized, "f")) {
-            __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f").publish('MultichainAccountService:multichainAccountGroupCreated', group);
-        }
-        return group;
+            })));
+            // --------------------------------------------------------------------------------
+            // READ THIS CAREFULLY:
+            //
+            // Since we're not "fully supporting multichain" for now, we still rely on single
+            // :accountCreated events to sync multichain account groups and wallets. Which means
+            // that even if of the provider fails, some accounts will still be created on some
+            // other providers and will become "available" on the `AccountsController`, like:
+            //
+            // 1. Creating a multichain account group for index 1
+            // 2. EvmAccountProvider.createAccounts returns the EVM account for index 1
+            //   * AccountsController WILL fire :accountCreated for this account
+            //   * This account WILL BE "available" on the AccountsController state
+            // 3. SolAccountProvider.createAccounts fails to create a Solana account for index 1
+            //   * AccountsController WON't fire :accountCreated for this account
+            //   * This account WON'T be "available" on the Account
+            // 4. MultichainAccountService will receive a :accountCreated for the EVM account from
+            // step 2 and will create a new multichain account group for index 1, but it won't
+            // receive any event for the Solana account of this group. Thus, this group won't be
+            // "aligned" (missing "blockchain account" on this group).
+            //
+            // --------------------------------------------------------------------------------
+            // If any of the provider failed to create their accounts, then we consider the
+            // multichain account group to have failed too.
+            if (results.some((result) => result.status === 'rejected')) {
+                // NOTE: Some accounts might still have been created on other account providers. We
+                // don't rollback them.
+                const error = `Unable to create multichain account group for index: ${groupIndex}`;
+                let warn = `${error}:`;
+                for (const result of results) {
+                    if (result.status === 'rejected') {
+                        warn += `\n- ${result.reason}`;
+                    }
+                }
+                console.warn(warn);
+                throw new Error(error);
+            }
+            // Because of the :accountAdded automatic sync, we might already have created the
+            // group, so we first try to get it.
+            group = this.getMultichainAccountGroup(groupIndex);
+            if (!group) {
+                // If for some reason it's still not created, we're creating it explicitly now:
+                group = new MultichainAccountGroup({
+                    wallet: this,
+                    providers: __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f"),
+                    groupIndex,
+                    messenger: __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f"),
+                });
+            }
+            // Register the account to our internal map.
+            __classPrivateFieldGet(this, _MultichainAccountWallet_accountGroups, "f").set(groupIndex, group); // `group` cannot be undefined here.
+            if (__classPrivateFieldGet(this, _MultichainAccountWallet_initialized, "f")) {
+                __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f").publish('MultichainAccountService:multichainAccountGroupCreated', group);
+            }
+            return group;
+        });
     }
     /**
      * Creates the next multichain account group.
@@ -251,113 +268,123 @@ export class MultichainAccountWallet {
         return this.createMultichainAccountGroup(this.getNextGroupIndex());
     }
     /**
-     * Gets whether alignment is currently in progress for this wallet.
+     * Align all accounts from each existing multichain account groups.
      *
-     * @returns True if alignment is in progress, false otherwise.
-     */
-    getIsAlignmentInProgress() {
-        return __classPrivateFieldGet(this, _MultichainAccountWallet_isAlignmentInProgress, "f");
-    }
-    /**
-     * Align all multichain account groups.
+     * NOTE: This operation WILL lock the wallet's mutex.
      */
-    async alignGroups() {
-        if (__classPrivateFieldGet(this, _MultichainAccountWallet_isAlignmentInProgress, "f")) {
-            return; // Prevent concurrent alignments
-        }
-        __classPrivateFieldSet(this, _MultichainAccountWallet_isAlignmentInProgress, true, "f");
-        try {
-            const groups = this.getMultichainAccountGroups();
-            await Promise.all(groups.map((g) => g.align()));
-        }
-        finally {
-            __classPrivateFieldSet(this, _MultichainAccountWallet_isAlignmentInProgress, false, "f");
-        }
+    async alignAccounts() {
+        await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_withLock).call(this, 'in-progress:alignment', async () => {
+            await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_alignAccounts).call(this);
+        });
     }
     /**
      * Align a specific multichain account group.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @param groupIndex - The group index to align.
      */
     async alignGroup(groupIndex) {
-        if (__classPrivateFieldGet(this, _MultichainAccountWallet_isAlignmentInProgress, "f")) {
-            return; // Prevent concurrent alignments
-        }
-        __classPrivateFieldSet(this, _MultichainAccountWallet_isAlignmentInProgress, true, "f");
-        try {
+        await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_withLock).call(this, 'in-progress:alignment', async () => {
             const group = this.getMultichainAccountGroup(groupIndex);
             if (group) {
                 await group.align();
             }
-        }
-        finally {
-            __classPrivateFieldSet(this, _MultichainAccountWallet_isAlignmentInProgress, false, "f");
-        }
+        });
     }
     /**
      * Discover and create accounts for all providers.
      *
+     * NOTE: This operation WILL lock the wallet's mutex.
+     *
      * @returns The discovered accounts for each provider.
      */
-    async discoverAndCreateAccounts() {
-        // Start with the next available group index (so we can resume the discovery
-        // from there).
-        let maxGroupIndex = this.getNextGroupIndex();
-        // One serialized loop per provider; all run concurrently
-        const runProviderDiscovery = async (context) => {
-            const message = (stepName, groupIndex) => `[${context.provider.getName()}] Discovery ${stepName} (groupIndex=${groupIndex})`;
-            while (!context.stopped) {
-                // Fast‑forward to current high‑water mark
-                const targetGroupIndex = Math.max(context.groupIndex, maxGroupIndex);
-                log(message('STARTED', targetGroupIndex));
-                let accounts = [];
-                try {
-                    accounts = await context.provider.discoverAndCreateAccounts({
-                        entropySource: __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f"),
-                        groupIndex: targetGroupIndex,
-                    });
-                }
-                catch (error) {
-                    context.stopped = true;
-                    console.error(error);
-                    log(message('FAILED', targetGroupIndex), error);
-                    break;
-                }
-                if (!accounts.length) {
-                    log(message('STOPPED', targetGroupIndex));
-                    context.stopped = true;
-                    break;
+    async discoverAccounts() {
+        return __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_withLock).call(this, 'in-progress:discovery', async () => {
+            // Start with the next available group index (so we can resume the discovery
+            // from there).
+            let maxGroupIndex = this.getNextGroupIndex();
+            // One serialized loop per provider; all run concurrently
+            const runProviderDiscovery = async (context) => {
+                const message = (stepName, groupIndex) => `[${context.provider.getName()}] Discovery ${stepName} (groupIndex=${groupIndex})`;
+                while (!context.stopped) {
+                    // Fast‑forward to current high‑water mark
+                    const targetGroupIndex = Math.max(context.groupIndex, maxGroupIndex);
+                    log(message('STARTED', targetGroupIndex));
+                    let accounts = [];
+                    try {
+                        accounts = await context.provider.discoverAccounts({
+                            entropySource: __classPrivateFieldGet(this, _MultichainAccountWallet_entropySource, "f"),
+                            groupIndex: targetGroupIndex,
+                        });
+                    }
+                    catch (error) {
+                        context.stopped = true;
+                        console.error(error);
+                        log(message('FAILED', targetGroupIndex), error);
+                        break;
+                    }
+                    if (!accounts.length) {
+                        log(message('STOPPED', targetGroupIndex));
+                        context.stopped = true;
+                        break;
+                    }
+                    log(message('SUCCEEDED', targetGroupIndex));
+                    context.accounts = context.accounts.concat(accounts);
+                    const nextGroupIndex = targetGroupIndex + 1;
+                    context.groupIndex = nextGroupIndex;
+                    if (nextGroupIndex > maxGroupIndex) {
+                        maxGroupIndex = nextGroupIndex;
+                    }
                 }
-                log(message('SUCCEEDED', targetGroupIndex));
-                context.count += accounts.length;
-                const nextGroupIndex = targetGroupIndex + 1;
-                context.groupIndex = nextGroupIndex;
-                if (nextGroupIndex > maxGroupIndex) {
-                    maxGroupIndex = nextGroupIndex;
-                }
-            }
-        };
-        const providerContexts = __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f").map((provider) => ({
-            provider,
-            stopped: false,
-            groupIndex: maxGroupIndex,
-            count: 0,
-        }));
-        // Start discovery for each providers.
-        await Promise.all(providerContexts.map(runProviderDiscovery));
-        // Sync the wallet after discovery to ensure that the newly added accounts are added into their groups.
-        // We can potentially remove this if we know that this race condition is not an issue in practice.
-        this.sync();
-        // Align missing accounts from group. This is required to create missing account from non-discovered
-        // indexes for some providers.
-        await this.alignGroups();
-        const discoveredAccounts = {};
-        for (const context of providerContexts) {
-            const providerName = context.provider.getName();
-            discoveredAccounts[providerName] = context.count;
-        }
-        return discoveredAccounts;
+            };
+            const providerContexts = __classPrivateFieldGet(this, _MultichainAccountWallet_providers, "f").map((provider) => ({
+                provider,
+                stopped: false,
+                groupIndex: maxGroupIndex,
+                accounts: [],
+            }));
+            // Start discovery for each providers.
+            await Promise.all(providerContexts.map(runProviderDiscovery));
+            // Sync the wallet after discovery to ensure that the newly added accounts are added into their groups.
+            // We can potentially remove this if we know that this race condition is not an issue in practice.
+            this.sync();
+            // Align missing accounts from group. This is required to create missing account from non-discovered
+            // indexes for some providers.
+            await __classPrivateFieldGet(this, _MultichainAccountWallet_instances, "m", _MultichainAccountWallet_alignAccounts).call(this);
+            return providerContexts.flatMap((context) => context.accounts);
+        });
     }
 }
-_MultichainAccountWallet_id = new WeakMap(), _MultichainAccountWallet_providers = new WeakMap(), _MultichainAccountWallet_entropySource = new WeakMap(), _MultichainAccountWallet_accountGroups = new WeakMap(), _MultichainAccountWallet_messenger = new WeakMap(), _MultichainAccountWallet_initialized = new WeakMap(), _MultichainAccountWallet_isAlignmentInProgress = new WeakMap();
+_MultichainAccountWallet_lock = new WeakMap(), _MultichainAccountWallet_id = new WeakMap(), _MultichainAccountWallet_providers = new WeakMap(), _MultichainAccountWallet_entropySource = new WeakMap(), _MultichainAccountWallet_accountGroups = new WeakMap(), _MultichainAccountWallet_messenger = new WeakMap(), _MultichainAccountWallet_initialized = new WeakMap(), _MultichainAccountWallet_status = new WeakMap(), _MultichainAccountWallet_instances = new WeakSet(), _MultichainAccountWallet_withLock = 
+/**
+ * Set the wallet status and run the associated operation callback.
+ *
+ * @param status - Wallet status associated with this operation.
+ * @param operation - Operation to run.
+ * @returns The operation's result.
+ * @throws {Error} If the wallet is already running a mutable operation.
+ */
+async function _MultichainAccountWallet_withLock(status, operation) {
+    const release = await __classPrivateFieldGet(this, _MultichainAccountWallet_lock, "f").acquire();
+    try {
+        __classPrivateFieldSet(this, _MultichainAccountWallet_status, status, "f");
+        __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f").publish('MultichainAccountService:walletStatusChange', this.id, __classPrivateFieldGet(this, _MultichainAccountWallet_status, "f"));
+        return await operation();
+    }
+    finally {
+        __classPrivateFieldSet(this, _MultichainAccountWallet_status, 'ready', "f");
+        __classPrivateFieldGet(this, _MultichainAccountWallet_messenger, "f").publish('MultichainAccountService:walletStatusChange', this.id, __classPrivateFieldGet(this, _MultichainAccountWallet_status, "f"));
+        release();
+    }
+}, _MultichainAccountWallet_alignAccounts = 
+/**
+ * Align all multichain account groups.
+ *
+ * NOTE: This operation WILL NOT lock the wallet's mutex.
+ */
+async function _MultichainAccountWallet_alignAccounts() {
+    const groups = this.getMultichainAccountGroups();
+    await Promise.all(groups.map((group) => group.align()));
+};
 //# sourceMappingURL=MultichainAccountWallet.mjs.map