feat(compactX): move zod checks/parse into listener parser

Author: fernandomg

typescript/solver/solvers/compactX/filler.ts

@@ -8,12 +8,7 @@ import { BuildRules, RulesMap } from "../types.js";
 import { retrieveTokenBalance } from "../utils.js";
 import { allowBlockLists, metadata } from "./config/index.js";
 import { PriceService } from "./services/price/PriceService.js";
-import {
-  type BroadcastRequest,
-  BroadcastRequestSchema,
-  type CompactXMetadata,
-  type CompactXParsedArgs,
-} from "./types.js";
+import type { CompactXMetadata, CompactXParsedArgs } from "./types.js";
 import { calculateFillValue, getMaxSettlementAmount, log } from "./utils.js";
 
 export type CompactXRule = CompactXFiller["rules"][number];
@@ -44,13 +39,11 @@ export class CompactXFiller extends BaseFiller<
 
   protected async prepareIntent(
     parsedArgs: CompactXParsedArgs,
-  ): Promise<Result<BroadcastRequest>> {
+  ): Promise<Result<string>> {
     try {
       await super.prepareIntent(parsedArgs);
 
-      const result = BroadcastRequestSchema.parse(parsedArgs.context);
-
-      return { data: result, success: true };
+      return { data: "", success: true };
     } catch (error: any) {
       return {
         error:
@@ -60,10 +53,9 @@ export class CompactXFiller extends BaseFiller<
     }
   }
 
-  protected async fill(
-    parsedArgs: CompactXParsedArgs,
-    request: BroadcastRequest,
-  ) {
+  protected async fill(parsedArgs: CompactXParsedArgs) {
+    const request = parsedArgs.context;
+
     this.log.info({
       msg: "Filling Intent",
       intent: `${this.metadata.protocolName}-${request.compact.id}`,

typescript/solver/solvers/compactX/listener.ts

@@ -2,7 +2,7 @@ import { chainIdsToName } from "../../config/index.js";
 import type { BaseWebSocketSource } from "../types.js";
 import { WebSocketListener } from "../WebSocketListener.js";
 import { metadata } from "./config/index.js";
-import { CompactXParsedArgs } from "./types.js";
+import { BroadcastRequestSchema, type CompactXParsedArgs } from "./types.js";
 import { log } from "./utils.js";
 
 type CompactXClassMetadata = {
@@ -16,15 +16,16 @@ export class CompactXListener extends WebSocketListener<CompactXParsedArgs> {
   }
 
   protected parseEventArgs(args: Buffer): CompactXParsedArgs {
-    const context: CompactXParsedArgs["context"] = JSON.parse(args.toString());
+    const context: CompactXParsedArgs["context"] = BroadcastRequestSchema.parse(
+      JSON.parse(args.toString()),
+    );
 
     return {
       orderId: context.compact.id,
       senderAddress: context.compact.sponsor,
       recipients: [
         {
-          destinationChainName:
-            chainIdsToName[context.compact.mandate.chainId.toString()],
+          destinationChainName: chainIdsToName[context.compact.mandate.chainId],
           recipientAddress: context.compact.mandate.recipient,
         },
       ],

typescript/solver/solvers/compactX/rules/checkExpirations.ts

@@ -3,12 +3,10 @@ import { CompactXRule } from "../filler.js";
 
 export function checkExpirations(): CompactXRule {
   return async (parsedArgs) => {
-    const chainId = parsedArgs.context.chainId;
-
     // Check if either compact or mandate has expired or is close to expiring
     const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
     const { compactExpirationBuffer, mandateExpirationBuffer } =
-      metadata.chainInfo[chainId];
+      metadata.chainInfo[parsedArgs.context.chainId];
 
     if (
       BigInt(parsedArgs.context.compact.expires) <=

typescript/solver/solvers/compactX/rules/validateChainsAndTokens.ts

@@ -39,7 +39,7 @@ export function validateChainsAndTokens(): CompactXRule {
     }
 
     // Validate destination token
-    const mandateToken = parsedArgs.context.compact.mandate.token.toLowerCase();
+    const mandateToken = parsedArgs.context.compact.mandate.token;
     const mandateChainTokens = getChainSupportedTokens(
       parsedArgs.context.compact.mandate.chainId,
     );

typescript/solver/solvers/compactX/rules/verifySignatures.ts

@@ -1,28 +1,20 @@
 import type { CompactXRule } from "../filler.js";
 import { TheCompactService } from "../services/TheCompactService.js";
-import { BroadcastRequestSchema } from "../types.js";
 import { deriveClaimHash, log } from "../utils.js";
 import { verifyBroadcastRequest } from "../validation/signature.js";
 
 export function verifySignatures(): CompactXRule {
   return async (parsedArgs, context) => {
-    const { data: request, error: requestError } =
-      BroadcastRequestSchema.safeParse(parsedArgs.context);
-
-    if (requestError) {
-      return { error: requestError.message, success: false };
-    }
-
     const theCompactService = new TheCompactService(context.multiProvider, log);
 
     // Derive and log claim hash
-    const claimHash = deriveClaimHash(request.compact);
+    const claimHash = deriveClaimHash(parsedArgs.context.compact);
 
     // Set the claim hash before verification
-    request.claimHash = claimHash;
+    parsedArgs.context.claimHash = claimHash;
 
     const { isValid, error } = await verifyBroadcastRequest(
-      request,
+      parsedArgs.context,
       theCompactService,
     );