fix unknown request arg types equivalency issue (#120)

Author: mindofmar

src/content-scripts/bypassCheck.tsx

@@ -6,6 +6,7 @@ import {
   SimulateRequestArgs,
   Transaction,
   TransactionArgs,
+  UnstandardizedSignatureRequestArgs,
 } from '../models/simulation/Transaction';
 import { uuid4 } from '@sentry/utils';
 import { PortMessage, PortIdentifiers } from '../lib/helpers/chrome/messageHandler';
@@ -84,8 +85,9 @@ window.addEventListener('message', (message) => {
         const contentScriptPort = Browser.runtime.connect({ name: PortIdentifiers.WG_CONTENT_SCRIPT });
         sendMessageToPort(contentScriptPort, request);
       } catch (e) {
-        const request: SignatureRequestArgs = {
-          ...data.params,
+        const request: UnstandardizedSignatureRequestArgs = {
+          signer: 'unknown request type',
+          params: data.params,
           id: uuid4(),
           chainId: String(chainId),
           method: data.method,

src/injected/injectWalletGuard.tsx

@@ -173,7 +173,8 @@ const addWalletGuardProxy = (provider: any) => {
 
           // Request does not conform to EIP-712 - pass along the params
           response = await REQUEST_MANAGER.request({
-            ...request.params,
+            signer: 'unknown request type',
+            params: request.params,
             chainId: await provider.request({ method: 'eth_chainId' }),
             method: request.method,
           });
@@ -368,7 +369,8 @@ const addWalletGuardProxy = (provider: any) => {
             .request({ method: 'eth_chainId' })
             .then((chainId: any) => {
               return REQUEST_MANAGER.request({
-                ...request.params,
+                signer: 'unknown request type',
+                params: request.params,
                 chainId,
                 method: request.method,
               });

src/lib/helpers/chrome/messageHandler.ts

@@ -46,6 +46,8 @@ export function findApprovedTransaction(approvedTxns: TransactionArgs[], txn: Tr
     return approvedTxns.find((x: any) => x.signMessage === txn.signMessage);
   } else if ('hash' in txn) {
     return approvedTxns.find((x: any) => x.hash === txn.hash);
+  } else if ('params' in txn) {
+    return approvedTxns.find((x: any) => txn.signer === 'unknown request type');
   }
 }
 

src/lib/simulation/requests.ts

@@ -42,7 +42,7 @@ export class RequestManager {
         signMessage: string;
       }
       | {
-        [key: string]: any
+        params: any
       }
     )
   ): Promise<Response> {

src/models/simulation/Transaction.ts

@@ -32,13 +32,17 @@ export enum SimulationMethodType {
   PersonalSign = 'personal_sign',
 }
 
-export type TransactionArgs = SimulateRequestArgs | SignatureRequestArgs | SignatureHashSignArgs | PersonalSignArgs;
+export type TransactionArgs = SimulateRequestArgs | SignatureRequestArgs | SignatureHashSignArgs | PersonalSignArgs | UnstandardizedSignatureRequestArgs;
 
 // Transaction we want to forward.
 export interface SimulateRequestArgs extends RequestArgs {
   transaction: Transaction;
 };
 
+export interface UnstandardizedSignatureRequestArgs extends RequestArgs {
+  params: any;
+}
+
 export interface SignatureRequestArgs extends RequestArgs {
   // Domain for this signature request.
   domain: any; // TODO: add types here?