Skip to content

Commit 9f401df

Browse files
ci: fix send-proofs-docker stuck because was batch already submitted (#1584)
1 parent 6b346a3 commit 9f401df

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

Makefile

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ docker_down:
906906
@echo "Everything down"
907907
docker ps
908908

909-
DOCKER_BURST_SIZE=2
909+
DOCKER_BURST_SIZE=1
910910
DOCKER_PROOFS_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
911911

912912
docker_batcher_send_sp1_burst:
@@ -918,7 +918,8 @@ docker_batcher_send_sp1_burst:
918918
--vm_program ./scripts/test_files/sp1/sp1_fibonacci.elf \
919919
--repetitions $(DOCKER_BURST_SIZE) \
920920
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
921-
--rpc_url $(DOCKER_RPC_URL)
921+
--rpc_url $(DOCKER_RPC_URL) \
922+
--max_fee 0.1ether
922923

923924
docker_batcher_send_risc0_burst:
924925
@echo "Sending Risc0 fibonacci task to Batcher..."
@@ -930,7 +931,8 @@ docker_batcher_send_risc0_burst:
930931
--public_input ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
931932
--repetitions $(DOCKER_BURST_SIZE) \
932933
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
933-
--rpc_url $(DOCKER_RPC_URL)
934+
--rpc_url $(DOCKER_RPC_URL) \
935+
--max_fee 0.1ether
934936

935937
docker_batcher_send_plonk_bn254_burst:
936938
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
@@ -942,7 +944,8 @@ docker_batcher_send_plonk_bn254_burst:
942944
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
943945
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
944946
--rpc_url $(DOCKER_RPC_URL) \
945-
--repetitions $(DOCKER_BURST_SIZE)
947+
--repetitions $(DOCKER_BURST_SIZE) \
948+
--max_fee 0.1ether
946949

947950
docker_batcher_send_plonk_bls12_381_burst:
948951
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
@@ -954,19 +957,21 @@ docker_batcher_send_plonk_bls12_381_burst:
954957
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
955958
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
956959
--repetitions $(DOCKER_BURST_SIZE) \
957-
--rpc_url $(DOCKER_RPC_URL)
960+
--rpc_url $(DOCKER_RPC_URL) \
961+
--max_fee 0.1ether
958962

959963
docker_batcher_send_groth16_burst:
960964
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
961965
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
962-
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
963-
--proving_system Groth16Bn254 \
964-
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16.proof \
965-
--public_input ./scripts/test_files/gnark_groth16_bn254_script/plonk_pub_input.pub \
966-
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16.vk \
967-
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
968-
--repetitions $(DOCKER_BURST_SIZE) \
969-
--rpc_url $(DOCKER_RPC_URL)
966+
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
967+
--proving_system Groth16Bn254 \
968+
--proof ./scripts/test_files/gnark_groth16_bn254_script/groth16.proof \
969+
--public_input ./scripts/test_files/gnark_groth16_bn254_script/plonk_pub_input.pub \
970+
--vk ./scripts/test_files/gnark_groth16_bn254_script/groth16.vk \
971+
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
972+
--repetitions $(DOCKER_BURST_SIZE) \
973+
--rpc_url $(DOCKER_RPC_URL) \
974+
--max_fee 0.1ether
970975

971976
# Update target as new proofs are supported.
972977
docker_batcher_send_all_proofs_burst:
@@ -993,6 +998,7 @@ docker_batcher_send_infinite_groth16:
993998
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.pub \
994999
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_$${counter}_groth16.vk \
9951000
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS); \
1001+
--max_fee 0.1ether
9961002
sleep $${timer}; \
9971003
counter=$$((counter + 1)); \
9981004
done \
@@ -1010,7 +1016,7 @@ docker_verify_proofs_onchain:
10101016
done \
10111017
'
10121018

1013-
DOCKER_PROOFS_WAIT_TIME=30
1019+
DOCKER_PROOFS_WAIT_TIME=60
10141020

10151021
docker_verify_proof_submission_success:
10161022
@echo "Verifying proofs were successfully submitted..."
@@ -1032,7 +1038,7 @@ docker_verify_proof_submission_success:
10321038
fi; \
10331039
echo "---------------------------------------------------------------------------------------------------"; \
10341040
done; \
1035-
if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne 10 ]; then \
1041+
if [ $$(ls -1 ./aligned_verification_data/*.cbor | wc -l) -ne 5 ]; then \
10361042
echo "ERROR: Some proofs were verified successfully, but some proofs are missing in the aligned_verification_data/ directory"; \
10371043
exit 1; \
10381044
fi; \

0 commit comments

Comments
 (0)