Skip to content

Commit 88505bd

Browse files
JuArceJuArce
committed
feat: update gnark scripts and proofs files
1 parent 5019745 commit 88505bd

31 files changed

Lines changed: 169 additions & 180 deletions

‎Makefile‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,9 @@ batcher_send_plonk_bn254_task: batcher/target/release/aligned
525525
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
526526
@cd batcher/aligned/ && cargo run --release -- submit \
527527
--proving_system GnarkPlonkBn254 \
528-
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
529-
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
530-
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
528+
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
529+
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
530+
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
531531
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
532532
--rpc_url $(RPC_URL) \
533533
--network $(NETWORK)
@@ -536,9 +536,9 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
536536
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
537537
@cd batcher/aligned/ && cargo run --release -- submit \
538538
--proving_system GnarkPlonkBn254 \
539-
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
540-
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
541-
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
539+
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
540+
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
541+
--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
542542
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
543543
--rpc_url $(RPC_URL) \
544544
--repetitions $(BURST_SIZE) \
@@ -548,9 +548,9 @@ batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
548548
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
549549
@cd batcher/aligned/ && cargo run --release -- submit \
550550
--proving_system GnarkPlonkBls12_381 \
551-
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
552-
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
553-
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
551+
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
552+
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
553+
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
554554
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
555555
--rpc_url $(RPC_URL) \
556556
--network $(NETWORK)
@@ -559,9 +559,9 @@ batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
559559
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
560560
@cd batcher/aligned/ && cargo run --release -- submit \
561561
--proving_system GnarkPlonkBls12_381 \
562-
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
563-
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
564-
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
562+
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
563+
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
564+
--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
565565
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
566566
--repetitions 15 \
567567
--rpc_url $(RPC_URL) \
@@ -571,9 +571,9 @@ batcher_send_groth16_bn254_task: batcher/target/release/aligned
571571
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
572572
@cd batcher/aligned/ && cargo run --release -- submit \
573573
--proving_system Groth16Bn254 \
574-
--proof ../../scripts/test_files/gnark_groth16_bn254_script/groth16.proof \
575-
--public_input ../../scripts/test_files/gnark_groth16_bn254_script/groth16.pub \
576-
--vk ../../scripts/test_files/gnark_groth16_bn254_script/groth16.vk \
574+
--proof ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.proof \
575+
--public_input ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.pub \
576+
--vk ../../scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.vk \
577577
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
578578
--rpc_url $(RPC_URL) \
579579
--network $(NETWORK)
@@ -670,19 +670,19 @@ aligned_get_user_balance_holesky:
670670
__GENERATE_PROOFS__:
671671
# TODO add a default proving system
672672

673-
generate_plonk_bls12_381_proof: ## Run the gnark_plonk_bls12_381_script
673+
generate_gnark_plonk_bls12_381_proof: ## Run the gnark_plonk_bls12_381_script
674674
@echo "Running gnark_plonk_bls12_381 script..."
675675
@go run scripts/test_files/gnark_plonk_bls12_381_script/main.go
676676

677-
generate_plonk_bn254_proof: ## Run the gnark_plonk_bn254_script
677+
generate_gnark_plonk_bn254_proof: ## Run the gnark_plonk_bn254_script
678678
@echo "Running gnark_plonk_bn254 script..."
679679
@go run scripts/test_files/gnark_plonk_bn254_script/main.go
680680

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

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

@@ -1045,9 +1045,9 @@ docker_batcher_send_plonk_bn254_burst:
10451045
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10461046
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10471047
--proving_system GnarkPlonkBn254 \
1048-
--proof ./scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
1049-
--public_input ./scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
1050-
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
1048+
--proof ./scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.proof \
1049+
--public_input ./scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input_0_12_0.pub \
1050+
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk_0_12_0.vk \
10511051
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10521052
--rpc_url $(DOCKER_RPC_URL) \
10531053
--repetitions $(DOCKER_BURST_SIZE) \
@@ -1058,9 +1058,9 @@ docker_batcher_send_plonk_bls12_381_burst:
10581058
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10591059
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10601060
--proving_system GnarkPlonkBls12_381 \
1061-
--proof ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
1062-
--public_input ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
1063-
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
1061+
--proof ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.proof \
1062+
--public_input ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input_0_12_0.pub \
1063+
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_0_12_0.vk \
10641064
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10651065
--repetitions $(DOCKER_BURST_SIZE) \
10661066
--rpc_url $(DOCKER_RPC_URL) \
@@ -1071,9 +1071,9 @@ docker_batcher_send_groth16_burst:
10711071
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10721072
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10731073
--proving_system Groth16Bn254 \
1074-
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16.proof \
1075-
--public_input ./scripts/test_files/gnark_groth16_bn254_script/groth16.pub \
1076-
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16.vk \
1074+
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.proof \
1075+
--public_input ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.pub \
1076+
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16_0_12_0.vk \
10771077
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10781078
--repetitions $(DOCKER_BURST_SIZE) \
10791079
--rpc_url $(DOCKER_RPC_URL) \
@@ -1100,9 +1100,9 @@ docker_batcher_send_infinite_groth16:
11001100
--rpc_url $(DOCKER_RPC_URL) \
11011101
--repetitions $(DOCKER_BURST_SIZE) \
11021102
--proving_system Groth16Bn254 \
1103-
--proof scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.proof \
1104-
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.pub \
1105-
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.vk \
1103+
--proof scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.proof \
1104+
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.pub \
1105+
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16_0_12_0.vk \
11061106
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS); \
11071107
--max_fee 0.1ether
11081108
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: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,24 @@ go 1.22.3
44

55
require (
66
github.com/consensys/gnark v0.12.0
7-
github.com/consensys/gnark-crypto v0.15.0
7+
github.com/consensys/gnark-crypto v0.17.0
88
)
99

1010
require (
1111
github.com/bits-and-blooms/bitset v1.20.0 // indirect
1212
github.com/blang/semver/v4 v4.0.0 // indirect
13-
github.com/consensys/bavard v0.1.27 // indirect
14-
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/consensys/bavard v0.1.29 // indirect
1514
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
1615
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
17-
github.com/ingonyama-zk/icicle v0.0.0-20230928131117-97f0079e5c71 // indirect
18-
github.com/ingonyama-zk/iciclegnark v0.1.0 // indirect
16+
github.com/ingonyama-zk/icicle/v3 v3.1.1-0.20241118092657-fccdb2f0921b // indirect
1917
github.com/mattn/go-colorable v0.1.13 // indirect
2018
github.com/mattn/go-isatty v0.0.20 // indirect
2119
github.com/mmcloughlin/addchain v0.4.0 // indirect
22-
github.com/pmezard/go-difflib v1.0.0 // indirect
20+
github.com/ronanh/intcomp v1.1.0 // indirect
2321
github.com/rs/zerolog v1.33.0 // indirect
24-
github.com/stretchr/testify v1.10.0 // indirect
2522
github.com/x448/float16 v0.8.4 // indirect
26-
golang.org/x/sync v0.10.0 // indirect
27-
golang.org/x/sys v0.29.0 // indirect
28-
gopkg.in/yaml.v3 v3.0.1 // 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
2926
rsc.io/tmplfunc v0.0.3 // indirect
3027
)

0 commit comments

Comments
 (0)