@metamask-previews/keyring-controller 19.0.1-preview-953c11ad → 19.0.2-preview-28a9753

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [19.0.2]
+
+### Changed
+
+- Remove use of `@metamask/keyring-api` ([#4695](https://github.com/MetaMask/core/pull/4695))
+  - `@metamask/providers` and `webextension-polyfill` peer depedencies are no longer required.
+- Use new `@metamask/keyring-internal-api@^1.0.0` ([#4695](https://github.com/MetaMask/core/pull/4695))
+  - This package has been split out from the Keyring API. Its types are compatible with the `@metamask/keyring-api` package used previously.
+- Bump `@metamask/message-manager` from `^11.0.2` to `^11.0.3` ([#5048](https://github.com/MetaMask/core/pull/5048))
+
 ## [19.0.1]
 
 ### Changed
@@ -608,7 +618,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.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@19.0.2...HEAD
+[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
 [18.0.0]: https://github.com/MetaMask/core/compare/@metamask/keyring-controller@17.3.1...@metamask/keyring-controller@18.0.0

package/dist/KeyringController.cjs

@@ -48,7 +48,6 @@ 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"));
-const ulid_1 = require("ulid");
 const constants_1 = require("./constants.cjs");
 const name = 'KeyringController';
 /**
@@ -200,14 +199,11 @@ function isSerializedKeyringsArray(array) {
  */
 async function displayForKeyring(keyring) {
     const accounts = await keyring.getAccounts();
-    const { opts } = keyring;
     return {
         type: keyring.type,
         // Cast to `string[]` here is safe here because `accounts` has no nullish
         // values, and `normalize` returns `string` unless given a nullish value
         accounts: accounts.map(normalize),
-        typeIndex: opts?.typeIndex,
-        id: opts?.id,
     };
 }
 /**
@@ -304,23 +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;
-            if (keyringId) {
-                selectedKeyring = this.getKeyringById(keyringId);
-            }
-            else {
-                selectedKeyring = this.getKeyringsByType(KeyringTypes.hd)[0];
-            }
-            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,7 +321,7 @@ class KeyringController extends base_controller_1.BaseController {
                 }
                 return existingAccount;
             }
-            const [addedAccountAddress] = await selectedKeyring.addAccounts(1);
+            const [addedAccountAddress] = await primaryKeyring.addAccounts(1);
             await this.verifySeedPhrase();
             return addedAccountAddress;
         });
@@ -386,14 +375,6 @@ class KeyringController extends base_controller_1.BaseController {
             });
         });
     }
-    async createKeyringFromMnemonic(mnemonic) {
-        return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_persistOrRollback).call(this, async () => {
-            return await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_createKeyringWithFirstAccount).call(this, KeyringTypes.hd, {
-                mnemonic,
-                numberOfAccounts: 1,
-            });
-        });
-    }
     /**
      * Create a new vault and primary keyring.
      *
@@ -450,18 +431,12 @@ class KeyringController extends base_controller_1.BaseController {
      * Gets the seed phrase of the HD keyring.
      *
      * @param password - Password of the keyring.
-     * @param typeIndex - Hd keyring identifier
      * @returns Promise resolving to the seed phrase.
      */
-    async exportSeedPhrase(password, typeIndex) {
+    async exportSeedPhrase(password) {
         await this.verifyPassword(password);
-        const keyring = this.getKeyringsByType(KeyringTypes.hd).find((innerKeyring) => innerKeyring
-            .opts.typeIndex === typeIndex);
-        if (!keyring) {
-            throw new Error(constants_1.KeyringControllerError.KeyringNotFound);
-        }
-        assertHasUint8ArrayMnemonic(keyring);
-        return keyring.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.
@@ -481,13 +456,10 @@ 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) {
-        return this.state.keyrings
-            .filter((keyring) => (keyringId ? keyring.id === keyringId : true))
-            .reduce((accounts, keyring) => accounts.concat(keyring.accounts), []);
+    async getAccounts() {
+        return this.state.keyrings.reduce((accounts, keyring) => accounts.concat(keyring.accounts), []);
     }
     /**
      * Get encryption public key.
@@ -521,19 +493,6 @@ class KeyringController extends base_controller_1.BaseController {
         }
         return keyring.decryptMessage(address, messageParams.data);
     }
-    /**
-     * Returns the keyring with the given id.
-     *
-     * @param id - The id of the keyring to return.
-     * @returns The keyring with the given id.
-     */
-    getKeyringById(id) {
-        const keyring = __classPrivateFieldGet(this, _KeyringController_keyrings, "f").find((item) => item.opts.id === id);
-        if (!keyring) {
-            throw new Error(constants_1.KeyringControllerError.KeyringNotFound);
-        }
-        return keyring;
-    }
     /**
      * Returns the currently initialized keyring that manages
      * the specified `address` if one exists.
@@ -923,15 +882,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) {
                     keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, selector.type, options.createWithData));
                 }
             }
-            else if ('id' in selector) {
-                keyring = this.getKeyringById(selector.id);
-            }
             if (!keyring) {
                 throw new Error(constants_1.KeyringControllerError.KeyringNotFound);
             }
@@ -1395,7 +1351,6 @@ async function _KeyringController_createKeyringWithFirstAccount(type, opts) {
     if (!firstAccount) {
         throw new Error(constants_1.KeyringControllerError.NoFirstAccount);
     }
-    return firstAccount;
 }, _KeyringController_newKeyring = 
 /**
  * Instantiate, initialize and return a new keyring of the given `type`,
@@ -1415,25 +1370,8 @@ async function _KeyringController_newKeyring(type, data) {
         throw new Error(`${constants_1.KeyringControllerError.NoKeyringBuilder}. Keyring type: ${type}`);
     }
     const keyring = keyringBuilder();
-    // find the last index of the type
-    const lastIndexOfType = __classPrivateFieldGet(this, _KeyringController_keyrings, "f").reduce((maxIndex, item) => {
-        if (item.type === type) {
-            return Math.max(maxIndex, item.opts
-                ?.typeIndex ?? 0);
-        }
-        return maxIndex;
-    }, 0);
-    if (type === KeyringTypes.hd) {
-        await keyring.deserialize({
-            ...(data ?? {}),
-            typeIndex: lastIndexOfType + 1,
-            id: (0, ulid_1.ulid)(),
-        });
-    }
-    else {
-        // @ts-expect-error Enforce data type after updating clients
-        await keyring.deserialize(data);
-    }
+    // @ts-expect-error Enforce data type after updating clients
+    await keyring.deserialize(data);
     if (keyring.init) {
         await keyring.init();
     }