@metamask-previews/keyring-controller 14.0.1-preview-f04be62f → 15.0.0-preview-11ae513

package/dist/{chunk-BVSGYW4D.js → chunk-LKJCRVNR.js}

@@ -3,7 +3,7 @@
 
 
 
-var _chunkCHLPTPMZjs = require('./chunk-CHLPTPMZ.js');
+var _chunkDNQK26H6js = require('./chunk-DNQK26H6.js');
 
 // src/KeyringController.ts
 var _util = require('@ethereumjs/util');
@@ -86,7 +86,7 @@ async function displayForKeyring(keyring) {
     accounts: accounts.map(_ethsigutil.normalize)
   };
 }
-var _keyringBuilders, _keyrings, _unsupportedKeyrings, _password, _encryptor, _cacheEncryptionKey, _qrKeyringStateListener, _registerMessageHandlers, registerMessageHandlers_fn, _getKeyringBuilderForType, getKeyringBuilderForType_fn, _addQRKeyring, addQRKeyring_fn, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn, _updateKeyringsInState, updateKeyringsInState_fn, _unlockKeyrings, unlockKeyrings_fn, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn, _newKeyring, newKeyring_fn, _clearKeyrings, clearKeyrings_fn, _restoreKeyring, restoreKeyring_fn, _destroyKeyring, destroyKeyring_fn, _removeEmptyKeyrings, removeEmptyKeyrings_fn, _checkForDuplicate, checkForDuplicate_fn, _setUnlocked, setUnlocked_fn, _getMemState, getMemState_fn;
+var _initVaultMutex, _vaultOperationMutex, _keyringBuilders, _keyrings, _unsupportedKeyrings, _password, _encryptor, _cacheEncryptionKey, _qrKeyringStateListener, _registerMessageHandlers, registerMessageHandlers_fn, _getKeyringBuilderForType, getKeyringBuilderForType_fn, _addQRKeyring, addQRKeyring_fn, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn, _getUpdatedKeyrings, getUpdatedKeyrings_fn, _unlockKeyrings, unlockKeyrings_fn, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn, _newKeyring, newKeyring_fn, _clearKeyrings, clearKeyrings_fn, _restoreKeyring, restoreKeyring_fn, _destroyKeyring, destroyKeyring_fn, _removeEmptyKeyrings, removeEmptyKeyrings_fn, _checkForDuplicate, checkForDuplicate_fn, _setUnlocked, setUnlocked_fn, _getMemState, getMemState_fn, _withVaultLock, withVaultLock_fn;
 var KeyringController = class extends _basecontroller.BaseController {
   /**
    * Creates a KeyringController instance.
@@ -124,14 +124,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      * Constructor helper for registering this controller's messaging system
      * actions.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _registerMessageHandlers);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _registerMessageHandlers);
     /**
      * Get the keyring builder for the given `type`.
      *
      * @param type - The type of keyring to get the builder for.
      * @returns The keyring builder, or undefined if none exists.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _getKeyringBuilderForType);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _getKeyringBuilderForType);
     /**
      * Add qr hardware keyring.
      *
@@ -139,15 +139,15 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @throws If a QRKeyring builder is not provided
      * when initializing the controller
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _addQRKeyring);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _addQRKeyring);
     /**
      * Subscribe to a QRKeyring state change events and
      * forward them through the messaging system.
      *
      * @param qrKeyring - The QRKeyring instance to subscribe to
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _subscribeToQRKeyringEvents);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _unsubscribeFromQRKeyringsEvents);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _subscribeToQRKeyringEvents);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _unsubscribeFromQRKeyringsEvents);
     /**
      * Create new vault with an initial keyring
      *
@@ -162,11 +162,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param keyring.opts - Optional parameters required to instantiate the keyring.
      * @returns A promise that resolves to the state.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _createNewVaultWithKeyring);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _createNewVaultWithKeyring);
     /**
-     * Update the controller state with its current keyrings.
+     * Get the updated array of each keyring's type and
+     * accounts list.
+     *
+     * @returns A promise resolving to the updated keyrings array.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _updateKeyringsInState);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _getUpdatedKeyrings);
     /**
      * Unlock Keyrings, decrypting the vault and deserializing all
      * keyrings contained in it, using a password or an encryption key with salt.
@@ -176,7 +179,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param encryptionSalt - The salt used to encrypt the vault.
      * @returns A promise resolving to the deserialized keyrings array.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _unlockKeyrings);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _unlockKeyrings);
     /**
      * Create a new keyring, ensuring that the first account is
      * also created.
@@ -185,7 +188,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param opts - Optional parameters required to instantiate the keyring.
      * @returns A promise that resolves if the operation is successful.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _createKeyringWithFirstAccount);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _createKeyringWithFirstAccount);
     /**
      * Instantiate, initialize and return a new keyring of the given `type`,
      * using the given `opts`. The keyring is built using the keyring builder
@@ -195,12 +198,15 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param data - The data to restore a previously serialized keyring.
      * @returns The new keyring.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _newKeyring);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _newKeyring);
     /**
      * Remove all managed keyrings, destroying all their
      * instances in memory.
+     *
+     * @param options - Operations options.
+     * @param options.skipStateUpdate - Whether to skip updating the controller state.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _clearKeyrings);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _clearKeyrings);
     /**
      * Restore a Keyring from a provided serialized payload.
      * On success, returns the resulting keyring instance.
@@ -208,7 +214,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param serialized - The serialized keyring.
      * @returns The deserialized keyring or undefined if the keyring type is unsupported.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _restoreKeyring);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _restoreKeyring);
     /**
      * Destroy Keyring
      *
@@ -218,14 +224,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      *
      * @param keyring - The keyring to destroy.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _destroyKeyring);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _destroyKeyring);
     /**
      * Remove empty keyrings.
      *
      * Loops through the keyrings and removes the ones with empty accounts
      * (usually after removing the last / only account) from a keyring.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _removeEmptyKeyrings);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _removeEmptyKeyrings);
     /**
      * Checks for duplicate keypairs, using the the first account in the given
      * array. Rejects if a duplicate is found.
@@ -236,32 +242,45 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param newAccountArray - Array of new accounts.
      * @returns The account, if no duplicate is found.
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _checkForDuplicate);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _checkForDuplicate);
     /**
      * Set the `isUnlocked` to true and notify listeners
      * through the messenger.
      *
      * @fires KeyringController:unlock
      */
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _setUnlocked);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _getMemState);
-    this.mutex = new (0, _asyncmutex.Mutex)();
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _keyringBuilders, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _keyrings, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _unsupportedKeyrings, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _password, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _encryptor, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _cacheEncryptionKey, void 0);
-    _chunkCHLPTPMZjs.__privateAdd.call(void 0, this, _qrKeyringStateListener, void 0);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyringBuilders, keyringBuilders ? defaultKeyringBuilders.concat(keyringBuilders) : defaultKeyringBuilders);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _encryptor, encryptor);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyrings, []);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _unsupportedKeyrings, []);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _cacheEncryptionKey, Boolean(options.cacheEncryptionKey));
-    if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _setUnlocked);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _getMemState);
+    /**
+     * Lock the vault mutex before executing the given function,
+     * and release it after the function is resolved or after an
+     * error is thrown.
+     *
+     * This ensures that each operation that interacts with the vault
+     * is executed in a mutually exclusive way.
+     *
+     * @param fn - The function to execute while the vault mutex is locked.
+     * @returns The result of the function.
+     */
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _withVaultLock);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _initVaultMutex, new (0, _asyncmutex.Mutex)());
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _vaultOperationMutex, new (0, _asyncmutex.Mutex)());
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _keyringBuilders, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _keyrings, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _unsupportedKeyrings, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _password, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _encryptor, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _cacheEncryptionKey, void 0);
+    _chunkDNQK26H6js.__privateAdd.call(void 0, this, _qrKeyringStateListener, void 0);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyringBuilders, keyringBuilders ? defaultKeyringBuilders.concat(keyringBuilders) : defaultKeyringBuilders);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _encryptor, encryptor);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyrings, []);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _unsupportedKeyrings, []);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _cacheEncryptionKey, Boolean(options.cacheEncryptionKey));
+    if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
       assertIsExportableKeyEncryptor(encryptor);
     }
-    _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+    _chunkDNQK26H6js.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
   }
   /**
    * Adds a new account to the default (first) HD seed phrase keyring.
@@ -276,15 +295,18 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!primaryKeyring) {
       throw new Error("No HD keyring found");
     }
-    const oldAccounts = await this.getAccounts();
+    const oldAccounts = await primaryKeyring.getAccounts();
     if (accountCount && oldAccounts.length !== accountCount) {
       if (accountCount > oldAccounts.length) {
         throw new Error("Account out of sequence");
       }
-      const primaryKeyringAccounts = await primaryKeyring.getAccounts();
+      const existingAccount = oldAccounts[accountCount];
+      if (!existingAccount) {
+        throw new Error(`Can't find account at index ${accountCount}`);
+      }
       return {
-        keyringState: _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
-        addedAccountAddress: primaryKeyringAccounts[accountCount]
+        keyringState: _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
+        addedAccountAddress: existingAccount
       };
     }
     const addedAccountAddress = await this.addNewAccountForKeyring(
@@ -292,7 +314,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     );
     await this.verifySeedPhrase();
     return {
-      keyringState: _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
+      keyringState: _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
       addedAccountAddress
     };
   }
@@ -334,7 +356,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     await primaryKeyring.addAccounts(1);
     await this.persistAllKeyrings();
     await this.verifySeedPhrase();
-    return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
   }
   /**
    * Effectively the same as creating a new keychain then populating it
@@ -346,19 +368,19 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the restored keychain object.
    */
   async createNewVaultAndRestore(password, seed) {
-    const releaseLock = await this.mutex.acquire();
+    const releaseLock = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _initVaultMutex).acquire();
     if (!password || !password.length) {
       throw new Error("Invalid password");
     }
     try {
-      await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
+      await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
         type: "HD Key Tree" /* hd */,
         opts: {
           mnemonic: seed,
           numberOfAccounts: 1
         }
       });
-      return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+      return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
     } finally {
       releaseLock();
     }
@@ -370,15 +392,15 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Newly-created keychain object.
    */
   async createNewVaultAndKeychain(password) {
-    const releaseLock = await this.mutex.acquire();
+    const releaseLock = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _initVaultMutex).acquire();
     try {
       const accounts = await this.getAccounts();
       if (!accounts.length) {
-        await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
+        await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
           type: "HD Key Tree" /* hd */
         });
       }
-      return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+      return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
     } finally {
       releaseLock();
     }
@@ -395,7 +417,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (type === "QR Hardware Wallet Device" /* qr */) {
       return this.getOrAddQRKeyring();
     }
-    const keyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts);
+    const keyring = await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts);
     if (type === "HD Key Tree" /* hd */ && (!_utils.isObject.call(void 0, opts) || !opts.mnemonic)) {
       if (!keyring.generateRandomMnemonic) {
         throw new Error(
@@ -406,8 +428,8 @@ var KeyringController = class extends _basecontroller.BaseController {
       await keyring.addAccounts(1);
     }
     const accounts = await keyring.getAccounts();
-    await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, type, accounts);
-    _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).push(keyring);
+    await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, type, accounts);
+    _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).push(keyring);
     await this.persistAllKeyrings();
     return keyring;
   }
@@ -421,7 +443,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!this.state.vault) {
       throw new Error("KeyringController - Cannot unlock without a previous vault." /* VaultError */);
     }
-    await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, this.state.vault);
+    await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).decrypt(password, this.state.vault);
   }
   /**
    * Returns the status of the vault.
@@ -439,8 +461,8 @@ var KeyringController = class extends _basecontroller.BaseController {
    */
   async exportSeedPhrase(password) {
     await this.verifyPassword(password);
-    assertHasUint8ArrayMnemonic(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings)[0]);
-    return _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings)[0].mnemonic;
+    assertHasUint8ArrayMnemonic(_chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings)[0]);
+    return _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings)[0].mnemonic;
   }
   /**
    * Gets the private key from the keyring controlling an address.
@@ -460,12 +482,12 @@ var KeyringController = class extends _basecontroller.BaseController {
     return await keyring.exportAccount(_ethsigutil.normalize.call(void 0, address));
   }
   /**
-   * Returns the public addresses of all accounts for the current keyring.
+   * Returns the public addresses of all accounts from every keyring.
    *
    * @returns A promise resolving to an array of addresses.
    */
   async getAccounts() {
-    const keyrings = _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings);
+    const keyrings = _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings);
     const keyringArrays = await Promise.all(
       keyrings.map(async (keyring) => keyring.getAccounts())
     );
@@ -523,7 +545,7 @@ var KeyringController = class extends _basecontroller.BaseController {
   async getKeyringForAccount(account) {
     const hexed = _ethsigutil.normalize.call(void 0, account);
     const candidates = await Promise.all(
-      _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+      _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
         return Promise.all([keyring, keyring.getAccounts()]);
       })
     );
@@ -556,7 +578,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns An array of keyrings of the given type.
    */
   getKeyringsByType(type) {
-    return _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).filter((keyring) => keyring.type === type);
+    return _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).filter((keyring) => keyring.type === type);
   }
   /**
    * Persist all serialized keyrings in the vault.
@@ -565,60 +587,66 @@ var KeyringController = class extends _basecontroller.BaseController {
    * operation completes.
    */
   async persistAllKeyrings() {
-    const { encryptionKey, encryptionSalt } = this.state;
-    if (!_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password) && !encryptionKey) {
-      throw new Error("KeyringController - Cannot persist vault without password and encryption key" /* MissingCredentials */);
-    }
-    const serializedKeyrings = await Promise.all(
-      _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
-        const [type, data] = await Promise.all([
-          keyring.type,
-          keyring.serialize()
-        ]);
-        return { type, data };
-      })
-    );
-    serializedKeyrings.push(..._chunkCHLPTPMZjs.__privateGet.call(void 0, this, _unsupportedKeyrings));
-    let vault;
-    let newEncryptionKey;
-    if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
-      assertIsExportableKeyEncryptor(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor));
-      if (encryptionKey) {
-        const key = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
-        const vaultJSON = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).encryptWithKey(
-          key,
-          serializedKeyrings
-        );
-        vaultJSON.salt = encryptionSalt;
-        vault = JSON.stringify(vaultJSON);
-      } else if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password)) {
-        const { vault: newVault, exportedKeyString } = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).encryptWithDetail(
-          _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password),
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _withVaultLock, withVaultLock_fn).call(this, async () => {
+      const { encryptionKey, encryptionSalt } = this.state;
+      if (!_chunkDNQK26H6js.__privateGet.call(void 0, this, _password) && !encryptionKey) {
+        throw new Error("KeyringController - Cannot persist vault without password and encryption key" /* MissingCredentials */);
+      }
+      const serializedKeyrings = await Promise.all(
+        _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+          const [type, data] = await Promise.all([
+            keyring.type,
+            keyring.serialize()
+          ]);
+          return { type, data };
+        })
+      );
+      serializedKeyrings.push(..._chunkDNQK26H6js.__privateGet.call(void 0, this, _unsupportedKeyrings));
+      if (!serializedKeyrings.some((keyring) => keyring.type === "HD Key Tree" /* hd */)) {
+        throw new Error("KeyringController - No HD Keyring found" /* NoHdKeyring */);
+      }
+      const updatedState = {};
+      if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+        assertIsExportableKeyEncryptor(_chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor));
+        if (encryptionKey) {
+          const key = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
+          const vaultJSON = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).encryptWithKey(
+            key,
+            serializedKeyrings
+          );
+          vaultJSON.salt = encryptionSalt;
+          updatedState.vault = JSON.stringify(vaultJSON);
+        } else if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _password)) {
+          const { vault: newVault, exportedKeyString } = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).encryptWithDetail(
+            _chunkDNQK26H6js.__privateGet.call(void 0, this, _password),
+            serializedKeyrings
+          );
+          updatedState.vault = newVault;
+          updatedState.encryptionKey = exportedKeyString;
+        }
+      } else {
+        if (typeof _chunkDNQK26H6js.__privateGet.call(void 0, this, _password) !== "string") {
+          throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+        }
+        updatedState.vault = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).encrypt(
+          _chunkDNQK26H6js.__privateGet.call(void 0, this, _password),
           serializedKeyrings
         );
-        vault = newVault;
-        newEncryptionKey = exportedKeyString;
       }
-    } else {
-      if (typeof _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password) !== "string") {
-        throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+      if (!updatedState.vault) {
+        throw new Error("KeyringController - Cannot persist vault without vault information" /* MissingVaultData */);
       }
-      vault = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).encrypt(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password), serializedKeyrings);
-    }
-    if (!vault) {
-      throw new Error("KeyringController - Cannot persist vault without vault information" /* MissingVaultData */);
-    }
-    this.update((state) => {
-      state.vault = vault;
-    });
-    await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _updateKeyringsInState, updateKeyringsInState_fn).call(this);
-    if (newEncryptionKey) {
+      const updatedKeyrings = await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
       this.update((state) => {
-        state.encryptionKey = newEncryptionKey;
-        state.encryptionSalt = JSON.parse(vault).salt;
+        state.vault = updatedState.vault;
+        state.keyrings = updatedKeyrings;
+        if (updatedState.encryptionKey) {
+          state.encryptionKey = updatedState.encryptionKey;
+          state.encryptionSalt = JSON.parse(updatedState.vault).salt;
+        }
       });
-    }
-    return true;
+      return true;
+    });
   }
   /**
    * Imports an account with the specified import strategy.
@@ -668,7 +696,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     ]);
     const accounts = await newKeyring.getAccounts();
     return {
-      keyringState: _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
+      keyringState: _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this),
       importedAccountAddress: accounts[0]
     };
   }
@@ -689,11 +717,11 @@ var KeyringController = class extends _basecontroller.BaseController {
     await keyring.removeAccount(address);
     const accounts = await keyring.getAccounts();
     if (accounts.length === 0) {
-      await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _removeEmptyKeyrings, removeEmptyKeyrings_fn).call(this);
+      await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _removeEmptyKeyrings, removeEmptyKeyrings_fn).call(this);
     }
     await this.persistAllKeyrings();
     this.messagingSystem.publish(`${name}:accountRemoved`, address);
-    return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
   }
   /**
    * Deallocates all secrets and locks the wallet.
@@ -701,15 +729,15 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to current state.
    */
   async setLocked() {
-    _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, void 0);
+    _chunkDNQK26H6js.__privateMethod.call(void 0, this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _password, void 0);
     this.update((state) => {
       state.isUnlocked = false;
       state.keyrings = [];
     });
-    await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+    await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
     this.messagingSystem.publish(`${name}:lock`);
-    return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
   }
   /**
    * Signs message by calling down into a specific keyring.
@@ -803,9 +831,10 @@ var KeyringController = class extends _basecontroller.BaseController {
    *
    * @param from - Address of the sender.
    * @param transactions - Base transactions to include in the UserOperation.
+   * @param executionContext - The execution context to use for the UserOperation.
    * @returns A pseudo-UserOperation that can be used to construct a real.
    */
-  async prepareUserOperation(from, transactions) {
+  async prepareUserOperation(from, transactions, executionContext) {
     const address = _ethsigutil.normalize.call(void 0, from);
     const keyring = await this.getKeyringForAccount(
       address
@@ -813,7 +842,11 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!keyring.prepareUserOperation) {
       throw new Error("KeyringController - The keyring for the current address does not support the method prepareUserOperation." /* UnsupportedPrepareUserOperation */);
     }
-    return await keyring.prepareUserOperation(address, transactions);
+    return await keyring.prepareUserOperation(
+      address,
+      transactions,
+      executionContext
+    );
   }
   /**
    * Patches properties of a UserOperation. Currently, only the
@@ -821,9 +854,10 @@ var KeyringController = class extends _basecontroller.BaseController {
    *
    * @param from - Address of the sender.
    * @param userOp - UserOperation to patch.
+   * @param executionContext - The execution context to use for the UserOperation.
    * @returns A patch to apply to the UserOperation.
    */
-  async patchUserOperation(from, userOp) {
+  async patchUserOperation(from, userOp, executionContext) {
     const address = _ethsigutil.normalize.call(void 0, from);
     const keyring = await this.getKeyringForAccount(
       address
@@ -831,16 +865,17 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!keyring.patchUserOperation) {
       throw new Error("KeyringController - The keyring for the current address does not support the method patchUserOperation." /* UnsupportedPatchUserOperation */);
     }
-    return await keyring.patchUserOperation(address, userOp);
+    return await keyring.patchUserOperation(address, userOp, executionContext);
   }
   /**
    * Signs an UserOperation.
    *
    * @param from - Address of the sender.
    * @param userOp - UserOperation to sign.
+   * @param executionContext - The execution context to use for the UserOperation.
    * @returns The signature of the UserOperation.
    */
-  async signUserOperation(from, userOp) {
+  async signUserOperation(from, userOp, executionContext) {
     const address = _ethsigutil.normalize.call(void 0, from);
     const keyring = await this.getKeyringForAccount(
       address
@@ -848,7 +883,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!keyring.signUserOperation) {
       throw new Error("KeyringController - The keyring for the current address does not support the method signUserOperation." /* UnsupportedSignUserOperation */);
     }
-    return await keyring.signUserOperation(address, userOp);
+    return await keyring.signUserOperation(address, userOp, executionContext);
   }
   /**
    * Attempts to decrypt the current vault and load its keyrings,
@@ -859,13 +894,13 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the current state.
    */
   async submitEncryptionKey(encryptionKey, encryptionSalt) {
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyrings, await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, void 0, encryptionKey, encryptionSalt));
-    _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyrings, await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, void 0, encryptionKey, encryptionSalt));
+    _chunkDNQK26H6js.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
     const qrKeyring = this.getQRKeyring();
     if (qrKeyring) {
-      _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
+      _chunkDNQK26H6js.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
     }
-    return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
   }
   /**
    * Attempts to decrypt the current vault and load its keyrings,
@@ -875,13 +910,13 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the current state.
    */
   async submitPassword(password) {
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyrings, await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, password));
-    _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+    _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyrings, await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, password));
+    _chunkDNQK26H6js.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
     const qrKeyring = this.getQRKeyring();
     if (qrKeyring) {
-      _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
+      _chunkDNQK26H6js.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
     }
-    return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+    return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
   }
   /**
    * Verifies the that the seed phrase restores the current keychain's accounts.
@@ -899,7 +934,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (accounts.length === 0) {
       throw new Error("Cannot verify an empty keyring.");
     }
-    const hdKeyringBuilder = _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, "HD Key Tree" /* hd */);
+    const hdKeyringBuilder = _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, "HD Key Tree" /* hd */);
     const hdKeyring = hdKeyringBuilder();
     await hdKeyring.deserialize({
       mnemonic: seedWords,
@@ -931,7 +966,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns The added keyring
    */
   async getOrAddQRKeyring() {
-    return this.getQRKeyring() || await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
+    return this.getQRKeyring() || await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
   }
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1011,6 +1046,8 @@ var KeyringController = class extends _basecontroller.BaseController {
     return { removedAccounts, remainingAccounts };
   }
 };
+_initVaultMutex = new WeakMap();
+_vaultOperationMutex = new WeakMap();
 _keyringBuilders = new WeakMap();
 _keyrings = new WeakMap();
 _unsupportedKeyrings = new WeakMap();
@@ -1071,28 +1108,28 @@ registerMessageHandlers_fn = function() {
 };
 _getKeyringBuilderForType = new WeakSet();
 getKeyringBuilderForType_fn = function(type) {
-  return _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyringBuilders).find(
+  return _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyringBuilders).find(
     (keyringBuilder) => keyringBuilder.type === type
   );
 };
 _addQRKeyring = new WeakSet();
 addQRKeyring_fn = async function() {
-  const qrKeyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
+  const qrKeyring = await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
     accounts: []
   });
   const accounts = await qrKeyring.getAccounts();
-  await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
-  _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).push(qrKeyring);
+  await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
+  _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).push(qrKeyring);
   await this.persistAllKeyrings();
-  _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
+  _chunkDNQK26H6js.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
   return qrKeyring;
 };
 _subscribeToQRKeyringEvents = new WeakSet();
 subscribeToQRKeyringEvents_fn = function(qrKeyring) {
-  _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _qrKeyringStateListener, (state) => {
+  _chunkDNQK26H6js.__privateSet.call(void 0, this, _qrKeyringStateListener, (state) => {
     this.messagingSystem.publish(`${name}:qrKeyringStateChange`, state);
   });
-  qrKeyring.getMemStore().subscribe(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
+  qrKeyring.getMemStore().subscribe(_chunkDNQK26H6js.__privateGet.call(void 0, this, _qrKeyringStateListener));
 };
 _unsubscribeFromQRKeyringsEvents = new WeakSet();
 unsubscribeFromQRKeyringsEvents_fn = function() {
@@ -1100,8 +1137,8 @@ unsubscribeFromQRKeyringsEvents_fn = function() {
     "QR Hardware Wallet Device" /* qr */
   );
   qrKeyrings.forEach((qrKeyring) => {
-    if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _qrKeyringStateListener)) {
-      qrKeyring.getMemStore().unsubscribe(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
+    if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _qrKeyringStateListener)) {
+      qrKeyring.getMemStore().unsubscribe(_chunkDNQK26H6js.__privateGet.call(void 0, this, _qrKeyringStateListener));
     }
   });
 };
@@ -1110,71 +1147,78 @@ createNewVaultWithKeyring_fn = async function(password, keyring) {
   if (typeof password !== "string") {
     throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
   }
-  _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, password);
-  await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
-  await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
-  _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
-  return _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
+  _chunkDNQK26H6js.__privateSet.call(void 0, this, _password, password);
+  await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+  await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
+  _chunkDNQK26H6js.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+  return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getMemState, getMemState_fn).call(this);
 };
-_updateKeyringsInState = new WeakSet();
-updateKeyringsInState_fn = async function() {
-  const keyrings = await Promise.all(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).map(displayForKeyring));
-  this.update((state) => {
-    state.keyrings = keyrings;
-  });
+_getUpdatedKeyrings = new WeakSet();
+getUpdatedKeyrings_fn = async function() {
+  return Promise.all(_chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).map(displayForKeyring));
 };
 _unlockKeyrings = new WeakSet();
 unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
-  const encryptedVault = this.state.vault;
-  if (!encryptedVault) {
-    throw new Error("KeyringController - Cannot unlock without a previous vault." /* VaultError */);
-  }
-  await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
-  let vault;
-  if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
-    assertIsExportableKeyEncryptor(_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor));
-    if (password) {
-      const result = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).decryptWithDetail(
-        password,
-        encryptedVault
-      );
-      vault = result.vault;
-      _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, password);
-      this.update((state) => {
-        state.encryptionKey = result.exportedKeyString;
-        state.encryptionSalt = result.salt;
-      });
-    } else {
-      const parsedEncryptedVault = JSON.parse(encryptedVault);
-      if (encryptionSalt !== parsedEncryptedVault.salt) {
-        throw new Error("KeyringController - Encryption key and salt provided are expired" /* ExpiredCredentials */);
+  return _chunkDNQK26H6js.__privateMethod.call(void 0, this, _withVaultLock, withVaultLock_fn).call(this, async ({ releaseLock }) => {
+    const encryptedVault = this.state.vault;
+    if (!encryptedVault) {
+      throw new Error("KeyringController - Cannot unlock without a previous vault." /* VaultError */);
+    }
+    await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this, { skipStateUpdate: true });
+    let vault;
+    const updatedState = {};
+    if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+      assertIsExportableKeyEncryptor(_chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor));
+      if (password) {
+        const result = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).decryptWithDetail(
+          password,
+          encryptedVault
+        );
+        vault = result.vault;
+        _chunkDNQK26H6js.__privateSet.call(void 0, this, _password, password);
+        updatedState.encryptionKey = result.exportedKeyString;
+        updatedState.encryptionSalt = result.salt;
+      } else {
+        const parsedEncryptedVault = JSON.parse(encryptedVault);
+        if (encryptionSalt !== parsedEncryptedVault.salt) {
+          throw new Error("KeyringController - Encryption key and salt provided are expired" /* ExpiredCredentials */);
+        }
+        if (typeof encryptionKey !== "string") {
+          throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+        }
+        const key = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
+        vault = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).decryptWithKey(
+          key,
+          parsedEncryptedVault
+        );
+        updatedState.encryptionKey = encryptionKey;
+        updatedState.encryptionSalt = encryptionSalt;
       }
-      if (typeof encryptionKey !== "string") {
+    } else {
+      if (typeof password !== "string") {
         throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
       }
-      const key = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
-      vault = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).decryptWithKey(key, parsedEncryptedVault);
-      this.update((state) => {
-        state.encryptionKey = encryptionKey;
-        state.encryptionSalt = encryptionSalt;
-      });
+      vault = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).decrypt(password, encryptedVault);
+      _chunkDNQK26H6js.__privateSet.call(void 0, this, _password, password);
     }
-  } else {
-    if (typeof password !== "string") {
-      throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+    if (!isSerializedKeyringsArray(vault)) {
+      throw new Error("KeyringController - The decrypted vault has an unexpected shape." /* VaultDataError */);
     }
-    vault = await _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, encryptedVault);
-    _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, password);
-  }
-  if (!isSerializedKeyringsArray(vault)) {
-    throw new Error("KeyringController - The decrypted vault has an unexpected shape." /* VaultDataError */);
-  }
-  await Promise.all(vault.map(_chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _restoreKeyring, restoreKeyring_fn).bind(this)));
-  await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _updateKeyringsInState, updateKeyringsInState_fn).call(this);
-  if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _password) && (!_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey) || !encryptionKey) && _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated && !_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated(encryptedVault)) {
-    await this.persistAllKeyrings();
-  }
-  return _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings);
+    await Promise.all(vault.map(_chunkDNQK26H6js.__privateMethod.call(void 0, this, _restoreKeyring, restoreKeyring_fn).bind(this)));
+    const updatedKeyrings = await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
+    this.update((state) => {
+      state.keyrings = updatedKeyrings;
+      if (updatedState.encryptionKey || updatedState.encryptionSalt) {
+        state.encryptionKey = updatedState.encryptionKey;
+        state.encryptionSalt = updatedState.encryptionSalt;
+      }
+    });
+    if (_chunkDNQK26H6js.__privateGet.call(void 0, this, _password) && (!_chunkDNQK26H6js.__privateGet.call(void 0, this, _cacheEncryptionKey) || !encryptionKey) && _chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).isVaultUpdated && !_chunkDNQK26H6js.__privateGet.call(void 0, this, _encryptor).isVaultUpdated(encryptedVault)) {
+      releaseLock();
+      await this.persistAllKeyrings();
+    }
+    return _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings);
+  });
 };
 _createKeyringWithFirstAccount = new WeakSet();
 createKeyringWithFirstAccount_fn = async function(type, opts) {
@@ -1186,7 +1230,7 @@ createKeyringWithFirstAccount_fn = async function(type, opts) {
 };
 _newKeyring = new WeakSet();
 newKeyring_fn = async function(type, data) {
-  const keyringBuilder = _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, type);
+  const keyringBuilder = _chunkDNQK26H6js.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, type);
   if (!keyringBuilder) {
     throw new Error(
       `${"KeyringController - No keyringBuilder found for keyring" /* NoKeyringBuilder */}. Keyring type: ${type}`
@@ -1200,25 +1244,27 @@ newKeyring_fn = async function(type, data) {
   return keyring;
 };
 _clearKeyrings = new WeakSet();
-clearKeyrings_fn = async function() {
-  for (const keyring of _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings)) {
-    await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
+clearKeyrings_fn = async function(options = { skipStateUpdate: false }) {
+  for (const keyring of _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings)) {
+    await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
+  }
+  _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyrings, []);
+  if (!options.skipStateUpdate) {
+    this.update((state) => {
+      state.keyrings = [];
+    });
   }
-  _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyrings, []);
-  this.update((state) => {
-    state.keyrings = [];
-  });
 };
 _restoreKeyring = new WeakSet();
 restoreKeyring_fn = async function(serialized) {
   try {
     const { type, data } = serialized;
-    const keyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, data);
+    const keyring = await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, data);
     await keyring.getAccounts();
-    _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).push(keyring);
+    _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).push(keyring);
     return keyring;
   } catch (_) {
-    _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _unsupportedKeyrings).push(serialized);
+    _chunkDNQK26H6js.__privateGet.call(void 0, this, _unsupportedKeyrings).push(serialized);
     return void 0;
   }
 };
@@ -1230,16 +1276,16 @@ _removeEmptyKeyrings = new WeakSet();
 removeEmptyKeyrings_fn = async function() {
   const validKeyrings = [];
   await Promise.all(
-    _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+    _chunkDNQK26H6js.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
       const accounts = await keyring.getAccounts();
       if (accounts.length > 0) {
         validKeyrings.push(keyring);
       } else {
-        await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
+        await _chunkDNQK26H6js.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
       }
     })
   );
-  _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _keyrings, validKeyrings);
+  _chunkDNQK26H6js.__privateSet.call(void 0, this, _keyrings, validKeyrings);
 };
 _checkForDuplicate = new WeakSet();
 checkForDuplicate_fn = async function(type, newAccountArray) {
@@ -1275,6 +1321,15 @@ getMemState_fn = function() {
     keyrings: this.state.keyrings
   };
 };
+_withVaultLock = new WeakSet();
+withVaultLock_fn = async function(fn) {
+  const releaseLock = await _chunkDNQK26H6js.__privateGet.call(void 0, this, _vaultOperationMutex).acquire();
+  try {
+    return await fn({ releaseLock });
+  } finally {
+    releaseLock();
+  }
+};
 var KeyringController_default = KeyringController;
 
 
@@ -1287,4 +1342,4 @@ var KeyringController_default = KeyringController;
 
 
 exports.KeyringTypes = KeyringTypes; exports.isCustodyKeyring = isCustodyKeyring; exports.AccountImportStrategy = AccountImportStrategy; exports.SignTypedDataVersion = SignTypedDataVersion; exports.keyringBuilderFactory = keyringBuilderFactory; exports.getDefaultKeyringState = getDefaultKeyringState; exports.KeyringController = KeyringController; exports.KeyringController_default = KeyringController_default;
-//# sourceMappingURL=chunk-BVSGYW4D.js.map
+//# sourceMappingURL=chunk-LKJCRVNR.js.map