feat: add EthKeyringWrapper for common Eth logic around KeyringV2 implementation

packages/keyring-api/CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add `EthKeyringWrapper` abstract class for Ethereum-based `KeyringV2` implementations ([#404](https://github.com/MetaMask/accounts/pull/404))
+  - Provides common Ethereum signing method routing (`submitRequest`) for all Ethereum-based keyrings.
 - Add `KeyringWrapper` base class to adapt legacy keyrings to `KeyringV2` ([#398](https://github.com/MetaMask/accounts/pull/398))
 
 ## [21.3.0]

packages/keyring-api/package.json

@@ -46,6 +46,8 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@ethereumjs/tx": "^5.4.0",
+    "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.1.0",

packages/keyring-api/src/eth/index.ts

@@ -3,3 +3,4 @@ export * from './erc4337';
 export * from './rpc';
 export * from './types';
 export * from './utils';
+export * from './v2';

packages/keyring-api/src/eth/rpc/params.ts

@@ -126,6 +126,13 @@ export type EthEip7702Authorization = Infer<
   typeof EthEip7702AuthorizationStruct
 >;
 
+/**
+ * A struct for getEncryptionPublicKey options.
+ */
+export const EthGetEncryptionPublicKeyOptionsStruct = optional(
+  record(string(), unknown()),
+);
+
 // ============================================================================
 // RPC Method Parameter Structs
 // ============================================================================
@@ -214,3 +221,11 @@ export const EthSignEip7702AuthorizationParamsStruct = tuple([
 export type EthSignEip7702AuthorizationParams = Infer<
   typeof EthSignEip7702AuthorizationParamsStruct
 >;
+
+/**
+ * Parameters for `eth_getEncryptionPublicKey`.
+ */
+export const EthGetEncryptionPublicKeyParamsStruct = tuple([
+  EthAddressStruct, // address
+  EthGetEncryptionPublicKeyOptionsStruct, // options
+]);

packages/keyring-api/src/eth/types.ts

@@ -1,7 +1,7 @@
 import { object } from '@metamask/keyring-utils';
 import type { Infer } from '@metamask/superstruct';
 import { nonempty, array, enums, literal } from '@metamask/superstruct';
-import { definePattern } from '@metamask/utils';
+import { definePattern, type Hex } from '@metamask/utils';
 
 import { EthScope } from '.';
 import {
@@ -12,7 +12,7 @@ import {
 
 export const EthBytesStruct = definePattern('EthBytes', /^0x[0-9a-f]*$/iu);
 
-export const EthAddressStruct = definePattern(
+export const EthAddressStruct = definePattern<Hex>(
   'EthAddress',
   /^0x[0-9a-f]{40}$/iu,
 );