feat: Reproducible builds for SP1 and Risc0

Cargo.toml

@@ -20,7 +20,7 @@ sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.1" }
 risc0-zkvm = { git = "https://github.com/risc0/risc0.git", tag = "v1.0.1" }
 
 # Aligned SDK
-aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag = "v0.8.0" }
+aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag = "v0.9.2" }
 ethers = { tag = "v2.0.15-fix-reconnections", features = [
     "ws",
     "rustls",

src/lib.rs

@@ -1,8 +1,6 @@
-use aligned_sdk::communication::serialization::cbor_serialize;
 use aligned_sdk::core::errors::{AlignedError, SubmitError};
 use ethers::utils::format_units;
 use log::{error, info};
-use risc0::PUBLIC_INPUT_FILE_PATH;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
@@ -20,7 +18,6 @@ use dialoguer::Confirm;
 use ethers::prelude::*;
 use ethers::providers::Http;
 use ethers::signers::LocalWallet;
-use ethers::types::U256;
 
 pub mod risc0;
 pub mod sp1;
@@ -166,7 +163,7 @@ pub async fn submit_proof_to_aligned(
         if Confirm::with_theme(&dialoguer::theme::ColorfulTheme::default())
             .with_prompt(format!(
                 "Would you like to deposit {:?} eth into Aligned to fund proof submission?",
-                estimated_fee
+                format_estimated_fee
             ))
             .interact()
             .map_err(|e| {
@@ -176,7 +173,7 @@ pub async fn submit_proof_to_aligned(
         {
             info!("Submitting deposit to Batcher");
             let Ok(tx_receipt) =
-                deposit_to_aligned(U256::from(estimated_fee), signer, network).await
+                deposit_to_aligned(estimated_fee, signer, network).await
             else {
                 return Err(SubmitError::GenericError(
                     "Failed to Deposit Funds into the Batcher".to_string(),
@@ -214,10 +211,10 @@ pub async fn submit_proof_to_aligned(
     let verification_data = VerificationData {
         proving_system: proof_system_id,
         proof,
-        proof_generator_addr: wallet.address(),
         vm_program_code: Some(elf_data),
         verification_key: None,
         pub_input: pub_input.clone(),
+        proof_generator_addr: wallet.address(),
     };
 
     let nonce = get_next_nonce(&args.rpc_url, wallet.address(), network)

src/main.rs

@@ -110,7 +110,8 @@ async fn main() -> io::Result<()> {
                 }
 
                 let script_dir = home_dir.join(sp1::SP1_SCRIPT_DIR);
-                if sp1::generate_sp1_proof(&script_dir, &current_dir)?.success() {
+                let program_dir = home_dir.join(sp1::SP1_SRC_DIR);
+                if sp1::generate_sp1_proof(&script_dir, &program_dir, &current_dir)?.success() {
                     info!("SP1 proof and ELF generated");
 
                     utils::replace(
@@ -124,7 +125,7 @@ async fn main() -> io::Result<()> {
                         submit_proof_to_aligned(
                             sp1::SP1_PROOF_PATH,
                             sp1::SP1_ELF_PATH,
-                            None,
+                            Some(sp1::SP1_PUB_INPUT_PATH),
                             args,
                             ProvingSystemId::SP1,
                         )

src/sp1.rs

@@ -21,6 +21,7 @@ pub const SP1_GUEST_CARGO_TOML: &str = "workspaces/sp1/program/Cargo.toml";
 // Proof data generation paths
 pub const SP1_ELF_PATH: &str = "./proof_data/sp1/sp1.elf";
 pub const SP1_PROOF_PATH: &str = "./proof_data/sp1/sp1.proof";
+pub const SP1_PUB_INPUT_PATH: &str = "./proof_data/sp1/sp1.pub";
 
 /// SP1 header added to programs for generating proofs of their execution
 pub const SP1_GUEST_PROGRAM_HEADER: &str = "#![no_main]\nsp1_zkvm::entrypoint!(main);\n";
@@ -66,7 +67,18 @@ pub fn prepare_host(
 }
 
 /// Generates SP1 proof and ELF
-pub fn generate_sp1_proof(script_dir: &PathBuf, current_dir: &PathBuf) -> io::Result<ExitStatus> {
+pub fn generate_sp1_proof(script_dir: &PathBuf, program_dir: &PathBuf, current_dir: &PathBuf) -> io::Result<ExitStatus> {
+    // Generate the ELF in Docker
+    Command::new("cargo")
+        .arg("prove")
+        .arg("build")
+        .arg("--docker")
+        .arg("--tag")
+        .arg("v1.0.1")
+        .current_dir(program_dir)
+        .status()?;
+
+    // Generate the Proof
     Command::new("cargo")
         .arg("run")
         .arg("--release")

src/utils.rs

@@ -416,5 +416,8 @@ pub fn prepare_guest(
     // Write to guest
     let mut file = fs::File::create(guest_main_file_path)?;
     file.write_all(guest_program.as_bytes())?;
+
+    //Remove zk_rust_io import
+    crate::utils::remove_lines(guest_main_file_path, "use zk_rust_io;")?;
     Ok(())
 }

workspaces/base_files/sp1/host

@@ -32,14 +32,7 @@ fn main() {
 
     let proof_data = bincode::serialize(&proof).expect("Failed to serialize proof");
     std::fs::create_dir_all(&current_dir.join("proof_data/sp1")).expect("Failed to create proof_data/sp1");
-    let mut proof_file = File::create(&current_dir.join("proof_data/sp1/sp1.proof")).expect("Failed to create SP1 elf file");
-    proof_file
-        .write_all(&proof_data)
-        .expect("Failed write SP1 elf to file");
-
-    // Save elf
-    let mut elf_file = File::create(&current_dir.join("proof_data/sp1/sp1.elf")).expect("Failed to create SP1 elf file");
-    elf_file
-        .write_all(&METHOD_ELF)
-        .expect("Failed write SP1 elf to file");
+    std::fs::write(&current_dir.join("proof_data/sp1/sp1.proof"), &proof_data).expect("Failed to create SP1 proof file");
+    std::fs::write(&current_dir.join("proof_data/sp1/sp1.elf"), &METHOD_ELF).expect("failed to save SP1 elf file");
+    std::fs::write(&current_dir.join("proof_data/sp1/sp1.pub"), &proof.public_values).expect("failed to save SP1 public input");
 }

workspaces/sp1/program/Cargo.toml

@@ -5,5 +5,4 @@ name = "method"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.1.1" }
-zk_rust_io = { git = "https://github.com/yetanotherco/zkRust.git", branch = "feat/v2" }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.1" }

workspaces/sp1/rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.79.0"
+components = ["llvm-tools", "rustc-dev"]
+

workspaces/sp1/script/Cargo.toml

@@ -5,7 +5,7 @@ name = "method"
 edition = "2021"
 
 [build-dependencies]
-sp1-helper = "1.0.1"
+sp1-build = "1.0.1"
 
 [dependencies]
 sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.1" }

workspaces/sp1/script/build.rs

@@ -1,5 +1,9 @@
-use sp1_helper::build_program;
+use sp1_build::{build_program_with_args, BuildArgs};
 
 fn main() {
-    build_program("../program")
+    let args = BuildArgs {
+        docker: true,
+        ..Default::default()
+    };
+    build_program_with_args("../program", args);
 }

workspaces/sp1/script/src/main.rs

@@ -5,10 +5,10 @@ use std::{fs::File, io::Write};
 ///
 /// This file is generated by running `cargo prove build` inside the `program` directory.
 pub const METHOD_ELF: &[u8] = include_bytes!("../../elf/riscv32im-succinct-zkvm-elf");
-const SP1_ELF_PATH: &str = "../../../sp1.elf";
-const SP1_PROOF_PATH: &str = "../../../sp1.proof";
 
 fn main() {
+    let args: Vec<String> = std::env::args().collect();
+    let current_dir = std::path::PathBuf::from(args[1].clone());
     // Setup the logger.
     sp1_sdk::utils::setup_logger();
 
@@ -25,21 +25,15 @@ fn main() {
         .run()
         .expect("failed to generate proof");
 
-    // Verify the proof.
-    client.verify(&proof, &vk).expect("failed to verify proof");
-
     // OUTPUT //
 
-    // Save proof.
-    let proof_data = bincode::serialize(&proof).expect("failed to serialize proof");
-    let mut proof_file = File::create(SP1_PROOF_PATH).expect("Failed to create sp1 elf file");
-    proof_file
-        .write_all(&proof_data)
-        .expect("failed write sp1 elf to file");
-
-    // Save elf
-    let mut elf_file = File::create(SP1_ELF_PATH).expect("Failed to create sp1 elf file");
-    elf_file
-        .write_all(&METHOD_ELF)
-        .expect("failed write sp1 elf to file");
+    // Verify the proof.
+    client.verify(&proof, &vk).expect("Failed to verify proof");
+
+    let proof_data = bincode::serialize(&proof).expect("Failed to serialize proof");
+    std::fs::create_dir_all(&current_dir.join("proof_data/sp1")).expect("Failed to create proof_data/sp1");
+    std::fs::write(&current_dir.join("proof_data/sp1/sp1.proof"), &proof_data).expect("Failed to create SP1 proof file");
+    std::fs::write(&current_dir.join("../sp1.pub"), &proof.public_values).expect("failed to save SP1 public input");
+    std::fs::write(&current_dir.join("../sp1.elf"), &METHOD_ELF).expect("failed to save SP1 elf file");
 }
+