@metamask-previews/keyring-controller 21.0.1-preview-6cc620a → 21.0.1-preview-ded32bd

package/dist/KeyringController.cjs

@@ -1309,6 +1309,7 @@ async function _KeyringController_restoreSerializedKeyrings(serializedKeyrings)
  * @returns A promise resolving to the deserialized keyrings array.
  */
 async function _KeyringController_unlockKeyrings(password, encryptionKey, encryptionSalt) {
+    console.log('Unlock keyrings...');
     return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_withVaultLock).call(this, async ({ releaseLock }) => {
         const encryptedVault = this.state.vault;
         if (!encryptedVault) {
@@ -1322,8 +1323,15 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
                 const result = await __classPrivateFieldGet(this, _KeyringController_encryptor, "f").decryptWithDetail(password, encryptedVault);
                 vault = result.vault;
                 __classPrivateFieldSet(this, _KeyringController_password, password, "f");
-                updatedState.encryptionKey = result.exportedKeyString;
-                updatedState.encryptionSalt = result.salt;
+                // This condition is required to not set the state of the keyring
+                // with an encryption key and salt derived from with parameters
+                // that are not the ones set by the encrytor class.
+                if (!__classPrivateFieldGet(this, _KeyringController_encryptor, "f").isVaultUpdated ||
+                    !__classPrivateFieldGet(this, _KeyringController_encryptor, "f").isVaultUpdated(encryptedVault)) {
+                    console.log('set stored encryption key and salt');
+                    updatedState.encryptionKey = result.exportedKeyString;
+                    updatedState.encryptionSalt = result.salt;
+                }
             }
             else {
                 const parsedEncryptedVault = JSON.parse(encryptedVault);