Merge branch 'refs/heads/staging' into 1998-fix-rename-groth16plonk-to-gnark_groth16-and-gnark_plonk-to-avoid-ambiguity-with-circom

# Conflicts:
#	Makefile
#	crates/batcher/src/zk_utils/mod.rs
#	crates/cli/send_proof_with_random_address.sh

Author: JuArce

.gitignore

@@ -21,3 +21,17 @@ infra/ansible/playbooks/files/**.pem
 
 examples/l2/crates/l2/db
 examples/l2/crates/l2/zkvm_programs/sp1/elf/sp1_state_transition_program
+
+# Circom
+*.ptau
+challenge_0003
+response_0003
+challenge_phase2_0003
+circuit.r1cs
+circuit.r1cs.json
+circuit.sym
+response_phase2_0003
+witness.wtns
+*.zkey
+circuit_cpp/
+circuit_js

Makefile

@@ -19,7 +19,7 @@ CONFIG_FILE?=config-files/config.yaml
 export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
-OPERATOR_VERSION=v0.16.1
+OPERATOR_VERSION=v0.17.0
 EIGEN_SDK_GO_VERSION_DEVNET=v0.2.0-beta.1
 EIGEN_SDK_GO_VERSION_TESTNET=v0.2.0-beta.1
 EIGEN_SDK_GO_VERSION_MAINNET=v0.2.0-beta.1
@@ -653,6 +653,29 @@ batcher_send_gnark_groth16_bn254_infinite: crates/target/release/aligned ## Send
 	@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
 	@./crates/cli/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
 
+batcher_send_circom_groth16_bn128_task: crates/target/release/aligned ## Send a Circom Groth16 BN128 proof to Batcher. Parameters: RPC_URL, NETWORK
+	@echo "Sending Circom Groth16 BN128 proof to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system CircomGroth16Bn128 \
+		--proof ../../scripts/test_files/circom_groth16_bn128_script/proof.json \
+		--public_input ../../scripts/test_files/circom_groth16_bn128_script/public.json \
+		--vk ../../scripts/test_files/circom_groth16_bn128_script/verification_key.json \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
+batcher_send_circom_groth16_bn128_burst: crates/target/release/aligned ## Send a burst of Circom Groth16 BN128 proofs to Batcher. Parameters: RPC_URL, NETWORK, BURST_SIZE
+	@echo "Sending Circom Groth16 BN128 proof to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system CircomGroth16Bn128 \
+		--proof ../../scripts/test_files/circom_groth16_bn128_script/proof.json \
+		--public_input ../../scripts/test_files/circom_groth16_bn128_script/public.json \
+		--vk ../../scripts/test_files/circom_groth16_bn128_script/verification_key.json \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--repetitions $(BURST_SIZE) \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
 batcher_send_proof_with_random_address: ## Send a proof with a random address to Batcher. Parameters: RPC_URL, NETWORK, PROOF_TYPE, REPETITIONS
 	@cd crates/cli/ && ./send_proof_with_random_address.sh
 
@@ -762,6 +785,13 @@ generate_gnark_groth16_bn254_ineq_proof: ## Run the gnark_plonk_bn254_script
 	@echo "Running gnark_groth_bn254_ineq script..."
 	@go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go 1
 
+generate_circom_groth16_bn128_proof: ## Run the circom_groth16_bn128_script
+	@echo "Running circom_groth16_bn128 script..."
+	@cd scripts/test_files/circom_groth16_bn128_script && ./generate_proof.sh
+
+generate_circom_groth16_bn128_setup: ## Run the circom_groth16_bn128_script setup
+	@echo "Running circom_groth16_bn128 script setup..."
+	@cd scripts/test_files/circom_groth16_bn128_script && ./generate_setup.sh
 
 __CONTRACTS_DEPLOYMENT__: ## ____
 deploy_aligned_contracts: ## Deploy Aligned Contracts. Parameters: NETWORK=<mainnet|holesky|sepolia>
@@ -1097,13 +1127,27 @@ docker_batcher_send_gnark_groth16_burst:
 			--rpc_url $(DOCKER_RPC_URL) \
 			--max_fee 0.1ether
 
+docker_batcher_send_circom_groth16_bn128_burst:
+	@echo "Sending Circom Groth16 BN128 task to Batcher..."
+	docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
+			  --private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
+			  --proving_system CircomGroth16Bn128 \
+			  --proof ./scripts/test_files/circom_groth16_bn128_script/proof.json \
+			  --public_input ./scripts/test_files/circom_groth16_bn128_script/public.json \
+			  --vk ./scripts/test_files/circom_groth16_bn128_script/verification_key.json \
+			  --proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
+			  --repetitions $(DOCKER_BURST_SIZE) \
+			  --rpc_url $(DOCKER_RPC_URL) \
+			  --max_fee 0.1ether
+
 # Update target as new proofs are supported.
 docker_batcher_send_all_proofs_burst:
 	@$(MAKE) docker_batcher_send_sp1_burst
 	@$(MAKE) docker_batcher_send_risc0_burst
 	@$(MAKE) docker_batcher_send_gnark_plonk_bn254_burst
 	@$(MAKE) docker_batcher_send_gnark_plonk_bls12_381_burst
 	@$(MAKE) docker_batcher_send_gnark_groth16_burst
+	@$(MAKE) docker_batcher_send_circom_groth16_bn128_burst
 
 docker_batcher_send_infinite_groth16:
 	docker exec $(shell docker ps | grep batcher | awk '{print $$1}') \
@@ -1141,6 +1185,7 @@ docker_verify_proofs_onchain:
 	  '
 
 DOCKER_PROOFS_WAIT_TIME=60
+DOCKER_SENT_PROOFS=6
 
 docker_verify_proof_submission_success: 
 	@echo "Verifying proofs were successfully submitted..."
@@ -1169,7 +1214,7 @@ docker_verify_proof_submission_success:
 				fi; \
 				echo "---------------------------------------------------------------------------------------------------"; \
 			done; \
-			if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne 5 ]; then \
+			if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne $(DOCKER_SENT_PROOFS) ]; then \
 				echo "ERROR: Some proofs were verified successfully, but some proofs are missing in the aligned_verification_data/ directory"; \
 				exit 1; \
 			fi; \

common/proving_systems.go

@@ -16,6 +16,7 @@ const (
 	GnarkGroth16Bn254
 	SP1
 	Risc0
+	CircomGroth16Bn128
 )
 
 func (t *ProvingSystemId) String() string {
@@ -34,6 +35,8 @@ func ProvingSystemIdFromString(provingSystem string) (ProvingSystemId, error) {
 		return SP1, nil
 	case "Risc0":
 		return Risc0, nil
+	case "CircomGroth16Bn128":
+		return CircomGroth16Bn128, nil
 	}
 
 	return 0, fmt.Errorf("unknown proving system: %s", provingSystem)
@@ -51,6 +54,8 @@ func ProvingSystemIdToString(provingSystem ProvingSystemId) (string, error) {
 		return "SP1", nil
 	case Risc0:
 		return "Risc0", nil
+	case CircomGroth16Bn128:
+		return "CircomGroth16Bn128", nil
 	}
 
 	return "", fmt.Errorf("unknown proving system: %d", provingSystem)
@@ -105,6 +110,8 @@ func (s *ProvingSystemId) UnmarshalCBOR(data []byte) error {
 		*s = SP1
 	case "Risc0":
 		*s = Risc0
+	case "CircomGroth16Bn128":
+		*s = CircomGroth16Bn128
 	}
 
 	return nil

crates/Cargo.lock

@@ -1,11 +1,20 @@
 use std::{env, path::PathBuf, process::Command};
 
-const GO_SRC: &str = "./gnark/verifier.go";
+const GO_SRC: &str = "./go_verifiers_lib/verifier.go";
 const GO_OUT: &str = "libverifier.a";
 const GO_LIB: &str = "verifier";
 
 fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+
+    // Fix the missing dependency issue
+    let mut get_cmd = Command::new("go");
+    get_cmd.arg("get")
+           .arg("github.com/yetanotherco/go-circom-prover-verifier/[email protected]");
+
+    let _ = get_cmd.output(); // Run but don't fail if it has issues
+
+    // Build library
     let mut go_build = Command::new("go");
     go_build
         .arg("build")

crates/batcher/build.rs

@@ -5,6 +5,7 @@ go 1.22.3
 require (
 	github.com/consensys/gnark v0.12.0
 	github.com/consensys/gnark-crypto v0.17.0
+	github.com/yetanotherco/go-circom-prover-verifier v0.0.0-20250618185957-f01a8a8ec4a6
 )
 
 require (
@@ -25,3 +26,5 @@ require (
 	golang.org/x/sys v0.30.0 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
+
+require github.com/ethereum/go-ethereum v1.14.0 // indirect

crates/batcher/gnark/go.mod crates/batcher/go_verifiers_lib/go.modcrates/batcher/gnark/go.mod renamed to crates/batcher/go_verifiers_lib/go.mod

@@ -11,6 +11,7 @@ github.com/consensys/gnark-crypto v0.17.0/go.mod h1:A2URlMHUT81ifJ0UlLzSlm7TmnE3
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ethereum/go-ethereum v1.14.0/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -44,6 +45,7 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+github.com/yetanotherco/go-circom-prover-verifier v0.0.0-20250618185957-f01a8a8ec4a6/go.mod h1:A6TUcQ/lvmwAA/Ir8kRMIX5NcIglk8iNKeHF8Nj6Hu0=
 golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=

crates/batcher/gnark/go.sum crates/batcher/go_verifiers_lib/go.sumcrates/batcher/gnark/go.sum renamed to crates/batcher/go_verifiers_lib/go.sum

@@ -8,13 +8,13 @@ typedef struct ListRef {
   const uint8_t *ptr;
   uintptr_t len;
 } ListRef;
-
-
 */
 import "C"
 
 import (
 	"bytes"
+	"github.com/yetanotherco/go-circom-prover-verifier/parsers"
+	"github.com/yetanotherco/go-circom-prover-verifier/verifier"
 	"log"
 	"unsafe"
 
@@ -119,3 +119,30 @@ func verifyGroth16Proof(proofBytesRef C.ListRef, pubInputBytesRef C.ListRef, ver
 	err = groth16.Verify(proof, verificationKey, pubInput)
 	return err == nil
 }
+
+//export VerifyCircomGroth16ProofBN128
+func VerifyCircomGroth16ProofBN128(proofBytesRef C.ListRef, pubInputBytesRef C.ListRef, verificationKeyBytesRef C.ListRef) bool {
+	proofBytes := listRefToBytes(proofBytesRef)
+	pubInputBytes := listRefToBytes(pubInputBytesRef)
+	verificationKeyBytes := listRefToBytes(verificationKeyBytesRef)
+
+	proof, err := parsers.ParseProof(proofBytes)
+	if err != nil {
+		log.Printf("Could not parse proof: %v", err)
+		return false
+	}
+
+	public, err := parsers.ParsePublicSignals(pubInputBytes)
+	if err != nil {
+		log.Printf("Could not parse public signals: %v", err)
+		return false
+	}
+
+	vk, err := parsers.ParseVk(verificationKeyBytes)
+	if err != nil {
+		log.Printf("Could not parse verification key: %v", err)
+		return false
+	}
+
+	return verifier.Verify(vk, proof, public)
+}

crates/batcher/gnark/verifier.go …tes/batcher/go_verifiers_lib/verifier.gocrates/batcher/gnark/verifier.go renamed to crates/batcher/go_verifiers_lib/verifier.go crates/batcher/gnark/verifier.go renamed to crates/batcher/go_verifiers_lib/verifier.go

@@ -0,0 +1 @@
+pub mod verifier;

crates/batcher/src/circom/mod.rs

@@ -0,0 +1,20 @@
+use crate::ffi::circom_ffi::VerifyCircomGroth16ProofBN128;
+use aligned_sdk::common::types::ProvingSystemId;
+
+pub fn verify_circom(
+    proving_system: &ProvingSystemId,
+    proof: &Vec<u8>,
+    public_input: &Vec<u8>,
+    verification_key: &Vec<u8>,
+) -> bool {
+    let proof = proof.into();
+    let public_input = public_input.into();
+    let verification_key = verification_key.into();
+
+    match proving_system {
+        ProvingSystemId::CircomGroth16Bn128 => unsafe {
+            VerifyCircomGroth16ProofBN128(proof, public_input, verification_key)
+        },
+        _ => false,
+    }
+}