@metamask-previews/eth-json-rpc-middleware 21.0.0-preview-70abd50a → 21.0.0-preview-536ed51

package/dist/wallet.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAOnE,OAAO,KAAK,EACV,cAAc,EAIf,wBAAwB;AAEzB,OAAO,EACL,KAAK,sCAAsC,EAE5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAgB;AAqBrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EACD,uBAAuB,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAoWtD"}
+{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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"}

package/dist/wallet.d.mts

@@ -1,8 +1,8 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { JsonRpcRequest } from "@metamask/utils";
+import type { JsonRpcMiddleware, MiddlewareContext, MiddlewareParams } from "@metamask/json-rpc-engine/v2";
+import type { MessageRequest } from "@metamask/message-manager";
+import type { JsonRpcRequest, Json } from "@metamask/utils";
 import { type ProcessRequestExecutionPermissionsHook } from "./methods/wallet-request-execution-permissions.mjs";
 import { type ProcessRevokeExecutionPermissionHook } from "./methods/wallet-revoke-execution-permission.mjs";
-import type { Block } from "./types.mjs";
 export type TransactionParams = {
     from: string;
 };
@@ -17,11 +17,11 @@ export type TypedMessageV1Params = Omit<TypedMessageParams, 'data'> & {
     data: Record<string, unknown>[];
 };
 export type WalletMiddlewareOptions = {
-    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
-    processDecryptMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
-    processEncryptionPublicKey?: (address: string, req: JsonRpcRequest) => Promise<string>;
+    getAccounts: (origin: string) => Promise<string[]>;
+    processDecryptMessage?: (msgParams: MessageParams, req: MessageRequest) => Promise<string>;
+    processEncryptionPublicKey?: (address: string, req: MessageRequest) => Promise<string>;
     processPersonalMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
-    processTransaction?: (txParams: TransactionParams, req: JsonRpcRequest) => Promise<string>;
+    processTransaction?: (txParams: TransactionParams, req: JsonRpcRequest, context: WalletMiddlewareContext) => Promise<string>;
     processSignTransaction?: (txParams: TransactionParams, req: JsonRpcRequest) => Promise<string>;
     processTypedMessage?: (msgParams: TypedMessageV1Params, req: JsonRpcRequest, version: string) => Promise<string>;
     processTypedMessageV3?: (msgParams: TypedMessageParams, req: JsonRpcRequest, version: string) => Promise<string>;
@@ -29,5 +29,32 @@ export type WalletMiddlewareOptions = {
     processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;
     processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;
 };
-export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<any, Block>;
+export type WalletMiddlewareKeyValues = {
+    networkClientId: string;
+    origin: string;
+    securityAlertResponse?: Record<string, Json>;
+    traceContext?: unknown;
+};
+export type WalletMiddlewareContext = MiddlewareContext<WalletMiddlewareKeyValues>;
+export type WalletMiddlewareParams = MiddlewareParams<JsonRpcRequest, WalletMiddlewareContext>;
+/**
+ * Creates a JSON-RPC middleware that handles "wallet"-related JSON-RPC methods.
+ * "Wallet" may have had a specific meaning at some point in the distant past,
+ * but at this point it's just an arbitrary label.
+ *
+ * @param options - The options for the middleware.
+ * @param options.getAccounts - The function to get the accounts for the origin.
+ * @param options.processDecryptMessage - The function to process the decrypt message request.
+ * @param options.processEncryptionPublicKey - The function to process the encryption public key request.
+ * @param options.processPersonalMessage - The function to process the personal message request.
+ * @param options.processTransaction - The function to process the transaction request.
+ * @param options.processSignTransaction - The function to process the sign transaction request.
+ * @param options.processTypedMessage - The function to process the typed message request.
+ * @param options.processTypedMessageV3 - The function to process the typed message v3 request.
+ * @param options.processTypedMessageV4 - The function to process the typed message v4 request.
+ * @param options.processRequestExecutionPermissions - The function to process the request execution permissions request.
+ * @param options.processRevokeExecutionPermission - The function to process the revoke execution permission request.
+ * @returns A JSON-RPC middleware that handles wallet-related JSON-RPC methods.
+ */
+export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext>;
 //# sourceMappingURL=wallet.d.mts.map

package/dist/wallet.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAOnE,OAAO,KAAK,EACV,cAAc,EAIf,wBAAwB;AAEzB,OAAO,EACL,KAAK,sCAAsC,EAE5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAgB;AAqBrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EACD,uBAAuB,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAoWtD"}
+{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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"}

package/dist/wallet.mjs

@@ -1,99 +1,156 @@
 import * as sigUtil from "@metamask/eth-sig-util";
-import { createAsyncMiddleware, createScaffoldMiddleware } from "@metamask/json-rpc-engine";
+import { createScaffoldMiddleware } from "@metamask/json-rpc-engine/v2";
 import { rpcErrors } from "@metamask/rpc-errors";
 import { isValidHexAddress } from "@metamask/utils";
-import { walletRequestExecutionPermissions } from "./methods/wallet-request-execution-permissions.mjs";
-import { walletRevokeExecutionPermission } from "./methods/wallet-revoke-execution-permission.mjs";
+import { createWalletRequestExecutionPermissionsHandler } from "./methods/wallet-request-execution-permissions.mjs";
+import { createWalletRevokeExecutionPermissionHandler } from "./methods/wallet-revoke-execution-permission.mjs";
 import { stripArrayTypeIfPresent } from "./utils/common.mjs";
 import { normalizeTypedMessage, parseTypedMessage } from "./utils/normalize.mjs";
 import { resemblesAddress, validateAndNormalizeKeyholder as validateKeyholder } from "./utils/validation.mjs";
+/**
+ * Creates a JSON-RPC middleware that handles "wallet"-related JSON-RPC methods.
+ * "Wallet" may have had a specific meaning at some point in the distant past,
+ * but at this point it's just an arbitrary label.
+ *
+ * @param options - The options for the middleware.
+ * @param options.getAccounts - The function to get the accounts for the origin.
+ * @param options.processDecryptMessage - The function to process the decrypt message request.
+ * @param options.processEncryptionPublicKey - The function to process the encryption public key request.
+ * @param options.processPersonalMessage - The function to process the personal message request.
+ * @param options.processTransaction - The function to process the transaction request.
+ * @param options.processSignTransaction - The function to process the sign transaction request.
+ * @param options.processTypedMessage - The function to process the typed message request.
+ * @param options.processTypedMessageV3 - The function to process the typed message v3 request.
+ * @param options.processTypedMessageV4 - The function to process the typed message v4 request.
+ * @param options.processRequestExecutionPermissions - The function to process the request execution permissions request.
+ * @param options.processRevokeExecutionPermission - The function to process the revoke execution permission request.
+ * @returns A JSON-RPC middleware that handles wallet-related JSON-RPC methods.
+ */
 export function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }) {
     if (!getAccounts) {
         throw new Error('opts.getAccounts is required');
     }
     return createScaffoldMiddleware({
         // account lookups
-        eth_accounts: createAsyncMiddleware(lookupAccounts),
-        eth_coinbase: createAsyncMiddleware(lookupDefaultAccount),
+        eth_accounts: lookupAccounts,
+        eth_coinbase: lookupDefaultAccount,
         // tx signatures
-        eth_sendTransaction: createAsyncMiddleware(sendTransaction),
-        eth_signTransaction: createAsyncMiddleware(signTransaction),
+        eth_sendTransaction: sendTransaction,
+        eth_signTransaction: signTransaction,
         // message signatures
-        eth_signTypedData: createAsyncMiddleware(signTypedData),
-        eth_signTypedData_v3: createAsyncMiddleware(signTypedDataV3),
-        eth_signTypedData_v4: createAsyncMiddleware(signTypedDataV4),
-        personal_sign: createAsyncMiddleware(personalSign),
-        eth_getEncryptionPublicKey: createAsyncMiddleware(encryptionPublicKey),
-        eth_decrypt: createAsyncMiddleware(decryptMessage),
-        personal_ecRecover: createAsyncMiddleware(personalRecover),
+        eth_signTypedData: signTypedData,
+        eth_signTypedData_v3: signTypedDataV3,
+        eth_signTypedData_v4: signTypedDataV4,
+        personal_sign: personalSign,
+        eth_getEncryptionPublicKey: encryptionPublicKey,
+        eth_decrypt: decryptMessage,
+        personal_ecRecover: personalRecover,
         // EIP-7715
-        wallet_requestExecutionPermissions: createAsyncMiddleware(async (req, res) => walletRequestExecutionPermissions(req, res, {
+        wallet_requestExecutionPermissions: createWalletRequestExecutionPermissionsHandler({
             processRequestExecutionPermissions,
-        })),
-        wallet_revokeExecutionPermission: createAsyncMiddleware(async (req, res) => walletRevokeExecutionPermission(req, res, {
+        }),
+        wallet_revokeExecutionPermission: createWalletRevokeExecutionPermissionHandler({
             processRevokeExecutionPermission,
-        })),
+        }),
     });
     //
     // account lookups
     //
-    async function lookupAccounts(req, res) {
-        res.result = await getAccounts(req);
+    /**
+     * Gets the accounts for the origin.
+     *
+     * @param options - Options bag.
+     * @param options.context - The context of the request.
+     * @returns The accounts for the origin.
+     */
+    async function lookupAccounts({ context, }) {
+        return await getAccounts(context.assertGet('origin'));
     }
-    async function lookupDefaultAccount(req, res) {
-        const accounts = await getAccounts(req);
-        res.result = accounts[0] || null;
+    /**
+     * Gets the default account (i.e. first in the list) for the origin.
+     *
+     * @param options - Options bag.
+     * @param options.context - The context of the request.
+     * @returns The default account for the origin.
+     */
+    async function lookupDefaultAccount({ context, }) {
+        const accounts = await getAccounts(context.assertGet('origin'));
+        return accounts[0] || null;
     }
     //
     // transaction signatures
     //
-    async function sendTransaction(req, res) {
+    /**
+     * Sends a transaction.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The transaction hash.
+     */
+    async function sendTransaction({ request, context, }) {
         if (!processTransaction) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params[0];
+        const params = request.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', req),
+            from: await validateAndNormalizeKeyholder(params?.from || '', context),
         };
-        res.result = await processTransaction(txParams, req);
+        return await processTransaction(txParams, request, context);
     }
-    async function signTransaction(req, res) {
+    /**
+     * Signs a transaction.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The signed transaction.
+     */
+    async function signTransaction({ request, context, }) {
         if (!processSignTransaction) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params[0];
+        const params = request.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', req),
+            from: await validateAndNormalizeKeyholder(params?.from || '', context),
         };
-        res.result = await processSignTransaction(txParams, req);
+        return await processSignTransaction(txParams, request);
     }
     //
     // message signatures
     //
-    async function signTypedData(req, res) {
+    /**
+     * Signs a `eth_signTypedData` message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The signed message.
+     */
+    async function signTypedData({ request, context, }) {
         if (!processTypedMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const message = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], req);
+        const address = await validateAndNormalizeKeyholder(params[1], context);
         const version = 'V1';
         const extraParams = params[2] || {};
         const msgParams = {
@@ -103,19 +160,27 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             signatureMethod: 'eth_signTypedData',
             version,
         };
-        res.result = await processTypedMessage(msgParams, req, version);
+        return await processTypedMessage(msgParams, request, version);
     }
-    async function signTypedDataV3(req, res) {
+    /**
+     * Signs a `eth_signTypedData_v3` message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The signed message.
+     */
+    async function signTypedDataV3({ request, context, }) {
         if (!processTypedMessageV3) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
         const message = normalizeTypedMessage(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -126,19 +191,27 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             version,
             signatureMethod: 'eth_signTypedData_v3',
         };
-        res.result = await processTypedMessageV3(msgParams, req, version);
+        return await processTypedMessageV3(msgParams, request, version);
     }
-    async function signTypedDataV4(req, res) {
+    /**
+     * Signs a `eth_signTypedData_v4` message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The signed message.
+     */
+    async function signTypedDataV4({ request, context, }) {
         if (!processTypedMessageV4) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
         const message = normalizeTypedMessage(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -149,18 +222,26 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             version,
             signatureMethod: 'eth_signTypedData_v4',
         };
-        res.result = await processTypedMessageV4(msgParams, req, version);
+        return await processTypedMessageV4(msgParams, request, version);
     }
-    async function personalSign(req, res) {
+    /**
+     * Signs a `personal_sign` message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The signed message.
+     */
+    async function personalSign({ request, context, }) {
         if (!processPersonalMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         // process normally
         const firstParam = params[0];
         const secondParam = params[1];
@@ -175,11 +256,6 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
         // and the second param is definitely not, but is hex.
         let address, message;
         if (resemblesAddress(firstParam) && !resemblesAddress(secondParam)) {
-            let warning = `The eth_personalSign method requires params ordered `;
-            warning += `[message, address]. This was previously handled incorrectly, `;
-            warning += `and has been corrected automatically. `;
-            warning += `Please switch this param order for smooth behavior in the future.`;
-            res.warning = warning;
             address = firstParam;
             message = secondParam;
         }
@@ -187,62 +263,93 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             message = firstParam;
             address = secondParam;
         }
-        address = await validateAndNormalizeKeyholder(address, req);
+        address = await validateAndNormalizeKeyholder(address, context);
         const msgParams = {
             ...extraParams,
             from: address,
             data: message,
             signatureMethod: 'personal_sign',
         };
-        res.result = await processPersonalMessage(msgParams, req);
+        return await processPersonalMessage(msgParams, request);
     }
-    async function personalRecover(req, res) {
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+    /**
+     * Recovers the signer address from a `personal_sign` message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @returns The recovered signer address.
+     */
+    async function personalRecover({ request, }) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const message = params[0];
         const signature = params[1];
         const signerAddress = sigUtil.recoverPersonalSignature({
             data: message,
             signature,
         });
-        res.result = signerAddress;
+        return signerAddress;
     }
-    async function encryptionPublicKey(req, res) {
+    /**
+     * Gets the encryption public key for an address.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The encryption public key.
+     */
+    async function encryptionPublicKey({ request, context, }) {
         if (!processEncryptionPublicKey) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
-        res.result = await processEncryptionPublicKey(address, req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
+        return await processEncryptionPublicKey(address, {
+            id: request.id,
+            origin: context.assertGet('origin'),
+            securityAlertResponse: context.assertGet('securityAlertResponse'),
+        });
     }
-    async function decryptMessage(req, res) {
+    /**
+     * Decrypts a message.
+     *
+     * @param options - Options bag.
+     * @param options.request - The request.
+     * @param options.context - The context of the request.
+     * @returns The decrypted message.
+     */
+    async function decryptMessage({ request, context, }) {
         if (!processDecryptMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const ciphertext = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], req);
+        const address = await validateAndNormalizeKeyholder(params[1], context);
         const extraParams = params[2] || {};
         const msgParams = {
             ...extraParams,
             from: address,
             data: ciphertext,
         };
-        res.result = await processDecryptMessage(msgParams, req);
+        return await processDecryptMessage(msgParams, {
+            id: request.id,
+            origin: context.assertGet('origin'),
+            securityAlertResponse: context.assertGet('securityAlertResponse'),
+        });
     }
     //
     // utility
@@ -252,12 +359,12 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
      * copy of it.
      *
      * @param address - The address to validate and normalize.
-     * @param req - The request object.
+     * @param context - The context of the request.
      * @returns The normalized address, if valid. Otherwise, throws
      * an error
      */
-    async function validateAndNormalizeKeyholder(address, req) {
-        return validateKeyholder(address, req, { getAccounts });
+    async function validateAndNormalizeKeyholder(address, context) {
+        return validateKeyholder(address, context, { getAccounts });
     }
 }
 /**