@metamask-previews/keyring-controller 19.0.2-preview-407f96d → 19.0.3-preview-ca1f35f

package/CHANGELOG.md

@@ -7,9 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [19.0.3]
+
 ### Changed
 
-- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
+- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.1` ([#5079](https://github.com/MetaMask/core/pull/5079)), ([#5135](https://github.com/MetaMask/core/pull/5135))
+- Bump `@metamask/keyring-api` from `^12.0.0` to `^13.0.0` ([#5066](https://github.com/MetaMask/core/pull/5066))
+- Bump `@metamask/keyring-internal-api` from `^1.0.0` to `^2.0.0` ([#5066](https://github.com/MetaMask/core/pull/5066)), ([#5136](https://github.com/MetaMask/core/pull/5136))
+- Bump `@metamask/utils` to `^11.0.1` ([#5080](https://github.com/MetaMask/core/pull/5080))
+- Bump `@metamask/rpc-errors` to `^7.0.2` ([#5080](https://github.com/MetaMask/core/pull/5080))
+
+### Fixed
+
+- Make `verifySeedPhrase` mutually exclusive ([#5077](https://github.com/MetaMask/core/pull/5077))
 
 ## [19.0.2]
 
@@ -622,7 +632,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.3...HEAD
+[19.0.3]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.2...@metamask/keyring-controller@19.0.3
 [19.0.2]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.1...@metamask/keyring-controller@19.0.2
 [19.0.1]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.0...@metamask/keyring-controller@19.0.1
 [19.0.0]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@18.0.0...@metamask/keyring-controller@19.0.0

package/dist/KeyringController.cjs

@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _KeyringController_instances, _KeyringController_controllerOperationMutex, _KeyringController_vaultOperationMutex, _KeyringController_keyringBuilders, _KeyringController_keyrings, _KeyringController_keyringsMetadata, _KeyringController_unsupportedKeyrings, _KeyringController_password, _KeyringController_encryptor, _KeyringController_cacheEncryptionKey, _KeyringController_qrKeyringStateListener, _KeyringController_registerMessageHandlers, _KeyringController_getKeyringById, _KeyringController_getKeyringBuilderForType, _KeyringController_addQRKeyring, _KeyringController_subscribeToQRKeyringEvents, _KeyringController_unsubscribeFromQRKeyringsEvents, _KeyringController_createNewVaultWithKeyring, _KeyringController_verifySeedPhrase, _KeyringController_getUpdatedKeyrings, _KeyringController_getSerializedKeyrings, _KeyringController_restoreSerializedKeyrings, _KeyringController_unlockKeyrings, _KeyringController_updateVault, _KeyringController_getAccountsFromKeyrings, _KeyringController_createKeyringWithFirstAccount, _KeyringController_newKeyring, _KeyringController_clearKeyrings, _KeyringController_restoreKeyring, _KeyringController_destroyKeyring, _KeyringController_removeEmptyKeyrings, _KeyringController_checkForDuplicate, _KeyringController_setUnlocked, _KeyringController_persistOrRollback, _KeyringController_withRollback, _KeyringController_assertControllerMutexIsLocked, _KeyringController_withControllerLock, _KeyringController_withVaultLock;
+var _KeyringController_instances, _KeyringController_controllerOperationMutex, _KeyringController_vaultOperationMutex, _KeyringController_keyringBuilders, _KeyringController_keyrings, _KeyringController_unsupportedKeyrings, _KeyringController_password, _KeyringController_encryptor, _KeyringController_cacheEncryptionKey, _KeyringController_qrKeyringStateListener, _KeyringController_registerMessageHandlers, _KeyringController_getKeyringBuilderForType, _KeyringController_addQRKeyring, _KeyringController_subscribeToQRKeyringEvents, _KeyringController_unsubscribeFromQRKeyringsEvents, _KeyringController_createNewVaultWithKeyring, _KeyringController_verifySeedPhrase, _KeyringController_getUpdatedKeyrings, _KeyringController_getSerializedKeyrings, _KeyringController_restoreSerializedKeyrings, _KeyringController_unlockKeyrings, _KeyringController_updateVault, _KeyringController_getAccountsFromKeyrings, _KeyringController_createKeyringWithFirstAccount, _KeyringController_newKeyring, _KeyringController_clearKeyrings, _KeyringController_restoreKeyring, _KeyringController_destroyKeyring, _KeyringController_removeEmptyKeyrings, _KeyringController_checkForDuplicate, _KeyringController_setUnlocked, _KeyringController_persistOrRollback, _KeyringController_withRollback, _KeyringController_assertControllerMutexIsLocked, _KeyringController_withControllerLock, _KeyringController_withVaultLock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyringController = exports.getDefaultKeyringState = exports.keyringBuilderFactory = exports.SignTypedDataVersion = exports.AccountImportStrategy = exports.isCustodyKeyring = exports.KeyringTypes = void 0;
 const util_1 = require("@ethereumjs/util");
@@ -48,10 +48,7 @@ const eth_simple_keyring_1 = __importDefault(require("@metamask/eth-simple-keyri
 const utils_1 = require("@metamask/utils");
 const async_mutex_1 = require("async-mutex");
 const ethereumjs_wallet_1 = __importStar(require("ethereumjs-wallet"));
-// When generating a ULID within the same millisecond, monotonicFactory provides some guarantees regarding sort order.
-const ulid_1 = require("ulid");
 const constants_1 = require("./constants.cjs");
-const ulid = (0, ulid_1.monotonicFactory)();
 const name = 'KeyringController';
 /**
  * Available keyring types
@@ -135,7 +132,6 @@ const getDefaultKeyringState = () => {
     return {
         isUnlocked: false,
         keyrings: [],
-        keyringsMetadata: [],
     };
 };
 exports.getDefaultKeyringState = getDefaultKeyringState;
@@ -267,7 +263,6 @@ class KeyringController extends base_controller_1.BaseController {
                 vault: { persist: true, anonymous: false },
                 isUnlocked: { persist: false, anonymous: true },
                 keyrings: { persist: false, anonymous: false },
-                keyringsMetadata: { persist: false, anonymous: false },
                 encryptionKey: { persist: false, anonymous: false },
                 encryptionSalt: { persist: false, anonymous: false },
             },
@@ -282,7 +277,6 @@ class KeyringController extends base_controller_1.BaseController {
         _KeyringController_vaultOperationMutex.set(this, new async_mutex_1.Mutex());
         _KeyringController_keyringBuilders.set(this, void 0);
         _KeyringController_keyrings.set(this, void 0);
-        _KeyringController_keyringsMetadata.set(this, void 0);
         _KeyringController_unsupportedKeyrings.set(this, void 0);
         _KeyringController_password.set(this, void 0);
         _KeyringController_encryptor.set(this, void 0);
@@ -293,7 +287,6 @@ class KeyringController extends base_controller_1.BaseController {
             : defaultKeyringBuilders, "f");
         __classPrivateFieldSet(this, _KeyringController_encryptor, encryptor, "f");
         __classPrivateFieldSet(this, _KeyringController_keyrings, [], "f");
-        __classPrivateFieldSet(this, _KeyringController_keyringsMetadata, [], "f");
         __classPrivateFieldSet(this, _KeyringController_unsupportedKeyrings, [], "f");
         // This option allows the controller to cache an exported key
         // for use in decrypting and encrypting data without password
@@ -307,20 +300,16 @@ class KeyringController extends base_controller_1.BaseController {
      * Adds a new account to the default (first) HD seed phrase keyring.
      *
      * @param accountCount - Number of accounts before adding a new one, used to
-     * @param keyringId - The id of the keyring to add the account to.
      * make the method idempotent.
      * @returns Promise resolving to the added account address.
      */
-    async addNewAccount(accountCount, keyringId) {
+    async addNewAccount(accountCount) {
         return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_persistOrRollback).call(this, async () => {
-            let selectedKeyring = this.getKeyringsByType('HD Key Tree')[0];
-            if (keyringId) {
-                selectedKeyring = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, keyringId);
-            }
-            if (!selectedKeyring) {
+            const primaryKeyring = this.getKeyringsByType('HD Key Tree')[0];
+            if (!primaryKeyring) {
                 throw new Error('No HD keyring found');
             }
-            const oldAccounts = await selectedKeyring.getAccounts();
+            const oldAccounts = await primaryKeyring.getAccounts();
             if (accountCount && oldAccounts.length !== accountCount) {
                 if (accountCount > oldAccounts.length) {
                     throw new Error('Account out of sequence');
@@ -332,8 +321,8 @@ class KeyringController extends base_controller_1.BaseController {
                 }
                 return existingAccount;
             }
-            const [addedAccountAddress] = await selectedKeyring.addAccounts(1);
-            await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_verifySeedPhrase).call(this, keyringId);
+            const [addedAccountAddress] = await primaryKeyring.addAccounts(1);
+            await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_verifySeedPhrase).call(this);
             return addedAccountAddress;
         });
     }
@@ -416,7 +405,7 @@ class KeyringController extends base_controller_1.BaseController {
         if (type === KeyringTypes.qr) {
             return this.getOrAddQRKeyring();
         }
-        return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_persistOrRollback).call(this, async () => __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, opts, { id: ulid(), name: '' }));
+        return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_persistOrRollback).call(this, async () => __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, opts));
     }
     /**
      * Method to verify a given password validity. Throws an
@@ -442,21 +431,12 @@ class KeyringController extends base_controller_1.BaseController {
      * Gets the seed phrase of the HD keyring.
      *
      * @param password - Password of the keyring.
-     * @param keyringId - The id of the keyring.
      * @returns Promise resolving to the seed phrase.
      */
-    async exportSeedPhrase(password, keyringId) {
+    async exportSeedPhrase(password) {
         await this.verifyPassword(password);
-        if (!keyringId) {
-            assertHasUint8ArrayMnemonic(__classPrivateFieldGet(this, _KeyringController_keyrings, "f")[0]);
-            return __classPrivateFieldGet(this, _KeyringController_keyrings, "f")[0].mnemonic;
-        }
-        const selectedKeyring = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, keyringId);
-        if (!selectedKeyring) {
-            throw new Error('Keyring not found');
-        }
-        assertHasUint8ArrayMnemonic(selectedKeyring);
-        return selectedKeyring.mnemonic;
+        assertHasUint8ArrayMnemonic(__classPrivateFieldGet(this, _KeyringController_keyrings, "f")[0]);
+        return __classPrivateFieldGet(this, _KeyringController_keyrings, "f")[0].mnemonic;
     }
     /**
      * Gets the private key from the keyring controlling an address.
@@ -476,18 +456,9 @@ class KeyringController extends base_controller_1.BaseController {
     /**
      * Returns the public addresses of all accounts from every keyring.
      *
-     * @param keyringId - The id of the keyring to get the accounts from.
      * @returns A promise resolving to an array of addresses.
      */
-    async getAccounts(keyringId) {
-        if (keyringId) {
-            const keyringIndex = this.state.keyringsMetadata.findIndex((keyring) => keyring.id === keyringId);
-            const keyring = this.state.keyrings[keyringIndex];
-            if (!keyring) {
-                throw new Error('Keyring not found');
-            }
-            return keyring.accounts;
-        }
+    async getAccounts() {
         return this.state.keyrings.reduce((accounts, keyring) => accounts.concat(keyring.accounts), []);
     }
     /**
@@ -627,7 +598,7 @@ class KeyringController extends base_controller_1.BaseController {
             }
             const newKeyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.simple, [
                 privateKey,
-            ], { id: ulid(), name: '' }));
+            ]));
             const accounts = await newKeyring.getAccounts();
             return accounts[0];
         });
@@ -866,11 +837,10 @@ class KeyringController extends base_controller_1.BaseController {
     /**
      * Verifies the that the seed phrase restores the current keychain's accounts.
      *
-     * @param keyringId - The id of the keyring to verify.
      * @returns Promise resolving to the seed phrase as Uint8Array.
      */
-    async verifySeedPhrase(keyringId) {
-        return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_withControllerLock).call(this, async () => __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_verifySeedPhrase).call(this, keyringId));
+    async verifySeedPhrase() {
+        return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_withControllerLock).call(this, async () => __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_verifySeedPhrase).call(this));
     }
     async withKeyring(selector, operation, options = {
         createIfMissing: false,
@@ -880,16 +850,12 @@ class KeyringController extends base_controller_1.BaseController {
             if ('address' in selector) {
                 keyring = (await this.getKeyringForAccount(selector.address));
             }
-            else if ('type' in selector) {
+            else {
                 keyring = this.getKeyringsByType(selector.type)[selector.index || 0];
                 if (!keyring && options.createIfMissing) {
-                    const newMetadata = { id: ulid(), name: '' };
-                    keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, selector.type, options.createWithData, newMetadata));
+                    keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, selector.type, options.createWithData));
                 }
             }
-            else if ('id' in selector) {
-                keyring = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, selector.id);
-            }
             if (!keyring) {
                 throw new Error(constants_1.KeyringControllerError.KeyringNotFound);
             }
@@ -1090,7 +1056,7 @@ class KeyringController extends base_controller_1.BaseController {
     }
 }
 exports.KeyringController = KeyringController;
-_KeyringController_controllerOperationMutex = new WeakMap(), _KeyringController_vaultOperationMutex = new WeakMap(), _KeyringController_keyringBuilders = new WeakMap(), _KeyringController_keyrings = new WeakMap(), _KeyringController_keyringsMetadata = new WeakMap(), _KeyringController_unsupportedKeyrings = new WeakMap(), _KeyringController_password = new WeakMap(), _KeyringController_encryptor = new WeakMap(), _KeyringController_cacheEncryptionKey = new WeakMap(), _KeyringController_qrKeyringStateListener = new WeakMap(), _KeyringController_instances = new WeakSet(), _KeyringController_registerMessageHandlers = function _KeyringController_registerMessageHandlers() {
+_KeyringController_controllerOperationMutex = new WeakMap(), _KeyringController_vaultOperationMutex = new WeakMap(), _KeyringController_keyringBuilders = new WeakMap(), _KeyringController_keyrings = new WeakMap(), _KeyringController_unsupportedKeyrings = new WeakMap(), _KeyringController_password = new WeakMap(), _KeyringController_encryptor = new WeakMap(), _KeyringController_cacheEncryptionKey = new WeakMap(), _KeyringController_qrKeyringStateListener = new WeakMap(), _KeyringController_instances = new WeakSet(), _KeyringController_registerMessageHandlers = function _KeyringController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler(`${name}:signMessage`, this.signMessage.bind(this));
     this.messagingSystem.registerActionHandler(`${name}:signPersonalMessage`, this.signPersonalMessage.bind(this));
     this.messagingSystem.registerActionHandler(`${name}:signTypedMessage`, this.signTypedMessage.bind(this));
@@ -1104,9 +1070,6 @@ _KeyringController_controllerOperationMutex = new WeakMap(), _KeyringController_
     this.messagingSystem.registerActionHandler(`${name}:patchUserOperation`, this.patchUserOperation.bind(this));
     this.messagingSystem.registerActionHandler(`${name}:signUserOperation`, this.signUserOperation.bind(this));
     this.messagingSystem.registerActionHandler(`${name}:addNewAccount`, this.addNewAccount.bind(this));
-}, _KeyringController_getKeyringById = function _KeyringController_getKeyringById(keyringId) {
-    const index = __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").findIndex((metadata) => metadata.id === keyringId);
-    return __classPrivateFieldGet(this, _KeyringController_keyrings, "f")[index];
 }, _KeyringController_getKeyringBuilderForType = function _KeyringController_getKeyringBuilderForType(type) {
     return __classPrivateFieldGet(this, _KeyringController_keyringBuilders, "f").find((keyringBuilder) => keyringBuilder.type === type);
 }, _KeyringController_addQRKeyring = 
@@ -1120,10 +1083,7 @@ _KeyringController_controllerOperationMutex = new WeakMap(), _KeyringController_
 async function _KeyringController_addQRKeyring() {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
     // QRKeyring is not yet compatible with Keyring type from @metamask/utils
-    return (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr, undefined, {
-        id: ulid(),
-        name: '',
-    }));
+    return (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, KeyringTypes.qr));
 }, _KeyringController_subscribeToQRKeyringEvents = function _KeyringController_subscribeToQRKeyringEvents(qrKeyring) {
     __classPrivateFieldSet(this, _KeyringController_qrKeyringStateListener, (state) => {
         this.messagingSystem.publish(`${name}:qrKeyringStateChange`, state);
@@ -1168,20 +1128,17 @@ async function _KeyringController_createNewVaultWithKeyring(password, keyring) {
 /**
  * Internal non-exclusive method to verify the seed phrase.
  *
- * @param keyringId - The id of the keyring to verify the seed phrase for.
  * @returns A promise resolving to the seed phrase as Uint8Array.
  */
-async function _KeyringController_verifySeedPhrase(keyringId) {
+async function _KeyringController_verifySeedPhrase() {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
-    const keyring = keyringId
-        ? __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, keyringId)
-        : this.getKeyringsByType(KeyringTypes.hd)[0];
-    if (!keyring) {
+    const primaryKeyring = this.getKeyringsByType(KeyringTypes.hd)[0];
+    if (!primaryKeyring) {
         throw new Error('No HD keyring found.');
     }
-    assertHasUint8ArrayMnemonic(keyring);
-    const seedWords = keyring.mnemonic;
-    const accounts = await keyring.getAccounts();
+    assertHasUint8ArrayMnemonic(primaryKeyring);
+    const seedWords = primaryKeyring.mnemonic;
+    const accounts = await primaryKeyring.getAccounts();
     /* istanbul ignore if */
     if (accounts.length === 0) {
         throw new Error('Cannot verify an empty keyring.');
@@ -1229,13 +1186,12 @@ async function _KeyringController_getUpdatedKeyrings() {
 async function _KeyringController_getSerializedKeyrings({ includeUnsupported } = {
     includeUnsupported: true,
 }) {
-    const serializedKeyrings = await Promise.all(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(async (keyring, index) => {
-        const [type, data, metadata] = await Promise.all([
+    const serializedKeyrings = await Promise.all(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(async (keyring) => {
+        const [type, data] = await Promise.all([
             keyring.type,
             keyring.serialize(),
-            __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f")[index],
         ]);
-        return { type, data, metadata };
+        return { type, data };
     }));
     if (includeUnsupported) {
         serializedKeyrings.push(...__classPrivateFieldGet(this, _KeyringController_unsupportedKeyrings, "f"));
@@ -1310,10 +1266,8 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
         }
         await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreSerializedKeyrings).call(this, vault);
         const updatedKeyrings = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getUpdatedKeyrings).call(this);
-        const updatedKeyringsMetadata = __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f");
         this.update((state) => {
             state.keyrings = updatedKeyrings;
-            state.keyringsMetadata = updatedKeyringsMetadata;
             if (updatedState.encryptionKey || updatedState.encryptionSalt) {
                 state.encryptionKey = updatedState.encryptionKey;
                 state.encryptionSalt = updatedState.encryptionSalt;
@@ -1364,11 +1318,9 @@ async function _KeyringController_unlockKeyrings(password, encryptionKey, encryp
             throw new Error(constants_1.KeyringControllerError.MissingVaultData);
         }
         const updatedKeyrings = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getUpdatedKeyrings).call(this);
-        const updatedKeyringsMetadata = __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f");
         this.update((state) => {
             state.vault = updatedState.vault;
             state.keyrings = updatedKeyrings;
-            state.keyringsMetadata = updatedKeyringsMetadata;
             if (updatedState.encryptionKey) {
                 state.encryptionKey = updatedState.encryptionKey;
                 state.encryptionSalt = JSON.parse(updatedState.vault).salt;
@@ -1403,15 +1355,11 @@ async function _KeyringController_getAccountsFromKeyrings() {
  */
 async function _KeyringController_createKeyringWithFirstAccount(type, opts) {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
-    const keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, opts, {
-        id: ulid(),
-        name: '',
-    }));
+    const keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, opts));
     const [firstAccount] = await keyring.getAccounts();
     if (!firstAccount) {
         throw new Error(constants_1.KeyringControllerError.NoFirstAccount);
     }
-    return firstAccount;
 }, _KeyringController_newKeyring = 
 /**
  * Instantiate, initialize and return a new keyring of the given `type`,
@@ -1421,11 +1369,10 @@ async function _KeyringController_createKeyringWithFirstAccount(type, opts) {
  *
  * @param type - The type of keyring to add.
  * @param data - The data to restore a previously serialized keyring.
- * @param metadata - The metadata to add to the keyring.
  * @returns The new keyring.
  * @throws If the keyring includes duplicated accounts.
  */
-async function _KeyringController_newKeyring(type, data, metadata) {
+async function _KeyringController_newKeyring(type, data) {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
     const keyringBuilder = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringBuilderForType).call(this, type);
     if (!keyringBuilder) {
@@ -1457,9 +1404,6 @@ async function _KeyringController_newKeyring(type, data, metadata) {
         __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_subscribeToQRKeyringEvents).call(this, keyring);
     }
     __classPrivateFieldGet(this, _KeyringController_keyrings, "f").push(keyring);
-    if (metadata && __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length < __classPrivateFieldGet(this, _KeyringController_keyrings, "f").length) {
-        __classPrivateFieldSet(this, _KeyringController_keyringsMetadata, [...__classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f"), metadata], "f");
-    }
     return keyring;
 }, _KeyringController_clearKeyrings = 
 /**
@@ -1483,8 +1427,8 @@ async function _KeyringController_clearKeyrings() {
 async function _KeyringController_restoreKeyring(serialized) {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
     try {
-        const { type, data, metadata } = serialized;
-        return await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, data, metadata);
+        const { type, data } = serialized;
+        return await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, type, data);
     }
     catch (_) {
         __classPrivateFieldGet(this, _KeyringController_unsupportedKeyrings, "f").push(serialized);
@@ -1515,14 +1459,13 @@ async function _KeyringController_removeEmptyKeyrings() {
     // Since getAccounts returns a Promise
     // We need to wait to hear back form each keyring
     // in order to decide which ones are now valid (accounts.length > 0)
-    await Promise.all(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(async (keyring, index) => {
+    await Promise.all(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(async (keyring) => {
         const accounts = await keyring.getAccounts();
         if (accounts.length > 0) {
             validKeyrings.push(keyring);
         }
         else {
             await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_destroyKeyring).call(this, keyring);
-            __classPrivateFieldSet(this, _KeyringController_keyringsMetadata, __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").filter((_, i) => i !== index), "f");
         }
     }));
     __classPrivateFieldSet(this, _KeyringController_keyrings, validKeyrings, "f");