@metamask/eth-hd-keyring 13.0.0 → 13.1.0

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.1.0]
+
+### Added
+
+- Add `HdKeyringV2` class implementing `KeyringV2` interface ([#398](https://github.com/MetaMask/accounts/pull/398)), ([#402](https://github.com/MetaMask/accounts/pull/402)), ([#404](https://github.com/MetaMask/accounts/pull/404)), ([#410](https://github.com/MetaMask/accounts/pull/410)), ([#413](https://github.com/MetaMask/accounts/pull/413)), ([#451](https://github.com/MetaMask/accounts/pull/451)), ([#453](https://github.com/MetaMask/accounts/pull/453))
+  - Wraps legacy `HdKeyring` to expose accounts via the unified `KeyringV2` API and the `KeyringAccount` type.
+  - Extends `EthKeyringWrapper` for common Ethereum logic.
+
+### Fixed
+
+- Enforce mnemonics validation ([#450](https://github.com/MetaMask/accounts/pull/450))
+  - Validates mnemonics against BIP39 specification (word count, wordlist, checksum) before use.
+  - Throws for invalid mnemonics.
+
 ## [13.0.0]
 
 ### Added
@@ -221,7 +235,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Deserialize method (and `HdKeyring` constructor by extension) can no longer be passed an options object containing a value for `numberOfAccounts` if it is not also containing a value for `mnemonic`.
 - Package name changed from `eth-hd-keyring` to `@metamask/eth-hd-keyring`.
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.1.0...HEAD
+[13.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.0.0...@metamask/eth-hd-keyring@13.1.0
 [13.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@12.1.0...@metamask/eth-hd-keyring@13.0.0
 [12.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@12.0.0...@metamask/eth-hd-keyring@12.1.0
 [12.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@11.0.0...@metamask/eth-hd-keyring@12.0.0

package/dist/hd-keyring-v2.cjs

@@ -0,0 +1,180 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _HdKeyringV2_instances, _HdKeyringV2_isLastAccount, _HdKeyringV2_createKeyringAccount;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HdKeyringV2 = void 0;
+const keyring_api_1 = require("@metamask/keyring-api");
+const utils_1 = require("@metamask/utils");
+/**
+ * Methods supported by HD keyring EOA accounts.
+ * HD keyrings support all standard signing methods plus encryption and app keys.
+ */
+const HD_KEYRING_METHODS = [
+    keyring_api_1.EthMethod.SignTransaction,
+    keyring_api_1.EthMethod.Sign,
+    keyring_api_1.EthMethod.PersonalSign,
+    keyring_api_1.EthMethod.SignTypedDataV1,
+    keyring_api_1.EthMethod.SignTypedDataV3,
+    keyring_api_1.EthMethod.SignTypedDataV4,
+    keyring_api_1.EthKeyringMethod.Decrypt,
+    keyring_api_1.EthKeyringMethod.GetEncryptionPublicKey,
+    keyring_api_1.EthKeyringMethod.GetAppKeyAddress,
+    keyring_api_1.EthKeyringMethod.SignEip7702Authorization,
+];
+const hdKeyringV2Capabilities = {
+    scopes: [keyring_api_1.EthScope.Eoa],
+    bip44: {
+        deriveIndex: true,
+    },
+    privateKey: {
+        exportFormats: [{ encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal }],
+    },
+};
+class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
+    constructor(options) {
+        super({
+            type: keyring_api_1.KeyringType.Hd,
+            inner: options.legacyKeyring,
+            capabilities: hdKeyringV2Capabilities,
+        });
+        _HdKeyringV2_instances.add(this);
+        this.entropySource = options.entropySource;
+    }
+    async getAccounts() {
+        const addresses = await this.inner.getAccounts();
+        return addresses.map((address, addressIndex) => {
+            // Check if we already have this account in the registry
+            const existingId = this.registry.getAccountId(address);
+            if (existingId) {
+                const cached = this.registry.get(existingId);
+                if (cached) {
+                    return cached;
+                }
+            }
+            // Create and register the account if not already cached
+            return __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, address, addressIndex);
+        });
+    }
+    async createAccounts(options) {
+        return this.withLock(async () => {
+            // For HD keyring, we only support BIP-44 derive index
+            if (options.type !== 'bip44:derive-index') {
+                throw new Error(`Unsupported account creation type for HdKeyring: ${options.type}`);
+            }
+            // Validate that the entropy source matches this keyring's entropy source
+            if (options.entropySource !== this.entropySource) {
+                throw new Error(`Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`);
+            }
+            // Sync with the inner keyring state in case it was modified externally
+            // This ensures our cache is up-to-date before we make changes
+            const currentAccounts = await this.getAccounts();
+            const currentCount = currentAccounts.length;
+            const targetIndex = options.groupIndex;
+            // Check if an account at this index already exists
+            // Since only the last account can be deleted, array position always equals groupIndex
+            const existingAccount = currentAccounts[targetIndex];
+            if (existingAccount) {
+                return [existingAccount];
+            }
+            // Only allow derivation of the next account in sequence
+            if (targetIndex !== currentCount) {
+                throw new Error(`Can only create the next account in sequence. ` +
+                    `Expected groupIndex ${currentCount}, got ${targetIndex}.`);
+            }
+            // Add the next account
+            const [newAddress] = await this.inner.addAccounts(1);
+            if (!newAddress) {
+                throw new Error('Failed to create new account');
+            }
+            const newAccount = __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, newAddress, targetIndex);
+            return [newAccount];
+        });
+    }
+    /**
+     * Delete an account from the keyring.
+     *
+     * ⚠️ Warning: Only deleting the last account is possible.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    async deleteAccount(accountId) {
+        await this.withLock(async () => {
+            // Get the account first, before any registry operations
+            const { address } = await this.getAccount(accountId);
+            const hexAddress = this.toHexAddress(address);
+            // Assert that the account to delete is the last one in the inner keyring
+            // We check against the inner keyring directly to avoid stale registry issues
+            if (!(await __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_isLastAccount).call(this, address))) {
+                throw new Error('Can only delete the last account in the HD keyring due to derivation index constraints.');
+            }
+            // Remove from the legacy keyring
+            this.inner.removeAccount(hexAddress);
+            // Remove from the registry
+            this.registry.delete(accountId);
+        });
+    }
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    async exportAccount(accountId, options) {
+        const account = await this.getAccount(accountId);
+        // Validate encoding - we only support hexadecimal for Ethereum keys
+        const requestedEncoding = options?.encoding ?? keyring_api_1.PrivateKeyEncoding.Hexadecimal;
+        if (requestedEncoding !== keyring_api_1.PrivateKeyEncoding.Hexadecimal) {
+            throw new Error(`Unsupported encoding for Ethereum HD keyring: ${requestedEncoding}. Only '${keyring_api_1.PrivateKeyEncoding.Hexadecimal}' is supported.`);
+        }
+        // The legacy HdKeyring returns a hex string without 0x prefix.
+        const privateKeyWithout0x = await this.inner.exportAccount(this.toHexAddress(account.address));
+        const privateKey = (0, utils_1.add0x)(privateKeyWithout0x);
+        return {
+            type: 'private-key',
+            privateKey,
+            encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal,
+        };
+    }
+}
+exports.HdKeyringV2 = HdKeyringV2;
+_HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount = 
+/**
+ * Checks if the given address is the last account in the inner keyring.
+ * This compares against the actual inner keyring state, not the registry,
+ * to avoid issues with stale registry entries.
+ *
+ * @param address - The address to check.
+ * @returns True if this is the last account in the inner keyring.
+ */
+async function _HdKeyringV2_isLastAccount(address) {
+    const innerAddresses = await this.inner.getAccounts();
+    const lastAddress = innerAddresses[innerAddresses.length - 1];
+    return address === lastAddress;
+}, _HdKeyringV2_createKeyringAccount = function _HdKeyringV2_createKeyringAccount(address, addressIndex) {
+    const id = this.registry.register(address);
+    const account = {
+        id,
+        type: keyring_api_1.EthAccountType.Eoa,
+        address,
+        scopes: [...this.capabilities.scopes],
+        methods: [...HD_KEYRING_METHODS],
+        options: {
+            entropy: {
+                type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+                id: this.entropySource,
+                groupIndex: addressIndex,
+                derivationPath: `${this.inner.hdPath}/${addressIndex}`,
+            },
+            exportable: true,
+        },
+    };
+    // Add the account to the registry
+    this.registry.set(account);
+    return account;
+};
+//# sourceMappingURL=hd-keyring-v2.cjs.map

package/dist/hd-keyring-v2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring-v2.cjs","sourceRoot":"","sources":["../src/hd-keyring-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport {\n  type CreateAccountOptions,\n  EthAccountType,\n  EthKeyringMethod,\n  EthKeyringWrapper,\n  EthMethod,\n  EthScope,\n  type ExportAccountOptions,\n  type ExportedAccount,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\n  type KeyringCapabilities,\n  type KeyringV2,\n  KeyringType,\n  PrivateKeyEncoding,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\nimport type { HdKeyring } from './hd-keyring';\n\n/**\n * Methods supported by HD keyring EOA accounts.\n * HD keyrings support all standard signing methods plus encryption and app keys.\n */\nconst HD_KEYRING_METHODS = [\n  EthMethod.SignTransaction,\n  EthMethod.Sign,\n  EthMethod.PersonalSign,\n  EthMethod.SignTypedDataV1,\n  EthMethod.SignTypedDataV3,\n  EthMethod.SignTypedDataV4,\n  EthKeyringMethod.Decrypt,\n  EthKeyringMethod.GetEncryptionPublicKey,\n  EthKeyringMethod.GetAppKeyAddress,\n  EthKeyringMethod.SignEip7702Authorization,\n];\n\nconst hdKeyringV2Capabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  bip44: {\n    deriveIndex: true,\n  },\n  privateKey: {\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * HD keyring via the unified V2 interface.\n */\nexport type HdKeyringV2Options = {\n  legacyKeyring: HdKeyring;\n  entropySource: EntropySourceId;\n};\n\nexport class HdKeyringV2\n  extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>>\n  implements KeyringV2\n{\n  protected readonly entropySource: EntropySourceId;\n\n  constructor(options: HdKeyringV2Options) {\n    super({\n      type: KeyringType.Hd,\n      inner: options.legacyKeyring,\n      capabilities: hdKeyringV2Capabilities,\n    });\n    this.entropySource = options.entropySource;\n  }\n\n  /**\n   * Checks if the given address is the last account in the inner keyring.\n   * This compares against the actual inner keyring state, not the registry,\n   * to avoid issues with stale registry entries.\n   *\n   * @param address - The address to check.\n   * @returns True if this is the last account in the inner keyring.\n   */\n  async #isLastAccount(address: string): Promise<boolean> {\n    const innerAddresses = await this.inner.getAccounts();\n    const lastAddress = innerAddresses[innerAddresses.length - 1];\n    return address === lastAddress;\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @param addressIndex - The account index in the HD path.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(\n    address: Hex,\n    addressIndex: number,\n  ): Bip44Account<KeyringAccount> {\n    const id = this.registry.register(address);\n\n    const account: Bip44Account<KeyringAccount> = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...HD_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.Mnemonic,\n          id: this.entropySource,\n          groupIndex: addressIndex,\n          derivationPath: `${this.inner.hdPath}/${addressIndex}`,\n        },\n        exportable: true,\n      },\n    };\n\n    // Add the account to the registry\n    this.registry.set(account);\n\n    return account;\n  }\n\n  async getAccounts(): Promise<Bip44Account<KeyringAccount>[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address, addressIndex) => {\n      // Check if we already have this account in the registry\n      const existingId = this.registry.getAccountId(address);\n      if (existingId) {\n        const cached = this.registry.get(existingId);\n        if (cached) {\n          return cached;\n        }\n      }\n\n      // Create and register the account if not already cached\n      return this.#createKeyringAccount(address, addressIndex);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withLock(async () => {\n      // For HD keyring, we only support BIP-44 derive index\n      if (options.type !== 'bip44:derive-index') {\n        throw new Error(\n          `Unsupported account creation type for HdKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate that the entropy source matches this keyring's entropy source\n      if (options.entropySource !== this.entropySource) {\n        throw new Error(\n          `Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`,\n        );\n      }\n\n      // Sync with the inner keyring state in case it was modified externally\n      // This ensures our cache is up-to-date before we make changes\n      const currentAccounts = await this.getAccounts();\n      const currentCount = currentAccounts.length;\n      const targetIndex = options.groupIndex;\n\n      // Check if an account at this index already exists\n      // Since only the last account can be deleted, array position always equals groupIndex\n      const existingAccount = currentAccounts[targetIndex];\n      if (existingAccount) {\n        return [existingAccount];\n      }\n\n      // Only allow derivation of the next account in sequence\n      if (targetIndex !== currentCount) {\n        throw new Error(\n          `Can only create the next account in sequence. ` +\n            `Expected groupIndex ${currentCount}, got ${targetIndex}.`,\n        );\n      }\n\n      // Add the next account\n      const [newAddress] = await this.inner.addAccounts(1);\n\n      if (!newAddress) {\n        throw new Error('Failed to create new account');\n      }\n\n      const newAccount = this.#createKeyringAccount(newAddress, targetIndex);\n\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * ⚠️ Warning: Only deleting the last account is possible.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      // Get the account first, before any registry operations\n      const { address } = await this.getAccount(accountId);\n      const hexAddress = this.toHexAddress(address);\n\n      // Assert that the account to delete is the last one in the inner keyring\n      // We check against the inner keyring directly to avoid stale registry issues\n      if (!(await this.#isLastAccount(address))) {\n        throw new Error(\n          'Can only delete the last account in the HD keyring due to derivation index constraints.',\n        );\n      }\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(hexAddress);\n\n      // Remove from the registry\n      this.registry.delete(accountId);\n    });\n  }\n\n  /**\n   * Export the private key for an account in hexadecimal format.\n   *\n   * @param accountId - The ID of the account to export.\n   * @param options - Export options (only hexadecimal encoding is supported).\n   * @returns The exported account with private key.\n   */\n  async exportAccount(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount> {\n    const account = await this.getAccount(accountId);\n\n    // Validate encoding - we only support hexadecimal for Ethereum keys\n    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for Ethereum HD keyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    // The legacy HdKeyring returns a hex string without 0x prefix.\n    const privateKeyWithout0x = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    const privateKey = add0x(privateKeyWithout0x);\n\n    return {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n  }\n}\n"]}

package/dist/hd-keyring-v2.d.cts

@@ -0,0 +1,38 @@
+import type { Bip44Account } from "@metamask/account-api";
+import { type CreateAccountOptions, EthKeyringWrapper, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2, type EntropySourceId } from "@metamask/keyring-api";
+import type { AccountId } from "@metamask/keyring-utils";
+import type { HdKeyring } from "./hd-keyring.cjs";
+/**
+ * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.
+ *
+ * This wrapper exposes the accounts and signing capabilities of the legacy
+ * HD keyring via the unified V2 interface.
+ */
+export type HdKeyringV2Options = {
+    legacyKeyring: HdKeyring;
+    entropySource: EntropySourceId;
+};
+export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+    #private;
+    protected readonly entropySource: EntropySourceId;
+    constructor(options: HdKeyringV2Options);
+    getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
+    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * ⚠️ Warning: Only deleting the last account is possible.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
+}
+//# sourceMappingURL=hd-keyring-v2.d.cts.map

package/dist/hd-keyring-v2.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring-v2.d.cts","sourceRoot":"","sources":["../src/hd-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,oBAAoB,EAGzB,iBAAiB,EAGjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,cAAc,EAGnB,KAAK,SAAS,EAGd,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,OAAO,KAAK,EAAE,SAAS,EAAE,yBAAqB;AA6B9C;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,WACX,SAAQ,iBAAiB,CAAC,SAAS,EAAE,YAAY,CAAC,cAAc,CAAC,CACjE,YAAW,SAAS;;IAEpB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAEtC,OAAO,EAAE,kBAAkB;IA2DjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAkBtD,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAkD1C;;;;;;OAMG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CAyB5B"}

package/dist/hd-keyring-v2.d.mts

@@ -0,0 +1,38 @@
+import type { Bip44Account } from "@metamask/account-api";
+import { type CreateAccountOptions, EthKeyringWrapper, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2, type EntropySourceId } from "@metamask/keyring-api";
+import type { AccountId } from "@metamask/keyring-utils";
+import type { HdKeyring } from "./hd-keyring.mjs";
+/**
+ * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.
+ *
+ * This wrapper exposes the accounts and signing capabilities of the legacy
+ * HD keyring via the unified V2 interface.
+ */
+export type HdKeyringV2Options = {
+    legacyKeyring: HdKeyring;
+    entropySource: EntropySourceId;
+};
+export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+    #private;
+    protected readonly entropySource: EntropySourceId;
+    constructor(options: HdKeyringV2Options);
+    getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
+    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * ⚠️ Warning: Only deleting the last account is possible.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
+}
+//# sourceMappingURL=hd-keyring-v2.d.mts.map

package/dist/hd-keyring-v2.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring-v2.d.mts","sourceRoot":"","sources":["../src/hd-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,oBAAoB,EAGzB,iBAAiB,EAGjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,cAAc,EAGnB,KAAK,SAAS,EAGd,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,OAAO,KAAK,EAAE,SAAS,EAAE,yBAAqB;AA6B9C;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,WACX,SAAQ,iBAAiB,CAAC,SAAS,EAAE,YAAY,CAAC,cAAc,CAAC,CACjE,YAAW,SAAS;;IAEpB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAEtC,OAAO,EAAE,kBAAkB;IA2DjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAkBtD,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAkD1C;;;;;;OAMG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CAyB5B"}

package/dist/hd-keyring-v2.mjs

@@ -0,0 +1,176 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _HdKeyringV2_instances, _HdKeyringV2_isLastAccount, _HdKeyringV2_createKeyringAccount;
+import { EthAccountType, EthKeyringMethod, EthKeyringWrapper, EthMethod, EthScope, KeyringAccountEntropyTypeOption, KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api";
+import { add0x } from "@metamask/utils";
+/**
+ * Methods supported by HD keyring EOA accounts.
+ * HD keyrings support all standard signing methods plus encryption and app keys.
+ */
+const HD_KEYRING_METHODS = [
+    EthMethod.SignTransaction,
+    EthMethod.Sign,
+    EthMethod.PersonalSign,
+    EthMethod.SignTypedDataV1,
+    EthMethod.SignTypedDataV3,
+    EthMethod.SignTypedDataV4,
+    EthKeyringMethod.Decrypt,
+    EthKeyringMethod.GetEncryptionPublicKey,
+    EthKeyringMethod.GetAppKeyAddress,
+    EthKeyringMethod.SignEip7702Authorization,
+];
+const hdKeyringV2Capabilities = {
+    scopes: [EthScope.Eoa],
+    bip44: {
+        deriveIndex: true,
+    },
+    privateKey: {
+        exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],
+    },
+};
+export class HdKeyringV2 extends EthKeyringWrapper {
+    constructor(options) {
+        super({
+            type: KeyringType.Hd,
+            inner: options.legacyKeyring,
+            capabilities: hdKeyringV2Capabilities,
+        });
+        _HdKeyringV2_instances.add(this);
+        this.entropySource = options.entropySource;
+    }
+    async getAccounts() {
+        const addresses = await this.inner.getAccounts();
+        return addresses.map((address, addressIndex) => {
+            // Check if we already have this account in the registry
+            const existingId = this.registry.getAccountId(address);
+            if (existingId) {
+                const cached = this.registry.get(existingId);
+                if (cached) {
+                    return cached;
+                }
+            }
+            // Create and register the account if not already cached
+            return __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, address, addressIndex);
+        });
+    }
+    async createAccounts(options) {
+        return this.withLock(async () => {
+            // For HD keyring, we only support BIP-44 derive index
+            if (options.type !== 'bip44:derive-index') {
+                throw new Error(`Unsupported account creation type for HdKeyring: ${options.type}`);
+            }
+            // Validate that the entropy source matches this keyring's entropy source
+            if (options.entropySource !== this.entropySource) {
+                throw new Error(`Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`);
+            }
+            // Sync with the inner keyring state in case it was modified externally
+            // This ensures our cache is up-to-date before we make changes
+            const currentAccounts = await this.getAccounts();
+            const currentCount = currentAccounts.length;
+            const targetIndex = options.groupIndex;
+            // Check if an account at this index already exists
+            // Since only the last account can be deleted, array position always equals groupIndex
+            const existingAccount = currentAccounts[targetIndex];
+            if (existingAccount) {
+                return [existingAccount];
+            }
+            // Only allow derivation of the next account in sequence
+            if (targetIndex !== currentCount) {
+                throw new Error(`Can only create the next account in sequence. ` +
+                    `Expected groupIndex ${currentCount}, got ${targetIndex}.`);
+            }
+            // Add the next account
+            const [newAddress] = await this.inner.addAccounts(1);
+            if (!newAddress) {
+                throw new Error('Failed to create new account');
+            }
+            const newAccount = __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, newAddress, targetIndex);
+            return [newAccount];
+        });
+    }
+    /**
+     * Delete an account from the keyring.
+     *
+     * ⚠️ Warning: Only deleting the last account is possible.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    async deleteAccount(accountId) {
+        await this.withLock(async () => {
+            // Get the account first, before any registry operations
+            const { address } = await this.getAccount(accountId);
+            const hexAddress = this.toHexAddress(address);
+            // Assert that the account to delete is the last one in the inner keyring
+            // We check against the inner keyring directly to avoid stale registry issues
+            if (!(await __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_isLastAccount).call(this, address))) {
+                throw new Error('Can only delete the last account in the HD keyring due to derivation index constraints.');
+            }
+            // Remove from the legacy keyring
+            this.inner.removeAccount(hexAddress);
+            // Remove from the registry
+            this.registry.delete(accountId);
+        });
+    }
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    async exportAccount(accountId, options) {
+        const account = await this.getAccount(accountId);
+        // Validate encoding - we only support hexadecimal for Ethereum keys
+        const requestedEncoding = options?.encoding ?? PrivateKeyEncoding.Hexadecimal;
+        if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {
+            throw new Error(`Unsupported encoding for Ethereum HD keyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`);
+        }
+        // The legacy HdKeyring returns a hex string without 0x prefix.
+        const privateKeyWithout0x = await this.inner.exportAccount(this.toHexAddress(account.address));
+        const privateKey = add0x(privateKeyWithout0x);
+        return {
+            type: 'private-key',
+            privateKey,
+            encoding: PrivateKeyEncoding.Hexadecimal,
+        };
+    }
+}
+_HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount = 
+/**
+ * Checks if the given address is the last account in the inner keyring.
+ * This compares against the actual inner keyring state, not the registry,
+ * to avoid issues with stale registry entries.
+ *
+ * @param address - The address to check.
+ * @returns True if this is the last account in the inner keyring.
+ */
+async function _HdKeyringV2_isLastAccount(address) {
+    const innerAddresses = await this.inner.getAccounts();
+    const lastAddress = innerAddresses[innerAddresses.length - 1];
+    return address === lastAddress;
+}, _HdKeyringV2_createKeyringAccount = function _HdKeyringV2_createKeyringAccount(address, addressIndex) {
+    const id = this.registry.register(address);
+    const account = {
+        id,
+        type: EthAccountType.Eoa,
+        address,
+        scopes: [...this.capabilities.scopes],
+        methods: [...HD_KEYRING_METHODS],
+        options: {
+            entropy: {
+                type: KeyringAccountEntropyTypeOption.Mnemonic,
+                id: this.entropySource,
+                groupIndex: addressIndex,
+                derivationPath: `${this.inner.hdPath}/${addressIndex}`,
+            },
+            exportable: true,
+        },
+    };
+    // Add the account to the registry
+    this.registry.set(account);
+    return account;
+};
+//# sourceMappingURL=hd-keyring-v2.mjs.map

package/dist/hd-keyring-v2.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring-v2.mjs","sourceRoot":"","sources":["../src/hd-keyring-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport {\n  type CreateAccountOptions,\n  EthAccountType,\n  EthKeyringMethod,\n  EthKeyringWrapper,\n  EthMethod,\n  EthScope,\n  type ExportAccountOptions,\n  type ExportedAccount,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\n  type KeyringCapabilities,\n  type KeyringV2,\n  KeyringType,\n  PrivateKeyEncoding,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\nimport type { HdKeyring } from './hd-keyring';\n\n/**\n * Methods supported by HD keyring EOA accounts.\n * HD keyrings support all standard signing methods plus encryption and app keys.\n */\nconst HD_KEYRING_METHODS = [\n  EthMethod.SignTransaction,\n  EthMethod.Sign,\n  EthMethod.PersonalSign,\n  EthMethod.SignTypedDataV1,\n  EthMethod.SignTypedDataV3,\n  EthMethod.SignTypedDataV4,\n  EthKeyringMethod.Decrypt,\n  EthKeyringMethod.GetEncryptionPublicKey,\n  EthKeyringMethod.GetAppKeyAddress,\n  EthKeyringMethod.SignEip7702Authorization,\n];\n\nconst hdKeyringV2Capabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  bip44: {\n    deriveIndex: true,\n  },\n  privateKey: {\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * HD keyring via the unified V2 interface.\n */\nexport type HdKeyringV2Options = {\n  legacyKeyring: HdKeyring;\n  entropySource: EntropySourceId;\n};\n\nexport class HdKeyringV2\n  extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>>\n  implements KeyringV2\n{\n  protected readonly entropySource: EntropySourceId;\n\n  constructor(options: HdKeyringV2Options) {\n    super({\n      type: KeyringType.Hd,\n      inner: options.legacyKeyring,\n      capabilities: hdKeyringV2Capabilities,\n    });\n    this.entropySource = options.entropySource;\n  }\n\n  /**\n   * Checks if the given address is the last account in the inner keyring.\n   * This compares against the actual inner keyring state, not the registry,\n   * to avoid issues with stale registry entries.\n   *\n   * @param address - The address to check.\n   * @returns True if this is the last account in the inner keyring.\n   */\n  async #isLastAccount(address: string): Promise<boolean> {\n    const innerAddresses = await this.inner.getAccounts();\n    const lastAddress = innerAddresses[innerAddresses.length - 1];\n    return address === lastAddress;\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @param addressIndex - The account index in the HD path.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(\n    address: Hex,\n    addressIndex: number,\n  ): Bip44Account<KeyringAccount> {\n    const id = this.registry.register(address);\n\n    const account: Bip44Account<KeyringAccount> = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...HD_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.Mnemonic,\n          id: this.entropySource,\n          groupIndex: addressIndex,\n          derivationPath: `${this.inner.hdPath}/${addressIndex}`,\n        },\n        exportable: true,\n      },\n    };\n\n    // Add the account to the registry\n    this.registry.set(account);\n\n    return account;\n  }\n\n  async getAccounts(): Promise<Bip44Account<KeyringAccount>[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address, addressIndex) => {\n      // Check if we already have this account in the registry\n      const existingId = this.registry.getAccountId(address);\n      if (existingId) {\n        const cached = this.registry.get(existingId);\n        if (cached) {\n          return cached;\n        }\n      }\n\n      // Create and register the account if not already cached\n      return this.#createKeyringAccount(address, addressIndex);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withLock(async () => {\n      // For HD keyring, we only support BIP-44 derive index\n      if (options.type !== 'bip44:derive-index') {\n        throw new Error(\n          `Unsupported account creation type for HdKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate that the entropy source matches this keyring's entropy source\n      if (options.entropySource !== this.entropySource) {\n        throw new Error(\n          `Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`,\n        );\n      }\n\n      // Sync with the inner keyring state in case it was modified externally\n      // This ensures our cache is up-to-date before we make changes\n      const currentAccounts = await this.getAccounts();\n      const currentCount = currentAccounts.length;\n      const targetIndex = options.groupIndex;\n\n      // Check if an account at this index already exists\n      // Since only the last account can be deleted, array position always equals groupIndex\n      const existingAccount = currentAccounts[targetIndex];\n      if (existingAccount) {\n        return [existingAccount];\n      }\n\n      // Only allow derivation of the next account in sequence\n      if (targetIndex !== currentCount) {\n        throw new Error(\n          `Can only create the next account in sequence. ` +\n            `Expected groupIndex ${currentCount}, got ${targetIndex}.`,\n        );\n      }\n\n      // Add the next account\n      const [newAddress] = await this.inner.addAccounts(1);\n\n      if (!newAddress) {\n        throw new Error('Failed to create new account');\n      }\n\n      const newAccount = this.#createKeyringAccount(newAddress, targetIndex);\n\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * ⚠️ Warning: Only deleting the last account is possible.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      // Get the account first, before any registry operations\n      const { address } = await this.getAccount(accountId);\n      const hexAddress = this.toHexAddress(address);\n\n      // Assert that the account to delete is the last one in the inner keyring\n      // We check against the inner keyring directly to avoid stale registry issues\n      if (!(await this.#isLastAccount(address))) {\n        throw new Error(\n          'Can only delete the last account in the HD keyring due to derivation index constraints.',\n        );\n      }\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(hexAddress);\n\n      // Remove from the registry\n      this.registry.delete(accountId);\n    });\n  }\n\n  /**\n   * Export the private key for an account in hexadecimal format.\n   *\n   * @param accountId - The ID of the account to export.\n   * @param options - Export options (only hexadecimal encoding is supported).\n   * @returns The exported account with private key.\n   */\n  async exportAccount(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount> {\n    const account = await this.getAccount(accountId);\n\n    // Validate encoding - we only support hexadecimal for Ethereum keys\n    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for Ethereum HD keyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    // The legacy HdKeyring returns a hex string without 0x prefix.\n    const privateKeyWithout0x = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    const privateKey = add0x(privateKeyWithout0x);\n\n    return {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n  }\n}\n"]}

package/dist/hd-keyring.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress;
+var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress, _HdKeyring_assertValidMnemonic;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HdKeyring = void 0;
 const util_1 = require("@ethereumjs/util");
@@ -365,7 +365,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
     if (this.root) {
         throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
     }
-    this.mnemonic = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
+    // Convert and validate before assigning to instance property
+    // to avoid inconsistent state if validation fails
+    const mnemonicAsUint8Array = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
+    __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_assertValidMnemonic).call(this, mnemonicAsUint8Array);
+    this.mnemonic = mnemonicAsUint8Array;
     this.seed = await (0, key_tree_1.mnemonicToSeed)(this.mnemonic, '', // No passphrase
     __classPrivateFieldGet(this, _HdKeyring_cryptographicFunctions, "f"));
     this.hdWallet = hdkey_1.HDKey.fromMasterSeed(this.seed);
@@ -376,6 +380,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
     const normalized = (0, eth_sig_util_1.normalize)(address);
     (0, utils_1.assert)(normalized, 'Expected address to be set');
     return (0, utils_1.add0x)(normalized);
+}, _HdKeyring_assertValidMnemonic = function _HdKeyring_assertValidMnemonic(mnemonic) {
+    const mnemonicString = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_uint8ArrayToString).call(this, mnemonic);
+    if (!(0, scure_bip39_1.validateMnemonic)(mnemonicString, english_1.wordlist)) {
+        throw new Error('Eth-Hd-Keyring: Invalid secret recovery phrase provided');
+    }
 };
 HdKeyring.type = type;
 //# sourceMappingURL=hd-keyring.cjs.map

package/dist/hd-keyring.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"hd-keyring.cjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  type EIP7702Authorization,\n  type EthEncryptedData,\n  getEncryptionPublicKey,\n  type MessageTypes,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n  type TypedDataV1,\n  type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n  type CryptographicFunctions,\n  mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n  add0x,\n  assert,\n  assertIsHexString,\n  bigIntToBytes,\n  bytesToHex,\n  type Hex,\n  remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n  cryptographicFunctions?: CryptographicFunctions;\n};\n\n/**\n * The serialized state of an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type SerializedHDKeyringState = {\n  mnemonic: number[];\n  numberOfAccounts: number;\n  hdPath: string;\n};\n\n/**\n * An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type DeserializableHDKeyringState = Omit<\n  SerializedHDKeyringState,\n  'mnemonic'\n> & {\n  mnemonic: number[] | SerializedBuffer | string;\n};\n\n/**\n * Options for selecting an account from an `HDKeyring` instance.\n *\n * @property withAppKeyOrigin - The origin of the app requesting the account.\n */\nexport type HDKeyringAccountSelectionOptions = {\n  withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/**\n * Wallet storage object that contains both the HDKey and pre-computed address.\n */\ntype WalletData = {\n  hdKey: HDKey;\n  address: Hex;\n};\n\n/**\n * Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n *\n * @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n */\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'type' in value &&\n    value.type === 'Buffer' &&\n    'data' in value &&\n    Array.isArray(value.data)\n  );\n}\n\nexport class HdKeyring implements Keyring {\n  static type: string = type;\n\n  type: string = type;\n\n  mnemonic?: Uint8Array | null;\n\n  seed?: Uint8Array | null;\n\n  root?: HDKey | null;\n\n  hdWallet?: HDKey;\n\n  hdPath: string = hdPathString;\n\n  readonly #walletMap = new Map<Hex, WalletData>();\n\n  readonly #cryptographicFunctions?: CryptographicFunctions;\n\n  constructor(opts: HDKeyringOptions = {}) {\n    // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n    this.#cryptographicFunctions = opts.cryptographicFunctions;\n  }\n\n  /**\n   * Initialize the keyring with a random mnemonic.\n   *\n   * @returns A promise that resolves when the process is complete.\n   */\n  async generateRandomMnemonic(): Promise<void> {\n    await this.#initFromMnemonic(generateMnemonic(wordlist));\n  }\n\n  /**\n   * Return the serialized state of the keyring.\n   *\n   * @returns The serialized state of the keyring.\n   */\n  async serialize(): Promise<SerializedHDKeyringState> {\n    let mnemonic: number[] = [];\n\n    if (this.mnemonic) {\n      const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n      mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n    }\n\n    return {\n      mnemonic,\n      numberOfAccounts: this.#walletMap.size,\n      hdPath: this.hdPath,\n    };\n  }\n\n  /**\n   * Initialize the keyring with the given serialized state.\n   *\n   * @param opts - The serialized state of the keyring.\n   * @returns An empty array.\n   */\n  async deserialize(\n    opts: Partial<DeserializableHDKeyringState>,\n  ): Promise<void> {\n    if (opts.numberOfAccounts && !opts.mnemonic) {\n      throw new Error(\n        'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n      );\n    }\n\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.#walletMap.clear();\n    this.mnemonic = null;\n    this.seed = null;\n    this.root = null;\n    this.hdPath = opts.hdPath ?? hdPathString;\n\n    if (opts.mnemonic) {\n      await this.#initFromMnemonic(opts.mnemonic);\n    }\n\n    if (opts.numberOfAccounts) {\n      await this.addAccounts(opts.numberOfAccounts);\n    }\n  }\n\n  /**\n   * Add new accounts to the keyring. The accounts will be derived\n   * sequentially from the root HD wallet, using increasing indices.\n   *\n   * @param numberOfAccounts - The number of accounts to add.\n   * @returns The addresses of the new accounts.\n   */\n  async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n    if (!this.root) {\n      throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n    }\n\n    const oldLen = this.#walletMap.size;\n    const newAddresses: Hex[] = [];\n    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n      const hdKey = this.root.deriveChild(i);\n      assert(hdKey.publicKey, 'Expected public key to be set');\n\n      const address = this.#addressFromPublicKey(hdKey.publicKey);\n      const walletData: WalletData = {\n        hdKey,\n        address,\n      };\n\n      this.#walletMap.set(address, walletData);\n      newAddresses.push(address);\n    }\n\n    return Promise.resolve(newAddresses);\n  }\n\n  /**\n   * Get the addresses of all accounts in the keyring.\n   *\n   * @returns The addresses of all accounts in the keyring.\n   */\n  async getAccounts(): Promise<Hex[]> {\n    return Array.from(this.#walletMap.keys());\n  }\n\n  /**\n   * Get the public address of the account for the given app key origin.\n   *\n   * @param address - The address of the account.\n   * @param origin - The origin of the app requesting the account.\n   * @returns The public address of the account.\n   */\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    assert(wallet.publicKey, 'Expected public key to be set');\n    const appKeyAddress = this.#normalizeAddress(\n      bytesToHex(publicToAddress(wallet.publicKey)),\n    );\n    return appKeyAddress;\n  }\n\n  /**\n   * Export the private key for a specific account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for exporting the account.\n   * @param opts.withAppKeyOrigin - An optional string to export the account\n   * for a specific app origin.\n   * @returns The private key of the account.\n   */\n  async exportAccount(\n    address: Hex,\n    opts?: { withAppKeyOrigin: string },\n  ): Promise<string> {\n    const wallet = opts\n      ? this.#getWalletForAccount(address, opts)\n      : this.#getWalletForAccount(address);\n    const { privateKey } = wallet;\n    assert(\n      privateKey instanceof Uint8Array,\n      'Expected private key to be of type Uint8Array',\n    );\n    return remove0x(bytesToHex(privateKey));\n  }\n\n  /**\n   * Sign a transaction using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param tx - The transaction to sign.\n   * @param opts - The options for signing the transaction.\n   * @returns The signed transaction.\n   */\n  async signTransaction(\n    address: Hex,\n    tx: TypedTransaction,\n    opts = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = tx.sign(Buffer.from(privKey));\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? tx;\n  }\n\n  /**\n   * Sign a message using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param data - The data to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    assertIsHexString(data);\n    const message = remove0x(data);\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  /**\n   * Sign a personal message using the private key of the specified account.\n   * This method is compatible with the `personal_sign` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param msgHex - The message to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const privateKey = Buffer.from(privKey);\n    return personalSign({ privateKey, data: msgHex });\n  }\n\n  /**\n   * Decrypt an encrypted message using the private key of the specified account.\n   * The message must be encrypted using the public key of the account.\n   * This method is compatible with the `eth_decryptMessage` RPC method\n   *\n   * @param withAccount - The address of the account.\n   * @param encryptedData - The encrypted data.\n   * @returns The decrypted message.\n   */\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: EthEncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const { privateKey: privateKeyAsUint8Array } = wallet;\n    assert(privateKeyAsUint8Array, 'Expected private key to be set');\n    const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n    return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n  }\n\n  /**\n   * Sign a typed message using the private key of the specified account.\n   * This method is compatible with the `eth_signTypedData` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param data - The typed data to sign.\n   * @param options - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version },\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: HDKeyringAccountSelectionOptions & Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !Object.keys(SignTypedDataVersion).includes(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({\n      privateKey: Buffer.from(privateKey),\n      data,\n      version,\n    });\n  }\n\n  /**\n   * Sign an EIP-7702 authorization using the private key of the specified account.\n   * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n   *\n   * @param withAccount - The address of the account.\n   * @param authorization - The EIP-7702 authorization to sign.\n   * @param opts - The options for selecting the account.\n   * @returns The signature of the authorization.\n   */\n  async signEip7702Authorization(\n    withAccount: Hex,\n    authorization: EIP7702Authorization,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n    return signEIP7702Authorization({\n      privateKey: Buffer.from(privateKey),\n      authorization,\n    });\n  }\n\n  /**\n   * Remove an account from the keyring.\n   *\n   * @param account - The address of the account to remove.\n   */\n  removeAccount(account: Hex): void {\n    const address = this.#normalizeAddress(account);\n\n    if (!this.#walletMap.has(address)) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#walletMap.delete(address);\n  }\n\n  /**\n   * Get the public key of the account to be used for encryption.\n   *\n   * @param withAccount - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The public key of the account.\n   */\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n    return publicKey;\n  }\n\n  /**\n   * Convert a Uint8Array mnemonic to a secret recovery phrase,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The Uint8Array mnemonic.\n   * @returns The string mnemonic.\n   */\n  #uint8ArrayToString(mnemonic: Uint8Array): string {\n    const recoveredIndices = Array.from(\n      new Uint16Array(new Uint8Array(mnemonic).buffer),\n    );\n    return recoveredIndices.map((i) => wordlist[i]).join(' ');\n  }\n\n  /**\n   * Convert a secret recovery phrase to a Uint8Array mnemonic,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The string mnemonic.\n   * @returns The Uint8Array mnemonic.\n   */\n  #stringToUint8Array(mnemonic: string): Uint8Array {\n    const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n    return new Uint8Array(new Uint16Array(indices).buffer);\n  }\n\n  /**\n   * Convert a mnemonic to a Uint8Array mnemonic.\n   *\n   * @param mnemonic - The mnemonic seed phrase.\n   * @returns The Uint8Array mnemonic.\n   */\n  #mnemonicToUint8Array(\n    mnemonic: Buffer | SerializedBuffer | string | Uint8Array | number[],\n  ): Uint8Array {\n    let mnemonicData: unknown = mnemonic;\n    // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n    // with the structure `{ type: 'Buffer', data: [...] }`\n    if (isSerializedBuffer(mnemonic)) {\n      mnemonicData = mnemonic.data;\n    }\n\n    if (\n      // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n      typeof mnemonicData === 'string' ||\n      Buffer.isBuffer(mnemonicData) ||\n      Array.isArray(mnemonicData)\n    ) {\n      let mnemonicAsString: string;\n      if (Array.isArray(mnemonicData)) {\n        mnemonicAsString = Buffer.from(mnemonicData).toString();\n      } else if (Buffer.isBuffer(mnemonicData)) {\n        mnemonicAsString = mnemonicData.toString();\n      } else {\n        mnemonicAsString = mnemonicData;\n      }\n      return this.#stringToUint8Array(mnemonicAsString);\n    } else if (\n      mnemonicData instanceof Object &&\n      !(mnemonicData instanceof Uint8Array)\n    ) {\n      // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n      return Uint8Array.from(Object.values(mnemonicData));\n    }\n\n    assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n    return mnemonicData;\n  }\n\n  /**\n   * Get the private key for the specified account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The private key of the account.\n   */\n  #getPrivateKeyFor(\n    address: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Uint8Array | Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    assert(wallet.privateKey, 'Missing private key');\n    return wallet.privateKey;\n  }\n\n  /**\n   * Get the wallet for the specified account.\n   *\n   * @param account - The address of the account.\n   * @returns The wallet for the account as HDKey.\n   */\n  #getWalletForAccount(account: Hex): HDKey;\n\n  /**\n   * Get the wallet for the specified account and app origin.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    accounts: Hex,\n    opts: { withAppKeyOrigin: string },\n  ): { privateKey: Buffer; publicKey: Buffer };\n\n  /**\n   * Get the wallet for the specified account with optional\n   * additional options.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    account: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer };\n\n  #getWalletForAccount(\n    account: Hex,\n    { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer } {\n    const address = this.#normalizeAddress(account);\n    const walletData = this.#walletMap.get(address);\n    if (!walletData) {\n      throw new Error('HD Keyring - Unable to find matching address.');\n    }\n\n    if (withAppKeyOrigin) {\n      const { privateKey } = walletData.hdKey;\n      assert(privateKey, 'Expected private key to be set');\n      const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n      const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n      return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n    }\n\n    return walletData.hdKey;\n  }\n\n  /**\n   * Sets appropriate properties for the keyring based on the given\n   * BIP39-compliant mnemonic.\n   *\n   * @param mnemonic - A seed phrase represented\n   * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n   * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n   */\n  async #initFromMnemonic(\n    mnemonic: string | number[] | SerializedBuffer | Buffer | Uint8Array,\n  ): Promise<void> {\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n    this.seed = await mnemonicToSeed(\n      this.mnemonic,\n      '', // No passphrase\n      this.#cryptographicFunctions,\n    );\n    this.hdWallet = HDKey.fromMasterSeed(this.seed);\n    this.root = this.hdWallet.derive(this.hdPath);\n  }\n\n  /**\n   * Get the address of the account from the public key.\n   *\n   * @param publicKey - The public key of the account.\n   * @returns The address of the account.\n   */\n  #addressFromPublicKey(publicKey: Uint8Array): Hex {\n    return add0x(\n      bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n    );\n  }\n\n  /**\n   * Normalize an address to a lower-cased '0x'-prefixed hex string.\n   *\n   * @param address - The address to normalize.\n   * @returns The normalized address.\n   */\n  #normalizeAddress(address: string): Hex {\n    const normalized = normalize(address);\n    assert(normalized, 'Expected address to be set');\n    return add0x(normalized);\n  }\n}\n"]}
+{"version":3,"file":"hd-keyring.cjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  type EIP7702Authorization,\n  type EthEncryptedData,\n  getEncryptionPublicKey,\n  type MessageTypes,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n  type TypedDataV1,\n  type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n  type CryptographicFunctions,\n  mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic, validateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n  add0x,\n  assert,\n  assertIsHexString,\n  bigIntToBytes,\n  bytesToHex,\n  type Hex,\n  remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\ntype Mnemonic = string | number[] | SerializedBuffer | Buffer | Uint8Array;\n\nexport type HDKeyringOptions = {\n  cryptographicFunctions?: CryptographicFunctions;\n};\n\n/**\n * The serialized state of an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type SerializedHDKeyringState = {\n  mnemonic: number[];\n  numberOfAccounts: number;\n  hdPath: string;\n};\n\n/**\n * An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type DeserializableHDKeyringState = Omit<\n  SerializedHDKeyringState,\n  'mnemonic'\n> & {\n  mnemonic: number[] | SerializedBuffer | string;\n};\n\n/**\n * Options for selecting an account from an `HDKeyring` instance.\n *\n * @property withAppKeyOrigin - The origin of the app requesting the account.\n */\nexport type HDKeyringAccountSelectionOptions = {\n  withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/**\n * Wallet storage object that contains both the HDKey and pre-computed address.\n */\ntype WalletData = {\n  hdKey: HDKey;\n  address: Hex;\n};\n\n/**\n * Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n *\n * @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n */\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'type' in value &&\n    value.type === 'Buffer' &&\n    'data' in value &&\n    Array.isArray(value.data)\n  );\n}\n\nexport class HdKeyring implements Keyring {\n  static type: string = type;\n\n  type: string = type;\n\n  mnemonic?: Uint8Array | null;\n\n  seed?: Uint8Array | null;\n\n  root?: HDKey | null;\n\n  hdWallet?: HDKey;\n\n  hdPath: string = hdPathString;\n\n  readonly #walletMap = new Map<Hex, WalletData>();\n\n  readonly #cryptographicFunctions?: CryptographicFunctions;\n\n  constructor(opts: HDKeyringOptions = {}) {\n    // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n    this.#cryptographicFunctions = opts.cryptographicFunctions;\n  }\n\n  /**\n   * Initialize the keyring with a random mnemonic.\n   *\n   * @returns A promise that resolves when the process is complete.\n   */\n  async generateRandomMnemonic(): Promise<void> {\n    await this.#initFromMnemonic(generateMnemonic(wordlist));\n  }\n\n  /**\n   * Return the serialized state of the keyring.\n   *\n   * @returns The serialized state of the keyring.\n   */\n  async serialize(): Promise<SerializedHDKeyringState> {\n    let mnemonic: number[] = [];\n\n    if (this.mnemonic) {\n      const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n      mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n    }\n\n    return {\n      mnemonic,\n      numberOfAccounts: this.#walletMap.size,\n      hdPath: this.hdPath,\n    };\n  }\n\n  /**\n   * Initialize the keyring with the given serialized state.\n   *\n   * @param opts - The serialized state of the keyring.\n   * @returns An empty array.\n   */\n  async deserialize(\n    opts: Partial<DeserializableHDKeyringState>,\n  ): Promise<void> {\n    if (opts.numberOfAccounts && !opts.mnemonic) {\n      throw new Error(\n        'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n      );\n    }\n\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.#walletMap.clear();\n    this.mnemonic = null;\n    this.seed = null;\n    this.root = null;\n    this.hdPath = opts.hdPath ?? hdPathString;\n\n    if (opts.mnemonic) {\n      await this.#initFromMnemonic(opts.mnemonic);\n    }\n\n    if (opts.numberOfAccounts) {\n      await this.addAccounts(opts.numberOfAccounts);\n    }\n  }\n\n  /**\n   * Add new accounts to the keyring. The accounts will be derived\n   * sequentially from the root HD wallet, using increasing indices.\n   *\n   * @param numberOfAccounts - The number of accounts to add.\n   * @returns The addresses of the new accounts.\n   */\n  async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n    if (!this.root) {\n      throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n    }\n\n    const oldLen = this.#walletMap.size;\n    const newAddresses: Hex[] = [];\n    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n      const hdKey = this.root.deriveChild(i);\n      assert(hdKey.publicKey, 'Expected public key to be set');\n\n      const address = this.#addressFromPublicKey(hdKey.publicKey);\n      const walletData: WalletData = {\n        hdKey,\n        address,\n      };\n\n      this.#walletMap.set(address, walletData);\n      newAddresses.push(address);\n    }\n\n    return Promise.resolve(newAddresses);\n  }\n\n  /**\n   * Get the addresses of all accounts in the keyring.\n   *\n   * @returns The addresses of all accounts in the keyring.\n   */\n  async getAccounts(): Promise<Hex[]> {\n    return Array.from(this.#walletMap.keys());\n  }\n\n  /**\n   * Get the public address of the account for the given app key origin.\n   *\n   * @param address - The address of the account.\n   * @param origin - The origin of the app requesting the account.\n   * @returns The public address of the account.\n   */\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    assert(wallet.publicKey, 'Expected public key to be set');\n    const appKeyAddress = this.#normalizeAddress(\n      bytesToHex(publicToAddress(wallet.publicKey)),\n    );\n    return appKeyAddress;\n  }\n\n  /**\n   * Export the private key for a specific account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for exporting the account.\n   * @param opts.withAppKeyOrigin - An optional string to export the account\n   * for a specific app origin.\n   * @returns The private key of the account.\n   */\n  async exportAccount(\n    address: Hex,\n    opts?: { withAppKeyOrigin: string },\n  ): Promise<string> {\n    const wallet = opts\n      ? this.#getWalletForAccount(address, opts)\n      : this.#getWalletForAccount(address);\n    const { privateKey } = wallet;\n    assert(\n      privateKey instanceof Uint8Array,\n      'Expected private key to be of type Uint8Array',\n    );\n    return remove0x(bytesToHex(privateKey));\n  }\n\n  /**\n   * Sign a transaction using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param tx - The transaction to sign.\n   * @param opts - The options for signing the transaction.\n   * @returns The signed transaction.\n   */\n  async signTransaction(\n    address: Hex,\n    tx: TypedTransaction,\n    opts = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = tx.sign(Buffer.from(privKey));\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? tx;\n  }\n\n  /**\n   * Sign a message using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param data - The data to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    assertIsHexString(data);\n    const message = remove0x(data);\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  /**\n   * Sign a personal message using the private key of the specified account.\n   * This method is compatible with the `personal_sign` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param msgHex - The message to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const privateKey = Buffer.from(privKey);\n    return personalSign({ privateKey, data: msgHex });\n  }\n\n  /**\n   * Decrypt an encrypted message using the private key of the specified account.\n   * The message must be encrypted using the public key of the account.\n   * This method is compatible with the `eth_decryptMessage` RPC method\n   *\n   * @param withAccount - The address of the account.\n   * @param encryptedData - The encrypted data.\n   * @returns The decrypted message.\n   */\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: EthEncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const { privateKey: privateKeyAsUint8Array } = wallet;\n    assert(privateKeyAsUint8Array, 'Expected private key to be set');\n    const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n    return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n  }\n\n  /**\n   * Sign a typed message using the private key of the specified account.\n   * This method is compatible with the `eth_signTypedData` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param data - The typed data to sign.\n   * @param options - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version },\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: HDKeyringAccountSelectionOptions & Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !Object.keys(SignTypedDataVersion).includes(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({\n      privateKey: Buffer.from(privateKey),\n      data,\n      version,\n    });\n  }\n\n  /**\n   * Sign an EIP-7702 authorization using the private key of the specified account.\n   * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n   *\n   * @param withAccount - The address of the account.\n   * @param authorization - The EIP-7702 authorization to sign.\n   * @param opts - The options for selecting the account.\n   * @returns The signature of the authorization.\n   */\n  async signEip7702Authorization(\n    withAccount: Hex,\n    authorization: EIP7702Authorization,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n    return signEIP7702Authorization({\n      privateKey: Buffer.from(privateKey),\n      authorization,\n    });\n  }\n\n  /**\n   * Remove an account from the keyring.\n   *\n   * @param account - The address of the account to remove.\n   */\n  removeAccount(account: Hex): void {\n    const address = this.#normalizeAddress(account);\n\n    if (!this.#walletMap.has(address)) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#walletMap.delete(address);\n  }\n\n  /**\n   * Get the public key of the account to be used for encryption.\n   *\n   * @param withAccount - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The public key of the account.\n   */\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n    return publicKey;\n  }\n\n  /**\n   * Convert a Uint8Array mnemonic to a secret recovery phrase,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The Uint8Array mnemonic.\n   * @returns The string mnemonic.\n   */\n  #uint8ArrayToString(mnemonic: Uint8Array): string {\n    const recoveredIndices = Array.from(\n      new Uint16Array(new Uint8Array(mnemonic).buffer),\n    );\n    return recoveredIndices.map((i) => wordlist[i]).join(' ');\n  }\n\n  /**\n   * Convert a secret recovery phrase to a Uint8Array mnemonic,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The string mnemonic.\n   * @returns The Uint8Array mnemonic.\n   */\n  #stringToUint8Array(mnemonic: string): Uint8Array {\n    const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n    return new Uint8Array(new Uint16Array(indices).buffer);\n  }\n\n  /**\n   * Convert a mnemonic to a Uint8Array mnemonic.\n   *\n   * @param mnemonic - The mnemonic seed phrase.\n   * @returns The Uint8Array mnemonic.\n   */\n  #mnemonicToUint8Array(mnemonic: Mnemonic): Uint8Array {\n    let mnemonicData: unknown = mnemonic;\n    // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n    // with the structure `{ type: 'Buffer', data: [...] }`\n    if (isSerializedBuffer(mnemonic)) {\n      mnemonicData = mnemonic.data;\n    }\n\n    if (\n      // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n      typeof mnemonicData === 'string' ||\n      Buffer.isBuffer(mnemonicData) ||\n      Array.isArray(mnemonicData)\n    ) {\n      let mnemonicAsString: string;\n      if (Array.isArray(mnemonicData)) {\n        mnemonicAsString = Buffer.from(mnemonicData).toString();\n      } else if (Buffer.isBuffer(mnemonicData)) {\n        mnemonicAsString = mnemonicData.toString();\n      } else {\n        mnemonicAsString = mnemonicData;\n      }\n      return this.#stringToUint8Array(mnemonicAsString);\n    } else if (\n      mnemonicData instanceof Object &&\n      !(mnemonicData instanceof Uint8Array)\n    ) {\n      // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n      return Uint8Array.from(Object.values(mnemonicData));\n    }\n\n    assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n    return mnemonicData;\n  }\n\n  /**\n   * Get the private key for the specified account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The private key of the account.\n   */\n  #getPrivateKeyFor(\n    address: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Uint8Array | Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    assert(wallet.privateKey, 'Missing private key');\n    return wallet.privateKey;\n  }\n\n  /**\n   * Get the wallet for the specified account.\n   *\n   * @param account - The address of the account.\n   * @returns The wallet for the account as HDKey.\n   */\n  #getWalletForAccount(account: Hex): HDKey;\n\n  /**\n   * Get the wallet for the specified account and app origin.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    accounts: Hex,\n    opts: { withAppKeyOrigin: string },\n  ): { privateKey: Buffer; publicKey: Buffer };\n\n  /**\n   * Get the wallet for the specified account with optional\n   * additional options.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    account: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer };\n\n  #getWalletForAccount(\n    account: Hex,\n    { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer } {\n    const address = this.#normalizeAddress(account);\n    const walletData = this.#walletMap.get(address);\n    if (!walletData) {\n      throw new Error('HD Keyring - Unable to find matching address.');\n    }\n\n    if (withAppKeyOrigin) {\n      const { privateKey } = walletData.hdKey;\n      assert(privateKey, 'Expected private key to be set');\n      const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n      const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n      return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n    }\n\n    return walletData.hdKey;\n  }\n\n  /**\n   * Sets appropriate properties for the keyring based on the given\n   * BIP39-compliant mnemonic.\n   *\n   * @param mnemonic - A seed phrase represented\n   * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n   * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n   */\n  async #initFromMnemonic(mnemonic: Mnemonic): Promise<void> {\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    // Convert and validate before assigning to instance property\n    // to avoid inconsistent state if validation fails\n    const mnemonicAsUint8Array = this.#mnemonicToUint8Array(mnemonic);\n    this.#assertValidMnemonic(mnemonicAsUint8Array);\n    this.mnemonic = mnemonicAsUint8Array;\n\n    this.seed = await mnemonicToSeed(\n      this.mnemonic,\n      '', // No passphrase\n      this.#cryptographicFunctions,\n    );\n    this.hdWallet = HDKey.fromMasterSeed(this.seed);\n    this.root = this.hdWallet.derive(this.hdPath);\n  }\n\n  /**\n   * Get the address of the account from the public key.\n   *\n   * @param publicKey - The public key of the account.\n   * @returns The address of the account.\n   */\n  #addressFromPublicKey(publicKey: Uint8Array): Hex {\n    return add0x(\n      bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n    );\n  }\n\n  /**\n   * Normalize an address to a lower-cased '0x'-prefixed hex string.\n   *\n   * @param address - The address to normalize.\n   * @returns The normalized address.\n   */\n  #normalizeAddress(address: string): Hex {\n    const normalized = normalize(address);\n    assert(normalized, 'Expected address to be set');\n    return add0x(normalized);\n  }\n\n  /**\n   * Assert that the mnemonic seed phrase is valid.\n   * Throws an error if the mnemonic is not a valid BIP39 phrase.\n   *\n   * @param mnemonic - The mnemonic seed phrase to validate (as Uint8Array).\n   * @throws If the mnemonic is not a valid BIP39 secret recovery phrase.\n   */\n  #assertValidMnemonic(mnemonic: Uint8Array): void {\n    const mnemonicString = this.#uint8ArrayToString(mnemonic);\n    if (!validateMnemonic(mnemonicString, wordlist)) {\n      throw new Error(\n        'Eth-Hd-Keyring: Invalid secret recovery phrase provided',\n      );\n    }\n  }\n}\n"]}

package/dist/hd-keyring.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"hd-keyring.d.cts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hd-keyring.d.cts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}

package/dist/hd-keyring.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"hd-keyring.d.mts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hd-keyring.d.mts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}

package/dist/hd-keyring.mjs

@@ -9,11 +9,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress;
+var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress, _HdKeyring_assertValidMnemonic;
 import { privateToPublic, publicToAddress, ecsign } from "@ethereumjs/util";
 import { concatSig, decrypt, getEncryptionPublicKey, normalize, personalSign, signEIP7702Authorization, signTypedData, SignTypedDataVersion } from "@metamask/eth-sig-util";
 import { mnemonicToSeed } from "@metamask/key-tree";
-import { generateMnemonic } from "@metamask/scure-bip39";
+import { generateMnemonic, validateMnemonic } from "@metamask/scure-bip39";
 import { wordlist } from "@metamask/scure-bip39/dist/wordlists/english.js";
 import { add0x, assert, assertIsHexString, bigIntToBytes, bytesToHex, remove0x } from "@metamask/utils";
 import { HDKey } from "ethereum-cryptography/hdkey";
@@ -361,7 +361,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
     if (this.root) {
         throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
     }
-    this.mnemonic = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
+    // Convert and validate before assigning to instance property
+    // to avoid inconsistent state if validation fails
+    const mnemonicAsUint8Array = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
+    __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_assertValidMnemonic).call(this, mnemonicAsUint8Array);
+    this.mnemonic = mnemonicAsUint8Array;
     this.seed = await mnemonicToSeed(this.mnemonic, '', // No passphrase
     __classPrivateFieldGet(this, _HdKeyring_cryptographicFunctions, "f"));
     this.hdWallet = HDKey.fromMasterSeed(this.seed);
@@ -372,6 +376,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
     const normalized = normalize(address);
     assert(normalized, 'Expected address to be set');
     return add0x(normalized);
+}, _HdKeyring_assertValidMnemonic = function _HdKeyring_assertValidMnemonic(mnemonic) {
+    const mnemonicString = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_uint8ArrayToString).call(this, mnemonic);
+    if (!validateMnemonic(mnemonicString, wordlist)) {
+        throw new Error('Eth-Hd-Keyring: Invalid secret recovery phrase provided');
+    }
 };
 HdKeyring.type = type;
 //# sourceMappingURL=hd-keyring.mjs.map

package/dist/hd-keyring.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"hd-keyring.mjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  type EIP7702Authorization,\n  type EthEncryptedData,\n  getEncryptionPublicKey,\n  type MessageTypes,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n  type TypedDataV1,\n  type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n  type CryptographicFunctions,\n  mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n  add0x,\n  assert,\n  assertIsHexString,\n  bigIntToBytes,\n  bytesToHex,\n  type Hex,\n  remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n  cryptographicFunctions?: CryptographicFunctions;\n};\n\n/**\n * The serialized state of an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type SerializedHDKeyringState = {\n  mnemonic: number[];\n  numberOfAccounts: number;\n  hdPath: string;\n};\n\n/**\n * An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type DeserializableHDKeyringState = Omit<\n  SerializedHDKeyringState,\n  'mnemonic'\n> & {\n  mnemonic: number[] | SerializedBuffer | string;\n};\n\n/**\n * Options for selecting an account from an `HDKeyring` instance.\n *\n * @property withAppKeyOrigin - The origin of the app requesting the account.\n */\nexport type HDKeyringAccountSelectionOptions = {\n  withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/**\n * Wallet storage object that contains both the HDKey and pre-computed address.\n */\ntype WalletData = {\n  hdKey: HDKey;\n  address: Hex;\n};\n\n/**\n * Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n *\n * @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n */\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'type' in value &&\n    value.type === 'Buffer' &&\n    'data' in value &&\n    Array.isArray(value.data)\n  );\n}\n\nexport class HdKeyring implements Keyring {\n  static type: string = type;\n\n  type: string = type;\n\n  mnemonic?: Uint8Array | null;\n\n  seed?: Uint8Array | null;\n\n  root?: HDKey | null;\n\n  hdWallet?: HDKey;\n\n  hdPath: string = hdPathString;\n\n  readonly #walletMap = new Map<Hex, WalletData>();\n\n  readonly #cryptographicFunctions?: CryptographicFunctions;\n\n  constructor(opts: HDKeyringOptions = {}) {\n    // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n    this.#cryptographicFunctions = opts.cryptographicFunctions;\n  }\n\n  /**\n   * Initialize the keyring with a random mnemonic.\n   *\n   * @returns A promise that resolves when the process is complete.\n   */\n  async generateRandomMnemonic(): Promise<void> {\n    await this.#initFromMnemonic(generateMnemonic(wordlist));\n  }\n\n  /**\n   * Return the serialized state of the keyring.\n   *\n   * @returns The serialized state of the keyring.\n   */\n  async serialize(): Promise<SerializedHDKeyringState> {\n    let mnemonic: number[] = [];\n\n    if (this.mnemonic) {\n      const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n      mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n    }\n\n    return {\n      mnemonic,\n      numberOfAccounts: this.#walletMap.size,\n      hdPath: this.hdPath,\n    };\n  }\n\n  /**\n   * Initialize the keyring with the given serialized state.\n   *\n   * @param opts - The serialized state of the keyring.\n   * @returns An empty array.\n   */\n  async deserialize(\n    opts: Partial<DeserializableHDKeyringState>,\n  ): Promise<void> {\n    if (opts.numberOfAccounts && !opts.mnemonic) {\n      throw new Error(\n        'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n      );\n    }\n\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.#walletMap.clear();\n    this.mnemonic = null;\n    this.seed = null;\n    this.root = null;\n    this.hdPath = opts.hdPath ?? hdPathString;\n\n    if (opts.mnemonic) {\n      await this.#initFromMnemonic(opts.mnemonic);\n    }\n\n    if (opts.numberOfAccounts) {\n      await this.addAccounts(opts.numberOfAccounts);\n    }\n  }\n\n  /**\n   * Add new accounts to the keyring. The accounts will be derived\n   * sequentially from the root HD wallet, using increasing indices.\n   *\n   * @param numberOfAccounts - The number of accounts to add.\n   * @returns The addresses of the new accounts.\n   */\n  async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n    if (!this.root) {\n      throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n    }\n\n    const oldLen = this.#walletMap.size;\n    const newAddresses: Hex[] = [];\n    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n      const hdKey = this.root.deriveChild(i);\n      assert(hdKey.publicKey, 'Expected public key to be set');\n\n      const address = this.#addressFromPublicKey(hdKey.publicKey);\n      const walletData: WalletData = {\n        hdKey,\n        address,\n      };\n\n      this.#walletMap.set(address, walletData);\n      newAddresses.push(address);\n    }\n\n    return Promise.resolve(newAddresses);\n  }\n\n  /**\n   * Get the addresses of all accounts in the keyring.\n   *\n   * @returns The addresses of all accounts in the keyring.\n   */\n  async getAccounts(): Promise<Hex[]> {\n    return Array.from(this.#walletMap.keys());\n  }\n\n  /**\n   * Get the public address of the account for the given app key origin.\n   *\n   * @param address - The address of the account.\n   * @param origin - The origin of the app requesting the account.\n   * @returns The public address of the account.\n   */\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    assert(wallet.publicKey, 'Expected public key to be set');\n    const appKeyAddress = this.#normalizeAddress(\n      bytesToHex(publicToAddress(wallet.publicKey)),\n    );\n    return appKeyAddress;\n  }\n\n  /**\n   * Export the private key for a specific account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for exporting the account.\n   * @param opts.withAppKeyOrigin - An optional string to export the account\n   * for a specific app origin.\n   * @returns The private key of the account.\n   */\n  async exportAccount(\n    address: Hex,\n    opts?: { withAppKeyOrigin: string },\n  ): Promise<string> {\n    const wallet = opts\n      ? this.#getWalletForAccount(address, opts)\n      : this.#getWalletForAccount(address);\n    const { privateKey } = wallet;\n    assert(\n      privateKey instanceof Uint8Array,\n      'Expected private key to be of type Uint8Array',\n    );\n    return remove0x(bytesToHex(privateKey));\n  }\n\n  /**\n   * Sign a transaction using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param tx - The transaction to sign.\n   * @param opts - The options for signing the transaction.\n   * @returns The signed transaction.\n   */\n  async signTransaction(\n    address: Hex,\n    tx: TypedTransaction,\n    opts = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = tx.sign(Buffer.from(privKey));\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? tx;\n  }\n\n  /**\n   * Sign a message using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param data - The data to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    assertIsHexString(data);\n    const message = remove0x(data);\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  /**\n   * Sign a personal message using the private key of the specified account.\n   * This method is compatible with the `personal_sign` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param msgHex - The message to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const privateKey = Buffer.from(privKey);\n    return personalSign({ privateKey, data: msgHex });\n  }\n\n  /**\n   * Decrypt an encrypted message using the private key of the specified account.\n   * The message must be encrypted using the public key of the account.\n   * This method is compatible with the `eth_decryptMessage` RPC method\n   *\n   * @param withAccount - The address of the account.\n   * @param encryptedData - The encrypted data.\n   * @returns The decrypted message.\n   */\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: EthEncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const { privateKey: privateKeyAsUint8Array } = wallet;\n    assert(privateKeyAsUint8Array, 'Expected private key to be set');\n    const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n    return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n  }\n\n  /**\n   * Sign a typed message using the private key of the specified account.\n   * This method is compatible with the `eth_signTypedData` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param data - The typed data to sign.\n   * @param options - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version },\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: HDKeyringAccountSelectionOptions & Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !Object.keys(SignTypedDataVersion).includes(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({\n      privateKey: Buffer.from(privateKey),\n      data,\n      version,\n    });\n  }\n\n  /**\n   * Sign an EIP-7702 authorization using the private key of the specified account.\n   * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n   *\n   * @param withAccount - The address of the account.\n   * @param authorization - The EIP-7702 authorization to sign.\n   * @param opts - The options for selecting the account.\n   * @returns The signature of the authorization.\n   */\n  async signEip7702Authorization(\n    withAccount: Hex,\n    authorization: EIP7702Authorization,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n    return signEIP7702Authorization({\n      privateKey: Buffer.from(privateKey),\n      authorization,\n    });\n  }\n\n  /**\n   * Remove an account from the keyring.\n   *\n   * @param account - The address of the account to remove.\n   */\n  removeAccount(account: Hex): void {\n    const address = this.#normalizeAddress(account);\n\n    if (!this.#walletMap.has(address)) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#walletMap.delete(address);\n  }\n\n  /**\n   * Get the public key of the account to be used for encryption.\n   *\n   * @param withAccount - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The public key of the account.\n   */\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n    return publicKey;\n  }\n\n  /**\n   * Convert a Uint8Array mnemonic to a secret recovery phrase,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The Uint8Array mnemonic.\n   * @returns The string mnemonic.\n   */\n  #uint8ArrayToString(mnemonic: Uint8Array): string {\n    const recoveredIndices = Array.from(\n      new Uint16Array(new Uint8Array(mnemonic).buffer),\n    );\n    return recoveredIndices.map((i) => wordlist[i]).join(' ');\n  }\n\n  /**\n   * Convert a secret recovery phrase to a Uint8Array mnemonic,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The string mnemonic.\n   * @returns The Uint8Array mnemonic.\n   */\n  #stringToUint8Array(mnemonic: string): Uint8Array {\n    const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n    return new Uint8Array(new Uint16Array(indices).buffer);\n  }\n\n  /**\n   * Convert a mnemonic to a Uint8Array mnemonic.\n   *\n   * @param mnemonic - The mnemonic seed phrase.\n   * @returns The Uint8Array mnemonic.\n   */\n  #mnemonicToUint8Array(\n    mnemonic: Buffer | SerializedBuffer | string | Uint8Array | number[],\n  ): Uint8Array {\n    let mnemonicData: unknown = mnemonic;\n    // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n    // with the structure `{ type: 'Buffer', data: [...] }`\n    if (isSerializedBuffer(mnemonic)) {\n      mnemonicData = mnemonic.data;\n    }\n\n    if (\n      // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n      typeof mnemonicData === 'string' ||\n      Buffer.isBuffer(mnemonicData) ||\n      Array.isArray(mnemonicData)\n    ) {\n      let mnemonicAsString: string;\n      if (Array.isArray(mnemonicData)) {\n        mnemonicAsString = Buffer.from(mnemonicData).toString();\n      } else if (Buffer.isBuffer(mnemonicData)) {\n        mnemonicAsString = mnemonicData.toString();\n      } else {\n        mnemonicAsString = mnemonicData;\n      }\n      return this.#stringToUint8Array(mnemonicAsString);\n    } else if (\n      mnemonicData instanceof Object &&\n      !(mnemonicData instanceof Uint8Array)\n    ) {\n      // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n      return Uint8Array.from(Object.values(mnemonicData));\n    }\n\n    assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n    return mnemonicData;\n  }\n\n  /**\n   * Get the private key for the specified account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The private key of the account.\n   */\n  #getPrivateKeyFor(\n    address: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Uint8Array | Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    assert(wallet.privateKey, 'Missing private key');\n    return wallet.privateKey;\n  }\n\n  /**\n   * Get the wallet for the specified account.\n   *\n   * @param account - The address of the account.\n   * @returns The wallet for the account as HDKey.\n   */\n  #getWalletForAccount(account: Hex): HDKey;\n\n  /**\n   * Get the wallet for the specified account and app origin.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    accounts: Hex,\n    opts: { withAppKeyOrigin: string },\n  ): { privateKey: Buffer; publicKey: Buffer };\n\n  /**\n   * Get the wallet for the specified account with optional\n   * additional options.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    account: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer };\n\n  #getWalletForAccount(\n    account: Hex,\n    { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer } {\n    const address = this.#normalizeAddress(account);\n    const walletData = this.#walletMap.get(address);\n    if (!walletData) {\n      throw new Error('HD Keyring - Unable to find matching address.');\n    }\n\n    if (withAppKeyOrigin) {\n      const { privateKey } = walletData.hdKey;\n      assert(privateKey, 'Expected private key to be set');\n      const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n      const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n      return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n    }\n\n    return walletData.hdKey;\n  }\n\n  /**\n   * Sets appropriate properties for the keyring based on the given\n   * BIP39-compliant mnemonic.\n   *\n   * @param mnemonic - A seed phrase represented\n   * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n   * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n   */\n  async #initFromMnemonic(\n    mnemonic: string | number[] | SerializedBuffer | Buffer | Uint8Array,\n  ): Promise<void> {\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n    this.seed = await mnemonicToSeed(\n      this.mnemonic,\n      '', // No passphrase\n      this.#cryptographicFunctions,\n    );\n    this.hdWallet = HDKey.fromMasterSeed(this.seed);\n    this.root = this.hdWallet.derive(this.hdPath);\n  }\n\n  /**\n   * Get the address of the account from the public key.\n   *\n   * @param publicKey - The public key of the account.\n   * @returns The address of the account.\n   */\n  #addressFromPublicKey(publicKey: Uint8Array): Hex {\n    return add0x(\n      bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n    );\n  }\n\n  /**\n   * Normalize an address to a lower-cased '0x'-prefixed hex string.\n   *\n   * @param address - The address to normalize.\n   * @returns The normalized address.\n   */\n  #normalizeAddress(address: string): Hex {\n    const normalized = normalize(address);\n    assert(normalized, 'Expected address to be set');\n    return add0x(normalized);\n  }\n}\n"]}
+{"version":3,"file":"hd-keyring.mjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  type EIP7702Authorization,\n  type EthEncryptedData,\n  getEncryptionPublicKey,\n  type MessageTypes,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n  type TypedDataV1,\n  type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n  type CryptographicFunctions,\n  mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic, validateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n  add0x,\n  assert,\n  assertIsHexString,\n  bigIntToBytes,\n  bytesToHex,\n  type Hex,\n  remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\ntype Mnemonic = string | number[] | SerializedBuffer | Buffer | Uint8Array;\n\nexport type HDKeyringOptions = {\n  cryptographicFunctions?: CryptographicFunctions;\n};\n\n/**\n * The serialized state of an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type SerializedHDKeyringState = {\n  mnemonic: number[];\n  numberOfAccounts: number;\n  hdPath: string;\n};\n\n/**\n * An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n *\n * @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n */\nexport type DeserializableHDKeyringState = Omit<\n  SerializedHDKeyringState,\n  'mnemonic'\n> & {\n  mnemonic: number[] | SerializedBuffer | string;\n};\n\n/**\n * Options for selecting an account from an `HDKeyring` instance.\n *\n * @property withAppKeyOrigin - The origin of the app requesting the account.\n */\nexport type HDKeyringAccountSelectionOptions = {\n  withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/**\n * Wallet storage object that contains both the HDKey and pre-computed address.\n */\ntype WalletData = {\n  hdKey: HDKey;\n  address: Hex;\n};\n\n/**\n * Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n *\n * @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n */\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'type' in value &&\n    value.type === 'Buffer' &&\n    'data' in value &&\n    Array.isArray(value.data)\n  );\n}\n\nexport class HdKeyring implements Keyring {\n  static type: string = type;\n\n  type: string = type;\n\n  mnemonic?: Uint8Array | null;\n\n  seed?: Uint8Array | null;\n\n  root?: HDKey | null;\n\n  hdWallet?: HDKey;\n\n  hdPath: string = hdPathString;\n\n  readonly #walletMap = new Map<Hex, WalletData>();\n\n  readonly #cryptographicFunctions?: CryptographicFunctions;\n\n  constructor(opts: HDKeyringOptions = {}) {\n    // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n    this.#cryptographicFunctions = opts.cryptographicFunctions;\n  }\n\n  /**\n   * Initialize the keyring with a random mnemonic.\n   *\n   * @returns A promise that resolves when the process is complete.\n   */\n  async generateRandomMnemonic(): Promise<void> {\n    await this.#initFromMnemonic(generateMnemonic(wordlist));\n  }\n\n  /**\n   * Return the serialized state of the keyring.\n   *\n   * @returns The serialized state of the keyring.\n   */\n  async serialize(): Promise<SerializedHDKeyringState> {\n    let mnemonic: number[] = [];\n\n    if (this.mnemonic) {\n      const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n      mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n    }\n\n    return {\n      mnemonic,\n      numberOfAccounts: this.#walletMap.size,\n      hdPath: this.hdPath,\n    };\n  }\n\n  /**\n   * Initialize the keyring with the given serialized state.\n   *\n   * @param opts - The serialized state of the keyring.\n   * @returns An empty array.\n   */\n  async deserialize(\n    opts: Partial<DeserializableHDKeyringState>,\n  ): Promise<void> {\n    if (opts.numberOfAccounts && !opts.mnemonic) {\n      throw new Error(\n        'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n      );\n    }\n\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    this.#walletMap.clear();\n    this.mnemonic = null;\n    this.seed = null;\n    this.root = null;\n    this.hdPath = opts.hdPath ?? hdPathString;\n\n    if (opts.mnemonic) {\n      await this.#initFromMnemonic(opts.mnemonic);\n    }\n\n    if (opts.numberOfAccounts) {\n      await this.addAccounts(opts.numberOfAccounts);\n    }\n  }\n\n  /**\n   * Add new accounts to the keyring. The accounts will be derived\n   * sequentially from the root HD wallet, using increasing indices.\n   *\n   * @param numberOfAccounts - The number of accounts to add.\n   * @returns The addresses of the new accounts.\n   */\n  async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n    if (!this.root) {\n      throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n    }\n\n    const oldLen = this.#walletMap.size;\n    const newAddresses: Hex[] = [];\n    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n      const hdKey = this.root.deriveChild(i);\n      assert(hdKey.publicKey, 'Expected public key to be set');\n\n      const address = this.#addressFromPublicKey(hdKey.publicKey);\n      const walletData: WalletData = {\n        hdKey,\n        address,\n      };\n\n      this.#walletMap.set(address, walletData);\n      newAddresses.push(address);\n    }\n\n    return Promise.resolve(newAddresses);\n  }\n\n  /**\n   * Get the addresses of all accounts in the keyring.\n   *\n   * @returns The addresses of all accounts in the keyring.\n   */\n  async getAccounts(): Promise<Hex[]> {\n    return Array.from(this.#walletMap.keys());\n  }\n\n  /**\n   * Get the public address of the account for the given app key origin.\n   *\n   * @param address - The address of the account.\n   * @param origin - The origin of the app requesting the account.\n   * @returns The public address of the account.\n   */\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    assert(wallet.publicKey, 'Expected public key to be set');\n    const appKeyAddress = this.#normalizeAddress(\n      bytesToHex(publicToAddress(wallet.publicKey)),\n    );\n    return appKeyAddress;\n  }\n\n  /**\n   * Export the private key for a specific account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for exporting the account.\n   * @param opts.withAppKeyOrigin - An optional string to export the account\n   * for a specific app origin.\n   * @returns The private key of the account.\n   */\n  async exportAccount(\n    address: Hex,\n    opts?: { withAppKeyOrigin: string },\n  ): Promise<string> {\n    const wallet = opts\n      ? this.#getWalletForAccount(address, opts)\n      : this.#getWalletForAccount(address);\n    const { privateKey } = wallet;\n    assert(\n      privateKey instanceof Uint8Array,\n      'Expected private key to be of type Uint8Array',\n    );\n    return remove0x(bytesToHex(privateKey));\n  }\n\n  /**\n   * Sign a transaction using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param tx - The transaction to sign.\n   * @param opts - The options for signing the transaction.\n   * @returns The signed transaction.\n   */\n  async signTransaction(\n    address: Hex,\n    tx: TypedTransaction,\n    opts = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = tx.sign(Buffer.from(privKey));\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? tx;\n  }\n\n  /**\n   * Sign a message using the private key of the specified account.\n   *\n   * @param address - The address of the account.\n   * @param data - The data to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    assertIsHexString(data);\n    const message = remove0x(data);\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  /**\n   * Sign a personal message using the private key of the specified account.\n   * This method is compatible with the `personal_sign` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param msgHex - The message to sign.\n   * @param opts - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: string,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const privateKey = Buffer.from(privKey);\n    return personalSign({ privateKey, data: msgHex });\n  }\n\n  /**\n   * Decrypt an encrypted message using the private key of the specified account.\n   * The message must be encrypted using the public key of the account.\n   * This method is compatible with the `eth_decryptMessage` RPC method\n   *\n   * @param withAccount - The address of the account.\n   * @param encryptedData - The encrypted data.\n   * @returns The decrypted message.\n   */\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: EthEncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const { privateKey: privateKeyAsUint8Array } = wallet;\n    assert(privateKeyAsUint8Array, 'Expected private key to be set');\n    const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n    return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n  }\n\n  /**\n   * Sign a typed message using the private key of the specified account.\n   * This method is compatible with the `eth_signTypedData` RPC method.\n   *\n   * @param address - The address of the account.\n   * @param data - The typed data to sign.\n   * @param options - The options for signing the message.\n   * @returns The signature of the message.\n   */\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version },\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: HDKeyringAccountSelectionOptions & Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !Object.keys(SignTypedDataVersion).includes(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({\n      privateKey: Buffer.from(privateKey),\n      data,\n      version,\n    });\n  }\n\n  /**\n   * Sign an EIP-7702 authorization using the private key of the specified account.\n   * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n   *\n   * @param withAccount - The address of the account.\n   * @param authorization - The EIP-7702 authorization to sign.\n   * @param opts - The options for selecting the account.\n   * @returns The signature of the authorization.\n   */\n  async signEip7702Authorization(\n    withAccount: Hex,\n    authorization: EIP7702Authorization,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n    return signEIP7702Authorization({\n      privateKey: Buffer.from(privateKey),\n      authorization,\n    });\n  }\n\n  /**\n   * Remove an account from the keyring.\n   *\n   * @param account - The address of the account to remove.\n   */\n  removeAccount(account: Hex): void {\n    const address = this.#normalizeAddress(account);\n\n    if (!this.#walletMap.has(address)) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#walletMap.delete(address);\n  }\n\n  /**\n   * Get the public key of the account to be used for encryption.\n   *\n   * @param withAccount - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The public key of the account.\n   */\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts: HDKeyringAccountSelectionOptions = {},\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n    return publicKey;\n  }\n\n  /**\n   * Convert a Uint8Array mnemonic to a secret recovery phrase,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The Uint8Array mnemonic.\n   * @returns The string mnemonic.\n   */\n  #uint8ArrayToString(mnemonic: Uint8Array): string {\n    const recoveredIndices = Array.from(\n      new Uint16Array(new Uint8Array(mnemonic).buffer),\n    );\n    return recoveredIndices.map((i) => wordlist[i]).join(' ');\n  }\n\n  /**\n   * Convert a secret recovery phrase to a Uint8Array mnemonic,\n   * using the english wordlist.\n   *\n   * @param mnemonic - The string mnemonic.\n   * @returns The Uint8Array mnemonic.\n   */\n  #stringToUint8Array(mnemonic: string): Uint8Array {\n    const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n    return new Uint8Array(new Uint16Array(indices).buffer);\n  }\n\n  /**\n   * Convert a mnemonic to a Uint8Array mnemonic.\n   *\n   * @param mnemonic - The mnemonic seed phrase.\n   * @returns The Uint8Array mnemonic.\n   */\n  #mnemonicToUint8Array(mnemonic: Mnemonic): Uint8Array {\n    let mnemonicData: unknown = mnemonic;\n    // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n    // with the structure `{ type: 'Buffer', data: [...] }`\n    if (isSerializedBuffer(mnemonic)) {\n      mnemonicData = mnemonic.data;\n    }\n\n    if (\n      // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n      typeof mnemonicData === 'string' ||\n      Buffer.isBuffer(mnemonicData) ||\n      Array.isArray(mnemonicData)\n    ) {\n      let mnemonicAsString: string;\n      if (Array.isArray(mnemonicData)) {\n        mnemonicAsString = Buffer.from(mnemonicData).toString();\n      } else if (Buffer.isBuffer(mnemonicData)) {\n        mnemonicAsString = mnemonicData.toString();\n      } else {\n        mnemonicAsString = mnemonicData;\n      }\n      return this.#stringToUint8Array(mnemonicAsString);\n    } else if (\n      mnemonicData instanceof Object &&\n      !(mnemonicData instanceof Uint8Array)\n    ) {\n      // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n      return Uint8Array.from(Object.values(mnemonicData));\n    }\n\n    assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n    return mnemonicData;\n  }\n\n  /**\n   * Get the private key for the specified account.\n   *\n   * @param address - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns The private key of the account.\n   */\n  #getPrivateKeyFor(\n    address: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): Uint8Array | Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    assert(wallet.privateKey, 'Missing private key');\n    return wallet.privateKey;\n  }\n\n  /**\n   * Get the wallet for the specified account.\n   *\n   * @param account - The address of the account.\n   * @returns The wallet for the account as HDKey.\n   */\n  #getWalletForAccount(account: Hex): HDKey;\n\n  /**\n   * Get the wallet for the specified account and app origin.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    accounts: Hex,\n    opts: { withAppKeyOrigin: string },\n  ): { privateKey: Buffer; publicKey: Buffer };\n\n  /**\n   * Get the wallet for the specified account with optional\n   * additional options.\n   *\n   * @param account - The address of the account.\n   * @param opts - The options for selecting the account.\n   * @returns A key pair representing the wallet.\n   */\n  #getWalletForAccount(\n    account: Hex,\n    opts?: HDKeyringAccountSelectionOptions,\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer };\n\n  #getWalletForAccount(\n    account: Hex,\n    { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n  ): HDKey | { privateKey: Buffer; publicKey: Buffer } {\n    const address = this.#normalizeAddress(account);\n    const walletData = this.#walletMap.get(address);\n    if (!walletData) {\n      throw new Error('HD Keyring - Unable to find matching address.');\n    }\n\n    if (withAppKeyOrigin) {\n      const { privateKey } = walletData.hdKey;\n      assert(privateKey, 'Expected private key to be set');\n      const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n      const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n      return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n    }\n\n    return walletData.hdKey;\n  }\n\n  /**\n   * Sets appropriate properties for the keyring based on the given\n   * BIP39-compliant mnemonic.\n   *\n   * @param mnemonic - A seed phrase represented\n   * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n   * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n   */\n  async #initFromMnemonic(mnemonic: Mnemonic): Promise<void> {\n    if (this.root) {\n      throw new Error(\n        'Eth-Hd-Keyring: Secret recovery phrase already provided',\n      );\n    }\n\n    // Convert and validate before assigning to instance property\n    // to avoid inconsistent state if validation fails\n    const mnemonicAsUint8Array = this.#mnemonicToUint8Array(mnemonic);\n    this.#assertValidMnemonic(mnemonicAsUint8Array);\n    this.mnemonic = mnemonicAsUint8Array;\n\n    this.seed = await mnemonicToSeed(\n      this.mnemonic,\n      '', // No passphrase\n      this.#cryptographicFunctions,\n    );\n    this.hdWallet = HDKey.fromMasterSeed(this.seed);\n    this.root = this.hdWallet.derive(this.hdPath);\n  }\n\n  /**\n   * Get the address of the account from the public key.\n   *\n   * @param publicKey - The public key of the account.\n   * @returns The address of the account.\n   */\n  #addressFromPublicKey(publicKey: Uint8Array): Hex {\n    return add0x(\n      bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n    );\n  }\n\n  /**\n   * Normalize an address to a lower-cased '0x'-prefixed hex string.\n   *\n   * @param address - The address to normalize.\n   * @returns The normalized address.\n   */\n  #normalizeAddress(address: string): Hex {\n    const normalized = normalize(address);\n    assert(normalized, 'Expected address to be set');\n    return add0x(normalized);\n  }\n\n  /**\n   * Assert that the mnemonic seed phrase is valid.\n   * Throws an error if the mnemonic is not a valid BIP39 phrase.\n   *\n   * @param mnemonic - The mnemonic seed phrase to validate (as Uint8Array).\n   * @throws If the mnemonic is not a valid BIP39 secret recovery phrase.\n   */\n  #assertValidMnemonic(mnemonic: Uint8Array): void {\n    const mnemonicString = this.#uint8ArrayToString(mnemonic);\n    if (!validateMnemonic(mnemonicString, wordlist)) {\n      throw new Error(\n        'Eth-Hd-Keyring: Invalid secret recovery phrase provided',\n      );\n    }\n  }\n}\n"]}

package/dist/index.cjs

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HdKeyring = void 0;
+exports.HdKeyringV2 = exports.HdKeyring = void 0;
 var hd_keyring_1 = require("./hd-keyring.cjs");
 Object.defineProperty(exports, "HdKeyring", { enumerable: true, get: function () { return hd_keyring_1.HdKeyring; } });
+var hd_keyring_v2_1 = require("./hd-keyring-v2.cjs");
+Object.defineProperty(exports, "HdKeyringV2", { enumerable: true, get: function () { return hd_keyring_v2_1.HdKeyringV2; } });
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAAhC,uGAAA,SAAS,OAAA","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n  SerializedHDKeyringState,\n  DeserializableHDKeyringState,\n  HDKeyringOptions,\n  HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAOlB,qDAAuE;AAA9D,4GAAA,WAAW,OAAA","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n  SerializedHDKeyringState,\n  DeserializableHDKeyringState,\n  HDKeyringOptions,\n  HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\nexport { HdKeyringV2, type HdKeyringV2Options } from './hd-keyring-v2';\n"]}

package/dist/index.d.cts

@@ -1,3 +1,4 @@
 export { HdKeyring } from "./hd-keyring.cjs";
 export type { SerializedHDKeyringState, DeserializableHDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.cjs";
+export { HdKeyringV2, type HdKeyringV2Options } from "./hd-keyring-v2.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB;AACtB,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,4BAAwB"}

package/dist/index.d.mts

@@ -1,3 +1,4 @@
 export { HdKeyring } from "./hd-keyring.mjs";
 export type { SerializedHDKeyringState, DeserializableHDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.mjs";
+export { HdKeyringV2, type HdKeyringV2Options } from "./hd-keyring-v2.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB;AACtB,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,4BAAwB"}

package/dist/index.mjs

@@ -1,2 +1,3 @@
 export { HdKeyring } from "./hd-keyring.mjs";
+export { HdKeyringV2 } from "./hd-keyring-v2.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n  SerializedHDKeyringState,\n  DeserializableHDKeyringState,\n  HDKeyringOptions,\n  HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AAOzC,OAAO,EAAE,WAAW,EAA2B,4BAAwB","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n  SerializedHDKeyringState,\n  DeserializableHDKeyringState,\n  HDKeyringOptions,\n  HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\nexport { HdKeyringV2, type HdKeyringV2Options } from './hd-keyring-v2';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/eth-hd-keyring",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts.",
   "keywords": [
     "ethereum",
@@ -43,18 +43,21 @@
     "test:clean": "jest --clearCache"
   },
   "dependencies": {
+    "@ethereumjs/tx": "^5.4.0",
     "@ethereumjs/util": "^9.1.0",
     "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/key-tree": "^10.0.2",
+    "@metamask/keyring-api": "^21.3.0",
     "@metamask/keyring-utils": "^3.1.0",
     "@metamask/scure-bip39": "^2.1.1",
+    "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.1.0",
     "ethereum-cryptography": "^2.1.2"
   },
   "devDependencies": {
-    "@ethereumjs/tx": "^5.4.0",
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
+    "@metamask/account-api": "^0.12.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/bip39": "^4.0.0",
     "@ts-bridge/cli": "^0.6.3",