Skip to content

Commit 72583d9

Browse files
Mechanix97JuArce
Mechanix97
and
JuArce
authored
feat: bump gnark version to 0.12 (#1863)
Co-authored-by: JuArce <[email protected]>
1 parent 6ec1dc6 commit 72583d9

36 files changed

+234
-207
lines changed

‎Makefile‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,9 @@ batcher_send_plonk_bn254_task: batcher/target/release/aligned
523523
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
524524
@cd batcher/aligned/ && cargo run --release -- submit \
525525
--proving_system GnarkPlonkBn254 \
526-
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
527-
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
528-
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
526+
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
527+
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
528+
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
529529
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
530530
--rpc_url $(RPC_URL) \
531531
--network $(NETWORK)
@@ -534,9 +534,9 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
534534
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
535535
@cd batcher/aligned/ && cargo run --release -- submit \
536536
--proving_system GnarkPlonkBn254 \
537-
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
538-
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
539-
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
537+
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
538+
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
539+
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
540540
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
541541
--rpc_url $(RPC_URL) \
542542
--repetitions $(BURST_SIZE) \
@@ -546,9 +546,9 @@ batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
546546
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
547547
@cd batcher/aligned/ && cargo run --release -- submit \
548548
--proving_system GnarkPlonkBls12_381 \
549-
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
550-
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
551-
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
549+
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
550+
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
551+
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
552552
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
553553
--rpc_url $(RPC_URL) \
554554
--network $(NETWORK)
@@ -557,9 +557,9 @@ batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
557557
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
558558
@cd batcher/aligned/ && cargo run --release -- submit \
559559
--proving_system GnarkPlonkBls12_381 \
560-
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
561-
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
562-
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
560+
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
561+
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
562+
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
563563
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
564564
--repetitions 15 \
565565
--rpc_url $(RPC_URL) \
@@ -569,9 +569,9 @@ batcher_send_groth16_bn254_task: batcher/target/release/aligned
569569
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
570570
@cd batcher/aligned/ && cargo run --release -- submit \
571571
--proving_system Groth16Bn254 \
572-
--proof ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.proof \
573-
--public_input ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.pub \
574-
--vk ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.vk \
572+
--proof ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.proof \
573+
--public_input ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.pub \
574+
--vk ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.vk \
575575
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
576576
--rpc_url $(RPC_URL) \
577577
--network $(NETWORK)
@@ -668,19 +668,19 @@ aligned_get_user_balance_holesky:
668668
__GENERATE_PROOFS__:
669669
# TODO add a default proving system
670670

671-
generate_plonk_bls12_381_proof: ## Run the gnark_plonk_bls12_381_script
671+
generate_gnark_plonk_bls12_381_proof: ## Run the gnark_plonk_bls12_381_script
672672
@echo "Running gnark_plonk_bls12_381 script..."
673673
@go run scripts/test_files/gnark_plonk_bls12_381_script/main.go
674674

675-
generate_plonk_bn254_proof: ## Run the gnark_plonk_bn254_script
675+
generate_gnark_plonk_bn254_proof: ## Run the gnark_plonk_bn254_script
676676
@echo "Running gnark_plonk_bn254 script..."
677677
@go run scripts/test_files/gnark_plonk_bn254_script/main.go
678678

679-
generate_groth16_proof: ## Run the gnark_plonk_bn254_script
679+
generate_gnark_groth16_bn254_proof: ## Run the gnark_groth16_bn254_script
680680
@echo "Running gnark_groth_bn254 script..."
681681
@go run scripts/test_files/gnark_groth16_bn254_script/main.go
682682

683-
generate_groth16_ineq_proof: ## Run the gnark_plonk_bn254_script
683+
generate_gnark_groth16_bn254_ineq_proof: ## Run the gnark_plonk_bn254_script
684684
@echo "Running gnark_groth_bn254_ineq script..."
685685
@go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go 1
686686

@@ -1043,9 +1043,9 @@ docker_batcher_send_plonk_bn254_burst:
10431043
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10441044
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10451045
--proving_system GnarkPlonkBn254 \
1046-
--proof ./scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
1047-
--public_input ./scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
1048-
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
1046+
--proof ./scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
1047+
--public_input ./scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
1048+
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
10491049
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10501050
--rpc_url $(DOCKER_RPC_URL) \
10511051
--repetitions $(DOCKER_BURST_SIZE) \
@@ -1056,9 +1056,9 @@ docker_batcher_send_plonk_bls12_381_burst:
10561056
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10571057
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10581058
--proving_system GnarkPlonkBls12_381 \
1059-
--proof ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
1060-
--public_input ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
1061-
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
1059+
--proof ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
1060+
--public_input ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
1061+
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
10621062
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10631063
--repetitions $(DOCKER_BURST_SIZE) \
10641064
--rpc_url $(DOCKER_RPC_URL) \
@@ -1069,9 +1069,9 @@ docker_batcher_send_groth16_burst:
10691069
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10701070
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10711071
--proving_system Groth16Bn254 \
1072-
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16.proof \
1073-
--public_input ./scripts/test_files/gnark_groth16_bn254_script/plonk_pub_input.pub \
1074-
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16.vk \
1072+
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.proof \
1073+
--public_input ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.pub \
1074+
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.vk \
10751075
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10761076
--repetitions $(DOCKER_BURST_SIZE) \
10771077
--rpc_url $(DOCKER_RPC_URL) \
@@ -1098,9 +1098,9 @@ docker_batcher_send_infinite_groth16:
10981098
--rpc_url $(DOCKER_RPC_URL) \
10991099
--repetitions $(DOCKER_BURST_SIZE) \
11001100
--proving_system Groth16Bn254 \
1101-
--proof scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.proof \
1102-
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.pub \
1103-
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.vk \
1101+
--proof scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.proof \
1102+
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.pub \
1103+
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.vk \
11041104
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS); \
11051105
--max_fee 0.1ether
11061106
sleep $${timer}; \

‎alerts/sender_with_alert.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ do
108108
submit=$(aligned submit \
109109
--proving_system Groth16Bn254 \
110110
--repetitions $REPETITIONS \
111-
--proof "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.proof" \
112-
--public_input "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.pub" \
113-
--vk "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk" \
111+
--proof "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16_0_12_0.proof" \
112+
--public_input "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16_0_12_0.pub" \
113+
--vk "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16_0_12_0.vk" \
114114
--private_key $PRIVATE_KEY \
115115
--rpc_url $RPC_URL \
116116
--network $NETWORK \

‎batcher/aligned-batcher/gnark/go.mod‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
module verifier
22

3-
go 1.22.3
3+
go 1.22.3
44

5-
require (
6-
github.com/consensys/gnark v0.10.0
7-
github.com/consensys/gnark-crypto v0.12.2-0.20240215234832-d72fcb379d3e
8-
)
5+
require (
6+
github.com/consensys/gnark v0.12.0
7+
github.com/consensys/gnark-crypto v0.17.0
8+
)
99

10-
require (
11-
github.com/bits-and-blooms/bitset v1.8.0 // indirect
12-
github.com/blang/semver/v4 v4.0.0 // indirect
13-
github.com/consensys/bavard v0.1.13 // indirect
14-
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
16-
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
17-
github.com/ingonyama-zk/icicle v0.0.0-20230928131117-97f0079e5c71 // indirect
18-
github.com/ingonyama-zk/iciclegnark v0.1.0 // indirect
19-
github.com/mattn/go-colorable v0.1.13 // indirect
20-
github.com/mattn/go-isatty v0.0.19 // indirect
21-
github.com/mmcloughlin/addchain v0.4.0 // indirect
22-
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
github.com/rs/zerolog v1.30.0 // indirect
24-
github.com/stretchr/testify v1.8.4 // indirect
25-
github.com/x448/float16 v0.8.4 // indirect
26-
golang.org/x/sync v0.3.0 // indirect
27-
golang.org/x/sys v0.15.0 // indirect
28-
gopkg.in/yaml.v3 v3.0.1 // indirect
29-
rsc.io/tmplfunc v0.0.3 // indirect
30-
)
10+
require (
11+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
12+
github.com/blang/semver/v4 v4.0.0 // indirect
13+
github.com/consensys/bavard v0.1.29 // indirect
14+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
15+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
16+
github.com/ingonyama-zk/icicle/v3 v3.1.1-0.20241118092657-fccdb2f0921b // indirect
17+
github.com/mattn/go-colorable v0.1.13 // indirect
18+
github.com/mattn/go-isatty v0.0.20 // indirect
19+
github.com/mmcloughlin/addchain v0.4.0 // indirect
20+
github.com/ronanh/intcomp v1.1.0 // indirect
21+
github.com/rs/zerolog v1.33.0 // indirect
22+
github.com/x448/float16 v0.8.4 // indirect
23+
golang.org/x/crypto v0.33.0 // indirect
24+
golang.org/x/sync v0.11.0 // indirect
25+
golang.org/x/sys v0.30.0 // indirect
26+
rsc.io/tmplfunc v0.0.3 // indirect
27+
)

0 commit comments

Comments
 (0)