Merge branch 'mina' into update_to_0_5

lambdaclass · Sep 16, 2024 · 590dd19 · 590dd19
2 parents a0c893e + e1f956f
commit 590dd19
Show file tree

Hide file tree

Showing 10 changed files with 5,584 additions and 1,289 deletions.
diff --git a/Makefile b/Makefile
@@ -376,32 +376,41 @@ batcher_send_mina_task:
 	@echo "Sending Mina state task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Mina \
-		--proof test_files/mina/protocol_state.proof \
-		--public_input test_files/mina/protocol_state.pub \
+		--proof ../../scripts/test_files/mina/mina_state.proof \
+		--public_input ../../scripts/test_files/mina/mina_state.pub \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
 
 batcher_send_mina_task_bad_hash:
 	@echo "Sending Mina state task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Mina \
-		--proof test_files/mina/protocol_state.proof \
-		--public_input test_files/mina/protocol_state_bad_hash.pub \
+		--proof ../../scripts/test_files/mina/mina_state.proof \
+		--public_input ../../scripts/test_files/mina/mina_state_bad_hash.pub \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
 
-batcher_send_mina_task_bad_consensus:
+batcher_send_mina_burst:
 	@echo "Sending Mina state task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Mina \
-		--proof test_files/mina/protocol_state.proof \
-		--public_input test_files/mina/protocol_state_bad_consensus.pub \
+		--proof ../../scripts/test_files/mina/mina_state.proof \
+		--public_input ../../scripts/test_files/mina/mina_state.pub \
+		--repetitions 15 \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
 
-batcher_send_mina_burst:
-	@echo "Sending Mina state task to Batcher..."
+batcher_send_mina_account_task:
+	@echo "Sending Mina account task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof ../../scripts/test_files/mina_account/mina_account.proof \
+		--public_input ../../scripts/test_files/mina_account/mina_account.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
+batcher_send_mina_account_burst:
+	@echo "Sending Mina account task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Mina \
-		--proof test_files/mina/protocol_state.proof \
-		--public_input test_files/mina/protocol_state.pub \
+		--proof ../../scripts/test_files/mina_account/mina_account.proof \
+		--public_input ../../scripts/test_files/mina_account/mina_account.pub \
 		--repetitions 15 \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657