@metamask-previews/keyring-controller 21.0.6-preview-780c8df → 21.0.6-preview-515e9b9c

package/CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The metadata is now stored in each keyring object in the `state.keyrings` array.
   - When updating to this version, we recommend removing the `keyringsMetadata` state and all state referencing a keyring ID with a migration. New metadata will be generated for each keyring automatically after the update.
 
+### Fixed
+
+- Keyrings with duplicate accounts are skipped as unsupported on unlock ([#5775](https://github.com/MetaMask/core/pull/5775))
+
 ## [21.0.6]
 
 ### Changed

package/dist/KeyringController.cjs

@@ -1485,11 +1485,12 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
  * 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() {
-    const keyrings = __classPrivateFieldGet(this, _KeyringController_keyrings, "f");
-    const keyringArrays = await Promise.all(keyrings.map(async ({ keyring }) => keyring.getAccounts()));
+async function _KeyringController_getAccountsFromKeyrings(additionalKeyrings = []) {
+    const keyrings = __classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(({ keyring }) => keyring);
+    const keyringArrays = await Promise.all([...keyrings, ...additionalKeyrings].map(async (keyring) => keyring.getAccounts()));
     const addresses = keyringArrays.reduce((res, arr) => {
         return res.concat(arr);
     }, []);
@@ -1606,6 +1607,7 @@ async function _KeyringController_restoreKeyring(serialized) {
         let newMetadata = false;
         let metadata = serializedMetadata;
         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 (!metadata) {
@@ -1664,10 +1666,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);
     }