@metamask-previews/keyring-controller 21.0.2-preview-9d7b1fa6 → 21.0.2-preview-a906644

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed wrong error message thrown when using the wrong password ([#1234](https://github.com/MetaMask/core/pull/1234))
+
 ## [21.0.2]
 
 ### Changed

package/dist/KeyringController.cjs

@@ -1295,9 +1295,6 @@ async function _KeyringController_restoreSerializedKeyrings(serializedKeyrings)
     for (const serializedKeyring of serializedKeyrings) {
         await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreKeyring).call(this, serializedKeyring);
     }
-    if (__classPrivateFieldGet(this, _KeyringController_keyrings, "f").length !== __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length) {
-        throw new Error(constants_1.KeyringControllerError.KeyringMetadataLengthMismatch);
-    }
 }, _KeyringController_unlockKeyrings = 
 /**
  * Unlock Keyrings, decrypting the vault and deserializing all
@@ -1355,6 +1352,11 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
             throw new Error(constants_1.KeyringControllerError.VaultDataError);
         }
         await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreSerializedKeyrings).call(this, vault);
+        // The keyrings array and the keyringsMetadata array should
+        // always be the same length while the controller is unlocked.
+        if (__classPrivateFieldGet(this, _KeyringController_keyrings, "f").length !== __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length) {
+            throw new Error(constants_1.KeyringControllerError.KeyringMetadataLengthMismatch);
+        }
         const updatedKeyrings = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getUpdatedKeyrings).call(this);
         this.update((state) => {
             state.keyrings = updatedKeyrings;