@metamask/eth-simple-keyring 10.0.0 → 11.1.0

package/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.1.0]
+
+### Added
+
+- Add `SimpleKeyringV2` class implementing `KeyringV2` interface ([#409](https://github.com/MetaMask/accounts/pull/409)), ([#410](https://github.com/MetaMask/accounts/pull/410)), ([#413](https://github.com/MetaMask/accounts/pull/413)), ([#451](https://github.com/MetaMask/accounts/pull/451)), ([#478](https://github.com/MetaMask/accounts/pull/478)), ([#482](https://github.com/MetaMask/accounts/pull/482))
+  - Add new dependency `@metamask/keyring-api@22.0.0`.
+  - Add new dependency `@metamask/keyring-sdk@1.0.0`.
+  - Wraps legacy `SimpleKeyring` to expose accounts via the unified `KeyringV2` API and the `KeyringAccount` type.
+  - Extends `EthKeyringWrapper` for common Ethereum logic.
+
+### Changed
+
+- Bump `@metamask/utils` from `^11.1.0` to `^11.10.0` ([#489](https://github.com/MetaMask/accounts/pull/489))
+
+## [11.0.0]
+
+### Changed
+
+- **BREAKING:** The method signature for `signTypedData` has been changed ([#224](https://github.com/MetaMask/accounts/pull/224))
+  - The method now accepts a `TypedDataV1` object when `SignTypedDataVersion.V1` is passed in the options, and `TypedMessage<Types>` when other versions are requested.
+  - The `options` argument type has been changed to `{ version: SignTypedDataVersion } | undefined`.
+
 ## [10.0.0]
 
 ### Changed
@@ -142,7 +164,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **BREAKING:** Remove redundant `newGethSignMessage` method ([#72](https://github.com/MetaMask/eth-simple-keyring/pull/72))
   - Consumers can use `signPersonalMessage` method as a replacement for `newGethSignMessage`.
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@10.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@11.1.0...HEAD
+[11.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@11.0.0...@metamask/eth-simple-keyring@11.1.0
+[11.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@10.0.0...@metamask/eth-simple-keyring@11.0.0
 [10.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@9.0.0...@metamask/eth-simple-keyring@10.0.0
 [9.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@8.1.1...@metamask/eth-simple-keyring@9.0.0
 [8.1.1]: https://github.com/MetaMask/accounts/compare/@metamask/eth-simple-keyring@8.1.0...@metamask/eth-simple-keyring@8.1.1

package/dist/simple-keyring-v2.cjs

@@ -0,0 +1,202 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SimpleKeyringV2_instances, _SimpleKeyringV2_createKeyringAccount, _SimpleKeyringV2_getPrivateKeys, _SimpleKeyringV2_setPrivateKeys, _SimpleKeyringV2_withRollback, _SimpleKeyringV2_importPrivateKeyOrRollback;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleKeyringV2 = void 0;
+const keyring_api_1 = require("@metamask/keyring-api");
+const keyring_sdk_1 = require("@metamask/keyring-sdk");
+const utils_1 = require("@metamask/utils");
+/**
+ * Methods supported by SimpleKeyring EOA accounts.
+ * SimpleKeyring supports all standard signing methods plus encryption and app keys.
+ */
+const SIMPLE_KEYRING_METHODS = [
+    keyring_api_1.EthMethod.SignTransaction,
+    keyring_api_1.EthMethod.Sign,
+    keyring_api_1.EthMethod.PersonalSign,
+    keyring_api_1.EthMethod.SignTypedDataV1,
+    keyring_api_1.EthMethod.SignTypedDataV3,
+    keyring_api_1.EthMethod.SignTypedDataV4,
+    keyring_sdk_1.EthKeyringMethod.Decrypt,
+    keyring_sdk_1.EthKeyringMethod.GetEncryptionPublicKey,
+    keyring_sdk_1.EthKeyringMethod.GetAppKeyAddress,
+    keyring_sdk_1.EthKeyringMethod.SignEip7702Authorization,
+];
+const simpleKeyringV2Capabilities = {
+    scopes: [keyring_api_1.EthScope.Eoa],
+    privateKey: {
+        importFormats: [
+            { encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal, type: keyring_api_1.EthAccountType.Eoa },
+        ],
+        exportFormats: [{ encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal }],
+    },
+};
+class SimpleKeyringV2 extends keyring_sdk_1.EthKeyringWrapper {
+    constructor(options) {
+        super({
+            type: keyring_api_1.KeyringType.PrivateKey,
+            inner: options.legacyKeyring,
+            capabilities: simpleKeyringV2Capabilities,
+        });
+        _SimpleKeyringV2_instances.add(this);
+    }
+    async getAccounts() {
+        const addresses = await this.inner.getAccounts();
+        return addresses.map((address) => {
+            // Check if we already have this account in the registry
+            const existingId = this.registry.getAccountId(address);
+            if (existingId) {
+                const cached = this.registry.get(existingId);
+                if (cached) {
+                    return cached;
+                }
+            }
+            // Create and register the account if not already cached
+            return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, address);
+        });
+    }
+    async createAccounts(options) {
+        return this.withLock(async () => {
+            // For SimpleKeyring, we only support private key import
+            if (options.type !== 'private-key:import') {
+                throw new Error(`Unsupported account creation type for SimpleKeyring: ${options.type}`);
+            }
+            // Validate account type
+            if (options.accountType !== keyring_api_1.EthAccountType.Eoa) {
+                throw new Error(`Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${keyring_api_1.EthAccountType.Eoa}' is supported.`);
+            }
+            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.`);
+            }
+            // Import the private key (with automatic rollback on failure)
+            const newAddress = await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_importPrivateKeyOrRollback).call(this, privateKey);
+            // Create and return the new KeyringAccount
+            const newAccount = __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, newAddress);
+            return [newAccount];
+        });
+    }
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    async deleteAccount(accountId) {
+        await this.withLock(async () => {
+            const account = await this.getAccount(accountId);
+            // Remove from the legacy keyring
+            this.inner.removeAccount(account.address);
+            // Remove from the registry
+            this.registry.delete(accountId);
+        });
+    }
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    async exportAccount(accountId, options) {
+        const account = await this.getAccount(accountId);
+        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 privateKeyHex = await this.inner.exportAccount(this.toHexAddress(account.address));
+        // Sanitize private key format
+        const privateKey = (0, utils_1.add0x)(privateKeyHex);
+        const exported = {
+            type: 'private-key',
+            privateKey,
+            encoding: keyring_api_1.PrivateKeyEncoding.Hexadecimal,
+        };
+        return exported;
+    }
+}
+exports.SimpleKeyringV2 = SimpleKeyringV2;
+_SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccount = function _SimpleKeyringV2_createKeyringAccount(address) {
+    const id = this.registry.register(address);
+    const account = {
+        id,
+        type: keyring_api_1.EthAccountType.Eoa,
+        address,
+        scopes: [...this.capabilities.scopes],
+        methods: [...SIMPLE_KEYRING_METHODS],
+        options: {
+            entropy: {
+                type: keyring_api_1.KeyringAccountEntropyTypeOption.PrivateKey,
+            },
+            exportable: true,
+        },
+    };
+    // Add the account to the registry
+    this.registry.set(account);
+    return account;
+}, _SimpleKeyringV2_getPrivateKeys = 
+/**
+ * Get all private keys from the inner SimpleKeyring.
+ *
+ * @returns An array of private keys in hexadecimal format.
+ */
+async function _SimpleKeyringV2_getPrivateKeys() {
+    return await this.inner.serialize();
+}, _SimpleKeyringV2_setPrivateKeys = 
+/**
+ * Set private keys in the inner SimpleKeyring.
+ *
+ * @param privateKeys - An array of private keys in hexadecimal format.
+ */
+async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
+    await this.inner.deserialize(privateKeys);
+}, _SimpleKeyringV2_withRollback = 
+/**
+ * Executes a transactional update on the inner keyring state.
+ * If the callback throws, the state is automatically rolled back.
+ *
+ * @param callback - A function that receives the current private keys and performs the update.
+ * Should return the result on success, or throw to trigger rollback.
+ * @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);
+    try {
+        return await callback(originalPrivateKeys);
+    }
+    catch (error) {
+        // Rollback on error
+        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, originalPrivateKeys);
+        throw error;
+    }
+}, _SimpleKeyringV2_importPrivateKeyOrRollback = 
+/**
+ * Import a private key and return the new address.
+ * If the import fails (no new address added), rolls back to the original state.
+ *
+ * @param privateKey - The private key to import in hexadecimal format.
+ * @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) => {
+        // 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]);
+        // 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
+        const newAddresses = addressesAfter.filter((addr) => !addressesBefore.has(addr));
+        if (newAddresses.length !== 1 || !newAddresses[0]) {
+            throw new Error('Failed to import private key');
+        }
+        return newAddresses[0];
+    });
+};
+//# sourceMappingURL=simple-keyring-v2.cjs.map

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

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

@@ -0,0 +1,34 @@
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2 } from "@metamask/keyring-api";
+import { EthKeyringWrapper } from "@metamask/keyring-sdk";
+import type { AccountId } from "@metamask/keyring-utils";
+import type SimpleKeyring from "./simple-keyring.cjs";
+/**
+ * Concrete {@link KeyringV2} 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 declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> implements KeyringV2 {
+    #private;
+    constructor(options: SimpleKeyringV2Options);
+    getAccounts(): Promise<KeyringAccount[]>;
+    createAccounts(options: CreateAccountOptions): Promise<KeyringAccount[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
+}
+//# sourceMappingURL=simple-keyring-v2.d.cts.map

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

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

@@ -0,0 +1,34 @@
+import { type CreateAccountOptions, type ExportAccountOptions, type ExportedAccount, type KeyringAccount, type KeyringV2 } from "@metamask/keyring-api";
+import { EthKeyringWrapper } from "@metamask/keyring-sdk";
+import type { AccountId } from "@metamask/keyring-utils";
+import type SimpleKeyring from "./simple-keyring.mjs";
+/**
+ * Concrete {@link KeyringV2} 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 declare class SimpleKeyringV2 extends EthKeyringWrapper<SimpleKeyring> implements KeyringV2 {
+    #private;
+    constructor(options: SimpleKeyringV2Options);
+    getAccounts(): Promise<KeyringAccount[]>;
+    createAccounts(options: CreateAccountOptions): Promise<KeyringAccount[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    exportAccount(accountId: AccountId, options?: ExportAccountOptions): Promise<ExportedAccount>;
+}
+//# sourceMappingURL=simple-keyring-v2.d.mts.map

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

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

@@ -0,0 +1,198 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SimpleKeyringV2_instances, _SimpleKeyringV2_createKeyringAccount, _SimpleKeyringV2_getPrivateKeys, _SimpleKeyringV2_setPrivateKeys, _SimpleKeyringV2_withRollback, _SimpleKeyringV2_importPrivateKeyOrRollback;
+import { EthAccountType, EthMethod, EthScope, KeyringAccountEntropyTypeOption, KeyringType, PrivateKeyEncoding } from "@metamask/keyring-api";
+import { EthKeyringMethod, EthKeyringWrapper } from "@metamask/keyring-sdk";
+import { add0x } from "@metamask/utils";
+/**
+ * Methods supported by SimpleKeyring EOA accounts.
+ * SimpleKeyring supports all standard signing methods plus encryption and app keys.
+ */
+const SIMPLE_KEYRING_METHODS = [
+    EthMethod.SignTransaction,
+    EthMethod.Sign,
+    EthMethod.PersonalSign,
+    EthMethod.SignTypedDataV1,
+    EthMethod.SignTypedDataV3,
+    EthMethod.SignTypedDataV4,
+    EthKeyringMethod.Decrypt,
+    EthKeyringMethod.GetEncryptionPublicKey,
+    EthKeyringMethod.GetAppKeyAddress,
+    EthKeyringMethod.SignEip7702Authorization,
+];
+const simpleKeyringV2Capabilities = {
+    scopes: [EthScope.Eoa],
+    privateKey: {
+        importFormats: [
+            { encoding: PrivateKeyEncoding.Hexadecimal, type: EthAccountType.Eoa },
+        ],
+        exportFormats: [{ encoding: PrivateKeyEncoding.Hexadecimal }],
+    },
+};
+export class SimpleKeyringV2 extends EthKeyringWrapper {
+    constructor(options) {
+        super({
+            type: KeyringType.PrivateKey,
+            inner: options.legacyKeyring,
+            capabilities: simpleKeyringV2Capabilities,
+        });
+        _SimpleKeyringV2_instances.add(this);
+    }
+    async getAccounts() {
+        const addresses = await this.inner.getAccounts();
+        return addresses.map((address) => {
+            // Check if we already have this account in the registry
+            const existingId = this.registry.getAccountId(address);
+            if (existingId) {
+                const cached = this.registry.get(existingId);
+                if (cached) {
+                    return cached;
+                }
+            }
+            // Create and register the account if not already cached
+            return __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, address);
+        });
+    }
+    async createAccounts(options) {
+        return this.withLock(async () => {
+            // For SimpleKeyring, we only support private key import
+            if (options.type !== 'private-key:import') {
+                throw new Error(`Unsupported account creation type for SimpleKeyring: ${options.type}`);
+            }
+            // Validate account type
+            if (options.accountType !== EthAccountType.Eoa) {
+                throw new Error(`Unsupported account type for SimpleKeyring: ${options.accountType}. Only '${EthAccountType.Eoa}' is supported.`);
+            }
+            const { encoding, privateKey } = options;
+            // Validate encoding
+            if (encoding !== PrivateKeyEncoding.Hexadecimal) {
+                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);
+            // Create and return the new KeyringAccount
+            const newAccount = __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_createKeyringAccount).call(this, newAddress);
+            return [newAccount];
+        });
+    }
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    async deleteAccount(accountId) {
+        await this.withLock(async () => {
+            const account = await this.getAccount(accountId);
+            // Remove from the legacy keyring
+            this.inner.removeAccount(account.address);
+            // Remove from the registry
+            this.registry.delete(accountId);
+        });
+    }
+    /**
+     * Export the private key for an account in hexadecimal format.
+     *
+     * @param accountId - The ID of the account to export.
+     * @param options - Export options (only hexadecimal encoding is supported).
+     * @returns The exported account with private key.
+     */
+    async exportAccount(accountId, options) {
+        const account = await this.getAccount(accountId);
+        const requestedEncoding = options?.encoding ?? PrivateKeyEncoding.Hexadecimal;
+        if (requestedEncoding !== PrivateKeyEncoding.Hexadecimal) {
+            throw new Error(`Unsupported encoding for SimpleKeyring: ${requestedEncoding}. Only '${PrivateKeyEncoding.Hexadecimal}' is supported.`);
+        }
+        const privateKeyHex = await this.inner.exportAccount(this.toHexAddress(account.address));
+        // Sanitize private key format
+        const privateKey = add0x(privateKeyHex);
+        const exported = {
+            type: 'private-key',
+            privateKey,
+            encoding: PrivateKeyEncoding.Hexadecimal,
+        };
+        return exported;
+    }
+}
+_SimpleKeyringV2_instances = new WeakSet(), _SimpleKeyringV2_createKeyringAccount = function _SimpleKeyringV2_createKeyringAccount(address) {
+    const id = this.registry.register(address);
+    const account = {
+        id,
+        type: EthAccountType.Eoa,
+        address,
+        scopes: [...this.capabilities.scopes],
+        methods: [...SIMPLE_KEYRING_METHODS],
+        options: {
+            entropy: {
+                type: KeyringAccountEntropyTypeOption.PrivateKey,
+            },
+            exportable: true,
+        },
+    };
+    // Add the account to the registry
+    this.registry.set(account);
+    return account;
+}, _SimpleKeyringV2_getPrivateKeys = 
+/**
+ * Get all private keys from the inner SimpleKeyring.
+ *
+ * @returns An array of private keys in hexadecimal format.
+ */
+async function _SimpleKeyringV2_getPrivateKeys() {
+    return await this.inner.serialize();
+}, _SimpleKeyringV2_setPrivateKeys = 
+/**
+ * Set private keys in the inner SimpleKeyring.
+ *
+ * @param privateKeys - An array of private keys in hexadecimal format.
+ */
+async function _SimpleKeyringV2_setPrivateKeys(privateKeys) {
+    await this.inner.deserialize(privateKeys);
+}, _SimpleKeyringV2_withRollback = 
+/**
+ * Executes a transactional update on the inner keyring state.
+ * If the callback throws, the state is automatically rolled back.
+ *
+ * @param callback - A function that receives the current private keys and performs the update.
+ * Should return the result on success, or throw to trigger rollback.
+ * @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);
+    try {
+        return await callback(originalPrivateKeys);
+    }
+    catch (error) {
+        // Rollback on error
+        await __classPrivateFieldGet(this, _SimpleKeyringV2_instances, "m", _SimpleKeyringV2_setPrivateKeys).call(this, originalPrivateKeys);
+        throw error;
+    }
+}, _SimpleKeyringV2_importPrivateKeyOrRollback = 
+/**
+ * Import a private key and return the new address.
+ * If the import fails (no new address added), rolls back to the original state.
+ *
+ * @param privateKey - The private key to import in hexadecimal format.
+ * @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) => {
+        // 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]);
+        // 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
+        const newAddresses = addressesAfter.filter((addr) => !addressesBefore.has(addr));
+        if (newAddresses.length !== 1 || !newAddresses[0]) {
+            throw new Error('Failed to import private key');
+        }
+        return newAddresses[0];
+    });
+};
+//# sourceMappingURL=simple-keyring-v2.mjs.map

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

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

package/dist/simple-keyring.cjs

@@ -92,15 +92,14 @@ class SimpleKeyring {
         const privateKey = wallet.privateKey.toString('hex');
         return (0, eth_sig_util_1.decrypt)({ privateKey, encryptedData });
     }
-    // personal_signTypedData, signs data along with the schema
-    async signTypedData(address, typedData, opts = { version: eth_sig_util_1.SignTypedDataVersion.V1 }) {
+    async signTypedData(address, data, options) {
+        let { version } = options ?? { version: eth_sig_util_1.SignTypedDataVersion.V1 };
         // Treat invalid versions as "V1"
-        let version = eth_sig_util_1.SignTypedDataVersion.V1;
-        if (opts.version && isSignTypedDataVersion(opts.version)) {
-            version = eth_sig_util_1.SignTypedDataVersion[opts.version];
+        if (!version || !isSignTypedDataVersion(version)) {
+            version = eth_sig_util_1.SignTypedDataVersion.V1;
         }
-        const privateKey = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeyFor).call(this, address, opts);
-        return (0, eth_sig_util_1.signTypedData)({ privateKey, data: typedData, version });
+        const privateKey = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeyFor).call(this, address, options);
+        return (0, eth_sig_util_1.signTypedData)({ privateKey, data, version });
     }
     // get public key for nacl
     async getEncryptionPublicKey(withAccount, opts) {

package/dist/simple-keyring.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"simple-keyring.cjs","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedTransaction } from '@ethereumjs/tx';\nimport {\n  ecsign,\n  isValidPrivate,\n  privateToPublic,\n  publicToAddress,\n  stripHexPrefix,\n} from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  EIP7702Authorization,\n  getEncryptionPublicKey,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n} from '@metamask/eth-sig-util';\nimport { Keyring } from '@metamask/keyring-utils';\nimport {\n  add0x,\n  bigIntToBytes,\n  bytesToHex,\n  Eip1024EncryptedData,\n  Hex,\n} from '@metamask/utils';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\nimport randombytes from 'randombytes';\n\ntype KeyringOpt = {\n  withAppKeyOrigin?: string;\n  version?: SignTypedDataVersion | string;\n};\n\ntype Wallet = {\n  privateKey: Buffer;\n  publicKey: Buffer;\n};\n\nconst TYPE = 'Simple Key Pair';\n\n// FIXME: This should not be exported as default.\nexport default class SimpleKeyring implements Keyring {\n  #wallets: { privateKey: Buffer; publicKey: Buffer }[];\n\n  readonly type: string = TYPE;\n\n  static type: string = TYPE;\n\n  constructor(privateKeys: string[] = []) {\n    this.#wallets = [];\n\n    /* istanbul ignore next: It's not possible to write a unit test for this, because a constructor isn't allowed\n     * to be async. Jest can't await the constructor, and when the error gets thrown, Jest can't catch it. */\n    this.deserialize(privateKeys).catch((error: Error) => {\n      throw new Error(`Problem deserializing SimpleKeyring ${error.message}`);\n    });\n  }\n\n  async serialize(): Promise<string[]> {\n    return this.#wallets.map((a) => a.privateKey.toString('hex'));\n  }\n\n  async deserialize(privateKeys: string[]): Promise<void> {\n    this.#wallets = privateKeys.map((hexPrivateKey) => {\n      const strippedHexPrivateKey = stripHexPrefix(hexPrivateKey);\n      const privateKey = Buffer.from(strippedHexPrivateKey, 'hex');\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      return { privateKey, publicKey };\n    });\n  }\n\n  async addAccounts(numAccounts = 1): Promise<Hex[]> {\n    const newWallets = [];\n    for (let i = 0; i < numAccounts; i++) {\n      const privateKey = generateKey();\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      newWallets.push({ privateKey, publicKey });\n    }\n    this.#wallets = this.#wallets.concat(newWallets);\n    const hexWallets = newWallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n    return hexWallets;\n  }\n\n  async getAccounts(): Promise<Hex[]> {\n    return this.#wallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n  }\n\n  async signTransaction(\n    address: Hex,\n    transaction: TypedTransaction,\n    opts: KeyringOpt = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = transaction.sign(privKey);\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? transaction;\n  }\n\n  async signEip7702Authorization(\n    address: Hex,\n    authorization: EIP7702Authorization,\n    opts: KeyringOpt = {},\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signEIP7702Authorization({ privateKey, authorization });\n  }\n\n  // For eth_sign, we need to sign arbitrary data:\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts = { withAppKeyOrigin: '', validateMessage: true },\n  ): Promise<string> {\n    const message = stripHexPrefix(data);\n    if (\n      opts.validateMessage &&\n      (message.length === 0 || !message.match(/^[a-fA-F0-9]*$/u))\n    ) {\n      throw new Error('Cannot sign invalid message');\n    }\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), privKey);\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  // For personal_sign, we need to prefix the message:\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    return personalSign({ privateKey: privKey, data: msgHex });\n  }\n\n  // For eth_decryptMessage:\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: Eip1024EncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const privateKey = wallet.privateKey.toString('hex');\n    return decrypt({ privateKey, encryptedData });\n  }\n\n  // personal_signTypedData, signs data along with the schema\n  async signTypedData(\n    address: Hex,\n    typedData: any,\n    opts: KeyringOpt = { version: SignTypedDataVersion.V1 },\n  ): Promise<string> {\n    // Treat invalid versions as \"V1\"\n    let version = SignTypedDataVersion.V1;\n\n    if (opts.version && isSignTypedDataVersion(opts.version)) {\n      version = SignTypedDataVersion[opts.version];\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signTypedData({ privateKey, data: typedData, version });\n  }\n\n  // get public key for nacl\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts?: KeyringOpt,\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(privKey.toString('hex'));\n    return publicKey;\n  }\n\n  #getPrivateKeyFor(\n    address: Hex,\n    opts: KeyringOpt = { withAppKeyOrigin: '' },\n  ): Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey;\n  }\n\n  // returns an address specific to an app\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    const appKeyAddress = add0x(bytesToHex(publicToAddress(wallet.publicKey)));\n    return appKeyAddress;\n  }\n\n  // exportAccount should return a hex-encoded private key:\n  async exportAccount(\n    address: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey.toString('hex');\n  }\n\n  removeAccount(address: string): void {\n    if (\n      !this.#wallets\n        .map(({ publicKey }) =>\n          bytesToHex(publicToAddress(publicKey)).toLowerCase(),\n        )\n        .includes(address.toLowerCase())\n    ) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#wallets = this.#wallets.filter(\n      ({ publicKey }) =>\n        bytesToHex(publicToAddress(publicKey)).toLowerCase() !==\n        address.toLowerCase(),\n    );\n  }\n\n  #getWalletForAccount(\n    account: string | number,\n    opts: KeyringOpt = {},\n  ): Wallet {\n    const address = normalize(account);\n    let wallet = this.#wallets.find(\n      ({ publicKey }) => bytesToHex(publicToAddress(publicKey)) === address,\n    );\n    if (!wallet) {\n      throw new Error('Simple Keyring - Unable to find matching address.');\n    }\n\n    if (opts.withAppKeyOrigin) {\n      const { privateKey } = wallet;\n      const appKeyOriginBuffer = Buffer.from(opts.withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = keccak256(appKeyBuffer);\n      const appKeyPublicKey = privateToPublic(appKeyPrivateKey);\n      wallet = {\n        privateKey: Buffer.from(appKeyPrivateKey),\n        publicKey: Buffer.from(appKeyPublicKey),\n      };\n    }\n\n    return wallet;\n  }\n}\n\n/**\n * Generate and validate a new random key of 32 bytes.\n *\n * @returns Buffer The generated key.\n */\nfunction generateKey(): Buffer {\n  const privateKey = randombytes(32);\n\n  if (!isValidPrivate(privateKey)) {\n    throw new Error(\n      'Private key does not satisfy the curve requirements (ie. it is invalid)',\n    );\n  }\n  return privateKey;\n}\n\n/**\n * Type predicate type guard to check if a string is in the enum SignTypedDataVersion.\n *\n * @param version - The string to check.\n * @returns Whether it's in the enum.\n */\n// TODO: Put this in @metamask/eth-sig-util\nfunction isSignTypedDataVersion(\n  version: SignTypedDataVersion | string,\n): version is SignTypedDataVersion {\n  return version in SignTypedDataVersion;\n}\n"]}
+{"version":3,"file":"simple-keyring.cjs","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedTransaction } from '@ethereumjs/tx';\nimport {\n  ecsign,\n  isValidPrivate,\n  privateToPublic,\n  publicToAddress,\n  stripHexPrefix,\n} from '@ethereumjs/util';\nimport {\n  type TypedDataV1,\n  type MessageTypes,\n  type TypedMessage,\n  concatSig,\n  decrypt,\n  EIP7702Authorization,\n  getEncryptionPublicKey,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n} from '@metamask/eth-sig-util';\nimport { Keyring } from '@metamask/keyring-utils';\nimport {\n  add0x,\n  bigIntToBytes,\n  bytesToHex,\n  Eip1024EncryptedData,\n  Hex,\n} from '@metamask/utils';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\nimport randombytes from 'randombytes';\n\ntype KeyringOpt = {\n  withAppKeyOrigin?: string;\n  version?: SignTypedDataVersion | string;\n};\n\ntype Wallet = {\n  privateKey: Buffer;\n  publicKey: Buffer;\n};\n\nconst TYPE = 'Simple Key Pair';\n\n// FIXME: This should not be exported as default.\nexport default class SimpleKeyring implements Keyring {\n  #wallets: { privateKey: Buffer; publicKey: Buffer }[];\n\n  readonly type: string = TYPE;\n\n  static type: string = TYPE;\n\n  constructor(privateKeys: string[] = []) {\n    this.#wallets = [];\n\n    /* istanbul ignore next: It's not possible to write a unit test for this, because a constructor isn't allowed\n     * to be async. Jest can't await the constructor, and when the error gets thrown, Jest can't catch it. */\n    this.deserialize(privateKeys).catch((error: Error) => {\n      throw new Error(`Problem deserializing SimpleKeyring ${error.message}`);\n    });\n  }\n\n  async serialize(): Promise<string[]> {\n    return this.#wallets.map((a) => a.privateKey.toString('hex'));\n  }\n\n  async deserialize(privateKeys: string[]): Promise<void> {\n    this.#wallets = privateKeys.map((hexPrivateKey) => {\n      const strippedHexPrivateKey = stripHexPrefix(hexPrivateKey);\n      const privateKey = Buffer.from(strippedHexPrivateKey, 'hex');\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      return { privateKey, publicKey };\n    });\n  }\n\n  async addAccounts(numAccounts = 1): Promise<Hex[]> {\n    const newWallets = [];\n    for (let i = 0; i < numAccounts; i++) {\n      const privateKey = generateKey();\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      newWallets.push({ privateKey, publicKey });\n    }\n    this.#wallets = this.#wallets.concat(newWallets);\n    const hexWallets = newWallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n    return hexWallets;\n  }\n\n  async getAccounts(): Promise<Hex[]> {\n    return this.#wallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n  }\n\n  async signTransaction(\n    address: Hex,\n    transaction: TypedTransaction,\n    opts: KeyringOpt = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = transaction.sign(privKey);\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? transaction;\n  }\n\n  async signEip7702Authorization(\n    address: Hex,\n    authorization: EIP7702Authorization,\n    opts: KeyringOpt = {},\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signEIP7702Authorization({ privateKey, authorization });\n  }\n\n  // For eth_sign, we need to sign arbitrary data:\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts = { withAppKeyOrigin: '', validateMessage: true },\n  ): Promise<string> {\n    const message = stripHexPrefix(data);\n    if (\n      opts.validateMessage &&\n      (message.length === 0 || !message.match(/^[a-fA-F0-9]*$/u))\n    ) {\n      throw new Error('Cannot sign invalid message');\n    }\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), privKey);\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  // For personal_sign, we need to prefix the message:\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    return personalSign({ privateKey: privKey, data: msgHex });\n  }\n\n  // For eth_decryptMessage:\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: Eip1024EncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const privateKey = wallet.privateKey.toString('hex');\n    return decrypt({ privateKey, encryptedData });\n  }\n\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version } & KeyringOpt,\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !isSignTypedDataVersion(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({ privateKey, data, version });\n  }\n\n  // get public key for nacl\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts?: KeyringOpt,\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(privKey.toString('hex'));\n    return publicKey;\n  }\n\n  #getPrivateKeyFor(\n    address: Hex,\n    opts: KeyringOpt = { withAppKeyOrigin: '' },\n  ): Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey;\n  }\n\n  // returns an address specific to an app\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    const appKeyAddress = add0x(bytesToHex(publicToAddress(wallet.publicKey)));\n    return appKeyAddress;\n  }\n\n  // exportAccount should return a hex-encoded private key:\n  async exportAccount(\n    address: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey.toString('hex');\n  }\n\n  removeAccount(address: string): void {\n    if (\n      !this.#wallets\n        .map(({ publicKey }) =>\n          bytesToHex(publicToAddress(publicKey)).toLowerCase(),\n        )\n        .includes(address.toLowerCase())\n    ) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#wallets = this.#wallets.filter(\n      ({ publicKey }) =>\n        bytesToHex(publicToAddress(publicKey)).toLowerCase() !==\n        address.toLowerCase(),\n    );\n  }\n\n  #getWalletForAccount(\n    account: string | number,\n    opts: KeyringOpt = {},\n  ): Wallet {\n    const address = normalize(account);\n    let wallet = this.#wallets.find(\n      ({ publicKey }) => bytesToHex(publicToAddress(publicKey)) === address,\n    );\n    if (!wallet) {\n      throw new Error('Simple Keyring - Unable to find matching address.');\n    }\n\n    if (opts.withAppKeyOrigin) {\n      const { privateKey } = wallet;\n      const appKeyOriginBuffer = Buffer.from(opts.withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = keccak256(appKeyBuffer);\n      const appKeyPublicKey = privateToPublic(appKeyPrivateKey);\n      wallet = {\n        privateKey: Buffer.from(appKeyPrivateKey),\n        publicKey: Buffer.from(appKeyPublicKey),\n      };\n    }\n\n    return wallet;\n  }\n}\n\n/**\n * Generate and validate a new random key of 32 bytes.\n *\n * @returns Buffer The generated key.\n */\nfunction generateKey(): Buffer {\n  const privateKey = randombytes(32);\n\n  if (!isValidPrivate(privateKey)) {\n    throw new Error(\n      'Private key does not satisfy the curve requirements (ie. it is invalid)',\n    );\n  }\n  return privateKey;\n}\n\n/**\n * Type predicate type guard to check if a string is in the enum SignTypedDataVersion.\n *\n * @param version - The string to check.\n * @returns Whether it's in the enum.\n */\n// TODO: Put this in @metamask/eth-sig-util\nfunction isSignTypedDataVersion(\n  version: SignTypedDataVersion | string,\n): version is SignTypedDataVersion {\n  return version in SignTypedDataVersion;\n}\n"]}

package/dist/simple-keyring.d.cts

@@ -1,5 +1,5 @@
 import { TypedTransaction } from "@ethereumjs/tx";
-import { EIP7702Authorization, SignTypedDataVersion } from "@metamask/eth-sig-util";
+import { type TypedDataV1, type MessageTypes, type TypedMessage, EIP7702Authorization, SignTypedDataVersion } from "@metamask/eth-sig-util";
 import { Keyring } from "@metamask/keyring-utils";
 import { Eip1024EncryptedData, Hex } from "@metamask/utils";
 type KeyringOpt = {
@@ -25,7 +25,9 @@ export default class SimpleKeyring implements Keyring {
         withAppKeyOrigin: string;
     }): Promise<string>;
     decryptMessage(withAccount: Hex, encryptedData: Eip1024EncryptedData): Promise<string>;
-    signTypedData(address: Hex, typedData: any, opts?: KeyringOpt): Promise<string>;
+    signTypedData<Version extends SignTypedDataVersion, Types extends MessageTypes, Options extends {
+        version?: Version;
+    } & KeyringOpt>(address: Hex, data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>, options?: Options): Promise<string>;
     getEncryptionPublicKey(withAccount: Hex, opts?: KeyringOpt): Promise<string>;
     getAppKeyAddress(address: Hex, origin: string): Promise<Hex>;
     exportAccount(address: Hex, opts?: {

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

@@ -1 +1 @@
-{"version":3,"file":"simple-keyring.d.cts","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,uBAAuB;AAQlD,OAAO,EAGL,oBAAoB,EAMpB,oBAAoB,EACrB,+BAA+B;AAChC,OAAO,EAAE,OAAO,EAAE,gCAAgC;AAClD,OAAO,EAIL,oBAAoB,EACpB,GAAG,EACJ,wBAAwB;AAIzB,KAAK,UAAU,GAAG;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAAC;CACzC,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;;IAGnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE7B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;gBAEf,WAAW,GAAE,MAAM,EAAO;IAUhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,WAAW,CAAC,WAAW,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAc5C,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAM7B,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,gBAAgB,EAC7B,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC;IAOtB,wBAAwB,CAC5B,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,oBAAoB,EACnC,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,MAAM,CAAC;IAMZ,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI;;;KAAkD,GACrD,OAAO,CAAC,MAAM,CAAC;IAmBZ,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,GAAG,EACX,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAMZ,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,MAAM,CAAC;IAOZ,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,IAAI,GAAE,UAAiD,GACtD,OAAO,CAAC,MAAM,CAAC;IAaZ,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,MAAM,CAAC;IAkBZ,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAKlB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CA4CrC"}
+{"version":3,"file":"simple-keyring.d.cts","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,uBAAuB;AAQlD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,YAAY,EAGjB,oBAAoB,EAMpB,oBAAoB,EACrB,+BAA+B;AAChC,OAAO,EAAE,OAAO,EAAE,gCAAgC;AAClD,OAAO,EAIL,oBAAoB,EACpB,GAAG,EACJ,wBAAwB;AAIzB,KAAK,UAAU,GAAG;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAAC;CACzC,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;;IAGnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE7B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;gBAEf,WAAW,GAAE,MAAM,EAAO;IAUhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,WAAW,CAAC,WAAW,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAc5C,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAM7B,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,gBAAgB,EAC7B,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC;IAOtB,wBAAwB,CAC5B,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,oBAAoB,EACnC,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,MAAM,CAAC;IAMZ,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI;;;KAAkD,GACrD,OAAO,CAAC,MAAM,CAAC;IAmBZ,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,GAAG,EACX,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAMZ,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,MAAM,CAAC;IAMZ,aAAa,CACjB,OAAO,SAAS,oBAAoB,EACpC,KAAK,SAAS,YAAY,EAC1B,OAAO,SAAS;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,UAAU,EAElD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,OAAO,SAAS,IAAI,GAAG,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,EAC9D,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC;IAaZ,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,MAAM,CAAC;IAkBZ,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAKlB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CA4CrC"}

package/dist/simple-keyring.d.mts

@@ -1,5 +1,5 @@
 import { TypedTransaction } from "@ethereumjs/tx";
-import { EIP7702Authorization, SignTypedDataVersion } from "@metamask/eth-sig-util";
+import { type TypedDataV1, type MessageTypes, type TypedMessage, EIP7702Authorization, SignTypedDataVersion } from "@metamask/eth-sig-util";
 import { Keyring } from "@metamask/keyring-utils";
 import { Eip1024EncryptedData, Hex } from "@metamask/utils";
 type KeyringOpt = {
@@ -25,7 +25,9 @@ export default class SimpleKeyring implements Keyring {
         withAppKeyOrigin: string;
     }): Promise<string>;
     decryptMessage(withAccount: Hex, encryptedData: Eip1024EncryptedData): Promise<string>;
-    signTypedData(address: Hex, typedData: any, opts?: KeyringOpt): Promise<string>;
+    signTypedData<Version extends SignTypedDataVersion, Types extends MessageTypes, Options extends {
+        version?: Version;
+    } & KeyringOpt>(address: Hex, data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>, options?: Options): Promise<string>;
     getEncryptionPublicKey(withAccount: Hex, opts?: KeyringOpt): Promise<string>;
     getAppKeyAddress(address: Hex, origin: string): Promise<Hex>;
     exportAccount(address: Hex, opts?: {

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

@@ -1 +1 @@
-{"version":3,"file":"simple-keyring.d.mts","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,uBAAuB;AAQlD,OAAO,EAGL,oBAAoB,EAMpB,oBAAoB,EACrB,+BAA+B;AAChC,OAAO,EAAE,OAAO,EAAE,gCAAgC;AAClD,OAAO,EAIL,oBAAoB,EACpB,GAAG,EACJ,wBAAwB;AAIzB,KAAK,UAAU,GAAG;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAAC;CACzC,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;;IAGnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE7B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;gBAEf,WAAW,GAAE,MAAM,EAAO;IAUhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,WAAW,CAAC,WAAW,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAc5C,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAM7B,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,gBAAgB,EAC7B,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC;IAOtB,wBAAwB,CAC5B,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,oBAAoB,EACnC,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,MAAM,CAAC;IAMZ,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI;;;KAAkD,GACrD,OAAO,CAAC,MAAM,CAAC;IAmBZ,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,GAAG,EACX,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAMZ,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,MAAM,CAAC;IAOZ,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,IAAI,GAAE,UAAiD,GACtD,OAAO,CAAC,MAAM,CAAC;IAaZ,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,MAAM,CAAC;IAkBZ,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAKlB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CA4CrC"}
+{"version":3,"file":"simple-keyring.d.mts","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,uBAAuB;AAQlD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,YAAY,EAGjB,oBAAoB,EAMpB,oBAAoB,EACrB,+BAA+B;AAChC,OAAO,EAAE,OAAO,EAAE,gCAAgC;AAClD,OAAO,EAIL,oBAAoB,EACpB,GAAG,EACJ,wBAAwB;AAIzB,KAAK,UAAU,GAAG;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAAC;CACzC,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,OAAO;;IAGnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE7B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;gBAEf,WAAW,GAAE,MAAM,EAAO;IAUhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,WAAW,CAAC,WAAW,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAc5C,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAM7B,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,gBAAgB,EAC7B,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC;IAOtB,wBAAwB,CAC5B,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,oBAAoB,EACnC,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,MAAM,CAAC;IAMZ,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI;;;KAAkD,GACrD,OAAO,CAAC,MAAM,CAAC;IAmBZ,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,GAAG,EACX,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAMZ,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,MAAM,CAAC;IAMZ,aAAa,CACjB,OAAO,SAAS,oBAAoB,EACpC,KAAK,SAAS,YAAY,EAC1B,OAAO,SAAS;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,UAAU,EAElD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,OAAO,SAAS,IAAI,GAAG,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,EAC9D,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC;IAaZ,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,MAAM,CAAC;IAkBZ,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI;;KAA2B,GAC9B,OAAO,CAAC,MAAM,CAAC;IAKlB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CA4CrC"}

package/dist/simple-keyring.mjs

@@ -94,15 +94,14 @@ class SimpleKeyring {
         const privateKey = wallet.privateKey.toString('hex');
         return decrypt({ privateKey, encryptedData });
     }
-    // personal_signTypedData, signs data along with the schema
-    async signTypedData(address, typedData, opts = { version: SignTypedDataVersion.V1 }) {
+    async signTypedData(address, data, options) {
+        let { version } = options ?? { version: SignTypedDataVersion.V1 };
         // Treat invalid versions as "V1"
-        let version = SignTypedDataVersion.V1;
-        if (opts.version && isSignTypedDataVersion(opts.version)) {
-            version = SignTypedDataVersion[opts.version];
+        if (!version || !isSignTypedDataVersion(version)) {
+            version = SignTypedDataVersion.V1;
         }
-        const privateKey = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeyFor).call(this, address, opts);
-        return signTypedData({ privateKey, data: typedData, version });
+        const privateKey = __classPrivateFieldGet(this, _SimpleKeyring_instances, "m", _SimpleKeyring_getPrivateKeyFor).call(this, address, options);
+        return signTypedData({ privateKey, data, version });
     }
     // get public key for nacl
     async getEncryptionPublicKey(withAccount, opts) {

package/dist/simple-keyring.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"simple-keyring.mjs","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedTransaction } from '@ethereumjs/tx';\nimport {\n  ecsign,\n  isValidPrivate,\n  privateToPublic,\n  publicToAddress,\n  stripHexPrefix,\n} from '@ethereumjs/util';\nimport {\n  concatSig,\n  decrypt,\n  EIP7702Authorization,\n  getEncryptionPublicKey,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n} from '@metamask/eth-sig-util';\nimport { Keyring } from '@metamask/keyring-utils';\nimport {\n  add0x,\n  bigIntToBytes,\n  bytesToHex,\n  Eip1024EncryptedData,\n  Hex,\n} from '@metamask/utils';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\nimport randombytes from 'randombytes';\n\ntype KeyringOpt = {\n  withAppKeyOrigin?: string;\n  version?: SignTypedDataVersion | string;\n};\n\ntype Wallet = {\n  privateKey: Buffer;\n  publicKey: Buffer;\n};\n\nconst TYPE = 'Simple Key Pair';\n\n// FIXME: This should not be exported as default.\nexport default class SimpleKeyring implements Keyring {\n  #wallets: { privateKey: Buffer; publicKey: Buffer }[];\n\n  readonly type: string = TYPE;\n\n  static type: string = TYPE;\n\n  constructor(privateKeys: string[] = []) {\n    this.#wallets = [];\n\n    /* istanbul ignore next: It's not possible to write a unit test for this, because a constructor isn't allowed\n     * to be async. Jest can't await the constructor, and when the error gets thrown, Jest can't catch it. */\n    this.deserialize(privateKeys).catch((error: Error) => {\n      throw new Error(`Problem deserializing SimpleKeyring ${error.message}`);\n    });\n  }\n\n  async serialize(): Promise<string[]> {\n    return this.#wallets.map((a) => a.privateKey.toString('hex'));\n  }\n\n  async deserialize(privateKeys: string[]): Promise<void> {\n    this.#wallets = privateKeys.map((hexPrivateKey) => {\n      const strippedHexPrivateKey = stripHexPrefix(hexPrivateKey);\n      const privateKey = Buffer.from(strippedHexPrivateKey, 'hex');\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      return { privateKey, publicKey };\n    });\n  }\n\n  async addAccounts(numAccounts = 1): Promise<Hex[]> {\n    const newWallets = [];\n    for (let i = 0; i < numAccounts; i++) {\n      const privateKey = generateKey();\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      newWallets.push({ privateKey, publicKey });\n    }\n    this.#wallets = this.#wallets.concat(newWallets);\n    const hexWallets = newWallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n    return hexWallets;\n  }\n\n  async getAccounts(): Promise<Hex[]> {\n    return this.#wallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n  }\n\n  async signTransaction(\n    address: Hex,\n    transaction: TypedTransaction,\n    opts: KeyringOpt = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = transaction.sign(privKey);\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? transaction;\n  }\n\n  async signEip7702Authorization(\n    address: Hex,\n    authorization: EIP7702Authorization,\n    opts: KeyringOpt = {},\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signEIP7702Authorization({ privateKey, authorization });\n  }\n\n  // For eth_sign, we need to sign arbitrary data:\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts = { withAppKeyOrigin: '', validateMessage: true },\n  ): Promise<string> {\n    const message = stripHexPrefix(data);\n    if (\n      opts.validateMessage &&\n      (message.length === 0 || !message.match(/^[a-fA-F0-9]*$/u))\n    ) {\n      throw new Error('Cannot sign invalid message');\n    }\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), privKey);\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  // For personal_sign, we need to prefix the message:\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    return personalSign({ privateKey: privKey, data: msgHex });\n  }\n\n  // For eth_decryptMessage:\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: Eip1024EncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const privateKey = wallet.privateKey.toString('hex');\n    return decrypt({ privateKey, encryptedData });\n  }\n\n  // personal_signTypedData, signs data along with the schema\n  async signTypedData(\n    address: Hex,\n    typedData: any,\n    opts: KeyringOpt = { version: SignTypedDataVersion.V1 },\n  ): Promise<string> {\n    // Treat invalid versions as \"V1\"\n    let version = SignTypedDataVersion.V1;\n\n    if (opts.version && isSignTypedDataVersion(opts.version)) {\n      version = SignTypedDataVersion[opts.version];\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signTypedData({ privateKey, data: typedData, version });\n  }\n\n  // get public key for nacl\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts?: KeyringOpt,\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(privKey.toString('hex'));\n    return publicKey;\n  }\n\n  #getPrivateKeyFor(\n    address: Hex,\n    opts: KeyringOpt = { withAppKeyOrigin: '' },\n  ): Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey;\n  }\n\n  // returns an address specific to an app\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    const appKeyAddress = add0x(bytesToHex(publicToAddress(wallet.publicKey)));\n    return appKeyAddress;\n  }\n\n  // exportAccount should return a hex-encoded private key:\n  async exportAccount(\n    address: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey.toString('hex');\n  }\n\n  removeAccount(address: string): void {\n    if (\n      !this.#wallets\n        .map(({ publicKey }) =>\n          bytesToHex(publicToAddress(publicKey)).toLowerCase(),\n        )\n        .includes(address.toLowerCase())\n    ) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#wallets = this.#wallets.filter(\n      ({ publicKey }) =>\n        bytesToHex(publicToAddress(publicKey)).toLowerCase() !==\n        address.toLowerCase(),\n    );\n  }\n\n  #getWalletForAccount(\n    account: string | number,\n    opts: KeyringOpt = {},\n  ): Wallet {\n    const address = normalize(account);\n    let wallet = this.#wallets.find(\n      ({ publicKey }) => bytesToHex(publicToAddress(publicKey)) === address,\n    );\n    if (!wallet) {\n      throw new Error('Simple Keyring - Unable to find matching address.');\n    }\n\n    if (opts.withAppKeyOrigin) {\n      const { privateKey } = wallet;\n      const appKeyOriginBuffer = Buffer.from(opts.withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = keccak256(appKeyBuffer);\n      const appKeyPublicKey = privateToPublic(appKeyPrivateKey);\n      wallet = {\n        privateKey: Buffer.from(appKeyPrivateKey),\n        publicKey: Buffer.from(appKeyPublicKey),\n      };\n    }\n\n    return wallet;\n  }\n}\n\n/**\n * Generate and validate a new random key of 32 bytes.\n *\n * @returns Buffer The generated key.\n */\nfunction generateKey(): Buffer {\n  const privateKey = randombytes(32);\n\n  if (!isValidPrivate(privateKey)) {\n    throw new Error(\n      'Private key does not satisfy the curve requirements (ie. it is invalid)',\n    );\n  }\n  return privateKey;\n}\n\n/**\n * Type predicate type guard to check if a string is in the enum SignTypedDataVersion.\n *\n * @param version - The string to check.\n * @returns Whether it's in the enum.\n */\n// TODO: Put this in @metamask/eth-sig-util\nfunction isSignTypedDataVersion(\n  version: SignTypedDataVersion | string,\n): version is SignTypedDataVersion {\n  return version in SignTypedDataVersion;\n}\n"]}
+{"version":3,"file":"simple-keyring.mjs","sourceRoot":"","sources":["../src/simple-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedTransaction } from '@ethereumjs/tx';\nimport {\n  ecsign,\n  isValidPrivate,\n  privateToPublic,\n  publicToAddress,\n  stripHexPrefix,\n} from '@ethereumjs/util';\nimport {\n  type TypedDataV1,\n  type MessageTypes,\n  type TypedMessage,\n  concatSig,\n  decrypt,\n  EIP7702Authorization,\n  getEncryptionPublicKey,\n  normalize,\n  personalSign,\n  signEIP7702Authorization,\n  signTypedData,\n  SignTypedDataVersion,\n} from '@metamask/eth-sig-util';\nimport { Keyring } from '@metamask/keyring-utils';\nimport {\n  add0x,\n  bigIntToBytes,\n  bytesToHex,\n  Eip1024EncryptedData,\n  Hex,\n} from '@metamask/utils';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\nimport randombytes from 'randombytes';\n\ntype KeyringOpt = {\n  withAppKeyOrigin?: string;\n  version?: SignTypedDataVersion | string;\n};\n\ntype Wallet = {\n  privateKey: Buffer;\n  publicKey: Buffer;\n};\n\nconst TYPE = 'Simple Key Pair';\n\n// FIXME: This should not be exported as default.\nexport default class SimpleKeyring implements Keyring {\n  #wallets: { privateKey: Buffer; publicKey: Buffer }[];\n\n  readonly type: string = TYPE;\n\n  static type: string = TYPE;\n\n  constructor(privateKeys: string[] = []) {\n    this.#wallets = [];\n\n    /* istanbul ignore next: It's not possible to write a unit test for this, because a constructor isn't allowed\n     * to be async. Jest can't await the constructor, and when the error gets thrown, Jest can't catch it. */\n    this.deserialize(privateKeys).catch((error: Error) => {\n      throw new Error(`Problem deserializing SimpleKeyring ${error.message}`);\n    });\n  }\n\n  async serialize(): Promise<string[]> {\n    return this.#wallets.map((a) => a.privateKey.toString('hex'));\n  }\n\n  async deserialize(privateKeys: string[]): Promise<void> {\n    this.#wallets = privateKeys.map((hexPrivateKey) => {\n      const strippedHexPrivateKey = stripHexPrefix(hexPrivateKey);\n      const privateKey = Buffer.from(strippedHexPrivateKey, 'hex');\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      return { privateKey, publicKey };\n    });\n  }\n\n  async addAccounts(numAccounts = 1): Promise<Hex[]> {\n    const newWallets = [];\n    for (let i = 0; i < numAccounts; i++) {\n      const privateKey = generateKey();\n      const publicKey = Buffer.from(privateToPublic(privateKey));\n      newWallets.push({ privateKey, publicKey });\n    }\n    this.#wallets = this.#wallets.concat(newWallets);\n    const hexWallets = newWallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n    return hexWallets;\n  }\n\n  async getAccounts(): Promise<Hex[]> {\n    return this.#wallets.map(({ publicKey }) =>\n      add0x(bytesToHex(publicToAddress(publicKey))),\n    );\n  }\n\n  async signTransaction(\n    address: Hex,\n    transaction: TypedTransaction,\n    opts: KeyringOpt = {},\n  ): Promise<TypedTransaction> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const signedTx = transaction.sign(privKey);\n    // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n    return signedTx ?? transaction;\n  }\n\n  async signEip7702Authorization(\n    address: Hex,\n    authorization: EIP7702Authorization,\n    opts: KeyringOpt = {},\n  ): Promise<string> {\n    const privateKey = this.#getPrivateKeyFor(address, opts);\n    return signEIP7702Authorization({ privateKey, authorization });\n  }\n\n  // For eth_sign, we need to sign arbitrary data:\n  async signMessage(\n    address: Hex,\n    data: string,\n    opts = { withAppKeyOrigin: '', validateMessage: true },\n  ): Promise<string> {\n    const message = stripHexPrefix(data);\n    if (\n      opts.validateMessage &&\n      (message.length === 0 || !message.match(/^[a-fA-F0-9]*$/u))\n    ) {\n      throw new Error('Cannot sign invalid message');\n    }\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    const msgSig = ecsign(Buffer.from(message, 'hex'), privKey);\n    const rawMsgSig = concatSig(\n      Buffer.from(bigIntToBytes(msgSig.v)),\n      Buffer.from(msgSig.r),\n      Buffer.from(msgSig.s),\n    );\n    return rawMsgSig;\n  }\n\n  // For personal_sign, we need to prefix the message:\n  async signPersonalMessage(\n    address: Hex,\n    msgHex: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(address, opts);\n    return personalSign({ privateKey: privKey, data: msgHex });\n  }\n\n  // For eth_decryptMessage:\n  async decryptMessage(\n    withAccount: Hex,\n    encryptedData: Eip1024EncryptedData,\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(withAccount);\n    const privateKey = wallet.privateKey.toString('hex');\n    return decrypt({ privateKey, encryptedData });\n  }\n\n  async signTypedData<\n    Version extends SignTypedDataVersion,\n    Types extends MessageTypes,\n    Options extends { version?: Version } & KeyringOpt,\n  >(\n    address: Hex,\n    data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n    options?: Options,\n  ): Promise<string> {\n    let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n    // Treat invalid versions as \"V1\"\n    if (!version || !isSignTypedDataVersion(version)) {\n      version = SignTypedDataVersion.V1;\n    }\n\n    const privateKey = this.#getPrivateKeyFor(address, options);\n    return signTypedData({ privateKey, data, version });\n  }\n\n  // get public key for nacl\n  async getEncryptionPublicKey(\n    withAccount: Hex,\n    opts?: KeyringOpt,\n  ): Promise<string> {\n    const privKey = this.#getPrivateKeyFor(withAccount, opts);\n    const publicKey = getEncryptionPublicKey(privKey.toString('hex'));\n    return publicKey;\n  }\n\n  #getPrivateKeyFor(\n    address: Hex,\n    opts: KeyringOpt = { withAppKeyOrigin: '' },\n  ): Buffer {\n    if (!address) {\n      throw new Error('Must specify address.');\n    }\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey;\n  }\n\n  // returns an address specific to an app\n  async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n    if (!origin || typeof origin !== 'string') {\n      throw new Error(`'origin' must be a non-empty string`);\n    }\n    const wallet = this.#getWalletForAccount(address, {\n      withAppKeyOrigin: origin,\n    });\n    const appKeyAddress = add0x(bytesToHex(publicToAddress(wallet.publicKey)));\n    return appKeyAddress;\n  }\n\n  // exportAccount should return a hex-encoded private key:\n  async exportAccount(\n    address: Hex,\n    opts = { withAppKeyOrigin: '' },\n  ): Promise<string> {\n    const wallet = this.#getWalletForAccount(address, opts);\n    return wallet.privateKey.toString('hex');\n  }\n\n  removeAccount(address: string): void {\n    if (\n      !this.#wallets\n        .map(({ publicKey }) =>\n          bytesToHex(publicToAddress(publicKey)).toLowerCase(),\n        )\n        .includes(address.toLowerCase())\n    ) {\n      throw new Error(`Address ${address} not found in this keyring`);\n    }\n\n    this.#wallets = this.#wallets.filter(\n      ({ publicKey }) =>\n        bytesToHex(publicToAddress(publicKey)).toLowerCase() !==\n        address.toLowerCase(),\n    );\n  }\n\n  #getWalletForAccount(\n    account: string | number,\n    opts: KeyringOpt = {},\n  ): Wallet {\n    const address = normalize(account);\n    let wallet = this.#wallets.find(\n      ({ publicKey }) => bytesToHex(publicToAddress(publicKey)) === address,\n    );\n    if (!wallet) {\n      throw new Error('Simple Keyring - Unable to find matching address.');\n    }\n\n    if (opts.withAppKeyOrigin) {\n      const { privateKey } = wallet;\n      const appKeyOriginBuffer = Buffer.from(opts.withAppKeyOrigin, 'utf8');\n      const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n      const appKeyPrivateKey = keccak256(appKeyBuffer);\n      const appKeyPublicKey = privateToPublic(appKeyPrivateKey);\n      wallet = {\n        privateKey: Buffer.from(appKeyPrivateKey),\n        publicKey: Buffer.from(appKeyPublicKey),\n      };\n    }\n\n    return wallet;\n  }\n}\n\n/**\n * Generate and validate a new random key of 32 bytes.\n *\n * @returns Buffer The generated key.\n */\nfunction generateKey(): Buffer {\n  const privateKey = randombytes(32);\n\n  if (!isValidPrivate(privateKey)) {\n    throw new Error(\n      'Private key does not satisfy the curve requirements (ie. it is invalid)',\n    );\n  }\n  return privateKey;\n}\n\n/**\n * Type predicate type guard to check if a string is in the enum SignTypedDataVersion.\n *\n * @param version - The string to check.\n * @returns Whether it's in the enum.\n */\n// TODO: Put this in @metamask/eth-sig-util\nfunction isSignTypedDataVersion(\n  version: SignTypedDataVersion | string,\n): version is SignTypedDataVersion {\n  return version in SignTypedDataVersion;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/eth-simple-keyring",
-  "version": "10.0.0",
+  "version": "11.1.0",
   "description": "A simple standard interface for a series of Ethereum private keys.",
   "keywords": [
     "ethereum",
@@ -46,7 +46,9 @@
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
     "@metamask/eth-sig-util": "^8.2.0",
-    "@metamask/utils": "^11.1.0",
+    "@metamask/keyring-api": "^22.0.0",
+    "@metamask/keyring-sdk": "^1.0.0",
+    "@metamask/utils": "^11.10.0",
     "ethereum-cryptography": "^2.1.2",
     "randombytes": "^2.1.0"
   },
@@ -55,7 +57,7 @@
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-utils": "^3.0.0",
+    "@metamask/keyring-utils": "^3.2.0",
     "@ts-bridge/cli": "^0.6.3",
     "@types/ethereumjs-tx": "^1.0.1",
     "@types/jest": "^29.5.12",