Merge pull request #35 from Poly-pay/parallel-tx

feat: support parallel transactions instead of sequential

Author: gianalarcon

packages/backend/assets/vkey.json

@@ -1 +1 @@
-{"vkHash":"0x104717314e0c94ef15d6992292b713aa2ffc48c74e0c41f7344a611caa606dde"}
+{"vkHash":"0x80aca2e84f244400a76040aa5c77f9d83ff8409a2bf0d0cde96daffcf0a50e1b"}

packages/backend/prisma/migrations/20251224012946_add_contraint_wallet_adress_nonce_to_tx/migration.sql

@@ -0,0 +1,22 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[walletAddress,nonce]` on the table `Transaction` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateTable
+CREATE TABLE "ReservedNonce" (
+    "id" TEXT NOT NULL,
+    "walletAddress" TEXT NOT NULL,
+    "nonce" INTEGER NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "ReservedNonce_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ReservedNonce_walletAddress_nonce_key" ON "ReservedNonce"("walletAddress", "nonce");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Transaction_walletAddress_nonce_key" ON "Transaction"("walletAddress", "nonce");

packages/backend/prisma/schema.prisma

@@ -57,7 +57,7 @@ model Transaction {
   txId   Int      @unique @default(autoincrement())
   type   TxType
   status TxStatus @default(PENDING)
-  nonce  Int
+  nonce  Int // unique per wallet
 
   // Transfer (ETH only)
   to           String?
@@ -94,11 +94,22 @@ model Transaction {
 
   votes Vote[]
 
+  @@unique([walletAddress, nonce])
   @@index([status])
   @@index([walletAddress])
   @@index([contactId])
 }
 
+model ReservedNonce {
+  id            String   @id @default(cuid())
+  walletAddress String
+  nonce         Int
+  expiresAt     DateTime
+  createdAt     DateTime @default(now())
+
+  @@unique([walletAddress, nonce])
+}
+
 model Vote {
   id              String   @id @default(cuid())
   txId            Int
@@ -197,9 +208,9 @@ enum TxType {
 
 enum TxStatus {
   PENDING
-  EXECUTING
+  EXECUTING // DEPRECATED: No longer needed. Check realtime on frontend instead
   EXECUTED
-  OUTDATED
+  OUTDATED // DEPRECATED: No longer needed with txId as nonce. Kept for backward compatibility.
   FAILED
 }
 

packages/backend/src/common/contracts/MetaMultiSigWallet.ts

@@ -93,10 +93,12 @@ export class RelayerService {
    */
   async executeTransaction(
     walletAddress: string,
+    nonce: number,
     to: string,
     value: string,
     data: string,
     zkProofs: {
+      commitment: string;
       nullifier: string;
       aggregationId: string;
       domainId: number;
@@ -260,6 +262,7 @@ export class RelayerService {
 
     // 2. Format proofs for contract
     const formattedProofs = zkProofs.map((proof) => ({
+      commitment: BigInt(proof.commitment),
       nullifier: BigInt(proof.nullifier),
       aggregationId: BigInt(proof.aggregationId),
       domainId: BigInt(proof.domainId),
@@ -269,6 +272,7 @@ export class RelayerService {
     }));
 
     const args = [
+      BigInt(nonce),
       to as `0x${string}`,
       BigInt(value),
       data as `0x${string}`,

packages/backend/src/relayer-wallet/relayer-wallet.service.ts

@@ -98,4 +98,9 @@ export class TransactionController {
   async executeOnChain(@Param('txId', ParseIntPipe) txId: number) {
     return this.transactionService.executeOnChain(txId);
   }
+
+  @Post('reserve-nonce')
+  async reserveNonce(@Body('walletAddress') walletAddress: string) {
+    return this.transactionService.reserveNonce(walletAddress);
+  }
 }