@metamask-previews/eth-simple-keyring 11.1.2-5c366be → 11.1.2-ea8175e

package/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `./v2` subpath export for keyring v2 implementation ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `SimpleKeyring` and `SimpleKeyringOptions` are now available from `@metamask/eth-simple-keyring/v2`.
+
+### Changed
+
+- **BREAKING:** Move and rename `SimpleKeyringV2` and `SimpleKeyringV2Options` to the new `./v2` subpath export ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `SimpleKeyringV2` is now `SimpleKeyring` from `@metamask/eth-simple-keyring/v2`.
+  - `SimpleKeyringV2Options` is now `SimpleKeyringOptions` from `@metamask/eth-simple-keyring/v2`.
+
 ## [11.1.2]
 
 ### Changed

package/dist/index.cjs

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleKeyringV2 = exports.default = void 0;
+exports.default = void 0;
 var simple_keyring_1 = require("./simple-keyring.cjs");
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(simple_keyring_1).default; } });
-var simple_keyring_v2_1 = require("./simple-keyring-v2.cjs");
-Object.defineProperty(exports, "SimpleKeyringV2", { enumerable: true, get: function () { return simple_keyring_v2_1.SimpleKeyringV2; } });
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA2C;AAAlC,0HAAA,OAAO,OAAA;AAChB,6DAG6B;AAF3B,oHAAA,eAAe,OAAA","sourcesContent":["export { default } from './simple-keyring';\nexport {\n  SimpleKeyringV2,\n  type SimpleKeyringV2Options,\n} from './simple-keyring-v2';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA2C;AAAlC,0HAAA,OAAO,OAAA","sourcesContent":["export { default } from './simple-keyring';\n"]}

package/dist/index.d.cts

@@ -1,3 +1,2 @@
 export { default } from "./simple-keyring.cjs";
-export { SimpleKeyringV2, type SimpleKeyringV2Options, } from "./simple-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,OAAO,EAAE,6BAAyB;AAC3C,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,GAC5B,gCAA4B"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,6BAAyB"}

package/dist/index.d.mts

@@ -1,3 +1,2 @@
 export { default } from "./simple-keyring.mjs";
-export { SimpleKeyringV2, type SimpleKeyringV2Options, } from "./simple-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,OAAO,EAAE,6BAAyB;AAC3C,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,GAC5B,gCAA4B"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,6BAAyB"}

package/dist/index.mjs

@@ -1,3 +1,2 @@
 export { default } from "./simple-keyring.mjs";
-export { SimpleKeyringV2 } from "./simple-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,OAAO,EAAE,6BAAyB;AAC3C,OAAO,EACL,eAAe,EAEhB,gCAA4B","sourcesContent":["export { default } from './simple-keyring';\nexport {\n  SimpleKeyringV2,\n  type SimpleKeyringV2Options,\n} from './simple-keyring-v2';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,6BAAyB","sourcesContent":["export { default } from './simple-keyring';\n"]}

package/dist/v2/index.cjs

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleKeyring = void 0;
+var simple_keyring_1 = require("./simple-keyring.cjs");
+Object.defineProperty(exports, "SimpleKeyring", { enumerable: true, get: function () { return simple_keyring_1.SimpleKeyring; } });
+//# 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,uDAA4E;AAAnE,+GAAA,aAAa,OAAA","sourcesContent":["export { SimpleKeyring, type SimpleKeyringOptions } from './simple-keyring';\n"]}

package/dist/v2/index.d.cts

@@ -0,0 +1,2 @@
+export { SimpleKeyring, type SimpleKeyringOptions } from "./simple-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,aAAa,EAAE,KAAK,oBAAoB,EAAE,6BAAyB"}

package/dist/v2/index.d.mts

@@ -0,0 +1,2 @@
+export { SimpleKeyring, type SimpleKeyringOptions } from "./simple-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,aAAa,EAAE,KAAK,oBAAoB,EAAE,6BAAyB"}

package/dist/v2/index.mjs

@@ -0,0 +1,2 @@
+export { SimpleKeyring } from "./simple-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,aAAa,EAA6B,6BAAyB","sourcesContent":["export { SimpleKeyring, type SimpleKeyringOptions } from './simple-keyring';\n"]}

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

@@ -4,10 +4,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 _SimpleKeyringV2_instances, _SimpleKeyringV2_createKeyringAccount, _SimpleKeyringV2_getPrivateKeys, _SimpleKeyringV2_setPrivateKeys, _SimpleKeyringV2_withRollback, _SimpleKeyringV2_importPrivateKeyOrRollback;
+var _SimpleKeyring_instances, _SimpleKeyring_createKeyringAccount, _SimpleKeyring_getPrivateKeys, _SimpleKeyring_setPrivateKeys, _SimpleKeyring_withRollback, _SimpleKeyring_importPrivateKeyOrRollback;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleKeyringV2 = void 0;
+exports.SimpleKeyring = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
+const v2_1 = require("@metamask/keyring-api/v2");
 const keyring_sdk_1 = require("@metamask/keyring-sdk");
 const utils_1 = require("@metamask/utils");
 /**
@@ -26,23 +27,23 @@ const SIMPLE_KEYRING_METHODS = [
     keyring_sdk_1.EthKeyringMethod.GetAppKeyAddress,
     keyring_sdk_1.EthKeyringMethod.SignEip7702Authorization,
 ];
-const simpleKeyringV2Capabilities = {
+const simpleKeyringCapabilities = {
     scopes: [keyring_api_1.EthScope.Eoa],
     privateKey: {
         importFormats: [
-            { encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal, type: keyring_api_1.EthAccountType.Eoa },
+            { encoding: v2_1.PrivateKeyEncoding.Hexadecimal, type: keyring_api_1.EthAccountType.Eoa },
         ],
-        exportFormats: [{ encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal }],
+        exportFormats: [{ encoding: v2_1.PrivateKeyEncoding.Hexadecimal }],
     },
 };
-class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
+class SimpleKeyring extends keyring_sdk_1.EthKeyringWrapper {
     constructor(options) {
         super({
-            type: keyring_api_1.KeyringType.PrivateKey,
+            type: v2_1.KeyringType.PrivateKey,
             inner: options.legacyKeyring,
-            capabilities: simpleKeyringV2Capabilities,
+            capabilities: simpleKeyringCapabilities,
         });
-        _SimpleKeyringV2_instances.add(this);
+        _SimpleKeyring_instances.add(this);
     }
     async getAccounts() {
         const addresses = await this.inner.getAccounts();
@@ -56,7 +57,7 @@ class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
                 }
             }
             // Create and register the account if not already cached
-            return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, address);
+            return __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_createKeyringAccount).call(this, address);
         });
     }
     async createAccounts(options) {
@@ -71,13 +72,13 @@ class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
             }
             const { encoding, privateKey } = options;
             // Validate encoding
-            if (encoding !== keyring_api_1.PrivateKeyEncoding.Hexadecimal) {
-                throw new Error(`Unsupported encoding for SimpleKeyring: ${encoding}. Only '${keyring_api_1.PrivateKeyEncoding.Hexadecimal}' is supported.`);
+            if (encoding !== v2_1.PrivateKeyEncoding.Hexadecimal) {
+                throw new Error(`Unsupported encoding for SimpleKeyring: ${encoding}. Only '${v2_1.PrivateKeyEncoding.Hexadecimal}' is supported.`);
             }
             // Import the private key (with automatic rollback on failure)
-            const newAddress = await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_importPrivateKeyOrRollback).call(this, privateKey);
+            const newAddress = await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_importPrivateKeyOrRollback).call(this, privateKey);
             // Create and return the new KeyringAccount
-            const newAccount = __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, newAddress);
+            const newAccount = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_createKeyringAccount).call(this, newAddress);
             return [newAccount];
         });
     }
@@ -104,9 +105,9 @@ class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
      */
     async exportAccount(accountId, options) {
         const account = await this.getAccount(accountId);
-        const requestedEncoding = options?.encoding ?? keyring_api_1.PrivateKeyEncoding.Hexadecimal;
-        if (requestedEncoding !== keyring_api_1.PrivateKeyEncoding.Hexadecimal) {
-            throw new Error(`Unsupported encoding for SimpleKeyring: ${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 SimpleKeyring: ${requestedEncoding}. Only '${v2_1.PrivateKeyEncoding.Hexadecimal}' is supported.`);
         }
         const privateKeyHex = await this.inner.exportAccount(this.toHexAddress(account.address));
         // Sanitize private key format
@@ -114,13 +115,13 @@ class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
         const exported = {
             type: 'private-key',
             privateKey,
-            encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal,
+            encoding: v2_1.PrivateKeyEncoding.Hexadecimal,
         };
         return exported;
     }
 }
-exports.SimpleKeyringV2 = SimpleKeyringV2;
-_SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccount = function _SimpleKeyringV2_createKeyringAccount(address) {
+exports.SimpleKeyring = SimpleKeyring;
+_SimpleKeyring_instances = new WeakSet(), _SimpleKeyring_createKeyringAccount = function _SimpleKeyring_createKeyringAccount(address) {
     const id = this.registry.register(address);
     const account = {
         id,
@@ -138,23 +139,23 @@ _SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccoun
     // Add the account to the registry
     this.registry.set(account);
     return account;
-}, _SimpleKeyringV2_getPrivateKeys = 
+}, _SimpleKeyring_getPrivateKeys = 
 /**
  * Get all private keys from the inner SimpleKeyring.
  *
  * @returns An array of private keys in hexadecimal format.
  */
-async function _SimpleKeyringV2_getPrivateKeys() {
+async function _SimpleKeyring_getPrivateKeys() {
     return await this.inner.serialize();
-}, _SimpleKeyringV2_setPrivateKeys = 
+}, _SimpleKeyring_setPrivateKeys = 
 /**
  * Set private keys in the inner SimpleKeyring.
  *
  * @param privateKeys - An array of private keys in hexadecimal format.
  */
-async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
+async function _SimpleKeyring_setPrivateKeys(privateKeys) {
     await this.inner.deserialize(privateKeys);
-}, _SimpleKeyringV2_withRollback = 
+}, _SimpleKeyring_withRollback = 
 /**
  * Executes a transactional update on the inner keyring state.
  * If the callback throws, the state is automatically rolled back.
@@ -164,17 +165,17 @@ async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
  * @returns The result of the callback.
  * @throws Error if the callback throws (after rollback).
  */
-async function _SimpleKeyringV2_withRollback(callback) {
-    const originalPrivateKeys = await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_getPrivateKeys).call(this);
+async function _SimpleKeyring_withRollback(callback) {
+    const originalPrivateKeys = await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeys).call(this);
     try {
         return await callback(originalPrivateKeys);
     }
     catch (error) {
         // Rollback on error
-        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, originalPrivateKeys);
+        await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_setPrivateKeys).call(this, originalPrivateKeys);
         throw error;
     }
-}, _SimpleKeyringV2_importPrivateKeyOrRollback = 
+}, _SimpleKeyring_importPrivateKeyOrRollback = 
 /**
  * Import a private key and return the new address.
  * If the import fails (no new address added), rolls back to the original state.
@@ -183,12 +184,12 @@ async function _SimpleKeyringV2_withRollback(callback) {
  * @returns The address of the newly imported account.
  * @throws Error if the import fails or no new address is added.
  */
-async function _SimpleKeyringV2_importPrivateKeyOrRollback(privateKey) {
-    return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_withRollback).call(this, async (currentPrivateKeys) => {
+async function _SimpleKeyring_importPrivateKeyOrRollback(privateKey) {
+    return __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_withRollback).call(this, async (currentPrivateKeys) => {
         // Get current addresses before import
         const addressesBefore = new Set(await this.inner.getAccounts());
         // Import the new private key
-        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, [...currentPrivateKeys, privateKey]);
+        await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_setPrivateKeys).call(this, [...currentPrivateKeys, privateKey]);
         // Get addresses after import and find the newly added one
         const addressesAfter = await this.inner.getAccounts();
         // Find the new address by diffing the two sets
@@ -199,4 +200,4 @@ async function _SimpleKeyringV2_importPrivateKeyOrRollback(privateKey) {
         return newAddresses[0];
     });
 };
-//# sourceMappingURL=simple-keyring-v2.cjs.map
+//# sourceMappingURL=simple-keyring.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simple-keyring.cjs","sourceRoot":"","sources":["../../src/v2/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\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';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nimport type LegacySimpleKeyring from '../simple-keyring';\n\n/**\n * Methods supported by SimpleKeyring EOA accounts.\n * SimpleKeyring supports all standard signing methods plus encryption and app keys.\n */\nconst SIMPLE_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 simpleKeyringCapabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  privateKey: {\n    importFormats: [\n      { encoding: PrivateKeyEncoding.Hexadecimal, type: EthAccountType.Eoa },\n    ],\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link Keyring} adapter for {@link SimpleKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * SimpleKeyring via the unified V2 interface.\n */\nexport type SimpleKeyringOptions = {\n  legacyKeyring: LegacySimpleKeyring;\n};\n\nexport class SimpleKeyring\n  extends EthKeyringWrapper<LegacySimpleKeyring>\n  implements Keyring\n{\n  constructor(options: SimpleKeyringOptions) {\n    super({\n      type: KeyringType.PrivateKey,\n      inner: options.legacyKeyring,\n      capabilities: simpleKeyringCapabilities,\n    });\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(address: Hex): KeyringAccount {\n    const id = this.registry.register(address);\n\n    const account: KeyringAccount = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...SIMPLE_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.PrivateKey,\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  /**\n   * Get all private keys from the inner SimpleKeyring.\n   *\n   * @returns An array of private keys in hexadecimal format.\n   */\n  async #getPrivateKeys(): Promise<string[]> {\n    return await this.inner.serialize();\n  }\n\n  /**\n   * Set private keys in the inner SimpleKeyring.\n   *\n   * @param privateKeys - An array of private keys in hexadecimal format.\n   */\n  async #setPrivateKeys(privateKeys: string[]): Promise<void> {\n    await this.inner.deserialize(privateKeys);\n  }\n\n  /**\n   * Executes a transactional update on the inner keyring state.\n   * If the callback throws, the state is automatically rolled back.\n   *\n   * @param callback - A function that receives the current private keys and performs the update.\n   * Should return the result on success, or throw to trigger rollback.\n   * @returns The result of the callback.\n   * @throws Error if the callback throws (after rollback).\n   */\n  async #withRollback<Result>(\n    callback: (currentPrivateKeys: string[]) => Promise<Result>,\n  ): Promise<Result> {\n    const originalPrivateKeys = await this.#getPrivateKeys();\n\n    try {\n      return await callback(originalPrivateKeys);\n    } catch (error) {\n      // Rollback on error\n      await this.#setPrivateKeys(originalPrivateKeys);\n      throw error;\n    }\n  }\n\n  /**\n   * Import a private key and return the new address.\n   * If the import fails (no new address added), rolls back to the original state.\n   *\n   * @param privateKey - The private key to import in hexadecimal format.\n   * @returns The address of the newly imported account.\n   * @throws Error if the import fails or no new address is added.\n   */\n  async #importPrivateKeyOrRollback(privateKey: string): Promise<Hex> {\n    return this.#withRollback(async (currentPrivateKeys) => {\n      // Get current addresses before import\n      const addressesBefore = new Set(await this.inner.getAccounts());\n\n      // Import the new private key\n      await this.#setPrivateKeys([...currentPrivateKeys, privateKey]);\n\n      // Get addresses after import and find the newly added one\n      const addressesAfter = await this.inner.getAccounts();\n\n      // Find the new address by diffing the two sets\n      const newAddresses = addressesAfter.filter(\n        (addr) => !addressesBefore.has(addr),\n      );\n\n      if (newAddresses.length !== 1 || !newAddresses[0]) {\n        throw new Error('Failed to import private key');\n      }\n\n      return newAddresses[0];\n    });\n  }\n\n  async getAccounts(): Promise<KeyringAccount[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address) => {\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);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    return this.withLock(async () => {\n      // For SimpleKeyring, we only support private key import\n      if (options.type !== 'private-key:import') {\n        throw new Error(\n          `Unsupported account creation type for SimpleKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate account type\n      if (options.accountType !== EthAccountType.Eoa) {\n        throw new Error(\n          `Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${EthAccountType.Eoa}' is supported.`,\n        );\n      }\n\n      const { encoding, privateKey } = options;\n\n      // Validate encoding\n      if (encoding !== PrivateKeyEncoding.Hexadecimal) {\n        throw new Error(\n          `Unsupported encoding for SimpleKeyring: ${encoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n        );\n      }\n\n      // Import the private key (with automatic rollback on failure)\n      const newAddress = await this.#importPrivateKeyOrRollback(privateKey);\n\n      // Create and return the new KeyringAccount\n      const newAccount = this.#createKeyringAccount(newAddress);\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      const account = await this.getAccount(accountId);\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(account.address);\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    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for SimpleKeyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    const privateKeyHex = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    // Sanitize private key format\n    const privateKey = add0x(privateKeyHex);\n\n    const exported: ExportedAccount = {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n\n    return exported;\n  }\n}\n"]}

package/dist/{simple-keyring-v2.d.mts → v2/simple-keyring.d.cts}

@@ -1,19 +1,20 @@
-import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2 } from "@metamask/keyring-api";
+import { type KeyringAccount } from "@metamask/keyring-api";
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type Keyring } from "@metamask/keyring-api/v2";
 import { EthKeyringWrapper } from "@metamask/keyring-sdk";
 import type { AccountId } from "@metamask/keyring-utils";
-import type SimpleKeyring from "./simple-keyring.mjs";
+import type LegacySimpleKeyring from "../simple-keyring.cjs";
 /**
- * Concrete {@link KeyringV2} adapter for {@link SimpleKeyring}.
+ * Concrete {@link Keyring} adapter for {@link SimpleKeyring}.
  *
  * This wrapper exposes the accounts and signing capabilities of the legacy
  * SimpleKeyring via the unified V2 interface.
  */
-export type SimpleKeyringV2Options = {
-    legacyKeyring: SimpleKeyring;
+export type SimpleKeyringOptions = {
+    legacyKeyring: LegacySimpleKeyring;
 };
-export declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> implements KeyringV2 {
+export declare class SimpleKeyring extends EthKeyringWrapper<LegacySimpleKeyring> implements Keyring {
     #private;
-    constructor(options: SimpleKeyringV2Options);
+    constructor(options: SimpleKeyringOptions);
     getAccounts(): Promise<KeyringAccount[]>;
     createAccounts(options: CreateAccountOptions): Promise<KeyringAccount[]>;
     /**
@@ -31,4 +32,4 @@ export declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> im
      */
     exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
 }
-//# sourceMappingURL=simple-keyring-v2.d.mts.map
+//# sourceMappingURL=simple-keyring.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simple-keyring.d.cts","sourceRoot":"","sources":["../../src/v2/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EAEpB,8BAA8B;AAC/B,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EAEpB,KAAK,OAAO,EAGb,iCAAiC;AAClC,OAAO,EAAoB,iBAAiB,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAIzD,OAAO,KAAK,mBAAmB,8BAA0B;AA6BzD;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,mBAAmB,CAAC;CACpC,CAAC;AAEF,qBAAa,aACX,SAAQ,iBAAiB,CAAC,mBAAmB,CAC7C,YAAW,OAAO;;gBAEN,OAAO,EAAE,oBAAoB;IA8GnC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAkBxC,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAkC5B;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

package/dist/{simple-keyring-v2.d.cts → v2/simple-keyring.d.mts}

@@ -1,19 +1,20 @@
-import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2 } from "@metamask/keyring-api";
+import { type KeyringAccount } from "@metamask/keyring-api";
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type Keyring } from "@metamask/keyring-api/v2";
 import { EthKeyringWrapper } from "@metamask/keyring-sdk";
 import type { AccountId } from "@metamask/keyring-utils";
-import type SimpleKeyring from "./simple-keyring.cjs";
+import type LegacySimpleKeyring from "../simple-keyring.mjs";
 /**
- * Concrete {@link KeyringV2} adapter for {@link SimpleKeyring}.
+ * Concrete {@link Keyring} adapter for {@link SimpleKeyring}.
  *
  * This wrapper exposes the accounts and signing capabilities of the legacy
  * SimpleKeyring via the unified V2 interface.
  */
-export type SimpleKeyringV2Options = {
-    legacyKeyring: SimpleKeyring;
+export type SimpleKeyringOptions = {
+    legacyKeyring: LegacySimpleKeyring;
 };
-export declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> implements KeyringV2 {
+export declare class SimpleKeyring extends EthKeyringWrapper<LegacySimpleKeyring> implements Keyring {
     #private;
-    constructor(options: SimpleKeyringV2Options);
+    constructor(options: SimpleKeyringOptions);
     getAccounts(): Promise<KeyringAccount[]>;
     createAccounts(options: CreateAccountOptions): Promise<KeyringAccount[]>;
     /**
@@ -31,4 +32,4 @@ export declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> im
      */
     exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
 }
-//# sourceMappingURL=simple-keyring-v2.d.cts.map
+//# sourceMappingURL=simple-keyring.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simple-keyring.d.mts","sourceRoot":"","sources":["../../src/v2/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EAEpB,8BAA8B;AAC/B,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EAEpB,KAAK,OAAO,EAGb,iCAAiC;AAClC,OAAO,EAAoB,iBAAiB,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAIzD,OAAO,KAAK,mBAAmB,8BAA0B;AA6BzD;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,mBAAmB,CAAC;CACpC,CAAC;AAEF,qBAAa,aACX,SAAQ,iBAAiB,CAAC,mBAAmB,CAC7C,YAAW,OAAO;;gBAEN,OAAO,EAAE,oBAAoB;IA8GnC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAkBxC,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAkC5B;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

package/dist/{simple-keyring-v2.mjs → v2/simple-keyring.mjs}

@@ -3,8 +3,9 @@ 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 _SimpleKeyringV2_instances, _SimpleKeyringV2_createKeyringAccount, _SimpleKeyringV2_getPrivateKeys, _SimpleKeyringV2_setPrivateKeys, _SimpleKeyringV2_withRollback, _SimpleKeyringV2_importPrivateKeyOrRollback;
-import { EthAccountType, EthMethod, EthScope, KeyringAccountEntropyTypeOption, KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api";
+var _SimpleKeyring_instances, _SimpleKeyring_createKeyringAccount, _SimpleKeyring_getPrivateKeys, _SimpleKeyring_setPrivateKeys, _SimpleKeyring_withRollback, _SimpleKeyring_importPrivateKeyOrRollback;
+import { EthAccountType, EthMethod, EthScope, KeyringAccountEntropyTypeOption } from "@metamask/keyring-api";
+import { KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api/v2";
 import { EthKeyringMethod, EthKeyringWrapper } from "@metamask/keyring-sdk";
 import { add0x } from "@metamask/utils";
 /**
@@ -23,7 +24,7 @@ const SIMPLE_KEYRING_METHODS = [
     EthKeyringMethod.GetAppKeyAddress,
     EthKeyringMethod.SignEip7702Authorization,
 ];
-const simpleKeyringV2Capabilities = {
+const simpleKeyringCapabilities = {
     scopes: [EthScope.Eoa],
     privateKey: {
         importFormats: [
@@ -32,14 +33,14 @@ const simpleKeyringV2Capabilities = {
         exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],
     },
 };
-export class SimpleKeyringV2 extends EthKeyringWrapper {
+export class SimpleKeyring extends EthKeyringWrapper {
     constructor(options) {
         super({
             type: KeyringType.PrivateKey,
             inner: options.legacyKeyring,
-            capabilities: simpleKeyringV2Capabilities,
+            capabilities: simpleKeyringCapabilities,
         });
-        _SimpleKeyringV2_instances.add(this);
+        _SimpleKeyring_instances.add(this);
     }
     async getAccounts() {
         const addresses = await this.inner.getAccounts();
@@ -53,7 +54,7 @@ export class SimpleKeyringV2 extends EthKeyringWrapper {
                 }
             }
             // Create and register the account if not already cached
-            return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, address);
+            return __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_createKeyringAccount).call(this, address);
         });
     }
     async createAccounts(options) {
@@ -72,9 +73,9 @@ export class SimpleKeyringV2 extends EthKeyringWrapper {
                 throw new Error(`Unsupported encoding for SimpleKeyring: ${encoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`);
             }
             // Import the private key (with automatic rollback on failure)
-            const newAddress = await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_importPrivateKeyOrRollback).call(this, privateKey);
+            const newAddress = await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_importPrivateKeyOrRollback).call(this, privateKey);
             // Create and return the new KeyringAccount
-            const newAccount = __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, newAddress);
+            const newAccount = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_createKeyringAccount).call(this, newAddress);
             return [newAccount];
         });
     }
@@ -116,7 +117,7 @@ export class SimpleKeyringV2 extends EthKeyringWrapper {
         return exported;
     }
 }
-_SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccount = function _SimpleKeyringV2_createKeyringAccount(address) {
+_SimpleKeyring_instances = new WeakSet(), _SimpleKeyring_createKeyringAccount = function _SimpleKeyring_createKeyringAccount(address) {
     const id = this.registry.register(address);
     const account = {
         id,
@@ -134,23 +135,23 @@ _SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccoun
     // Add the account to the registry
     this.registry.set(account);
     return account;
-}, _SimpleKeyringV2_getPrivateKeys = 
+}, _SimpleKeyring_getPrivateKeys = 
 /**
  * Get all private keys from the inner SimpleKeyring.
  *
  * @returns An array of private keys in hexadecimal format.
  */
-async function _SimpleKeyringV2_getPrivateKeys() {
+async function _SimpleKeyring_getPrivateKeys() {
     return await this.inner.serialize();
-}, _SimpleKeyringV2_setPrivateKeys = 
+}, _SimpleKeyring_setPrivateKeys = 
 /**
  * Set private keys in the inner SimpleKeyring.
  *
  * @param privateKeys - An array of private keys in hexadecimal format.
  */
-async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
+async function _SimpleKeyring_setPrivateKeys(privateKeys) {
     await this.inner.deserialize(privateKeys);
-}, _SimpleKeyringV2_withRollback = 
+}, _SimpleKeyring_withRollback = 
 /**
  * Executes a transactional update on the inner keyring state.
  * If the callback throws, the state is automatically rolled back.
@@ -160,17 +161,17 @@ async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
  * @returns The result of the callback.
  * @throws Error if the callback throws (after rollback).
  */
-async function _SimpleKeyringV2_withRollback(callback) {
-    const originalPrivateKeys = await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_getPrivateKeys).call(this);
+async function _SimpleKeyring_withRollback(callback) {
+    const originalPrivateKeys = await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeys).call(this);
     try {
         return await callback(originalPrivateKeys);
     }
     catch (error) {
         // Rollback on error
-        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, originalPrivateKeys);
+        await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_setPrivateKeys).call(this, originalPrivateKeys);
         throw error;
     }
-}, _SimpleKeyringV2_importPrivateKeyOrRollback = 
+}, _SimpleKeyring_importPrivateKeyOrRollback = 
 /**
  * Import a private key and return the new address.
  * If the import fails (no new address added), rolls back to the original state.
@@ -179,12 +180,12 @@ async function _SimpleKeyringV2_withRollback(callback) {
  * @returns The address of the newly imported account.
  * @throws Error if the import fails or no new address is added.
  */
-async function _SimpleKeyringV2_importPrivateKeyOrRollback(privateKey) {
-    return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_withRollback).call(this, async (currentPrivateKeys) => {
+async function _SimpleKeyring_importPrivateKeyOrRollback(privateKey) {
+    return __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_withRollback).call(this, async (currentPrivateKeys) => {
         // Get current addresses before import
         const addressesBefore = new Set(await this.inner.getAccounts());
         // Import the new private key
-        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, [...currentPrivateKeys, privateKey]);
+        await __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_setPrivateKeys).call(this, [...currentPrivateKeys, privateKey]);
         // Get addresses after import and find the newly added one
         const addressesAfter = await this.inner.getAccounts();
         // Find the new address by diffing the two sets
@@ -195,4 +196,4 @@ async function _SimpleKeyringV2_importPrivateKeyOrRollback(privateKey) {
         return newAddresses[0];
     });
 };
-//# sourceMappingURL=simple-keyring-v2.mjs.map
+//# sourceMappingURL=simple-keyring.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simple-keyring.mjs","sourceRoot":"","sources":["../../src/v2/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  EthAccountType,\n  EthMethod,\n  EthScope,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\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';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nimport type LegacySimpleKeyring from '../simple-keyring';\n\n/**\n * Methods supported by SimpleKeyring EOA accounts.\n * SimpleKeyring supports all standard signing methods plus encryption and app keys.\n */\nconst SIMPLE_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 simpleKeyringCapabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  privateKey: {\n    importFormats: [\n      { encoding: PrivateKeyEncoding.Hexadecimal, type: EthAccountType.Eoa },\n    ],\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link Keyring} adapter for {@link SimpleKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * SimpleKeyring via the unified V2 interface.\n */\nexport type SimpleKeyringOptions = {\n  legacyKeyring: LegacySimpleKeyring;\n};\n\nexport class SimpleKeyring\n  extends EthKeyringWrapper<LegacySimpleKeyring>\n  implements Keyring\n{\n  constructor(options: SimpleKeyringOptions) {\n    super({\n      type: KeyringType.PrivateKey,\n      inner: options.legacyKeyring,\n      capabilities: simpleKeyringCapabilities,\n    });\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(address: Hex): KeyringAccount {\n    const id = this.registry.register(address);\n\n    const account: KeyringAccount = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...SIMPLE_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.PrivateKey,\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  /**\n   * Get all private keys from the inner SimpleKeyring.\n   *\n   * @returns An array of private keys in hexadecimal format.\n   */\n  async #getPrivateKeys(): Promise<string[]> {\n    return await this.inner.serialize();\n  }\n\n  /**\n   * Set private keys in the inner SimpleKeyring.\n   *\n   * @param privateKeys - An array of private keys in hexadecimal format.\n   */\n  async #setPrivateKeys(privateKeys: string[]): Promise<void> {\n    await this.inner.deserialize(privateKeys);\n  }\n\n  /**\n   * Executes a transactional update on the inner keyring state.\n   * If the callback throws, the state is automatically rolled back.\n   *\n   * @param callback - A function that receives the current private keys and performs the update.\n   * Should return the result on success, or throw to trigger rollback.\n   * @returns The result of the callback.\n   * @throws Error if the callback throws (after rollback).\n   */\n  async #withRollback<Result>(\n    callback: (currentPrivateKeys: string[]) => Promise<Result>,\n  ): Promise<Result> {\n    const originalPrivateKeys = await this.#getPrivateKeys();\n\n    try {\n      return await callback(originalPrivateKeys);\n    } catch (error) {\n      // Rollback on error\n      await this.#setPrivateKeys(originalPrivateKeys);\n      throw error;\n    }\n  }\n\n  /**\n   * Import a private key and return the new address.\n   * If the import fails (no new address added), rolls back to the original state.\n   *\n   * @param privateKey - The private key to import in hexadecimal format.\n   * @returns The address of the newly imported account.\n   * @throws Error if the import fails or no new address is added.\n   */\n  async #importPrivateKeyOrRollback(privateKey: string): Promise<Hex> {\n    return this.#withRollback(async (currentPrivateKeys) => {\n      // Get current addresses before import\n      const addressesBefore = new Set(await this.inner.getAccounts());\n\n      // Import the new private key\n      await this.#setPrivateKeys([...currentPrivateKeys, privateKey]);\n\n      // Get addresses after import and find the newly added one\n      const addressesAfter = await this.inner.getAccounts();\n\n      // Find the new address by diffing the two sets\n      const newAddresses = addressesAfter.filter(\n        (addr) => !addressesBefore.has(addr),\n      );\n\n      if (newAddresses.length !== 1 || !newAddresses[0]) {\n        throw new Error('Failed to import private key');\n      }\n\n      return newAddresses[0];\n    });\n  }\n\n  async getAccounts(): Promise<KeyringAccount[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address) => {\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);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    return this.withLock(async () => {\n      // For SimpleKeyring, we only support private key import\n      if (options.type !== 'private-key:import') {\n        throw new Error(\n          `Unsupported account creation type for SimpleKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate account type\n      if (options.accountType !== EthAccountType.Eoa) {\n        throw new Error(\n          `Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${EthAccountType.Eoa}' is supported.`,\n        );\n      }\n\n      const { encoding, privateKey } = options;\n\n      // Validate encoding\n      if (encoding !== PrivateKeyEncoding.Hexadecimal) {\n        throw new Error(\n          `Unsupported encoding for SimpleKeyring: ${encoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n        );\n      }\n\n      // Import the private key (with automatic rollback on failure)\n      const newAddress = await this.#importPrivateKeyOrRollback(privateKey);\n\n      // Create and return the new KeyringAccount\n      const newAccount = this.#createKeyringAccount(newAddress);\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      const account = await this.getAccount(accountId);\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(account.address);\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    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for SimpleKeyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    const privateKeyHex = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    // Sanitize private key format\n    const privateKey = add0x(privateKeyHex);\n\n    const exported: ExportedAccount = {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n\n    return exported;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/eth-simple-keyring",
-  "version": "11.1.2-5c366be",
+  "version": "11.1.2-ea8175e",
   "description": "A simple standard interface for a series of Ethereum private keys.",
   "keywords": [
     "ethereum",
@@ -24,6 +24,16 @@
         "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"
+      }
     }
   },
   "main": "./dist/index.cjs",

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

@@ -1 +0,0 @@
-{"version":3,"file":"simple-keyring-v2.cjs","sourceRoot":"","sources":["../src/simple-keyring-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type CreateAccountOptions,\n  EthAccountType,\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} from '@metamask/keyring-api';\nimport { EthKeyringMethod, EthKeyringWrapper } from '@metamask/keyring-sdk';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nimport type SimpleKeyring from './simple-keyring';\n\n/**\n * Methods supported by SimpleKeyring EOA accounts.\n * SimpleKeyring supports all standard signing methods plus encryption and app keys.\n */\nconst SIMPLE_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 simpleKeyringV2Capabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  privateKey: {\n    importFormats: [\n      { encoding: PrivateKeyEncoding.Hexadecimal, type: EthAccountType.Eoa },\n    ],\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link SimpleKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * SimpleKeyring via the unified V2 interface.\n */\nexport type SimpleKeyringV2Options = {\n  legacyKeyring: SimpleKeyring;\n};\n\nexport class SimpleKeyringV2\n  extends EthKeyringWrapper<SimpleKeyring>\n  implements KeyringV2\n{\n  constructor(options: SimpleKeyringV2Options) {\n    super({\n      type: KeyringType.PrivateKey,\n      inner: options.legacyKeyring,\n      capabilities: simpleKeyringV2Capabilities,\n    });\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(address: Hex): KeyringAccount {\n    const id = this.registry.register(address);\n\n    const account: KeyringAccount = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...SIMPLE_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.PrivateKey,\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  /**\n   * Get all private keys from the inner SimpleKeyring.\n   *\n   * @returns An array of private keys in hexadecimal format.\n   */\n  async #getPrivateKeys(): Promise<string[]> {\n    return await this.inner.serialize();\n  }\n\n  /**\n   * Set private keys in the inner SimpleKeyring.\n   *\n   * @param privateKeys - An array of private keys in hexadecimal format.\n   */\n  async #setPrivateKeys(privateKeys: string[]): Promise<void> {\n    await this.inner.deserialize(privateKeys);\n  }\n\n  /**\n   * Executes a transactional update on the inner keyring state.\n   * If the callback throws, the state is automatically rolled back.\n   *\n   * @param callback - A function that receives the current private keys and performs the update.\n   * Should return the result on success, or throw to trigger rollback.\n   * @returns The result of the callback.\n   * @throws Error if the callback throws (after rollback).\n   */\n  async #withRollback<Result>(\n    callback: (currentPrivateKeys: string[]) => Promise<Result>,\n  ): Promise<Result> {\n    const originalPrivateKeys = await this.#getPrivateKeys();\n\n    try {\n      return await callback(originalPrivateKeys);\n    } catch (error) {\n      // Rollback on error\n      await this.#setPrivateKeys(originalPrivateKeys);\n      throw error;\n    }\n  }\n\n  /**\n   * Import a private key and return the new address.\n   * If the import fails (no new address added), rolls back to the original state.\n   *\n   * @param privateKey - The private key to import in hexadecimal format.\n   * @returns The address of the newly imported account.\n   * @throws Error if the import fails or no new address is added.\n   */\n  async #importPrivateKeyOrRollback(privateKey: string): Promise<Hex> {\n    return this.#withRollback(async (currentPrivateKeys) => {\n      // Get current addresses before import\n      const addressesBefore = new Set(await this.inner.getAccounts());\n\n      // Import the new private key\n      await this.#setPrivateKeys([...currentPrivateKeys, privateKey]);\n\n      // Get addresses after import and find the newly added one\n      const addressesAfter = await this.inner.getAccounts();\n\n      // Find the new address by diffing the two sets\n      const newAddresses = addressesAfter.filter(\n        (addr) => !addressesBefore.has(addr),\n      );\n\n      if (newAddresses.length !== 1 || !newAddresses[0]) {\n        throw new Error('Failed to import private key');\n      }\n\n      return newAddresses[0];\n    });\n  }\n\n  async getAccounts(): Promise<KeyringAccount[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address) => {\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);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    return this.withLock(async () => {\n      // For SimpleKeyring, we only support private key import\n      if (options.type !== 'private-key:import') {\n        throw new Error(\n          `Unsupported account creation type for SimpleKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate account type\n      if (options.accountType !== EthAccountType.Eoa) {\n        throw new Error(\n          `Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${EthAccountType.Eoa}' is supported.`,\n        );\n      }\n\n      const { encoding, privateKey } = options;\n\n      // Validate encoding\n      if (encoding !== PrivateKeyEncoding.Hexadecimal) {\n        throw new Error(\n          `Unsupported encoding for SimpleKeyring: ${encoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n        );\n      }\n\n      // Import the private key (with automatic rollback on failure)\n      const newAddress = await this.#importPrivateKeyOrRollback(privateKey);\n\n      // Create and return the new KeyringAccount\n      const newAccount = this.#createKeyringAccount(newAddress);\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      const account = await this.getAccount(accountId);\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(account.address);\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    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for SimpleKeyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    const privateKeyHex = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    // Sanitize private key format\n    const privateKey = add0x(privateKeyHex);\n\n    const exported: ExportedAccount = {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n\n    return exported;\n  }\n}\n"]}

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

@@ -1 +0,0 @@
-{"version":3,"file":"simple-keyring-v2.d.cts","sourceRoot":"","sources":["../src/simple-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,oBAAoB,EAIzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,cAAc,EAGnB,KAAK,SAAS,EAGf,8BAA8B;AAC/B,OAAO,EAAoB,iBAAiB,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAIzD,OAAO,KAAK,aAAa,6BAAyB;AA6BlD;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,qBAAa,eACX,SAAQ,iBAAiB,CAAC,aAAa,CACvC,YAAW,SAAS;;gBAER,OAAO,EAAE,sBAAsB;IA8GrC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAkBxC,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAkC5B;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"simple-keyring-v2.d.mts","sourceRoot":"","sources":["../src/simple-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,oBAAoB,EAIzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,cAAc,EAGnB,KAAK,SAAS,EAGf,8BAA8B;AAC/B,OAAO,EAAoB,iBAAiB,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAIzD,OAAO,KAAK,aAAa,6BAAyB;AA6BlD;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,qBAAa,eACX,SAAQ,iBAAiB,CAAC,aAAa,CACvC,YAAW,SAAS;;gBAER,OAAO,EAAE,sBAAsB;IA8GrC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAkBxC,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAkC5B;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD;;;;;;OAMG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"simple-keyring-v2.mjs","sourceRoot":"","sources":["../src/simple-keyring-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type CreateAccountOptions,\n  EthAccountType,\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} from '@metamask/keyring-api';\nimport { EthKeyringMethod, EthKeyringWrapper } from '@metamask/keyring-sdk';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { add0x, type Hex } from '@metamask/utils';\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nimport type SimpleKeyring from './simple-keyring';\n\n/**\n * Methods supported by SimpleKeyring EOA accounts.\n * SimpleKeyring supports all standard signing methods plus encryption and app keys.\n */\nconst SIMPLE_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 simpleKeyringV2Capabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  privateKey: {\n    importFormats: [\n      { encoding: PrivateKeyEncoding.Hexadecimal, type: EthAccountType.Eoa },\n    ],\n    exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],\n  },\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link SimpleKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * SimpleKeyring via the unified V2 interface.\n */\nexport type SimpleKeyringV2Options = {\n  legacyKeyring: SimpleKeyring;\n};\n\nexport class SimpleKeyringV2\n  extends EthKeyringWrapper<SimpleKeyring>\n  implements KeyringV2\n{\n  constructor(options: SimpleKeyringV2Options) {\n    super({\n      type: KeyringType.PrivateKey,\n      inner: options.legacyKeyring,\n      capabilities: simpleKeyringV2Capabilities,\n    });\n  }\n\n  /**\n   * Creates a KeyringAccount object for the given address and index.\n   *\n   * @param address - The account address.\n   * @returns The created KeyringAccount.\n   */\n  #createKeyringAccount(address: Hex): KeyringAccount {\n    const id = this.registry.register(address);\n\n    const account: KeyringAccount = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...SIMPLE_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.PrivateKey,\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  /**\n   * Get all private keys from the inner SimpleKeyring.\n   *\n   * @returns An array of private keys in hexadecimal format.\n   */\n  async #getPrivateKeys(): Promise<string[]> {\n    return await this.inner.serialize();\n  }\n\n  /**\n   * Set private keys in the inner SimpleKeyring.\n   *\n   * @param privateKeys - An array of private keys in hexadecimal format.\n   */\n  async #setPrivateKeys(privateKeys: string[]): Promise<void> {\n    await this.inner.deserialize(privateKeys);\n  }\n\n  /**\n   * Executes a transactional update on the inner keyring state.\n   * If the callback throws, the state is automatically rolled back.\n   *\n   * @param callback - A function that receives the current private keys and performs the update.\n   * Should return the result on success, or throw to trigger rollback.\n   * @returns The result of the callback.\n   * @throws Error if the callback throws (after rollback).\n   */\n  async #withRollback<Result>(\n    callback: (currentPrivateKeys: string[]) => Promise<Result>,\n  ): Promise<Result> {\n    const originalPrivateKeys = await this.#getPrivateKeys();\n\n    try {\n      return await callback(originalPrivateKeys);\n    } catch (error) {\n      // Rollback on error\n      await this.#setPrivateKeys(originalPrivateKeys);\n      throw error;\n    }\n  }\n\n  /**\n   * Import a private key and return the new address.\n   * If the import fails (no new address added), rolls back to the original state.\n   *\n   * @param privateKey - The private key to import in hexadecimal format.\n   * @returns The address of the newly imported account.\n   * @throws Error if the import fails or no new address is added.\n   */\n  async #importPrivateKeyOrRollback(privateKey: string): Promise<Hex> {\n    return this.#withRollback(async (currentPrivateKeys) => {\n      // Get current addresses before import\n      const addressesBefore = new Set(await this.inner.getAccounts());\n\n      // Import the new private key\n      await this.#setPrivateKeys([...currentPrivateKeys, privateKey]);\n\n      // Get addresses after import and find the newly added one\n      const addressesAfter = await this.inner.getAccounts();\n\n      // Find the new address by diffing the two sets\n      const newAddresses = addressesAfter.filter(\n        (addr) => !addressesBefore.has(addr),\n      );\n\n      if (newAddresses.length !== 1 || !newAddresses[0]) {\n        throw new Error('Failed to import private key');\n      }\n\n      return newAddresses[0];\n    });\n  }\n\n  async getAccounts(): Promise<KeyringAccount[]> {\n    const addresses = await this.inner.getAccounts();\n\n    return addresses.map((address) => {\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);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    return this.withLock(async () => {\n      // For SimpleKeyring, we only support private key import\n      if (options.type !== 'private-key:import') {\n        throw new Error(\n          `Unsupported account creation type for SimpleKeyring: ${options.type}`,\n        );\n      }\n\n      // Validate account type\n      if (options.accountType !== EthAccountType.Eoa) {\n        throw new Error(\n          `Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${EthAccountType.Eoa}' is supported.`,\n        );\n      }\n\n      const { encoding, privateKey } = options;\n\n      // Validate encoding\n      if (encoding !== PrivateKeyEncoding.Hexadecimal) {\n        throw new Error(\n          `Unsupported encoding for SimpleKeyring: ${encoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n        );\n      }\n\n      // Import the private key (with automatic rollback on failure)\n      const newAddress = await this.#importPrivateKeyOrRollback(privateKey);\n\n      // Create and return the new KeyringAccount\n      const newAccount = this.#createKeyringAccount(newAddress);\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      const account = await this.getAccount(accountId);\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(account.address);\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    const requestedEncoding =\n      options?.encoding ?? PrivateKeyEncoding.Hexadecimal;\n\n    if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {\n      throw new Error(\n        `Unsupported encoding for SimpleKeyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`,\n      );\n    }\n\n    const privateKeyHex = await this.inner.exportAccount(\n      this.toHexAddress(account.address),\n    );\n    // Sanitize private key format\n    const privateKey = add0x(privateKeyHex);\n\n    const exported: ExportedAccount = {\n      type: 'private-key',\n      privateKey,\n      encoding: PrivateKeyEncoding.Hexadecimal,\n    };\n\n    return exported;\n  }\n}\n"]}