feat(compactX): extract nonce check

Author: fernandomg

typescript/solver/solvers/compactX/config/metadata.ts

@@ -150,6 +150,9 @@ const metadata: CompactXMetadata = {
       {
         name: "validateArbiterAndTribunal",
       },
+      {
+        name: "verifyNonce",
+      },
     ],
   },
 };

typescript/solver/solvers/compactX/filler.ts

@@ -70,24 +70,6 @@ export class CompactXFiller extends BaseFiller<
       intent: `${this.metadata.protocolName}-${request.compact.id}`,
     });
 
-    const chainId = +request.chainId;
-
-    // Check if nonce has already been consumed
-    const theCompactService = new TheCompactService(
-      this.multiProvider,
-      this.log,
-    );
-
-    const nonceConsumed = await theCompactService.hasConsumedAllocatorNonce(
-      chainId,
-      BigInt(request.compact.nonce),
-      request.compact.arbiter,
-    );
-
-    if (nonceConsumed) {
-      throw new Error("Nonce has already been consumed");
-    }
-
     // Process the broadcast transaction
     const mandateChainId = request.compact.mandate.chainId;
 

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

@@ -1,4 +1,5 @@
 export { checkExpirations } from "./checkExpirations.js";
 export { validateArbiterAndTribunal } from "./validateArbiterAndTribunal.js";
 export { validateChainsAndTokens } from "./validateChainsAndTokens.js";
+export { verifyNonce } from "./verifyNonce.js";
 export { verifySignatures } from "./verifySignatures.js";

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

@@ -0,0 +1,24 @@
+import type { CompactXRule } from "../filler.js";
+import { TheCompactService } from "../services/TheCompactService.js";
+import { log } from "../utils.js";
+
+export function verifyNonce(): CompactXRule {
+  return async (parsedArgs, context) => {
+    const theCompactService = new TheCompactService(context.multiProvider, log);
+
+    const nonceConsumed = await theCompactService.hasConsumedAllocatorNonce(
+      +parsedArgs.context.chainId,
+      BigInt(parsedArgs.context.compact.nonce),
+      parsedArgs.context.compact.arbiter,
+    );
+
+    if (nonceConsumed) {
+      return {
+        error: "Nonce has already been consumed",
+        success: false,
+      };
+    }
+
+    return { data: "Signatures are Ok", success: true };
+  };
+}