Pull testnet changes to staging (#2038)

Co-authored-by: cliraa <[email protected]>
Co-authored-by: Julian Arce <[email protected]>

Author: 3 people

Makefile

@@ -529,6 +529,7 @@ batcher_send_sp1_task: ## Send a SP1 fibonacci proof to Batcher. Parameters: RPC
 		--proving_system SP1 \
 		--proof ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
 		--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf \
+		--public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 		--rpc_url $(RPC_URL) \
 		--network $(NETWORK)
@@ -539,6 +540,7 @@ batcher_send_sp1_burst: ## Send a burst of SP1 fibonacci proofs to Batcher. Para
 		--proving_system SP1 \
 		--proof ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
 		--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf \
+		--public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 		--repetitions $(BURST_SIZE) \
 		--rpc_url $(RPC_URL) \
@@ -763,6 +765,10 @@ generate_sp1_fibonacci_proof: ## Run the SP1 Fibonacci proof generator script
 	@cd scripts/test_files/sp1/fibonacci_proof_generator/script && RUST_LOG=info cargo run --release
 	@echo "Fibonacci proof and ELF generated in scripts/test_files/sp1 folder"
 
+generate_sp1_fibonacci_proof_no_pub_input: ## Run the SP1 Fibonacci proof generator script with empty journal
+	@cd scripts/test_files/sp1/no_public_inputs/script && RUST_LOG=info cargo run --release
+	@echo "Fibonacci proof and ELF with no public inputs generated in scripts/test_files/sp1 folder"
+
 generate_risc_zero_fibonacci_proof: ## Run the Risc0 Fibonacci proof generator script
 	@cd scripts/test_files/risc_zero/fibonacci_proof_generator && \
 	RUST_LOG=info cargo run --release && \
@@ -1073,6 +1079,7 @@ docker_batcher_send_sp1_burst:
               --proving_system SP1 \
               --proof ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
               --vm_program ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf \
+              --public_input ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
               --repetitions $(DOCKER_BURST_SIZE) \
               --proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
               --rpc_url $(DOCKER_RPC_URL) \

crates/batcher/src/sp1/mod.rs

@@ -1,10 +1,10 @@
 use log::{debug, error, warn};
-use sp1_sdk::{EnvProver, ProverClient};
+use sp1_sdk::{EnvProver, ProverClient, SP1ProofWithPublicValues};
 use std::sync::OnceLock;
 
 static SP1_PROVER_CLIENT: OnceLock<EnvProver> = OnceLock::new();
 
-pub fn verify_sp1_proof(proof: &[u8], elf: &[u8]) -> bool {
+pub fn verify_sp1_proof(proof: &[u8], public_inputs: &[u8], elf: &[u8]) -> bool {
     if proof.is_empty() || elf.is_empty() {
         error!("SP1 Input buffers zero size");
         return false;
@@ -14,8 +14,11 @@ pub fn verify_sp1_proof(proof: &[u8], elf: &[u8]) -> bool {
     let prover_client = SP1_PROVER_CLIENT.get_or_init(ProverClient::from_env);
 
     let (_pk, vk) = prover_client.setup(elf);
-    if let Ok(proof) = bincode::deserialize(proof) {
-        //client.verify(&proof, &vk).expect("failed to verify proof");
+    if let Ok(proof) = bincode::deserialize::<SP1ProofWithPublicValues>(proof) {
+        if *proof.public_values.as_slice() != *public_inputs {
+            warn!("SP1 public inputs do not match proof public values");
+            return false;
+        }
         let res = prover_client.verify(&proof, &vk).is_ok();
         debug!("SP1 proof is valid: {}", res);
         if res {

crates/batcher/src/zk_utils/mod.rs

@@ -20,7 +20,12 @@ fn verify_internal(verification_data: &VerificationData) -> bool {
                 warn!("Trying to verify SP1 proof but ELF was not provided. Returning invalid");
                 return false;
             };
-            verify_sp1_proof(verification_data.proof.as_slice(), elf.as_slice())
+            let pub_inputs = &verification_data.pub_input.clone().unwrap_or_default();
+            verify_sp1_proof(
+                verification_data.proof.as_slice(),
+                pub_inputs.as_slice(),
+                elf.as_slice(),
+            )
         }
         ProvingSystemId::Risc0 => {
             let Some(image_id_slice) = &verification_data.vm_program_code else {

crates/cli/get_proof_test_files.sh

@@ -8,9 +8,11 @@ CURRENT_TAG=$(curl -s -L \
 
 SP1_ELF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/$CURRENT_TAG/scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf"
 SP1_PROOF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/$CURRENT_TAG/scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof"
+SP1_PUBLIC_INPUT_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/$CURRENT_TAG/scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub"
 
 SP1_ELF_NAME="sp1_fibonacci_5_0_0.elf"
 SP1_PROOF_NAME="sp1_fibonacci_5_0_0.proof"
+SP1_PUBLIC_INPUT_NAME="sp1_fibonacci_5_0_0.pub"
 
 BASE_DIR=$HOME
 ALIGNED_DIR="${ALIGNED_DIR-"$BASE_DIR/.aligned"}"
@@ -36,7 +38,17 @@ else
     exit 1
 fi
 
+echo "Downloading SP1 public inputs file..."
+
+if curl -sSf -L "$SP1_PUBLIC_INPUT_NAME" -o "$ALIGNED_TEST_FILES_DIR/$SP1_PUBLIC_INPUT_NAME"; then
+    echo "SP1 public inputs downloaded successful"
+else
+    echo "Error: Failed to downloaded $SP1_PUBLIC_INPUT_NAME"
+    exit 1
+fi
+
 chmod +x "$ALIGNED_TEST_FILES_DIR/$SP1_ELF_NAME"
 chmod +x "$ALIGNED_TEST_FILES_DIR/$SP1_PROOF_NAME"
+chmod +x "$ALIGNED_TEST_FILES_DIR/$SP1_PUBLIC_INPUT_NAME"
 
-echo "SP1 ELF and proof files downloaded successfully in $ALIGNED_TEST_FILES_DIR"
+echo "SP1 ELF, proof and public inputs files downloaded successfully in $ALIGNED_TEST_FILES_DIR"

crates/cli/send_proof_with_random_address.sh

@@ -34,7 +34,8 @@ if [[ $PROOF_TYPE == "sp1" ]]; then
 		--proving_system SP1 \
 		--proof ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
 		--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf \
-    --random_address \
+		--public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
+		--random_address \
     --repetitions $REPETITIONS \
 		--rpc_url $RPC_URL \
 		--network $NETWORK

crates/cli/src/main.rs

@@ -877,7 +877,7 @@ fn verification_data_from_args(args: &SubmitArgs) -> Result<VerificationData, Su
     // Read proof file
     let proof = read_file(args.proof_file_name.clone())?;
 
-    let mut pub_input: Option<Vec<u8>> = None;
+    let pub_input: Option<Vec<u8>>;
     let mut verification_key: Option<Vec<u8>> = None;
     let mut vm_program_code: Option<Vec<u8>> = None;
 
@@ -887,6 +887,11 @@ fn verification_data_from_args(args: &SubmitArgs) -> Result<VerificationData, Su
                 "--vm_program",
                 args.vm_program_code_file_name.clone(),
             )?);
+            pub_input = args
+                .pub_input_file_name
+                .clone()
+                .map(read_file)
+                .transpose()?;
         }
         ProvingSystemId::Risc0 => {
             vm_program_code = Some(read_file_option(