@metamask-previews/keyring-controller 21.0.6-preview-d0bf3e9 → 21.0.6-preview-956e6bf8

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Discard keyrings with duplicate accounts when unlock the wallet ([#5775](https://github.com/MetaMask/core/pull/5775))
+- Metadata for unsupported keyring is removed on unlock ([#5725](https://github.com/MetaMask/core/pull/5725))
+
 ## [21.0.6]
 
 ### Changed

package/dist/KeyringController.cjs

@@ -1387,6 +1387,7 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
         const updatedKeyrings = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getUpdatedKeyrings).call(this);
         this.update((state) => {
             state.keyrings = updatedKeyrings;
+            state.keyringsMetadata = __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").slice();
             if (updatedState.encryptionKey || updatedState.encryptionSalt) {
                 state.encryptionKey = updatedState.encryptionKey;
                 state.encryptionSalt = updatedState.encryptionSalt;
@@ -1470,11 +1471,12 @@ async function _KeyringController_upgradeVaultEncryptionParams() {
  * Retrieves all the accounts from keyrings instances
  * that are currently in memory.
  *
+ * @param additionalKeyrings - Additional keyrings to include in the search.
  * @returns A promise resolving to an array of accounts.
  */
-async function _KeyringController_getAccountsFromKeyrings() {
+async function _KeyringController_getAccountsFromKeyrings(additionalKeyrings = []) {
     const keyrings = __classPrivateFieldGet(this, _KeyringController_keyrings, "f");
-    const keyringArrays = await Promise.all(keyrings.map(async (keyring) => keyring.getAccounts()));
+    const keyringArrays = await Promise.all([...keyrings, ...additionalKeyrings].map(async (keyring) => keyring.getAccounts()));
     const addresses = keyringArrays.reduce((res, arr) => {
         return res.concat(arr);
     }, []);
@@ -1593,6 +1595,7 @@ async function _KeyringController_restoreKeyring(serialized) {
     try {
         const { type, data } = serialized;
         const keyring = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_createKeyring).call(this, type, data);
+        await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertNoDuplicateAccounts).call(this, [keyring]);
         // If metadata is missing, assume the data is from an installation before
         // we had keyring metadata.
         if (__classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length <= __classPrivateFieldGet(this, _KeyringController_keyrings, "f").length) {
@@ -1607,6 +1610,11 @@ async function _KeyringController_restoreKeyring(serialized) {
     catch (error) {
         console.error(error);
         __classPrivateFieldGet(this, _KeyringController_unsupportedKeyrings, "f").push(serialized);
+        if (__classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length > __classPrivateFieldGet(this, _KeyringController_keyrings, "f").length) {
+            // There was already a metadata entry for the keyring, so
+            // we need to remove it
+            __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").splice(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").length, 1);
+        }
         return undefined;
     }
 }, _KeyringController_destroyKeyring = 
@@ -1651,10 +1659,11 @@ async function _KeyringController_removeEmptyKeyrings() {
 /**
  * Assert that there are no duplicate accounts in the keyrings.
  *
+ * @param additionalKeyrings - Additional keyrings to include in the check.
  * @throws If there are duplicate accounts.
  */
-async function _KeyringController_assertNoDuplicateAccounts() {
-    const accounts = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getAccountsFromKeyrings).call(this);
+async function _KeyringController_assertNoDuplicateAccounts(additionalKeyrings = []) {
+    const accounts = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getAccountsFromKeyrings).call(this, additionalKeyrings);
     if (new Set(accounts).size !== accounts.length) {
         throw new Error(constants_1.KeyringControllerError.DuplicatedAccount);
     }