@metamask/eth-hd-keyring 13.1.0 → 14.0.0

package/CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [14.0.0]
+
+### Added
+
+- Add `./v2` subpath export for keyring v2 implementation ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `HdKeyring` and `HdKeyringOptions` are now available from `@metamask/eth-hd-keyring/v2`.
+
+### Changed
+
+- **BREAKING:** Move and rename `HdKeyringV2` and `HdKeyringV2Options` to the new `./v2` subpath export ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `HdKeyringV2` is now `HdKeyring` from `@metamask/eth-hd-keyring/v2`.
+  - `HdKeyringV2Options` is now `HdKeyringOptions` from `@metamask/eth-hd-keyring/v2`.
+- Bump `@metamask/utils` from `^11.10.0` to `^11.11.0` ([#483](https://github.com/MetaMask/accounts/pull/483))
+- Bump `@metamask/account-api` from `^1.0.1` to `^1.0.2` ([#515](https://github.com/MetaMask/accounts/pull/515))
+- Bump `@metamask/keyring-api` from `^22.0.0` to `^23.0.0` ([#515](https://github.com/MetaMask/accounts/pull/515))
+- Bump `@metamask/keyring-sdk` from `^1.2.0` to `^2.0.0` ([#515](https://github.com/MetaMask/accounts/pull/515))
+
+## [13.1.1]
+
+### Changed
+
+- Add new dependency `@metamask/keyring-sdk@1.2.0` ([#478](https://github.com/MetaMask/accounts/pull/478)), ([#482](https://github.com/MetaMask/accounts/pull/482)), ([#496](https://github.com/MetaMask/accounts/pull/496)), ([#509](https://github.com/MetaMask/accounts/pull/509))
+  - This package now contains the keyring v2 wrapper helpers (`EthKeyringWrapper`, `EthKeyringMethod`).
+  - The account ID (generated by `KeyringAccountRegistry`) are now deterministic for EVM addresses.
+- Bump `@metamask/keyring-api` from `^21.6.0` to `^22.0.0` ([#482](https://github.com/MetaMask/accounts/pull/482))
+- Bump `@metamask/account-api` from `^1.0.0` to `^1.0.1` ([#487](https://github.com/MetaMask/accounts/pull/487))
+- Bump `@metamask/utils` from `^11.1.0` to `^11.10.0` ([#489](https://github.com/MetaMask/accounts/pull/489))
+
 ## [13.1.0]
 
 ### Added
@@ -235,7 +263,9 @@ 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.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@14.0.0...HEAD
+[14.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.1.1...@metamask/eth-hd-keyring@14.0.0
+[13.1.1]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.1.0...@metamask/eth-hd-keyring@13.1.1
 [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

package/dist/index.cjs

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HdKeyringV2 = exports.HdKeyring = void 0;
+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;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"]}
+{"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"]}

package/dist/index.d.cts

@@ -1,4 +1,3 @@
 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;AACtB,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,4BAAwB"}
+{"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"}

package/dist/index.d.mts

@@ -1,4 +1,3 @@
 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;AACtB,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,4BAAwB"}
+{"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"}

package/dist/index.mjs

@@ -1,3 +1,2 @@
 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;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"]}
+{"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"]}

package/dist/{hd-keyring-v2.cjs → v2/hd-keyring.cjs}

@@ -4,10 +4,12 @@ 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 _HdKeyringV2_instances, _HdKeyringV2_isLastAccount, _HdKeyringV2_createKeyringAccount;
+var _HdKeyring_instances, _HdKeyring_isLastAccount, _HdKeyring_createKeyringAccount;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HdKeyringV2 = void 0;
+exports.HdKeyring = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
+const v2_1 = require("@metamask/keyring-api/v2");
+const v2_2 = require("@metamask/keyring-sdk/v2");
 const utils_1 = require("@metamask/utils");
 /**
  * Methods supported by HD keyring EOA accounts.
@@ -20,28 +22,28 @@ const HD_KEYRING_METHODS = [
     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,
+    v2_2.EthKeyringMethod.Decrypt,
+    v2_2.EthKeyringMethod.GetEncryptionPublicKey,
+    v2_2.EthKeyringMethod.GetAppKeyAddress,
+    v2_2.EthKeyringMethod.SignEip7702Authorization,
 ];
-const hdKeyringV2Capabilities = {
+const hdKeyringCapabilities = {
     scopes: [keyring_api_1.EthScope.Eoa],
     bip44: {
         deriveIndex: true,
     },
     privateKey: {
-        exportFormats: [{ encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal }],
+        exportFormats: [{ encoding: v2_1.PrivateKeyEncoding.Hexadecimal }],
     },
 };
-class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
+class HdKeyring extends v2_2.EthKeyringWrapper {
     constructor(options) {
         super({
-            type: keyring_api_1.KeyringType.Hd,
+            type: v2_1.KeyringType.Hd,
             inner: options.legacyKeyring,
-            capabilities: hdKeyringV2Capabilities,
+            capabilities: hdKeyringCapabilities,
         });
-        _HdKeyringV2_instances.add(this);
+        _HdKeyring_instances.add(this);
         this.entropySource = options.entropySource;
     }
     async getAccounts() {
@@ -56,7 +58,7 @@ class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
                 }
             }
             // Create and register the account if not already cached
-            return __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, address, addressIndex);
+            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_createKeyringAccount).call(this, address, addressIndex);
         });
     }
     async createAccounts(options) {
@@ -90,7 +92,7 @@ class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
             if (!newAddress) {
                 throw new Error('Failed to create new account');
             }
-            const newAccount = __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, newAddress, targetIndex);
+            const newAccount = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_createKeyringAccount).call(this, newAddress, targetIndex);
             return [newAccount];
         });
     }
@@ -108,7 +110,7 @@ class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
             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))) {
+            if (!(await __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_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
@@ -127,9 +129,9 @@ class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
     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.`);
+        const requestedEncoding = options?.encoding ?? v2_1.PrivateKeyEncoding.Hexadecimal;
+        if (requestedEncoding !== v2_1.PrivateKeyEncoding.Hexadecimal) {
+            throw new Error(`Unsupported encoding for Ethereum HD keyring: ${requestedEncoding}. Only '${v2_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));
@@ -137,12 +139,12 @@ class HdKeyringV2 extends keyring_api_1.EthKeyringWrapper {
         return {
             type: 'private-key',
             privateKey,
-            encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal,
+            encoding: v2_1.PrivateKeyEncoding.Hexadecimal,
         };
     }
 }
-exports.HdKeyringV2 = HdKeyringV2;
-_HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount = 
+exports.HdKeyring = HdKeyring;
+_HdKeyring_instances = new WeakSet(), _HdKeyring_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,
@@ -151,11 +153,11 @@ _HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount =
  * @param address - The address to check.
  * @returns True if this is the last account in the inner keyring.
  */
-async function _HdKeyringV2_isLastAccount(address) {
+async function _HdKeyring_isLastAccount(address) {
     const innerAddresses = await this.inner.getAccounts();
     const lastAddress = innerAddresses[innerAddresses.length - 1];
     return address === lastAddress;
-}, _HdKeyringV2_createKeyringAccount = function _HdKeyringV2_createKeyringAccount(address, addressIndex) {
+}, _HdKeyring_createKeyringAccount = function _HdKeyring_createKeyringAccount(address, addressIndex) {
     const id = this.registry.register(address);
     const account = {
         id,
@@ -177,4 +179,4 @@ async function _HdKeyringV2_isLastAccount(address) {
     this.registry.set(account);
     return account;
 };
-//# sourceMappingURL=hd-keyring-v2.cjs.map
+//# sourceMappingURL=hd-keyring.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring.cjs","sourceRoot":"","sources":["../../src/v2/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport {\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport {\n  type CreateAccountOptions,\n  type ExportAccountOptions,\n  type ExportedAccount,\n  type KeyringCapabilities,\n  type Keyring,\n  KeyringType,\n  PrivateKeyEncoding,\n} from '@metamask/keyring-api/v2';\nimport { EthKeyringMethod, EthKeyringWrapper } from '@metamask/keyring-sdk/v2';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\nimport type { HdKeyring as LegacyHdKeyring } 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 hdKeyringCapabilities: 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 Keyring} 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 HdKeyringOptions = {\n  legacyKeyring: LegacyHdKeyring;\n  entropySource: EntropySourceId;\n};\n\nexport class HdKeyring\n  extends EthKeyringWrapper<LegacyHdKeyring, Bip44Account<KeyringAccount>>\n  implements Keyring\n{\n  protected readonly entropySource: EntropySourceId;\n\n  constructor(options: HdKeyringOptions) {\n    super({\n      type: KeyringType.Hd,\n      inner: options.legacyKeyring,\n      capabilities: hdKeyringCapabilities,\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.mts → v2/hd-keyring.d.cts}

@@ -1,21 +1,23 @@
 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 KeyringAccount, type EntropySourceId } from "@metamask/keyring-api";
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type Keyring } from "@metamask/keyring-api/v2";
+import { EthKeyringWrapper } from "@metamask/keyring-sdk/v2";
 import type { AccountId } from "@metamask/keyring-utils";
-import type { HdKeyring } from "./hd-keyring.mjs";
+import type { HdKeyring as LegacyHdKeyring } from "../hd-keyring.cjs";
 /**
- * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.
+ * Concrete {@link Keyring} 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;
+export type HdKeyringOptions = {
+    legacyKeyring: LegacyHdKeyring;
     entropySource: EntropySourceId;
 };
-export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+export declare class HdKeyring extends EthKeyringWrapper<LegacyHdKeyring, Bip44Account<KeyringAccount>> implements Keyring {
     #private;
     protected readonly entropySource: EntropySourceId;
-    constructor(options: HdKeyringV2Options);
+    constructor(options: HdKeyringOptions);
     getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
     createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
     /**
@@ -35,4 +37,4 @@ export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Accou
      */
     exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
 }
-//# sourceMappingURL=hd-keyring-v2.d.mts.map
+//# sourceMappingURL=hd-keyring.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring.d.cts","sourceRoot":"","sources":["../../src/v2/hd-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EAEpB,KAAK,OAAO,EAGb,iCAAiC;AAClC,OAAO,EAAoB,iBAAiB,EAAE,iCAAiC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,0BAAsB;AA6BlE;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,eAAe,CAAC;IAC/B,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,SACX,SAAQ,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,cAAc,CAAC,CACvE,YAAW,OAAO;;IAElB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAEtC,OAAO,EAAE,gBAAgB;IA2D/B,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.cts → v2/hd-keyring.d.mts}

@@ -1,21 +1,23 @@
 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 KeyringAccount, type EntropySourceId } from "@metamask/keyring-api";
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type Keyring } from "@metamask/keyring-api/v2";
+import { EthKeyringWrapper } from "@metamask/keyring-sdk/v2";
 import type { AccountId } from "@metamask/keyring-utils";
-import type { HdKeyring } from "./hd-keyring.cjs";
+import type { HdKeyring as LegacyHdKeyring } from "../hd-keyring.mjs";
 /**
- * Concrete {@link KeyringV2} adapter for {@link HdKeyring}.
+ * Concrete {@link Keyring} 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;
+export type HdKeyringOptions = {
+    legacyKeyring: LegacyHdKeyring;
     entropySource: EntropySourceId;
 };
-export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+export declare class HdKeyring extends EthKeyringWrapper<LegacyHdKeyring, Bip44Account<KeyringAccount>> implements Keyring {
     #private;
     protected readonly entropySource: EntropySourceId;
-    constructor(options: HdKeyringV2Options);
+    constructor(options: HdKeyringOptions);
     getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
     createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
     /**
@@ -35,4 +37,4 @@ export declare class HdKeyringV2 extends EthKeyringWrapper<HdKeyring, Bip44Accou
      */
     exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
 }
-//# sourceMappingURL=hd-keyring-v2.d.cts.map
+//# sourceMappingURL=hd-keyring.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring.d.mts","sourceRoot":"","sources":["../../src/v2/hd-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EAEpB,KAAK,OAAO,EAGb,iCAAiC;AAClC,OAAO,EAAoB,iBAAiB,EAAE,iCAAiC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,0BAAsB;AA6BlE;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,eAAe,CAAC;IAC/B,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,SACX,SAAQ,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,cAAc,CAAC,CACvE,YAAW,OAAO;;IAElB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAEtC,OAAO,EAAE,gBAAgB;IA2D/B,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 → v2/hd-keyring.mjs}

@@ -3,8 +3,10 @@ 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 _HdKeyringV2_instances, _HdKeyringV2_isLastAccount, _HdKeyringV2_createKeyringAccount;
-import { EthAccountType, EthKeyringMethod, EthKeyringWrapper, EthMethod, EthScope, KeyringAccountEntropyTypeOption, KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api";
+var _HdKeyring_instances, _HdKeyring_isLastAccount, _HdKeyring_createKeyringAccount;
+import { EthAccountType, EthMethod, EthScope, KeyringAccountEntropyTypeOption } from "@metamask/keyring-api";
+import { KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api/v2";
+import { EthKeyringMethod, EthKeyringWrapper } from "@metamask/keyring-sdk/v2";
 import { add0x } from "@metamask/utils";
 /**
  * Methods supported by HD keyring EOA accounts.
@@ -22,7 +24,7 @@ const HD_KEYRING_METHODS = [
     EthKeyringMethod.GetAppKeyAddress,
     EthKeyringMethod.SignEip7702Authorization,
 ];
-const hdKeyringV2Capabilities = {
+const hdKeyringCapabilities = {
     scopes: [EthScope.Eoa],
     bip44: {
         deriveIndex: true,
@@ -31,14 +33,14 @@ const hdKeyringV2Capabilities = {
         exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],
     },
 };
-export class HdKeyringV2 extends EthKeyringWrapper {
+export class HdKeyring extends EthKeyringWrapper {
     constructor(options) {
         super({
             type: KeyringType.Hd,
             inner: options.legacyKeyring,
-            capabilities: hdKeyringV2Capabilities,
+            capabilities: hdKeyringCapabilities,
         });
-        _HdKeyringV2_instances.add(this);
+        _HdKeyring_instances.add(this);
         this.entropySource = options.entropySource;
     }
     async getAccounts() {
@@ -53,7 +55,7 @@ export class HdKeyringV2 extends EthKeyringWrapper {
                 }
             }
             // Create and register the account if not already cached
-            return __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, address, addressIndex);
+            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_createKeyringAccount).call(this, address, addressIndex);
         });
     }
     async createAccounts(options) {
@@ -87,7 +89,7 @@ export class HdKeyringV2 extends EthKeyringWrapper {
             if (!newAddress) {
                 throw new Error('Failed to create new account');
             }
-            const newAccount = __classPrivateFieldGet(this, _HdKeyringV2_instances, "m", _HdKeyringV2_createKeyringAccount).call(this, newAddress, targetIndex);
+            const newAccount = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_createKeyringAccount).call(this, newAddress, targetIndex);
             return [newAccount];
         });
     }
@@ -105,7 +107,7 @@ export class HdKeyringV2 extends EthKeyringWrapper {
             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))) {
+            if (!(await __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_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
@@ -138,7 +140,7 @@ export class HdKeyringV2 extends EthKeyringWrapper {
         };
     }
 }
-_HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount = 
+_HdKeyring_instances = new WeakSet(), _HdKeyring_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,
@@ -147,11 +149,11 @@ _HdKeyringV2_instances = new WeakSet(), _HdKeyringV2_isLastAccount =
  * @param address - The address to check.
  * @returns True if this is the last account in the inner keyring.
  */
-async function _HdKeyringV2_isLastAccount(address) {
+async function _HdKeyring_isLastAccount(address) {
     const innerAddresses = await this.inner.getAccounts();
     const lastAddress = innerAddresses[innerAddresses.length - 1];
     return address === lastAddress;
-}, _HdKeyringV2_createKeyringAccount = function _HdKeyringV2_createKeyringAccount(address, addressIndex) {
+}, _HdKeyring_createKeyringAccount = function _HdKeyring_createKeyringAccount(address, addressIndex) {
     const id = this.registry.register(address);
     const account = {
         id,
@@ -173,4 +175,4 @@ async function _HdKeyringV2_isLastAccount(address) {
     this.registry.set(account);
     return account;
 };
-//# sourceMappingURL=hd-keyring-v2.mjs.map
+//# sourceMappingURL=hd-keyring.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hd-keyring.mjs","sourceRoot":"","sources":["../../src/v2/hd-keyring.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EACL,cAAc,EACd,SAAS,EACT,QAAQ,EAER,+BAA+B,EAEhC,8BAA8B;AAC/B,OAAO,EAML,WAAW,EACX,kBAAkB,EACnB,iCAAiC;AAClC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,iCAAiC;AAE/E,OAAO,EAAE,KAAK,EAAY,wBAAwB;AAIlD;;;GAGG;AACH,MAAM,kBAAkB,GAAG;IACzB,SAAS,CAAC,eAAe;IACzB,SAAS,CAAC,IAAI;IACd,SAAS,CAAC,YAAY;IACtB,SAAS,CAAC,eAAe;IACzB,SAAS,CAAC,eAAe;IACzB,SAAS,CAAC,eAAe;IACzB,gBAAgB,CAAC,OAAO;IACxB,gBAAgB,CAAC,sBAAsB;IACvC,gBAAgB,CAAC,gBAAgB;IACjC,gBAAgB,CAAC,wBAAwB;CAC1C,CAAC;AAEF,MAAM,qBAAqB,GAAwB;IACjD,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;IACtB,KAAK,EAAE;QACL,WAAW,EAAE,IAAI;KAClB;IACD,UAAU,EAAE;QACV,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,WAAW,EAAE,CAAC;KAC9D;CACF,CAAC;AAaF,MAAM,OAAO,SACX,SAAQ,iBAAgE;IAKxE,YAAY,OAAyB;QACnC,KAAK,CAAC;YACJ,IAAI,EAAE,WAAW,CAAC,EAAE;YACpB,KAAK,EAAE,OAAO,CAAC,aAAa;YAC5B,YAAY,EAAE,qBAAqB;SACpC,CAAC,CAAC;;QACH,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC7C,CAAC;IAoDD,KAAK,CAAC,WAAW;QACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAEjD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;YAC7C,wDAAwD;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC7C,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,MAAM,CAAC;gBAChB,CAAC;YACH,CAAC;YAED,wDAAwD;YACxD,OAAO,uBAAA,IAAI,6DAAsB,MAA1B,IAAI,EAAuB,OAAO,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,OAA6B;QAE7B,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,sDAAsD;YACtD,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CACb,oDAAoD,OAAO,CAAC,IAAI,EAAE,CACnE,CAAC;YACJ,CAAC;YAED,yEAAyE;YACzE,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CACb,sCAAsC,IAAI,CAAC,aAAa,WAAW,OAAO,CAAC,aAAa,GAAG,CAC5F,CAAC;YACJ,CAAC;YAED,uEAAuE;YACvE,8DAA8D;YAC9D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACjD,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC;YAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;YAEvC,mDAAmD;YACnD,sFAAsF;YACtF,MAAM,eAAe,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;YACrD,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,eAAe,CAAC,CAAC;YAC3B,CAAC;YAED,wDAAwD;YACxD,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,gDAAgD;oBAC9C,uBAAuB,YAAY,SAAS,WAAW,GAAG,CAC7D,CAAC;YACJ,CAAC;YAED,uBAAuB;YACvB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAErD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,UAAU,GAAG,uBAAA,IAAI,6DAAsB,MAA1B,IAAI,EAAuB,UAAU,EAAE,WAAW,CAAC,CAAC;YAEvE,OAAO,CAAC,UAAU,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAC,SAAoB;QACtC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,wDAAwD;YACxD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAE9C,yEAAyE;YACzE,6EAA6E;YAC7E,IAAI,CAAC,CAAC,MAAM,uBAAA,IAAI,sDAAe,MAAnB,IAAI,EAAgB,OAAO,CAAC,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAErC,2BAA2B;YAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CACjB,SAAoB,EACpB,OAA8B;QAE9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAEjD,oEAAoE;QACpE,MAAM,iBAAiB,GACrB,OAAO,EAAE,QAAQ,IAAI,kBAAkB,CAAC,WAAW,CAAC;QAEtD,IAAI,iBAAiB,KAAK,kBAAkB,CAAC,WAAW,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CACb,iDAAiD,iBAAiB,WAAW,kBAAkB,CAAC,WAAW,iBAAiB,CAC7H,CAAC;QACJ,CAAC;QAED,+DAA+D;QAC/D,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CACxD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CACnC,CAAC;QACF,MAAM,UAAU,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE9C,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,UAAU;YACV,QAAQ,EAAE,kBAAkB,CAAC,WAAW;SACzC,CAAC;IACJ,CAAC;CACF;;AAxLC;;;;;;;GAOG;AACH,KAAK,mCAAgB,OAAe;IAClC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IACtD,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9D,OAAO,OAAO,KAAK,WAAW,CAAC;AACjC,CAAC,6EAUC,OAAY,EACZ,YAAoB;IAEpB,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAiC;QAC5C,EAAE;QACF,IAAI,EAAE,cAAc,CAAC,GAAG;QACxB,OAAO;QACP,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;QACrC,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC;QAChC,OAAO,EAAE;YACP,OAAO,EAAE;gBACP,IAAI,EAAE,+BAA+B,CAAC,QAAQ;gBAC9C,EAAE,EAAE,IAAI,CAAC,aAAa;gBACtB,UAAU,EAAE,YAAY;gBACxB,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,YAAY,EAAE;aACvD;YACD,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IAEF,kCAAkC;IAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE3B,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport {\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport {\n  type CreateAccountOptions,\n  type ExportAccountOptions,\n  type ExportedAccount,\n  type KeyringCapabilities,\n  type Keyring,\n  KeyringType,\n  PrivateKeyEncoding,\n} from '@metamask/keyring-api/v2';\nimport { EthKeyringMethod, EthKeyringWrapper } from '@metamask/keyring-sdk/v2';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\nimport type { HdKeyring as LegacyHdKeyring } 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 hdKeyringCapabilities: 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 Keyring} 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 HdKeyringOptions = {\n  legacyKeyring: LegacyHdKeyring;\n  entropySource: EntropySourceId;\n};\n\nexport class HdKeyring\n  extends EthKeyringWrapper<LegacyHdKeyring, Bip44Account<KeyringAccount>>\n  implements Keyring\n{\n  protected readonly entropySource: EntropySourceId;\n\n  constructor(options: HdKeyringOptions) {\n    super({\n      type: KeyringType.Hd,\n      inner: options.legacyKeyring,\n      capabilities: hdKeyringCapabilities,\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/v2/index.cjs

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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; } });
+//# sourceMappingURL=index.cjs.map

package/dist/v2/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":";;;AAAA,+CAAgE;AAAvD,uGAAA,SAAS,OAAA","sourcesContent":["export { HdKeyring, type HdKeyringOptions } from './hd-keyring';\n"]}

package/dist/v2/index.d.cts

@@ -0,0 +1,2 @@
+export { HdKeyring, type HdKeyringOptions } from "./hd-keyring.cjs";
+//# sourceMappingURL=index.d.cts.map

package/dist/v2/index.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,yBAAqB"}

package/dist/v2/index.d.mts

@@ -0,0 +1,2 @@
+export { HdKeyring, type HdKeyringOptions } from "./hd-keyring.mjs";
+//# sourceMappingURL=index.d.mts.map

package/dist/v2/index.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,yBAAqB"}

package/dist/v2/index.mjs

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

package/dist/v2/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAyB,yBAAqB","sourcesContent":["export { HdKeyring, type HdKeyringOptions } from './hd-keyring';\n"]}

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@metamask/eth-hd-keyring",
-  "version": "13.1.0",
-  "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts.",
+  "version": "14.0.0",
+  "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts",
   "keywords": [
     "ethereum",
     "keyring"
   ],
-  "homepage": "https://github.com/MetaMask/eth-hd-keyring#readme",
+  "homepage": "https://github.com/MetaMask/accounts/tree/main/packages/keyring-eth-hd#readme",
   "bugs": {
-    "url": "https://github.com/MetaMask/eth-hd-keyring/issues"
+    "url": "https://github.com/MetaMask/accounts/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/MetaMask/eth-hd-keyring.git"
+    "url": "https://github.com/MetaMask/accounts.git"
   },
   "license": "ISC",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": {
@@ -25,7 +26,18 @@
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
       }
-    }
+    },
+    "./v2": {
+      "import": {
+        "types": "./dist/v2/index.d.mts",
+        "default": "./dist/v2/index.mjs"
+      },
+      "require": {
+        "types": "./dist/v2/index.d.cts",
+        "default": "./dist/v2/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.cts",
@@ -33,38 +45,45 @@
     "dist/"
   ],
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --no-references",
+    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
+    "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
     "build:clean": "yarn build --clean",
     "build:docs": "typedoc",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-hd-keyring",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-hd-keyring",
     "publish:preview": "yarn npm publish --tag preview",
-    "test": "jest",
-    "test:clean": "jest --clearCache"
+    "since-latest-release": "../../scripts/since-latest-release.sh",
+    "test": "yarn test:source && yarn test:types",
+    "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
+    "test:source": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
+    "test:types": "../../scripts/tsd-test.sh ./src",
+    "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "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/keyring-api": "^23.0.0",
+    "@metamask/keyring-sdk": "^2.0.0",
+    "@metamask/keyring-utils": "^3.2.0",
     "@metamask/scure-bip39": "^2.1.1",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/utils": "^11.1.0",
-    "ethereum-cryptography": "^2.1.2"
+    "@metamask/utils": "^11.11.0",
+    "ethereum-cryptography": "^2.2.1"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
-    "@metamask/account-api": "^0.12.0",
+    "@metamask/account-api": "^1.0.2",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/bip39": "^4.0.0",
+    "@metamask/old-hd-keyring": "npm:@metamask/eth-hd-keyring@^4.0.1",
     "@ts-bridge/cli": "^0.6.3",
     "@types/jest": "^29.5.12",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
-    "old-hd-keyring": "npm:@metamask/eth-hd-keyring@^4.0.1"
+    "jest": "^29.5.0"
   },
   "engines": {
     "node": "^18.18 || >=20"

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

@@ -1 +0,0 @@
-{"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.map

@@ -1 +0,0 @@
-{"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.map

@@ -1 +0,0 @@
-{"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.map

@@ -1 +0,0 @@
-{"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"]}