refactor: Migrate processTransaction

Author: rekmarks

packages/eth-json-rpc-middleware/src/utils/validation.test.ts

@@ -8,6 +8,7 @@ import {
   validateAndNormalizeKeyholder,
   validateParams,
 } from './validation';
+import type { WalletMiddlewareKeyValues } from '../wallet';
 
 jest.mock('@metamask/superstruct', () => ({
   ...jest.requireActual('@metamask/superstruct'),
@@ -16,7 +17,7 @@ jest.mock('@metamask/superstruct', () => ({
 
 const ADDRESS_MOCK = '0xABCDabcdABCDabcdABCDabcdABCDabcdABCDabcd';
 const createContext = () =>
-  new MiddlewareContext<{ origin: string }>([['origin', 'test']]);
+  new MiddlewareContext<WalletMiddlewareKeyValues>([['origin', 'test']]);
 
 const STRUCT_ERROR_MOCK = {
   failures: () => [

packages/eth-json-rpc-middleware/src/utils/validation.ts

@@ -1,9 +1,10 @@
-import type { MiddlewareContext } from '@metamask/json-rpc-engine/v2';
 import { providerErrors, rpcErrors } from '@metamask/rpc-errors';
 import type { Struct, StructError } from '@metamask/superstruct';
 import { validate } from '@metamask/superstruct';
 import type { Hex } from '@metamask/utils';
 
+import type { WalletMiddlewareContext } from '../wallet';
+
 /**
  * Validates and normalizes a keyholder address for transaction- and
  * signature-related operations.
@@ -17,7 +18,7 @@ import type { Hex } from '@metamask/utils';
  */
 export async function validateAndNormalizeKeyholder(
   address: Hex,
-  context: MiddlewareContext<{ origin: string }>,
+  context: WalletMiddlewareContext,
   { getAccounts }: { getAccounts: (origin: string) => Promise<string[]> },
 ): Promise<Hex> {
   if (

packages/eth-json-rpc-middleware/src/wallet.ts

@@ -58,6 +58,7 @@ export type WalletMiddlewareOptions = {
   processTransaction?: (
     txParams: TransactionParams,
     req: JsonRpcRequest,
+    context: WalletMiddlewareContext,
   ) => Promise<string>;
   processSignTransaction?: (
     txParams: TransactionParams,
@@ -82,7 +83,16 @@ export type WalletMiddlewareOptions = {
   processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;
 };
 
-export type WalletMiddlewareContext = MiddlewareContext<{ origin: string }>;
+export type WalletMiddlewareKeyValues = {
+  networkClientId: string;
+  origin: string;
+  securityAlertResponse?: Record<string, Json>;
+  traceContext?: unknown;
+};
+
+export type WalletMiddlewareContext =
+  MiddlewareContext<WalletMiddlewareKeyValues>;
+
 export type WalletMiddlewareParams = MiddlewareParams<
   JsonRpcRequest,
   WalletMiddlewareContext
@@ -220,7 +230,7 @@ export function createWalletMiddleware({
       ...params,
       from: await validateAndNormalizeKeyholder(params?.from || '', context),
     };
-    return await processTransaction(txParams, request);
+    return await processTransaction(txParams, request, context);
   }
 
   /**

packages/eth-json-rpc-middleware/test/util/helpers.ts

@@ -10,6 +10,8 @@ import type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';
 import { klona } from 'klona/full';
 import { isDeepStrictEqual } from 'util';
 
+import type { WalletMiddlewareKeyValues } from '../../src/wallet';
+
 export const createRequest = <
   Input extends Partial<JsonRpcRequest<Json[]>>,
   Output extends Input & JsonRpcRequest<Json[]>,
@@ -24,20 +26,25 @@ export const createRequest = <
   } as Output;
 };
 
-const createHandleOptions = () => ({
+const createHandleOptions = (
+  keyValues: Partial<WalletMiddlewareKeyValues> = {},
+): { context: WalletMiddlewareKeyValues } => ({
   context: {
-    origin: 'test',
+    networkClientId: 'test-client-id',
+    origin: 'test-origin',
+    ...keyValues,
   },
 });
 
 export const createHandleParams = <
-  Input extends Partial<JsonRpcRequest<Json[]>>,
-  Output extends Input & JsonRpcRequest<Json[]>,
+  InputReq extends Partial<JsonRpcRequest<Json[]>>,
+  OutputReq extends InputReq & JsonRpcRequest<Json[]>,
 >(
-  request: Input,
-): [Output, ReturnType<typeof createHandleOptions>] => [
+  request: InputReq,
+  keyValues: Partial<WalletMiddlewareKeyValues> = {},
+): [OutputReq, ReturnType<typeof createHandleOptions>] => [
   createRequest(request),
-  createHandleOptions(),
+  createHandleOptions(keyValues),
 ];
 
 /**