Merge branch 'main' into 480-chore-implement-pausable-in-servicemanager

Author: entropidelic

Makefile

@@ -210,6 +210,23 @@ batcher_send_infinite_sp1:
 	@echo "Sending infinite SP1 fibonacci task to Batcher..."
 	@./batcher/aligned/send_infinite_sp1_tasks/send_infinite_sp1_tasks.sh
 
+batcher_send_risc0_task:
+	@echo "Sending Risc0 fibonacci task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Risc0 \
+		--proof test_files/risc_zero/risc_zero_fibonacci.proof \
+        --vm_program test_files/risc_zero/fibonacci_id.bin \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
+batcher_send_risc0_burst:
+	@echo "Sending Risc0 fibonacci task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Risc0 \
+		--proof test_files/risc_zero/risc_zero_fibonacci.proof \
+        --vm_program test_files/risc_zero/fibonacci_id.bin \
+        --repetitions 15 \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
 batcher_send_plonk_bn254_task: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
@@ -547,12 +564,10 @@ __RISC_ZERO_FFI__: ##
 build_risc_zero_macos:
 	@cd operator/risc_zero/lib && cargo build --release
 	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.dylib operator/risc_zero/lib/librisc_zero_verifier_ffi.dylib
-	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.a operator/risc_zero/lib/librisc_zero_verifier_ffi.a
 
 build_risc_zero_linux:
 	@cd operator/risc_zero/lib && cargo build --release
 	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.so operator/risc_zero/lib/librisc_zero_verifier_ffi.so
-	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.a operator/risc_zero/lib/librisc_zero_verifier_ffi.a
 
 test_risc_zero_rust_ffi:
 	@echo "Testing RISC Zero Rust FFI source code..."
@@ -568,11 +583,8 @@ test_risc_zero_go_bindings_linux: build_risc_zero_linux
 
 generate_risc_zero_fibonacci_proof:
 	@cd task_sender/test_examples/risc_zero/fibonacci_proof_generator && \
-		cargo clean && \
-		rm -f risc_zero_fibonacci.proof && \
 		RUST_LOG=info cargo run --release && \
-		echo "Fibonacci proof generated in task_sender/test_examples/risc_zero folder" && \
-		echo "Fibonacci proof image ID generated in task_sender/test_examples/risc_zero folder"
+		echo "Fibonacci proof and image ID generated in task_sender/test_examples/risc_zero folder"
 
 __MERKLE_TREE_FFI__: ##
 build_merkle_tree_macos:
@@ -669,7 +681,7 @@ build_all_ffi: ## Build all FFIs
 build_all_ffi_macos: ## Build all FFIs for macOS
 	@echo "Building all FFIs for macOS..."
 	@$(MAKE) build_sp1_macos
-#	@$(MAKE) build_risc_zero_macos
+	@$(MAKE) build_risc_zero_macos
 #	@$(MAKE) build_merkle_tree_macos
 	@$(MAKE) build_halo2_ipa_macos
 	@$(MAKE) build_halo2_kzg_macos
@@ -678,7 +690,7 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 build_all_ffi_linux: ## Build all FFIs for Linux
 	@echo "Building all FFIs for Linux..."
 	@$(MAKE) build_sp1_linux
-#	@$(MAKE) build_risc_zero_linux
+	@$(MAKE) build_risc_zero_linux
 #	@$(MAKE) build_merkle_tree_linux
 	@$(MAKE) build_halo2_ipa_linux
 	@$(MAKE) build_halo2_kzg_linux

README_SEND_PROOFS.md

@@ -11,7 +11,7 @@ The SP1 proof needs the proof file and the vm program file.
 ```bash
 rm -rf ./aligned_verification_data/ &&
 aligned submit \
---proving_system <SP1|GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
+--proving_system SP1 \
 --proof <proof_file> \
 --vm_program <vm_program_file> \
 --conn wss://batcher.alignedlayer.com \
@@ -30,14 +30,40 @@ aligned submit \
 --conn wss://batcher.alignedlayer.com
 ```
 
+## Risc0 proof
+
+The Risc0 proof needs the proof file and the vm program file (vm program file is the image id).
+
+```bash
+rm -rf ./aligned_verification_data/ &&
+aligned submit \
+--proving_system Risc0 \
+--proof <proof_file> \
+--vm_program <vm_program_file> \
+--conn wss://batcher.alignedlayer.com \
+--proof_generator_addr [proof_generator_addr] \
+--batch_inclusion_data_directory_path [batch_inclusion_data_directory_path]
+```
+
+**Example**
+
+```bash
+rm -rf ~/.aligned/aligned_verification_data/ &&                                                                                
+aligned submit \
+--proving_system Risc0 \
+--proof ./batcher/aligned/test_files/risc_zero/risc_zero_fibonacci.proof \
+--vm_program ./batcher/aligned/test_files/risc_zero/fibonacci_id.bin \
+--aligned_verification_data_path ~/.aligned/aligned_verification_data
+```
+
 ## GnarkPlonkBn254, GnarkPlonkBls12_381 and Groth16Bn254
 
 The GnarkPlonkBn254, GnarkPlonkBls12_381 and Groth16Bn254 proofs need the proof file, the public input file and the verification key file.
 
 ```bash
 rm -rf ./aligned_verification_data/ &&
 aligned submit \
---proving_system <SP1|GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
+--proving_system <GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
 --proof <proof_file> \
 --public_input <public_input_file> \
 --vk <verification_key_file> \