Skip to content

Commit 70d8abe

Browse files
maximopalopolimaximopalopoli
committed
Merge branch 'staging' into refactor/avoid-cloning-immutable-values
2 parents 9dc0d56 + f1d207d commit 70d8abe

File tree

96 files changed

+1680
-1040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1680
-1040
lines changed

‎.gitignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,17 @@ infra/ansible/playbooks/files/**.pem
2121

2222
examples/l2/crates/l2/db
2323
examples/l2/crates/l2/zkvm_programs/sp1/elf/sp1_state_transition_program
24+
25+
# Circom
26+
*.ptau
27+
challenge_0003
28+
response_0003
29+
challenge_phase2_0003
30+
circuit.r1cs
31+
circuit.r1cs.json
32+
circuit.sym
33+
response_phase2_0003
34+
witness.wtns
35+
*.zkey
36+
circuit_cpp/
37+
circuit_js

‎Makefile‎

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CONFIG_FILE?=config-files/config.yaml
1919
export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
2020
AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
2121

22-
OPERATOR_VERSION=v0.16.1
22+
OPERATOR_VERSION=v0.17.0
2323
EIGEN_SDK_GO_VERSION_DEVNET=v0.2.0-beta.1
2424
EIGEN_SDK_GO_VERSION_TESTNET=v0.2.0-beta.1
2525
EIGEN_SDK_GO_VERSION_MAINNET=v0.2.0-beta.1
@@ -292,8 +292,8 @@ verify_aggregated_proof_risc0:
292292
--network $(NETWORK) \
293293
--from-block $(FROM_BLOCK) \
294294
--proving_system Risc0 \
295-
--program-id-file ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
296-
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
295+
--program-id-file ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_1_0.bin \
296+
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.pub \
297297
--beacon_url $(BEACON_URL) \
298298
--rpc_url $(RPC_URL)
299299

@@ -549,9 +549,9 @@ batcher_send_risc0_task: ## Send a Risc0 fibonacci proof to Batcher. Parameters:
549549
@echo "Sending Risc0 fibonacci proof to Batcher..."
550550
@cd crates/cli/ && cargo run --release -- submit \
551551
--proving_system Risc0 \
552-
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.proof \
553-
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
554-
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
552+
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.proof \
553+
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_1_0.bin \
554+
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.pub \
555555
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
556556
--rpc_url $(RPC_URL) \
557557
--network $(NETWORK)
@@ -560,8 +560,8 @@ batcher_send_risc0_task_no_pub_input: ## Send a Risc0 proof without public input
560560
@echo "Sending Risc0 no pub input proof to Batcher..."
561561
@cd crates/cli/ && cargo run --release -- submit \
562562
--proving_system Risc0 \
563-
--proof ../../scripts/test_files/risc_zero/no_public_inputs/risc_zero_no_pub_input_2_0.proof \
564-
--vm_program ../../scripts/test_files/risc_zero/no_public_inputs/no_pub_input_id_2_0.bin \
563+
--proof ../../scripts/test_files/risc_zero/no_public_inputs/risc_zero_no_pub_input_2_1_0.proof \
564+
--vm_program ../../scripts/test_files/risc_zero/no_public_inputs/risc_zero_no_pub_input_id_2_1_0.bin \
565565
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
566566
--rpc_url $(RPC_URL) \
567567
--network $(NETWORK)
@@ -570,9 +570,9 @@ batcher_send_risc0_burst: ## Send a burst of Risc0 fibonacci proofs to Batcher.
570570
@echo "Sending Risc0 fibonacci proof to Batcher..."
571571
@cd crates/cli/ && cargo run --release -- submit \
572572
--proving_system Risc0 \
573-
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.proof \
574-
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
575-
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
573+
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.proof \
574+
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_1_0.bin \
575+
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.pub \
576576
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
577577
--repetitions $(BURST_SIZE) \
578578
--rpc_url $(RPC_URL) \
@@ -653,6 +653,29 @@ batcher_send_groth16_bn254_infinite: crates/target/release/aligned ## Send a dif
653653
@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
654654
@./crates/cli/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
655655

656+
batcher_send_circom_groth16_bn128_task: crates/target/release/aligned ## Send a Circom Groth16 BN128 proof to Batcher. Parameters: RPC_URL, NETWORK
657+
@echo "Sending Circom Groth16 BN128 proof to Batcher..."
658+
@cd crates/cli/ && cargo run --release -- submit \
659+
--proving_system CircomGroth16Bn128 \
660+
--proof ../../scripts/test_files/circom_groth16_bn128_script/proof.json \
661+
--public_input ../../scripts/test_files/circom_groth16_bn128_script/public.json \
662+
--vk ../../scripts/test_files/circom_groth16_bn128_script/verification_key.json \
663+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
664+
--rpc_url $(RPC_URL) \
665+
--network $(NETWORK)
666+
667+
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
668+
@echo "Sending Circom Groth16 BN128 proof to Batcher..."
669+
@cd crates/cli/ && cargo run --release -- submit \
670+
--proving_system CircomGroth16Bn128 \
671+
--proof ../../scripts/test_files/circom_groth16_bn128_script/proof.json \
672+
--public_input ../../scripts/test_files/circom_groth16_bn128_script/public.json \
673+
--vk ../../scripts/test_files/circom_groth16_bn128_script/verification_key.json \
674+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
675+
--repetitions $(BURST_SIZE) \
676+
--rpc_url $(RPC_URL) \
677+
--network $(NETWORK)
678+
656679
batcher_send_proof_with_random_address: ## Send a proof with a random address to Batcher. Parameters: RPC_URL, NETWORK, PROOF_TYPE, REPETITIONS
657680
@cd crates/cli/ && ./send_proof_with_random_address.sh
658681

@@ -762,6 +785,13 @@ generate_gnark_groth16_bn254_ineq_proof: ## Run the gnark_plonk_bn254_script
762785
@echo "Running gnark_groth_bn254_ineq script..."
763786
@go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go 1
764787

788+
generate_circom_groth16_bn128_proof: ## Run the circom_groth16_bn128_script
789+
@echo "Running circom_groth16_bn128 script..."
790+
@cd scripts/test_files/circom_groth16_bn128_script && ./generate_proof.sh
791+
792+
generate_circom_groth16_bn128_setup: ## Run the circom_groth16_bn128_script setup
793+
@echo "Running circom_groth16_bn128 script setup..."
794+
@cd scripts/test_files/circom_groth16_bn128_script && ./generate_setup.sh
765795

766796
__CONTRACTS_DEPLOYMENT__: ## ____
767797
deploy_aligned_contracts: ## Deploy Aligned Contracts. Parameters: NETWORK=<mainnet|holesky|sepolia>
@@ -1050,9 +1080,9 @@ docker_batcher_send_risc0_burst:
10501080
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
10511081
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
10521082
--proving_system Risc0 \
1053-
--proof ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.proof \
1054-
--vm_program ./scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
1055-
--public_input ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
1083+
--proof ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.proof \
1084+
--vm_program ./scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_1_0.bin \
1085+
--public_input ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_1_0.pub \
10561086
--repetitions $(DOCKER_BURST_SIZE) \
10571087
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
10581088
--rpc_url $(DOCKER_RPC_URL) \
@@ -1097,13 +1127,27 @@ docker_batcher_send_groth16_burst:
10971127
--rpc_url $(DOCKER_RPC_URL) \
10981128
--max_fee 0.1ether
10991129

1130+
docker_batcher_send_circom_groth16_bn128_burst:
1131+
@echo "Sending Circom Groth16 BN128 task to Batcher..."
1132+
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
1133+
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
1134+
--proving_system CircomGroth16Bn128 \
1135+
--proof ./scripts/test_files/circom_groth16_bn128_script/proof.json \
1136+
--public_input ./scripts/test_files/circom_groth16_bn128_script/public.json \
1137+
--vk ./scripts/test_files/circom_groth16_bn128_script/verification_key.json \
1138+
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
1139+
--repetitions $(DOCKER_BURST_SIZE) \
1140+
--rpc_url $(DOCKER_RPC_URL) \
1141+
--max_fee 0.1ether
1142+
11001143
# Update target as new proofs are supported.
11011144
docker_batcher_send_all_proofs_burst:
11021145
@$(MAKE) docker_batcher_send_sp1_burst
11031146
@$(MAKE) docker_batcher_send_risc0_burst
11041147
@$(MAKE) docker_batcher_send_plonk_bn254_burst
11051148
@$(MAKE) docker_batcher_send_plonk_bls12_381_burst
11061149
@$(MAKE) docker_batcher_send_groth16_burst
1150+
@$(MAKE) docker_batcher_send_circom_groth16_bn128_burst
11071151

11081152
docker_batcher_send_infinite_groth16:
11091153
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') \
@@ -1141,6 +1185,7 @@ docker_verify_proofs_onchain:
11411185
'
11421186

11431187
DOCKER_PROOFS_WAIT_TIME=60
1188+
DOCKER_SENT_PROOFS=6
11441189

11451190
docker_verify_proof_submission_success:
11461191
@echo "Verifying proofs were successfully submitted..."
@@ -1169,7 +1214,7 @@ docker_verify_proof_submission_success:
11691214
fi; \
11701215
echo "---------------------------------------------------------------------------------------------------"; \
11711216
done; \
1172-
if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne 5 ]; then \
1217+
if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne $(DOCKER_SENT_PROOFS) ]; then \
11731218
echo "ERROR: Some proofs were verified successfully, but some proofs are missing in the aligned_verification_data/ directory"; \
11741219
exit 1; \
11751220
fi; \

0 commit comments

Comments
 (0)