update batcher circom verifier to accept raw pub inputs

Author: MarcosNicolau

crates/batcher/go_verifiers_lib/go.mod

@@ -2,6 +2,12 @@ module verifier
 
 go 1.22.3
 
+replace github.com/iden3/go-rapidsnark => github.com/MarcosNicolau/go-rapidsnark v0.0.0-20250828172020-87df0a23ada4
+
+replace github.com/iden3/go-rapidsnark/types => github.com/MarcosNicolau/go-rapidsnark/types v0.0.0-20250828172020-87df0a23ada4
+
+replace github.com/iden3/go-rapidsnark/verifier => github.com/MarcosNicolau/go-rapidsnark/verifier v0.0.0-20250828172020-87df0a23ada4
+
 require (
 	github.com/consensys/gnark v0.12.0
 	github.com/consensys/gnark-crypto v0.17.0

crates/batcher/go_verifiers_lib/go.sum

@@ -1,3 +1,7 @@
+github.com/MarcosNicolau/go-rapidsnark/types v0.0.0-20250828172020-87df0a23ada4 h1:NAZOH8mk5hgWpxf1ujVw+uggsRBMcXiiC7R7sZXVfW0=
+github.com/MarcosNicolau/go-rapidsnark/types v0.0.0-20250828172020-87df0a23ada4/go.mod h1:ApgcaUxKIgSRA6fAeFxK7p+lgXXfG4oA2HN5DhFlfF4=
+github.com/MarcosNicolau/go-rapidsnark/verifier v0.0.0-20250828172020-87df0a23ada4 h1:Sz8H0fl9kjg8iZmaHT8pyCx4Smy5JJtq0OyKfz8iXls=
+github.com/MarcosNicolau/go-rapidsnark/verifier v0.0.0-20250828172020-87df0a23ada4/go.mod h1:KgL3Yr9NehlFDI4EIWVLE3UDUi8ulyjbp7HcXSBfiGI=
 github.com/bits-and-blooms/bitset v1.20.0 h1:2F+rfL86jE2d/bmw7OhqUg2Sj/1rURkBn3MdfoPyRVU=
 github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -21,10 +25,6 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/iden3/go-iden3-crypto v0.0.17 h1:NdkceRLJo/pI4UpcjVah4lN/a3yzxRUGXqxbWcYh9mY=
 github.com/iden3/go-iden3-crypto v0.0.17/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
-github.com/iden3/go-rapidsnark/types v0.0.3 h1:f0s1Qdut1qHe1O67+m+xUVRBPwSXnq5j0xSrBi0jqM4=
-github.com/iden3/go-rapidsnark/types v0.0.3/go.mod h1:ApgcaUxKIgSRA6fAeFxK7p+lgXXfG4oA2HN5DhFlfF4=
-github.com/iden3/go-rapidsnark/verifier v0.0.5 h1:J7y0ovrEjDQoWtZmlrp4tgGng1A9faMeYsQH4igAEqA=
-github.com/iden3/go-rapidsnark/verifier v0.0.5/go.mod h1:KgL3Yr9NehlFDI4EIWVLE3UDUi8ulyjbp7HcXSBfiGI=
 github.com/ingonyama-zk/icicle/v3 v3.1.1-0.20241118092657-fccdb2f0921b h1:AvQTK7l0PTHODD06PVQX1Tn2o29sRIaKIDOvTJmKurY=
 github.com/ingonyama-zk/icicle/v3 v3.1.1-0.20241118092657-fccdb2f0921b/go.mod h1:e0JHb27/P6WorCJS3YolbY5XffS4PGBuoW38OthLkDs=
 github.com/leanovate/gopter v0.2.11 h1:vRjThO1EKPb/1NsDXuDrzldR28RLkBflWYcU9CvzWu4=

crates/batcher/go_verifiers_lib/verifier.go

@@ -14,8 +14,7 @@ import "C"
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/iden3/go-rapidsnark/types"
-	"github.com/iden3/go-rapidsnark/verifier"
+	"math/big"
 
 	"log"
 	"unsafe"
@@ -24,6 +23,8 @@ import (
 	"github.com/consensys/gnark/backend/groth16"
 	"github.com/consensys/gnark/backend/plonk"
 	"github.com/consensys/gnark/backend/witness"
+	"github.com/iden3/go-rapidsnark/types"
+	"github.com/iden3/go-rapidsnark/verifier"
 )
 
 func listRefToBytes(listRef C.ListRef) []byte {
@@ -122,6 +123,20 @@ func verifyGnarkGroth16Proof(proofBytesRef C.ListRef, pubInputBytesRef C.ListRef
 	return err == nil
 }
 
+func bytesToBigInts32(b []byte) []*big.Int {
+	if len(b)%32 != 0 {
+		panic("pubInputBytes length is not a multiple of 32")
+	}
+
+	inputs := make([]*big.Int, 0, len(b)/32)
+	for i := 0; i < len(b); i += 32 {
+		chunk := b[i : i+32]
+		bi := new(big.Int).SetBytes(chunk)
+		inputs = append(inputs, bi)
+	}
+	return inputs
+}
+
 //export VerifyCircomGroth16ProofBN256
 func VerifyCircomGroth16ProofBN256(proofBytesRef C.ListRef, pubInputBytesRef C.ListRef, verificationKeyBytesRef C.ListRef) bool {
 	proofBytes := listRefToBytes(proofBytesRef)
@@ -131,26 +146,36 @@ func VerifyCircomGroth16ProofBN256(proofBytesRef C.ListRef, pubInputBytesRef C.L
 	proofData := &types.ProofData{}
 	err := json.Unmarshal(proofBytes, proofData)
 	if err != nil {
-		log.Printf("Could not marshal proof: %v", err)
+		log.Printf("Could not unmarshal proof: %v", err)
 		return false
 	}
 
-	var pubSignals []string
-	err = json.Unmarshal(pubInputBytes, &pubSignals)
+	parsedProofData, err := verifier.ParseProofData(*proofData)
 	if err != nil {
-		log.Printf("Error unmarshaling JSON: %v", err)
+		log.Printf("Could not parse proof: %v", err)
 		return false
 	}
 
-	zkProof := types.ZKProof{
-		Proof:      proofData,
-		PubSignals: pubSignals,
+	var vkStr verifier.VkJSON
+	err = json.Unmarshal(verificationKeyBytes, &vkStr)
+	if err != nil {
+		log.Printf("Could not unmarshal vk: %v", err)
+		return false
+	}
+
+	vk, err := verifier.ParseVK(vkStr)
+	if err != nil {
+		log.Printf("Could not parse vk: %v", err)
+		return false
 	}
 
-	err = verifier.VerifyGroth16(zkProof, verificationKeyBytes)
+	inputs := bytesToBigInts32(pubInputBytes)
+
+	err = verifier.VerifyRaw(vk, parsedProofData, inputs)
 	if err != nil {
 		log.Printf("Could not verify Groth16 proof: %v", err)
 		return false
 	}
+
 	return true
 }