@metamask-previews/keyring-controller 19.0.2-preview-9e831370 → 19.0.2-preview-03f094b7

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
+
 ## [19.0.2]
 
 ### Changed

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_unsupportedKeyrings, _KeyringController_password, _KeyringController_encryptor, _KeyringController_cacheEncryptionKey, _KeyringController_qrKeyringStateListener, _KeyringController_registerMessageHandlers, _KeyringController_getKeyringBuilderForType, _KeyringController_addQRKeyring, _KeyringController_subscribeToQRKeyringEvents, _KeyringController_unsubscribeFromQRKeyringsEvents, _KeyringController_createNewVaultWithKeyring, _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");
@@ -322,7 +322,7 @@ class KeyringController extends base_controller_1.BaseController {
                 return existingAccount;
             }
             const [addedAccountAddress] = await primaryKeyring.addAccounts(1);
-            await this.verifySeedPhrase();
+            await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_verifySeedPhrase).call(this);
             return addedAccountAddress;
         });
     }
@@ -840,39 +840,7 @@ class KeyringController extends base_controller_1.BaseController {
      * @returns Promise resolving to the seed phrase as Uint8Array.
      */
     async verifySeedPhrase() {
-        const primaryKeyring = this.getKeyringsByType(KeyringTypes.hd)[0];
-        if (!primaryKeyring) {
-            throw new Error('No HD keyring found.');
-        }
-        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.');
-        }
-        // The HD Keyring Builder is a default keyring builder
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const hdKeyringBuilder = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringBuilderForType).call(this, KeyringTypes.hd);
-        const hdKeyring = hdKeyringBuilder();
-        // @ts-expect-error @metamask/eth-hd-keyring correctly handles
-        // Uint8Array seed phrases in the `deserialize` method.
-        await hdKeyring.deserialize({
-            mnemonic: seedWords,
-            numberOfAccounts: accounts.length,
-        });
-        const testAccounts = await hdKeyring.getAccounts();
-        /* istanbul ignore if */
-        if (testAccounts.length !== accounts.length) {
-            throw new Error('Seed phrase imported incorrect number of accounts.');
-        }
-        testAccounts.forEach((account, i) => {
-            /* istanbul ignore if */
-            if (account.toLowerCase() !== accounts[i].toLowerCase()) {
-                throw new Error('Seed phrase imported different accounts.');
-            }
-        });
-        return seedWords;
+        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,
@@ -1156,6 +1124,47 @@ async function _KeyringController_createNewVaultWithKeyring(password, keyring) {
     await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_clearKeyrings).call(this);
     await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_createKeyringWithFirstAccount).call(this, keyring.type, keyring.opts);
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_setUnlocked).call(this);
+}, _KeyringController_verifySeedPhrase = 
+/**
+ * Internal non-exclusive method to verify the seed phrase.
+ *
+ * @returns A promise resolving to the seed phrase as Uint8Array.
+ */
+async function _KeyringController_verifySeedPhrase() {
+    __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
+    const primaryKeyring = this.getKeyringsByType(KeyringTypes.hd)[0];
+    if (!primaryKeyring) {
+        throw new Error('No HD keyring found.');
+    }
+    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.');
+    }
+    // The HD Keyring Builder is a default keyring builder
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const hdKeyringBuilder = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringBuilderForType).call(this, KeyringTypes.hd);
+    const hdKeyring = hdKeyringBuilder();
+    // @ts-expect-error @metamask/eth-hd-keyring correctly handles
+    // Uint8Array seed phrases in the `deserialize` method.
+    await hdKeyring.deserialize({
+        mnemonic: seedWords,
+        numberOfAccounts: accounts.length,
+    });
+    const testAccounts = await hdKeyring.getAccounts();
+    /* istanbul ignore if */
+    if (testAccounts.length !== accounts.length) {
+        throw new Error('Seed phrase imported incorrect number of accounts.');
+    }
+    testAccounts.forEach((account, i) => {
+        /* istanbul ignore if */
+        if (account.toLowerCase() !== accounts[i].toLowerCase()) {
+            throw new Error('Seed phrase imported different accounts.');
+        }
+    });
+    return seedWords;
 }, _KeyringController_getUpdatedKeyrings = 
 /**
  * Get the updated array of each keyring's type and