@metamask-previews/keyring-controller 15.0.0-preview-61ace68c → 15.0.0-preview-cb17e99

package/dist/KeyringController.js

@@ -7,7 +7,7 @@
 
 
 
-var _chunkISACMNF3js = require('./chunk-ISACMNF3.js');
+var _chunkH4OUA6YGjs = require('./chunk-H4OUA6YG.js');
 require('./chunk-QDPHKQON.js');
 
 
@@ -18,5 +18,5 @@ require('./chunk-QDPHKQON.js');
 
 
 
-exports.AccountImportStrategy = _chunkISACMNF3js.AccountImportStrategy; exports.KeyringController = _chunkISACMNF3js.KeyringController; exports.KeyringTypes = _chunkISACMNF3js.KeyringTypes; exports.SignTypedDataVersion = _chunkISACMNF3js.SignTypedDataVersion; exports.default = _chunkISACMNF3js.KeyringController_default; exports.getDefaultKeyringState = _chunkISACMNF3js.getDefaultKeyringState; exports.isCustodyKeyring = _chunkISACMNF3js.isCustodyKeyring; exports.keyringBuilderFactory = _chunkISACMNF3js.keyringBuilderFactory;
+exports.AccountImportStrategy = _chunkH4OUA6YGjs.AccountImportStrategy; exports.KeyringController = _chunkH4OUA6YGjs.KeyringController; exports.KeyringTypes = _chunkH4OUA6YGjs.KeyringTypes; exports.SignTypedDataVersion = _chunkH4OUA6YGjs.SignTypedDataVersion; exports.default = _chunkH4OUA6YGjs.KeyringController_default; exports.getDefaultKeyringState = _chunkH4OUA6YGjs.getDefaultKeyringState; exports.isCustodyKeyring = _chunkH4OUA6YGjs.isCustodyKeyring; exports.keyringBuilderFactory = _chunkH4OUA6YGjs.keyringBuilderFactory;
 //# sourceMappingURL=KeyringController.js.map

package/dist/KeyringController.mjs

@@ -7,7 +7,7 @@ import {
   getDefaultKeyringState,
   isCustodyKeyring,
   keyringBuilderFactory
-} from "./chunk-RVCG63UG.mjs";
+} from "./chunk-5VBIIMC6.mjs";
 import "./chunk-HT7WOORD.mjs";
 export {
   AccountImportStrategy,

package/dist/{chunk-RVCG63UG.mjs → chunk-5VBIIMC6.mjs}

@@ -86,7 +86,7 @@ async function displayForKeyring(keyring) {
     accounts: accounts.map(normalize)
   };
 }
-var _controllerOperationMutex, _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, _updateVault, updateVault_fn, _getAccountsFromKeyrings, getAccountsFromKeyrings_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, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn, _withControllerLock, withControllerLock_fn, _withVaultLock, withVaultLock_fn;
+var _controllerOperationMutex, _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, _getSerializedKeyrings, getSerializedKeyrings_fn, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn, _unlockKeyrings, unlockKeyrings_fn, _updateVault, updateVault_fn, _getAccountsFromKeyrings, getAccountsFromKeyrings_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, _persistOrRollback, persistOrRollback_fn, _withRollback, withRollback_fn, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn, _withControllerLock, withControllerLock_fn, _withVaultLock, withVaultLock_fn;
 var KeyringController = class extends BaseController {
   /**
    * Creates a KeyringController instance.
@@ -170,6 +170,21 @@ var KeyringController = class extends BaseController {
      * @returns A promise resolving to the updated keyrings array.
      */
     __privateAdd(this, _getUpdatedKeyrings);
+    /**
+     * Serialize the current array of keyring instances,
+     * including unsupported keyrings by default.
+     *
+     * @param options - Method options.
+     * @param options.includeUnsupported - Whether to include unsupported keyrings.
+     * @returns The serialized keyrings.
+     */
+    __privateAdd(this, _getSerializedKeyrings);
+    /**
+     * Restore a serialized keyrings array.
+     *
+     * @param serializedKeyrings - The serialized keyrings array.
+     */
+    __privateAdd(this, _restoreSerializedKeyrings);
     /**
      * Unlock Keyrings, decrypting the vault and deserializing all
      * keyrings contained in it, using a password or an encryption key with salt.
@@ -210,7 +225,6 @@ var KeyringController = class extends BaseController {
      *
      * @param type - The type of keyring to add.
      * @param data - The data to restore a previously serialized keyring.
-     * @param persist - Whether to persist the keyring to the vault.
      * @returns The new keyring.
      * @throws If the keyring includes duplicated accounts.
      */
@@ -218,9 +232,6 @@ var KeyringController = class extends BaseController {
     /**
      * Remove all managed keyrings, destroying all their
      * instances in memory.
-     *
-     * @param options - Operations options.
-     * @param options.skipStateUpdate - Whether to skip updating the controller state.
      */
     __privateAdd(this, _clearKeyrings);
     /**
@@ -266,6 +277,23 @@ var KeyringController = class extends BaseController {
      * @fires KeyringController:unlock
      */
     __privateAdd(this, _setUnlocked);
+    /**
+     * Execute the given function after acquiring the controller lock
+     * and save the keyrings to state after it, or rollback to their
+     * previous state in case of error.
+     *
+     * @param fn - The function to execute.
+     * @returns The result of the function.
+     */
+    __privateAdd(this, _persistOrRollback);
+    /**
+     * Execute the given function after acquiring the controller lock
+     * and rollback keyrings and password states in case of error.
+     *
+     * @param fn - The function to execute atomically.
+     * @returns The result of the function.
+     */
+    __privateAdd(this, _withRollback);
     /**
      * Assert that the controller mutex is locked.
      *
@@ -324,7 +352,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving to the added account address.
    */
   async addNewAccount(accountCount) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const primaryKeyring = this.getKeyringsByType("HD Key Tree")[0];
       if (!primaryKeyring) {
         throw new Error("No HD keyring found");
@@ -342,7 +370,6 @@ var KeyringController = class extends BaseController {
       }
       const [addedAccountAddress] = await primaryKeyring.addAccounts(1);
       await this.verifySeedPhrase();
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
       return addedAccountAddress;
     });
   }
@@ -354,7 +381,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving to the added account address
    */
   async addNewAccountForKeyring(keyring, accountCount) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const oldAccounts = await __privateMethod(this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       if (accountCount && oldAccounts.length !== accountCount) {
         if (accountCount > oldAccounts.length) {
@@ -365,7 +392,6 @@ var KeyringController = class extends BaseController {
         return existingAccount;
       }
       await keyring.addAccounts(1);
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
       const addedAccountAddress = (await __privateMethod(this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this)).find(
         (selectedAddress) => !oldAccounts.includes(selectedAddress)
       );
@@ -379,13 +405,12 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving to the added account address.
    */
   async addNewAccountWithoutUpdate() {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const primaryKeyring = this.getKeyringsByType("HD Key Tree")[0];
       if (!primaryKeyring) {
         throw new Error("No HD keyring found");
       }
       const [addedAccountAddress] = await primaryKeyring.addAccounts(1);
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
       await this.verifySeedPhrase();
       return addedAccountAddress;
     });
@@ -400,7 +425,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the operation ends successfully.
    */
   async createNewVaultAndRestore(password, seed) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       if (!password || !password.length) {
         throw new Error("Invalid password");
       }
@@ -420,7 +445,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the operation ends successfully.
    */
   async createNewVaultAndKeychain(password) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const accounts = await __privateMethod(this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       if (!accounts.length) {
         await __privateMethod(this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
@@ -441,7 +466,7 @@ var KeyringController = class extends BaseController {
     if (type === "QR Hardware Wallet Device" /* qr */) {
       return this.getOrAddQRKeyring();
     }
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, opts, true));
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, opts));
   }
   /**
    * Method to verify a given password validity. Throws an
@@ -593,7 +618,7 @@ var KeyringController = class extends BaseController {
    * operation completes.
    */
   async persistAllKeyrings() {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => __privateMethod(this, _updateVault, updateVault_fn).call(this));
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => true);
   }
   /**
    * Imports an account with the specified import strategy.
@@ -604,7 +629,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving to the imported account address.
    */
   async importAccountWithStrategy(strategy, args) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       let privateKey;
       switch (strategy) {
         case "privateKey":
@@ -638,7 +663,9 @@ var KeyringController = class extends BaseController {
         default:
           throw new Error(`Unexpected import strategy: '${strategy}'`);
       }
-      const newKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "Simple Key Pair" /* simple */, [privateKey], true);
+      const newKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "Simple Key Pair" /* simple */, [
+        privateKey
+      ]);
       const accounts = await newKeyring.getAccounts();
       return accounts[0];
     });
@@ -651,7 +678,7 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the account is removed.
    */
   async removeAccount(address) {
-    await __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    await __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = await this.getKeyringForAccount(
         address
       );
@@ -663,7 +690,6 @@ var KeyringController = class extends BaseController {
       if (accounts.length === 0) {
         await __privateMethod(this, _removeEmptyKeyrings, removeEmptyKeyrings_fn).call(this);
       }
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
     });
     this.messagingSystem.publish(`${name}:accountRemoved`, address);
   }
@@ -673,14 +699,14 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async setLocked() {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _withRollback, withRollback_fn).call(this, async () => {
       __privateMethod(this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
       __privateSet(this, _password, void 0);
+      await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this);
       this.update((state) => {
         state.isUnlocked = false;
         state.keyrings = [];
       });
-      await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this);
       this.messagingSystem.publish(`${name}:lock`);
     });
   }
@@ -839,13 +865,9 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async submitEncryptionKey(encryptionKey, encryptionSalt) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _withRollback, withRollback_fn).call(this, async () => {
       __privateSet(this, _keyrings, await __privateMethod(this, _unlockKeyrings, unlockKeyrings_fn).call(this, void 0, encryptionKey, encryptionSalt));
       __privateMethod(this, _setUnlocked, setUnlocked_fn).call(this);
-      const qrKeyring = this.getQRKeyring();
-      if (qrKeyring) {
-        __privateMethod(this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
-      }
     });
   }
   /**
@@ -856,13 +878,9 @@ var KeyringController = class extends BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async submitPassword(password) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _withRollback, withRollback_fn).call(this, async () => {
       __privateSet(this, _keyrings, await __privateMethod(this, _unlockKeyrings, unlockKeyrings_fn).call(this, password));
       __privateMethod(this, _setUnlocked, setUnlocked_fn).call(this);
-      const qrKeyring = this.getQRKeyring();
-      if (qrKeyring) {
-        __privateMethod(this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
-      }
     });
   }
   /**
@@ -913,15 +931,14 @@ var KeyringController = class extends BaseController {
    * @returns The added keyring
    */
   async getOrAddQRKeyring() {
-    return this.getQRKeyring() || await __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => __privateMethod(this, _addQRKeyring, addQRKeyring_fn).call(this));
+    return this.getQRKeyring() || await __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => __privateMethod(this, _addQRKeyring, addQRKeyring_fn).call(this));
   }
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async restoreQRKeyring(serialized) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = this.getQRKeyring() || await __privateMethod(this, _addQRKeyring, addQRKeyring_fn).call(this);
       keyring.deserialize(serialized);
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
     });
   }
   async resetQRKeyringState() {
@@ -949,7 +966,7 @@ var KeyringController = class extends BaseController {
     (await this.getOrAddQRKeyring()).cancelSync();
   }
   async connectQRHardware(page) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       try {
         const keyring = this.getQRKeyring() || await __privateMethod(this, _addQRKeyring, addQRKeyring_fn).call(this);
         let accounts;
@@ -975,11 +992,10 @@ var KeyringController = class extends BaseController {
     });
   }
   async unlockQRHardwareWalletAccount(index) {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = this.getQRKeyring() || await __privateMethod(this, _addQRKeyring, addQRKeyring_fn).call(this);
       keyring.setAccountToUnlock(index);
       await keyring.addAccounts(1);
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
     });
   }
   async getAccountKeyringType(account) {
@@ -989,7 +1005,7 @@ var KeyringController = class extends BaseController {
     return keyring.type;
   }
   async forgetQRDevice() {
-    return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async () => {
+    return __privateMethod(this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = this.getQRKeyring();
       if (!keyring) {
         return { removedAccounts: [], remainingAccounts: [] };
@@ -1000,7 +1016,6 @@ var KeyringController = class extends BaseController {
       const removedAccounts = allAccounts.filter(
         (address) => !remainingAccounts.includes(address)
       );
-      await __privateMethod(this, _updateVault, updateVault_fn).call(this);
       return { removedAccounts, remainingAccounts };
     });
   }
@@ -1074,15 +1089,9 @@ getKeyringBuilderForType_fn = function(type) {
 _addQRKeyring = new WeakSet();
 addQRKeyring_fn = async function() {
   __privateMethod(this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  const qrKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
+  return await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
     accounts: []
   });
-  const accounts = await qrKeyring.getAccounts();
-  await __privateMethod(this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
-  __privateGet(this, _keyrings).push(qrKeyring);
-  await __privateMethod(this, _updateVault, updateVault_fn).call(this);
-  __privateMethod(this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, qrKeyring);
-  return qrKeyring;
 };
 _subscribeToQRKeyringEvents = new WeakSet();
 subscribeToQRKeyringEvents_fn = function(qrKeyring) {
@@ -1117,6 +1126,31 @@ _getUpdatedKeyrings = new WeakSet();
 getUpdatedKeyrings_fn = async function() {
   return Promise.all(__privateGet(this, _keyrings).map(displayForKeyring));
 };
+_getSerializedKeyrings = new WeakSet();
+getSerializedKeyrings_fn = async function({ includeUnsupported } = {
+  includeUnsupported: true
+}) {
+  const serializedKeyrings = await Promise.all(
+    __privateGet(this, _keyrings).map(async (keyring) => {
+      const [type, data] = await Promise.all([
+        keyring.type,
+        keyring.serialize()
+      ]);
+      return { type, data };
+    })
+  );
+  if (includeUnsupported) {
+    serializedKeyrings.push(...__privateGet(this, _unsupportedKeyrings));
+  }
+  return serializedKeyrings;
+};
+_restoreSerializedKeyrings = new WeakSet();
+restoreSerializedKeyrings_fn = async function(serializedKeyrings) {
+  await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this);
+  for (const serializedKeyring of serializedKeyrings) {
+    await __privateMethod(this, _restoreKeyring, restoreKeyring_fn).call(this, serializedKeyring);
+  }
+};
 _unlockKeyrings = new WeakSet();
 unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
   return __privateMethod(this, _withVaultLock, withVaultLock_fn).call(this, async ({ releaseLock }) => {
@@ -1124,7 +1158,6 @@ unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
     if (!encryptedVault) {
       throw new Error("KeyringController - Cannot unlock without a previous vault." /* VaultError */);
     }
-    await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this, { skipStateUpdate: true });
     let vault;
     const updatedState = {};
     if (__privateGet(this, _cacheEncryptionKey)) {
@@ -1164,7 +1197,7 @@ unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
     if (!isSerializedKeyringsArray(vault)) {
       throw new Error("KeyringController - The decrypted vault has an unexpected shape." /* VaultDataError */);
     }
-    await Promise.all(vault.map(__privateMethod(this, _restoreKeyring, restoreKeyring_fn).bind(this)));
+    await __privateMethod(this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, vault);
     const updatedKeyrings = await __privateMethod(this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
     this.update((state) => {
       state.keyrings = updatedKeyrings;
@@ -1187,16 +1220,7 @@ updateVault_fn = function() {
     if (!__privateGet(this, _password) && !encryptionKey) {
       throw new Error("KeyringController - Cannot persist vault without password and encryption key" /* MissingCredentials */);
     }
-    const serializedKeyrings = await Promise.all(
-      __privateGet(this, _keyrings).map(async (keyring) => {
-        const [type, data] = await Promise.all([
-          keyring.type,
-          keyring.serialize()
-        ]);
-        return { type, data };
-      })
-    );
-    serializedKeyrings.push(...__privateGet(this, _unsupportedKeyrings));
+    const serializedKeyrings = await __privateMethod(this, _getSerializedKeyrings, getSerializedKeyrings_fn).call(this);
     if (!serializedKeyrings.some((keyring) => keyring.type === "HD Key Tree" /* hd */)) {
       throw new Error("KeyringController - No HD Keyring found" /* NoHdKeyring */);
     }
@@ -1257,14 +1281,14 @@ getAccountsFromKeyrings_fn = async function() {
 _createKeyringWithFirstAccount = new WeakSet();
 createKeyringWithFirstAccount_fn = async function(type, opts) {
   __privateMethod(this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  const keyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, opts, true);
+  const keyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, opts);
   const [firstAccount] = await keyring.getAccounts();
   if (!firstAccount) {
     throw new Error("KeyringController - First Account not found." /* NoFirstAccount */);
   }
 };
 _newKeyring = new WeakSet();
-newKeyring_fn = async function(type, data, persist = false) {
+newKeyring_fn = async function(type, data) {
   __privateMethod(this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   const keyringBuilder = __privateMethod(this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, type);
   if (!keyringBuilder) {
@@ -1287,34 +1311,26 @@ newKeyring_fn = async function(type, data, persist = false) {
     await keyring.addAccounts(1);
   }
   await __privateMethod(this, _checkForDuplicate, checkForDuplicate_fn).call(this, type, await keyring.getAccounts());
-  if (persist) {
-    __privateGet(this, _keyrings).push(keyring);
-    await __privateMethod(this, _updateVault, updateVault_fn).call(this);
+  if (type === "QR Hardware Wallet Device" /* qr */) {
+    __privateMethod(this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, keyring);
   }
+  __privateGet(this, _keyrings).push(keyring);
   return keyring;
 };
 _clearKeyrings = new WeakSet();
-clearKeyrings_fn = async function(options = { skipStateUpdate: false }) {
+clearKeyrings_fn = async function() {
   __privateMethod(this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   for (const keyring of __privateGet(this, _keyrings)) {
     await __privateMethod(this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
   }
   __privateSet(this, _keyrings, []);
-  if (!options.skipStateUpdate) {
-    this.update((state) => {
-      state.keyrings = [];
-    });
-  }
 };
 _restoreKeyring = new WeakSet();
 restoreKeyring_fn = async function(serialized) {
   __privateMethod(this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   try {
     const { type, data } = serialized;
-    const keyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, data);
-    await keyring.getAccounts();
-    __privateGet(this, _keyrings).push(keyring);
-    return keyring;
+    return await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, type, data);
   } catch (_) {
     __privateGet(this, _unsupportedKeyrings).push(serialized);
     return void 0;
@@ -1368,6 +1384,28 @@ setUnlocked_fn = function() {
   });
   this.messagingSystem.publish(`${name}:unlock`);
 };
+_persistOrRollback = new WeakSet();
+persistOrRollback_fn = async function(fn) {
+  return __privateMethod(this, _withRollback, withRollback_fn).call(this, async ({ releaseLock }) => {
+    const callbackResult = await fn({ releaseLock });
+    await __privateMethod(this, _updateVault, updateVault_fn).call(this);
+    return callbackResult;
+  });
+};
+_withRollback = new WeakSet();
+withRollback_fn = async function(fn) {
+  return __privateMethod(this, _withControllerLock, withControllerLock_fn).call(this, async ({ releaseLock }) => {
+    const currentSerializedKeyrings = await __privateMethod(this, _getSerializedKeyrings, getSerializedKeyrings_fn).call(this);
+    const currentPassword = __privateGet(this, _password);
+    try {
+      return await fn({ releaseLock });
+    } catch (e) {
+      await __privateMethod(this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, currentSerializedKeyrings);
+      __privateSet(this, _password, currentPassword);
+      throw e;
+    }
+  });
+};
 _assertControllerMutexIsLocked = new WeakSet();
 assertControllerMutexIsLocked_fn = function() {
   if (!__privateGet(this, _controllerOperationMutex).isLocked()) {
@@ -1403,4 +1441,4 @@ export {
   KeyringController,
   KeyringController_default
 };
-//# sourceMappingURL=chunk-RVCG63UG.mjs.map
+//# sourceMappingURL=chunk-5VBIIMC6.mjs.map