@metamask-previews/keyring-controller 16.0.0-preview-a1db0714 → 16.0.0-preview-a6633f22

package/dist/{chunk-2GJQ6KDW.js → chunk-ORDHI6BF.js}

@@ -3,7 +3,7 @@
 
 
 
-var _chunkZGV2QNCGjs = require('./chunk-ZGV2QNCG.js');
+var _chunkNOCGQCUMjs = require('./chunk-NOCGQCUM.js');
 
 // src/KeyringController.ts
 var _util = require('@ethereumjs/util');
@@ -74,6 +74,14 @@ function assertIsExportableKeyEncryptor(encryptor) {
     throw new Error("KeyringController - The encryptor does not support encryption key export." /* UnsupportedEncryptionKeyExport */);
   }
 }
+function assertIsValidPassword(password) {
+  if (typeof password !== "string") {
+    throw new Error("KeyringController - Password must be of type string." /* WrongPasswordType */);
+  }
+  if (!password || !password.length) {
+    throw new Error("KeyringController - Password cannot be empty." /* InvalidEmptyPassword */);
+  }
+}
 function isSerializedKeyringsArray(array) {
   return typeof array === "object" && Array.isArray(array) && array.every((value) => value.type && _utils.isValidJson.call(void 0, value.data));
 }
@@ -124,14 +132,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      * Constructor helper for registering this controller's messaging system
      * actions.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _registerMessageHandlers);
+    _chunkNOCGQCUMjs.__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.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _getKeyringBuilderForType);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _getKeyringBuilderForType);
     /**
      * Add qr hardware keyring.
      *
@@ -139,15 +147,15 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @throws If a QRKeyring builder is not provided
      * when initializing the controller
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _addQRKeyring);
+    _chunkNOCGQCUMjs.__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
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _subscribeToQRKeyringEvents);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _unsubscribeFromQRKeyringsEvents);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _subscribeToQRKeyringEvents);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _unsubscribeFromQRKeyringsEvents);
     /**
      * Create new vault with an initial keyring
      *
@@ -162,14 +170,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.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _createNewVaultWithKeyring);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _createNewVaultWithKeyring);
     /**
      * Get the updated array of each keyring's type and
      * accounts list.
      *
      * @returns A promise resolving to the updated keyrings array.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _getUpdatedKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _getUpdatedKeyrings);
     /**
      * Serialize the current array of keyring instances,
      * including unsupported keyrings by default.
@@ -178,13 +186,13 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param options.includeUnsupported - Whether to include unsupported keyrings.
      * @returns The serialized keyrings.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _getSerializedKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _getSerializedKeyrings);
     /**
      * Restore a serialized keyrings array.
      *
      * @param serializedKeyrings - The serialized keyrings array.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _restoreSerializedKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _restoreSerializedKeyrings);
     /**
      * Unlock Keyrings, decrypting the vault and deserializing all
      * keyrings contained in it, using a password or an encryption key with salt.
@@ -194,20 +202,20 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param encryptionSalt - The salt used to encrypt the vault.
      * @returns A promise resolving to the deserialized keyrings array.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _unlockKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _unlockKeyrings);
     /**
      * Update the vault with the current keyrings.
      *
      * @returns A promise resolving to `true` if the operation is successful.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _updateVault);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _updateVault);
     /**
      * Retrieves all the accounts from keyrings instances
      * that are currently in memory.
      *
      * @returns A promise resolving to an array of accounts.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _getAccountsFromKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _getAccountsFromKeyrings);
     /**
      * Create a new keyring, ensuring that the first account is
      * also created.
@@ -216,7 +224,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.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _createKeyringWithFirstAccount);
+    _chunkNOCGQCUMjs.__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
@@ -228,12 +236,12 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @returns The new keyring.
      * @throws If the keyring includes duplicated accounts.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _newKeyring);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _newKeyring);
     /**
      * Remove all managed keyrings, destroying all their
      * instances in memory.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _clearKeyrings);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _clearKeyrings);
     /**
      * Restore a Keyring from a provided serialized payload.
      * On success, returns the resulting keyring instance.
@@ -241,7 +249,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param serialized - The serialized keyring.
      * @returns The deserialized keyring or undefined if the keyring type is unsupported.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _restoreKeyring);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _restoreKeyring);
     /**
      * Destroy Keyring
      *
@@ -251,14 +259,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      *
      * @param keyring - The keyring to destroy.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _destroyKeyring);
+    _chunkNOCGQCUMjs.__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.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _removeEmptyKeyrings);
+    _chunkNOCGQCUMjs.__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.
@@ -269,14 +277,14 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param newAccountArray - Array of new accounts.
      * @returns The account, if no duplicate is found.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _checkForDuplicate);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _checkForDuplicate);
     /**
      * Set the `isUnlocked` to true and notify listeners
      * through the messenger.
      *
      * @fires KeyringController:unlock
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _setUnlocked);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _setUnlocked);
     /**
      * Execute the given function after acquiring the controller lock
      * and save the keyrings to state after it, or rollback to their
@@ -285,7 +293,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param fn - The function to execute.
      * @returns The result of the function.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _persistOrRollback);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _persistOrRollback);
     /**
      * Execute the given function after acquiring the controller lock
      * and rollback keyrings and password states in case of error.
@@ -293,13 +301,13 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param fn - The function to execute atomically.
      * @returns The result of the function.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _withRollback);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _withRollback);
     /**
      * Assert that the controller mutex is locked.
      *
      * @throws If the controller mutex is not locked.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _assertControllerMutexIsLocked);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _assertControllerMutexIsLocked);
     /**
      * Lock the controller mutex before executing the given function,
      * and release it after the function is resolved or after an
@@ -312,7 +320,7 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param fn - The function to execute while the controller mutex is locked.
      * @returns The result of the function.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _withControllerLock);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _withControllerLock);
     /**
      * Lock the vault mutex before executing the given function,
      * and release it after the function is resolved or after an
@@ -324,25 +332,25 @@ var KeyringController = class extends _basecontroller.BaseController {
      * @param fn - The function to execute while the vault mutex is locked.
      * @returns The result of the function.
      */
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _withVaultLock);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _controllerOperationMutex, new (0, _asyncmutex.Mutex)());
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _vaultOperationMutex, new (0, _asyncmutex.Mutex)());
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _keyringBuilders, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _keyrings, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _unsupportedKeyrings, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _password, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _encryptor, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _cacheEncryptionKey, void 0);
-    _chunkZGV2QNCGjs.__privateAdd.call(void 0, this, _qrKeyringStateListener, void 0);
-    _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyringBuilders, keyringBuilders ? defaultKeyringBuilders.concat(keyringBuilders) : defaultKeyringBuilders);
-    _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _encryptor, encryptor);
-    _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyrings, []);
-    _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _unsupportedKeyrings, []);
-    _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _cacheEncryptionKey, Boolean(options.cacheEncryptionKey));
-    if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _withVaultLock);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _controllerOperationMutex, new (0, _asyncmutex.Mutex)());
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _vaultOperationMutex, new (0, _asyncmutex.Mutex)());
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _keyringBuilders, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _keyrings, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _unsupportedKeyrings, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _password, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _encryptor, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _cacheEncryptionKey, void 0);
+    _chunkNOCGQCUMjs.__privateAdd.call(void 0, this, _qrKeyringStateListener, void 0);
+    _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyringBuilders, keyringBuilders ? defaultKeyringBuilders.concat(keyringBuilders) : defaultKeyringBuilders);
+    _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _encryptor, encryptor);
+    _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyrings, []);
+    _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _unsupportedKeyrings, []);
+    _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _cacheEncryptionKey, Boolean(options.cacheEncryptionKey));
+    if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
       assertIsExportableKeyEncryptor(encryptor);
     }
-    _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+    _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
   }
   /**
    * Adds a new account to the default (first) HD seed phrase keyring.
@@ -352,7 +360,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the added account address.
    */
   async addNewAccount(accountCount) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const primaryKeyring = this.getKeyringsByType("HD Key Tree")[0];
       if (!primaryKeyring) {
         throw new Error("No HD keyring found");
@@ -381,8 +389,8 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the added account address
    */
   async addNewAccountForKeyring(keyring, accountCount) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
-      const oldAccounts = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      const oldAccounts = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       if (accountCount && oldAccounts.length !== accountCount) {
         if (accountCount > oldAccounts.length) {
           throw new Error("Account out of sequence");
@@ -392,7 +400,7 @@ var KeyringController = class extends _basecontroller.BaseController {
         return existingAccount;
       }
       await keyring.addAccounts(1);
-      const addedAccountAddress = (await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this)).find(
+      const addedAccountAddress = (await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this)).find(
         (selectedAddress) => !oldAccounts.includes(selectedAddress)
       );
       _utils.assertIsStrictHexString.call(void 0, addedAccountAddress);
@@ -405,7 +413,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the added account address.
    */
   async addNewAccountWithoutUpdate() {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const primaryKeyring = this.getKeyringsByType("HD Key Tree")[0];
       if (!primaryKeyring) {
         throw new Error("No HD keyring found");
@@ -425,11 +433,9 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the operation ends successfully.
    */
   async createNewVaultAndRestore(password, seed) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
-      if (!password || !password.length) {
-        throw new Error("Invalid password");
-      }
-      await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      assertIsValidPassword(password);
+      await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
         type: "HD Key Tree" /* hd */,
         opts: {
           mnemonic: seed,
@@ -445,10 +451,10 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the operation ends successfully.
    */
   async createNewVaultAndKeychain(password) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
-      const accounts = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      const accounts = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       if (!accounts.length) {
-        await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
+        await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _createNewVaultWithKeyring, createNewVaultWithKeyring_fn).call(this, password, {
           type: "HD Key Tree" /* hd */
         });
       }
@@ -466,7 +472,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (type === "QR Hardware Wallet Device" /* qr */) {
       return this.getOrAddQRKeyring();
     }
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts));
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts));
   }
   /**
    * Method to verify a given password validity. Throws an
@@ -478,7 +484,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (!this.state.vault) {
       throw new Error("KeyringController - Cannot unlock without a previous vault." /* VaultError */);
     }
-    await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, this.state.vault);
+    await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, this.state.vault);
   }
   /**
    * Returns the status of the vault.
@@ -496,8 +502,8 @@ var KeyringController = class extends _basecontroller.BaseController {
    */
   async exportSeedPhrase(password) {
     await this.verifyPassword(password);
-    assertHasUint8ArrayMnemonic(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings)[0]);
-    return _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings)[0].mnemonic;
+    assertHasUint8ArrayMnemonic(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings)[0]);
+    return _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings)[0].mnemonic;
   }
   /**
    * Gets the private key from the keyring controlling an address.
@@ -576,7 +582,7 @@ var KeyringController = class extends _basecontroller.BaseController {
   async getKeyringForAccount(account) {
     const hexed = _ethsigutil.normalize.call(void 0, account);
     const candidates = await Promise.all(
-      _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+      _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
         return Promise.all([keyring, keyring.getAccounts()]);
       })
     );
@@ -609,7 +615,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns An array of keyrings of the given type.
    */
   getKeyringsByType(type) {
-    return _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).filter((keyring) => keyring.type === type);
+    return _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).filter((keyring) => keyring.type === type);
   }
   /**
    * Persist all serialized keyrings in the vault.
@@ -619,7 +625,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * operation completes.
    */
   async persistAllKeyrings() {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => true);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => true);
   }
   /**
    * Imports an account with the specified import strategy.
@@ -630,7 +636,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving to the imported account address.
    */
   async importAccountWithStrategy(strategy, args) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       let privateKey;
       switch (strategy) {
         case "privateKey":
@@ -664,7 +670,7 @@ var KeyringController = class extends _basecontroller.BaseController {
         default:
           throw new Error(`Unexpected import strategy: '${strategy}'`);
       }
-      const newKeyring = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "Simple Key Pair" /* simple */, [
+      const newKeyring = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "Simple Key Pair" /* simple */, [
         privateKey
       ]);
       const accounts = await newKeyring.getAccounts();
@@ -679,7 +685,7 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the account is removed.
    */
   async removeAccount(address) {
-    await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = await this.getKeyringForAccount(
         address
       );
@@ -689,7 +695,7 @@ var KeyringController = class extends _basecontroller.BaseController {
       await keyring.removeAccount(address);
       const accounts = await keyring.getAccounts();
       if (accounts.length === 0) {
-        await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _removeEmptyKeyrings, removeEmptyKeyrings_fn).call(this);
+        await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _removeEmptyKeyrings, removeEmptyKeyrings_fn).call(this);
       }
     });
     this.messagingSystem.publish(`${name}:accountRemoved`, address);
@@ -700,10 +706,10 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async setLocked() {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
-      _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
-      _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _password, void 0);
-      await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
+      _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, void 0);
+      await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
       this.update((state) => {
         state.isUnlocked = false;
         state.keyrings = [];
@@ -857,6 +863,27 @@ var KeyringController = class extends _basecontroller.BaseController {
     }
     return await keyring.signUserOperation(address, userOp, executionContext);
   }
+  /**
+   * Changes the password used to encrypt the vault.
+   *
+   * @param password - The new password.
+   * @returns Promise resolving when the operation completes.
+   */
+  changePassword(password) {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      if (!this.state.isUnlocked) {
+        throw new Error("KeyringController - Cannot persist vault without password and encryption key" /* MissingCredentials */);
+      }
+      assertIsValidPassword(password);
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, password);
+      if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+        this.update((state) => {
+          delete state.encryptionKey;
+          delete state.encryptionSalt;
+        });
+      }
+    });
+  }
   /**
    * Attempts to decrypt the current vault and load its keyrings,
    * using the given encryption key and salt.
@@ -866,9 +893,9 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async submitEncryptionKey(encryptionKey, encryptionSalt) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
-      _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyrings, await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, void 0, encryptionKey, encryptionSalt));
-      _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyrings, await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, void 0, encryptionKey, encryptionSalt));
+      _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
     });
   }
   /**
@@ -879,9 +906,9 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns Promise resolving when the operation completes.
    */
   async submitPassword(password) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
-      _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyrings, await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, password));
-      _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async () => {
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyrings, await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _unlockKeyrings, unlockKeyrings_fn).call(this, password));
+      _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
     });
   }
   /**
@@ -900,7 +927,7 @@ var KeyringController = class extends _basecontroller.BaseController {
     if (accounts.length === 0) {
       throw new Error("Cannot verify an empty keyring.");
     }
-    const hdKeyringBuilder = _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, "HD Key Tree" /* hd */);
+    const hdKeyringBuilder = _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, "HD Key Tree" /* hd */);
     const hdKeyring = hdKeyringBuilder();
     await hdKeyring.deserialize({
       mnemonic: seedWords,
@@ -920,14 +947,14 @@ var KeyringController = class extends _basecontroller.BaseController {
   async withKeyring(selector, operation, options = {
     createIfMissing: false
   }) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       let keyring;
       if ("address" in selector) {
         keyring = await this.getKeyringForAccount(selector.address);
       } else {
         keyring = this.getKeyringsByType(selector.type)[selector.index || 0];
         if (!keyring && options.createIfMissing) {
-          keyring = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, selector.type, options.createWithData);
+          keyring = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, selector.type, options.createWithData);
         }
       }
       if (!keyring) {
@@ -955,13 +982,13 @@ var KeyringController = class extends _basecontroller.BaseController {
    * @returns The added keyring
    */
   async getOrAddQRKeyring() {
-    return this.getQRKeyring() || await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this));
+    return this.getQRKeyring() || await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this));
   }
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async restoreQRKeyring(serialized) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
-      const keyring = this.getQRKeyring() || await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      const keyring = this.getQRKeyring() || await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
       keyring.deserialize(serialized);
     });
   }
@@ -990,9 +1017,9 @@ var KeyringController = class extends _basecontroller.BaseController {
     (await this.getOrAddQRKeyring()).cancelSync();
   }
   async connectQRHardware(page) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       try {
-        const keyring = this.getQRKeyring() || await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
+        const keyring = this.getQRKeyring() || await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
         let accounts;
         switch (page) {
           case -1:
@@ -1016,8 +1043,8 @@ var KeyringController = class extends _basecontroller.BaseController {
     });
   }
   async unlockQRHardwareWalletAccount(index) {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
-      const keyring = this.getQRKeyring() || await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+      const keyring = this.getQRKeyring() || await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _addQRKeyring, addQRKeyring_fn).call(this);
       keyring.setAccountToUnlock(index);
       await keyring.addAccounts(1);
     });
@@ -1029,14 +1056,14 @@ var KeyringController = class extends _basecontroller.BaseController {
     return keyring.type;
   }
   async forgetQRDevice() {
-    return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
+    return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _persistOrRollback, persistOrRollback_fn).call(this, async () => {
       const keyring = this.getQRKeyring();
       if (!keyring) {
         return { removedAccounts: [], remainingAccounts: [] };
       }
-      const allAccounts = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
+      const allAccounts = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       keyring.forgetDevice();
-      const remainingAccounts = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
+      const remainingAccounts = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
       const removedAccounts = allAccounts.filter(
         (address) => !remainingAccounts.includes(address)
       );
@@ -1106,23 +1133,21 @@ registerMessageHandlers_fn = function() {
 };
 _getKeyringBuilderForType = new WeakSet();
 getKeyringBuilderForType_fn = function(type) {
-  return _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyringBuilders).find(
+  return _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyringBuilders).find(
     (keyringBuilder) => keyringBuilder.type === type
   );
 };
 _addQRKeyring = new WeakSet();
 addQRKeyring_fn = async function() {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  return await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */, {
-    accounts: []
-  });
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  return await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device" /* qr */);
 };
 _subscribeToQRKeyringEvents = new WeakSet();
 subscribeToQRKeyringEvents_fn = function(qrKeyring) {
-  _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _qrKeyringStateListener, (state) => {
+  _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _qrKeyringStateListener, (state) => {
     this.messagingSystem.publish(`${name}:qrKeyringStateChange`, state);
   });
-  qrKeyring.getMemStore().subscribe(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
+  qrKeyring.getMemStore().subscribe(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
 };
 _unsubscribeFromQRKeyringsEvents = new WeakSet();
 unsubscribeFromQRKeyringsEvents_fn = function() {
@@ -1130,32 +1155,32 @@ unsubscribeFromQRKeyringsEvents_fn = function() {
     "QR Hardware Wallet Device" /* qr */
   );
   qrKeyrings.forEach((qrKeyring) => {
-    if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _qrKeyringStateListener)) {
-      qrKeyring.getMemStore().unsubscribe(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
+    if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _qrKeyringStateListener)) {
+      qrKeyring.getMemStore().unsubscribe(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _qrKeyringStateListener));
     }
   });
 };
 _createNewVaultWithKeyring = new WeakSet();
 createNewVaultWithKeyring_fn = async function(password, keyring) {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   if (typeof password !== "string") {
     throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
   }
-  _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _password, password);
-  await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
-  await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
+  _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, password);
+  await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+  await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _setUnlocked, setUnlocked_fn).call(this);
 };
 _getUpdatedKeyrings = new WeakSet();
 getUpdatedKeyrings_fn = async function() {
-  return Promise.all(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).map(displayForKeyring));
+  return Promise.all(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).map(displayForKeyring));
 };
 _getSerializedKeyrings = new WeakSet();
 getSerializedKeyrings_fn = async function({ includeUnsupported } = {
   includeUnsupported: true
 }) {
   const serializedKeyrings = await Promise.all(
-    _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+    _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
       const [type, data] = await Promise.all([
         keyring.type,
         keyring.serialize()
@@ -1164,35 +1189,35 @@ getSerializedKeyrings_fn = async function({ includeUnsupported } = {
     })
   );
   if (includeUnsupported) {
-    serializedKeyrings.push(..._chunkZGV2QNCGjs.__privateGet.call(void 0, this, _unsupportedKeyrings));
+    serializedKeyrings.push(..._chunkNOCGQCUMjs.__privateGet.call(void 0, this, _unsupportedKeyrings));
   }
   return serializedKeyrings;
 };
 _restoreSerializedKeyrings = new WeakSet();
 restoreSerializedKeyrings_fn = async function(serializedKeyrings) {
-  await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+  await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
   for (const serializedKeyring of serializedKeyrings) {
-    await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _restoreKeyring, restoreKeyring_fn).call(this, serializedKeyring);
+    await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _restoreKeyring, restoreKeyring_fn).call(this, serializedKeyring);
   }
 };
 _unlockKeyrings = new WeakSet();
 unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
-  return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withVaultLock, withVaultLock_fn).call(this, async ({ releaseLock }) => {
+  return _chunkNOCGQCUMjs.__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 */);
     }
     let vault;
     const updatedState = {};
-    if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
-      assertIsExportableKeyEncryptor(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor));
+    if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+      assertIsExportableKeyEncryptor(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor));
       if (password) {
-        const result = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).decryptWithDetail(
+        const result = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).decryptWithDetail(
           password,
           encryptedVault
         );
         vault = result.vault;
-        _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _password, password);
+        _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, password);
         updatedState.encryptionKey = result.exportedKeyString;
         updatedState.encryptionSalt = result.salt;
       } else {
@@ -1203,8 +1228,8 @@ unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
         if (typeof encryptionKey !== "string") {
           throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
         }
-        const key = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
-        vault = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).decryptWithKey(
+        const key = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
+        vault = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).decryptWithKey(
           key,
           parsedEncryptedVault
         );
@@ -1215,14 +1240,14 @@ unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
       if (typeof password !== "string") {
         throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
       }
-      vault = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, encryptedVault);
-      _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _password, password);
+      vault = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).decrypt(password, encryptedVault);
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, password);
     }
     if (!isSerializedKeyringsArray(vault)) {
       throw new Error("KeyringController - The decrypted vault has an unexpected shape." /* VaultDataError */);
     }
-    await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, vault);
-    const updatedKeyrings = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
+    await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, vault);
+    const updatedKeyrings = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
     this.update((state) => {
       state.keyrings = updatedKeyrings;
       if (updatedState.encryptionKey || updatedState.encryptionSalt) {
@@ -1230,56 +1255,54 @@ unlockKeyrings_fn = async function(password, encryptionKey, encryptionSalt) {
         state.encryptionSalt = updatedState.encryptionSalt;
       }
     });
-    if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password) && (!_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _cacheEncryptionKey) || !encryptionKey) && _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated && !_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated(encryptedVault)) {
+    if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password) && (!_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _cacheEncryptionKey) || !encryptionKey) && _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated && !_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).isVaultUpdated(encryptedVault)) {
       releaseLock();
-      await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _updateVault, updateVault_fn).call(this);
+      await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _updateVault, updateVault_fn).call(this);
     }
-    return _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings);
+    return _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings);
   });
 };
 _updateVault = new WeakSet();
 updateVault_fn = function() {
-  return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withVaultLock, withVaultLock_fn).call(this, async () => {
+  return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withVaultLock, withVaultLock_fn).call(this, async () => {
     const { encryptionKey, encryptionSalt } = this.state;
-    if (!_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password) && !encryptionKey) {
+    if (!_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password) && !encryptionKey) {
       throw new Error("KeyringController - Cannot persist vault without password and encryption key" /* MissingCredentials */);
     }
-    const serializedKeyrings = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getSerializedKeyrings, getSerializedKeyrings_fn).call(this);
+    const serializedKeyrings = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, 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 */);
     }
     const updatedState = {};
-    if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
-      assertIsExportableKeyEncryptor(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor));
+    if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
+      assertIsExportableKeyEncryptor(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor));
       if (encryptionKey) {
-        const key = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
-        const vaultJSON = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).encryptWithKey(
+        const key = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).importKey(encryptionKey);
+        const vaultJSON = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).encryptWithKey(
           key,
           serializedKeyrings
         );
         vaultJSON.salt = encryptionSalt;
         updatedState.vault = JSON.stringify(vaultJSON);
-      } else if (_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password)) {
-        const { vault: newVault, exportedKeyString } = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).encryptWithDetail(
-          _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password),
+      } else if (_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password)) {
+        const { vault: newVault, exportedKeyString } = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).encryptWithDetail(
+          _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password),
           serializedKeyrings
         );
         updatedState.vault = newVault;
         updatedState.encryptionKey = exportedKeyString;
       }
     } else {
-      if (typeof _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password) !== "string") {
-        throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
-      }
-      updatedState.vault = await _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _encryptor).encrypt(
-        _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password),
+      assertIsValidPassword(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password));
+      updatedState.vault = await _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _encryptor).encrypt(
+        _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password),
         serializedKeyrings
       );
     }
     if (!updatedState.vault) {
       throw new Error("KeyringController - Cannot persist vault without vault information" /* MissingVaultData */);
     }
-    const updatedKeyrings = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
+    const updatedKeyrings = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getUpdatedKeyrings, getUpdatedKeyrings_fn).call(this);
     this.update((state) => {
       state.vault = updatedState.vault;
       state.keyrings = updatedKeyrings;
@@ -1293,7 +1316,7 @@ updateVault_fn = function() {
 };
 _getAccountsFromKeyrings = new WeakSet();
 getAccountsFromKeyrings_fn = async function() {
-  const keyrings = _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings);
+  const keyrings = _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings);
   const keyringArrays = await Promise.all(
     keyrings.map(async (keyring) => keyring.getAccounts())
   );
@@ -1304,8 +1327,8 @@ getAccountsFromKeyrings_fn = async function() {
 };
 _createKeyringWithFirstAccount = new WeakSet();
 createKeyringWithFirstAccount_fn = async function(type, opts) {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  const keyring = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  const keyring = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, opts);
   const [firstAccount] = await keyring.getAccounts();
   if (!firstAccount) {
     throw new Error("KeyringController - First Account not found." /* NoFirstAccount */);
@@ -1313,8 +1336,8 @@ createKeyringWithFirstAccount_fn = async function(type, opts) {
 };
 _newKeyring = new WeakSet();
 newKeyring_fn = async function(type, data) {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  const keyringBuilder = _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getKeyringBuilderForType, getKeyringBuilderForType_fn).call(this, type);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  const keyringBuilder = _chunkNOCGQCUMjs.__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}`
@@ -1334,29 +1357,29 @@ newKeyring_fn = async function(type, data) {
     keyring.generateRandomMnemonic();
     await keyring.addAccounts(1);
   }
-  await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, type, await keyring.getAccounts());
+  await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, type, await keyring.getAccounts());
   if (type === "QR Hardware Wallet Device" /* qr */) {
-    _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, keyring);
+    _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _subscribeToQRKeyringEvents, subscribeToQRKeyringEvents_fn).call(this, keyring);
   }
-  _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).push(keyring);
+  _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).push(keyring);
   return keyring;
 };
 _clearKeyrings = new WeakSet();
 clearKeyrings_fn = async function() {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  for (const keyring of _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings)) {
-    await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  for (const keyring of _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings)) {
+    await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
   }
-  _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyrings, []);
+  _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyrings, []);
 };
 _restoreKeyring = new WeakSet();
 restoreKeyring_fn = async function(serialized) {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   try {
     const { type, data } = serialized;
-    return await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, data);
+    return await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, type, data);
   } catch (_) {
-    _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _unsupportedKeyrings).push(serialized);
+    _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _unsupportedKeyrings).push(serialized);
     return void 0;
   }
 };
@@ -1366,23 +1389,23 @@ destroyKeyring_fn = async function(keyring) {
 };
 _removeEmptyKeyrings = new WeakSet();
 removeEmptyKeyrings_fn = async function() {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   const validKeyrings = [];
   await Promise.all(
-    _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
+    _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _keyrings).map(async (keyring) => {
       const accounts = await keyring.getAccounts();
       if (accounts.length > 0) {
         validKeyrings.push(keyring);
       } else {
-        await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
+        await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _destroyKeyring, destroyKeyring_fn).call(this, keyring);
       }
     })
   );
-  _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _keyrings, validKeyrings);
+  _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _keyrings, validKeyrings);
 };
 _checkForDuplicate = new WeakSet();
 checkForDuplicate_fn = async function(type, newAccountArray) {
-  const accounts = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
+  const accounts = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getAccountsFromKeyrings, getAccountsFromKeyrings_fn).call(this);
   switch (type) {
     case "Simple Key Pair" /* simple */: {
       const isIncluded = Boolean(
@@ -1402,7 +1425,7 @@ checkForDuplicate_fn = async function(type, newAccountArray) {
 };
 _setUnlocked = new WeakSet();
 setUnlocked_fn = function() {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
   this.update((state) => {
     state.isUnlocked = true;
   });
@@ -1410,40 +1433,40 @@ setUnlocked_fn = function() {
 };
 _persistOrRollback = new WeakSet();
 persistOrRollback_fn = async function(fn) {
-  return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async ({ releaseLock }) => {
+  return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withRollback, withRollback_fn).call(this, async ({ releaseLock }) => {
     const callbackResult = await fn({ releaseLock });
-    await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _updateVault, updateVault_fn).call(this);
+    await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _updateVault, updateVault_fn).call(this);
     return callbackResult;
   });
 };
 _withRollback = new WeakSet();
 withRollback_fn = async function(fn) {
-  return _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _withControllerLock, withControllerLock_fn).call(this, async ({ releaseLock }) => {
-    const currentSerializedKeyrings = await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _getSerializedKeyrings, getSerializedKeyrings_fn).call(this);
-    const currentPassword = _chunkZGV2QNCGjs.__privateGet.call(void 0, this, _password);
+  return _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _withControllerLock, withControllerLock_fn).call(this, async ({ releaseLock }) => {
+    const currentSerializedKeyrings = await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _getSerializedKeyrings, getSerializedKeyrings_fn).call(this);
+    const currentPassword = _chunkNOCGQCUMjs.__privateGet.call(void 0, this, _password);
     try {
       return await fn({ releaseLock });
     } catch (e) {
-      await _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, currentSerializedKeyrings);
-      _chunkZGV2QNCGjs.__privateSet.call(void 0, this, _password, currentPassword);
+      await _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _restoreSerializedKeyrings, restoreSerializedKeyrings_fn).call(this, currentSerializedKeyrings);
+      _chunkNOCGQCUMjs.__privateSet.call(void 0, this, _password, currentPassword);
       throw e;
     }
   });
 };
 _assertControllerMutexIsLocked = new WeakSet();
 assertControllerMutexIsLocked_fn = function() {
-  if (!_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _controllerOperationMutex).isLocked()) {
+  if (!_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _controllerOperationMutex).isLocked()) {
     throw new Error("KeyringController - attempt to update vault during a non mutually exclusive operation" /* ControllerLockRequired */);
   }
 };
 _withControllerLock = new WeakSet();
 withControllerLock_fn = async function(fn) {
-  return withLock(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _controllerOperationMutex), fn);
+  return withLock(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _controllerOperationMutex), fn);
 };
 _withVaultLock = new WeakSet();
 withVaultLock_fn = async function(fn) {
-  _chunkZGV2QNCGjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
-  return withLock(_chunkZGV2QNCGjs.__privateGet.call(void 0, this, _vaultOperationMutex), fn);
+  _chunkNOCGQCUMjs.__privateMethod.call(void 0, this, _assertControllerMutexIsLocked, assertControllerMutexIsLocked_fn).call(this);
+  return withLock(_chunkNOCGQCUMjs.__privateGet.call(void 0, this, _vaultOperationMutex), fn);
 };
 async function withLock(mutex, fn) {
   const releaseLock = await mutex.acquire();
@@ -1465,4 +1488,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-2GJQ6KDW.js.map
+//# sourceMappingURL=chunk-ORDHI6BF.js.map