fix(passport): undefined fee options, post to relayer error

Author: nattb8

packages/passport/sdk/src/zkEvm/relayerClient.test.ts

@@ -72,7 +72,7 @@ describe('relayerClient', () => {
       });
     });
 
-    it('throws HTTP error for non-ok response', async () => {
+    it('throws error from JSON response when response contains error field', async () => {
       const to = '0xd64b0d2d72bb1b3f18046b8a7fc6c9ee6bccd287';
       const data = '0x123';
 
@@ -84,7 +84,23 @@ describe('relayerClient', () => {
       });
 
       await expect(relayerClient.ethSendTransaction(to, data)).rejects.toThrow(
-        'Relayer HTTP error: 401. Content: "{"error":"invalid_token"}"',
+        'invalid_token',
+      );
+    });
+
+    it('throws HTTP error for non-ok response without error field', async () => {
+      const to = '0xd64b0d2d72bb1b3f18046b8a7fc6c9ee6bccd287';
+      const data = '0x123';
+
+      (global.fetch as jest.Mock).mockResolvedValue({
+        ok: false,
+        status: 500,
+        statusText: 'Internal Server Error',
+        text: () => Promise.resolve('{"result":"some_result"}'),
+      });
+
+      await expect(relayerClient.ethSendTransaction(to, data)).rejects.toThrow(
+        'Relayer HTTP error: 500. Content: "{"result":"some_result"}"',
       );
     });
 

packages/passport/sdk/src/zkEvm/relayerClient.ts

@@ -51,7 +51,7 @@ type ImGetFeeOptionsRequest = {
 };
 
 type ImGetFeeOptionsResponse = JsonRpc & {
-  result: FeeOption[]
+  result: FeeOption[] | undefined
 };
 
 // ImSign types
@@ -126,13 +126,13 @@ export class RelayerClient {
       body: JSON.stringify(body),
     });
 
+    const responseText = await response.text();
+
     if (!response.ok) {
-      const responseText = await response.text();
       const preview = RelayerClient.getResponsePreview(responseText);
       throw new Error(`Relayer HTTP error: ${response.status}. Content: "${preview}"`);
     }
 
-    const responseText = await response.text();
     let jsonResponse;
     try {
       jsonResponse = JSON.parse(responseText);
@@ -141,6 +141,10 @@ export class RelayerClient {
       throw new Error(`Relayer JSON parse error: ${parseError instanceof Error ? parseError.message : 'Unknown error'}. Content: "${preview}"`);
     }
 
+    if (jsonResponse.error) {
+      throw new Error(jsonResponse.error);
+    }
+
     return jsonResponse;
   }
 
@@ -167,7 +171,7 @@ export class RelayerClient {
     return result;
   }
 
-  public async imGetFeeOptions(userAddress: string, data: BytesLike): Promise<FeeOption[]> {
+  public async imGetFeeOptions(userAddress: string, data: BytesLike): Promise<FeeOption[] | undefined> {
     const { chainId } = await this.rpcProvider.getNetwork();
     const payload: ImGetFeeOptionsRequest = {
       method: 'im_getFeeOptions',

packages/passport/sdk/src/zkEvm/transactionHelpers.test.ts

@@ -306,6 +306,48 @@ describe('transactionHelpers', () => {
         flow,
       })).rejects.toThrow('Transaction send failed');
     });
+
+    it('throws an error when imGetFeeOptions returns undefined', async () => {
+      (relayerClient.imGetFeeOptions as jest.Mock).mockResolvedValue(undefined);
+
+      await expect(prepareAndSignTransaction({
+        transactionRequest,
+        ethSigner,
+        rpcProvider,
+        guardianClient,
+        relayerClient,
+        zkEvmAddress,
+        flow,
+      })).rejects.toThrow('Invalid fee options received from relayer');
+    });
+
+    it('throws an error when imGetFeeOptions returns null', async () => {
+      (relayerClient.imGetFeeOptions as jest.Mock).mockResolvedValue(null);
+
+      await expect(prepareAndSignTransaction({
+        transactionRequest,
+        ethSigner,
+        rpcProvider,
+        guardianClient,
+        relayerClient,
+        zkEvmAddress,
+        flow,
+      })).rejects.toThrow('Invalid fee options received from relayer');
+    });
+
+    it('throws an error when imGetFeeOptions returns a non-array', async () => {
+      (relayerClient.imGetFeeOptions as jest.Mock).mockResolvedValue({ invalid: 'response' });
+
+      await expect(prepareAndSignTransaction({
+        transactionRequest,
+        ethSigner,
+        rpcProvider,
+        guardianClient,
+        relayerClient,
+        zkEvmAddress,
+        flow,
+      })).rejects.toThrow('Invalid fee options received from relayer');
+    });
   });
 
   describe('prepareAndSignEjectionTransaction', () => {

packages/passport/sdk/src/zkEvm/transactionHelpers.ts

@@ -55,6 +55,10 @@ const getFeeOption = async (
     transactions,
   );
 
+  if (!feeOptions || !Array.isArray(feeOptions)) {
+    throw new Error('Invalid fee options received from relayer');
+  }
+
   const imxFeeOption = feeOptions.find(
     (feeOption) => feeOption.tokenSymbol === 'IMX',
   );