refactor: split guest program into two

prajwolrg · prajwolrg · commit 514a35db3dd8 · 2025-06-17T11:14:05.000+05:45
diff --git a/.github/workflows/prover.yml b/.github/workflows/prover.yml
@@ -46,6 +46,6 @@ jobs:
           --github-token "${{ secrets.GITHUB_TOKEN }}" \
           --pr-number "${{ github.event.pull_request.number }}" \
           --commit-hash "${{ github.sha }}" \
-          --programs fibonacci,sha2-chain,schnorr-sig-verify
+          --programs fibonacci,sha2-chain,schnorr-sig-verify,groth16-verify-sp1,groth16-verify-risc0
         env:
           RUSTFLAGS: "-C target-cpu=native -C link-arg=-fuse-ld=lld"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,8 @@ members = [
   # examples
   "examples/fibonacci-composition",
   "examples/fibonacci",
-  "examples/groth16-verify",
+  "examples/groth16-verify-sp1",
+  "examples/groth16-verify-risc0",
   "examples/sha2-chain",
   "examples/schnorr-sig-verify",
 ]
@@ -35,7 +36,8 @@ fibonacci = { path = "examples/fibonacci" }
 fibonacci-composition = { path = "examples/fibonacci-composition" }
 sha2-chain = { path = "examples/sha2-chain" }
 schnorr-sig-verify = { path = "examples/schnorr-sig-verify" }
-groth16-verify = { path = "examples/groth16-verify" }
+groth16-verify-sp1 = { path = "examples/groth16-verify-sp1" }
+groth16-verify-risc0 = { path = "examples/groth16-verify-risc0" }
 
 arbitrary = { version = "1.3.2", features = ["derive"] }
 async-trait = "0.1.86"
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ CARGO_INSTALL_EXTRA_FLAGS ?=
 FEATURES ?=
 
 # List of programs
-PROGRAMS ?= groth16-verify
+PROGRAMS ?= groth16-verify-sp1
 
 # ZkVm to use
 ZKVM ?= risc0
diff --git a/artifacts/risc0/Cargo.toml b/artifacts/risc0/Cargo.toml
@@ -15,5 +15,6 @@ methods = [
   "sha2-chain",
   "schnorr-sig-verify",
   "fibonacci-composition",
-  "groth16-verify",
+  "groth16-verify-risc0",
+  "groth16-verify-sp1",
 ]
diff --git a/artifacts/sp1/src/lib.rs b/artifacts/sp1/src/lib.rs
@@ -5,4 +5,5 @@ pub const FIBONACCI_ELF: &[u8] = include_elf!("guest-sp1-fibonacci");
 pub const FIBONACCI_COMPOSITION_ELF: &[u8] = include_elf!("guest-sp1-fibonacci-composition");
 pub const SHA2_CHAIN_ELF: &[u8] = include_elf!("guest-sp1-sha2-chain");
 pub const SCHNORR_SIG_VERIFY_ELF: &[u8] = include_elf!("guest-sp1-schnorr-sig-verify");
-pub const GROTH16_VERIFY_ELF: &[u8] = include_elf!("guest-sp1-groth16-verify");
+pub const GROTH16_VERIFY_SP1_ELF: &[u8] = include_elf!("guest-sp1-groth16-verify-sp1");
+pub const GROTH16_VERIFY_RISC0_ELF: &[u8] = include_elf!("guest-sp1-groth16-verify-risc0");
diff --git a/examples/groth16-verify-risc0/Cargo.toml b/examples/groth16-verify-risc0/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
-name = "groth16-verify"
+name = "groth16-verify-risc0"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 serde.workspace = true
-zkaleido-sp1-groth16-verifier = { path = "../../adapters/sp1/groth16-verifier" }
 zkaleido-risc0-groth16-verifier = { path = "../../adapters/risc0/groth16-verifier" }
 zkaleido = { path = "../../zkaleido" }
 zkaleido-native-adapter = { path = "../../adapters/native" }
diff --git a/examples/groth16-verify-risc0/src/input.rs b/examples/groth16-verify-risc0/src/input.rs
@@ -4,25 +4,15 @@ use serde::{Deserialize, Serialize};
 use zkaleido::ProofReceipt;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Groth16VerifyInput {
+pub struct Risc0Groth16VerifyInput {
     pub risc0_receipt: ProofReceipt,
     pub risc0_vk: [u8; 32],
-    pub sp1_receipt: ProofReceipt,
-    pub sp1_vk: [u8; 32],
 }
 
-impl Groth16VerifyInput {
+impl Risc0Groth16VerifyInput {
     pub fn load() -> Self {
         let base = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
 
-        let sp1_vk_hex = "0000e3572a33647cba427acbaecac23a01e237a8140d2c91b3873457beb5be13";
-        let sp1_vk: [u8; 32] = hex::decode(sp1_vk_hex).unwrap().try_into().unwrap();
-        let sp1_proof_file = base.join(format!(
-            "../../adapters/sp1/groth16-verifier/proofs/fibonacci_sp1_0x{}.proof.bin",
-            sp1_vk_hex
-        ));
-        let sp1_receipt = ProofReceipt::load(sp1_proof_file).unwrap();
-
         let risc0_vk_hex = "25eaa741d5cb0d99fe15ce60c4bf3886f96932f22ee67041f0b4165203ef5a02";
         let risc0_vk: [u8; 32] = hex::decode(risc0_vk_hex).unwrap().try_into().unwrap();
         let proof_file = base.join(format!(
@@ -31,11 +21,9 @@ impl Groth16VerifyInput {
         ));
         let risc0_receipt = ProofReceipt::load(proof_file).unwrap();
 
-        Groth16VerifyInput {
+        Risc0Groth16VerifyInput {
             risc0_receipt,
             risc0_vk,
-            sp1_receipt,
-            sp1_vk,
         }
     }
 }
diff --git a/examples/groth16-verify-risc0/src/lib.rs b/examples/groth16-verify-risc0/src/lib.rs
@@ -0,0 +1,18 @@
+use zkaleido::ZkVmEnv;
+
+use crate::input::Risc0Groth16VerifyInput;
+
+pub mod input;
+pub mod program;
+
+pub fn process_groth16_verify_risc0(zkvm: &impl ZkVmEnv) {
+    let Risc0Groth16VerifyInput {
+        risc0_receipt,
+        risc0_vk,
+    } = zkvm.read_serde();
+
+    let risc0_verified =
+        zkaleido_risc0_groth16_verifier::verify_groth16(&risc0_receipt, &risc0_vk).is_ok();
+
+    zkvm.commit_serde(&risc0_verified);
+}
diff --git a/examples/groth16-verify-risc0/src/program.rs b/examples/groth16-verify-risc0/src/program.rs
@@ -0,0 +1,70 @@
+use zkaleido::{ProofType, ZkVmInputResult, ZkVmProgram, ZkVmProgramPerf};
+
+use crate::input::Risc0Groth16VerifyInput;
+
+pub struct Risc0Groth16VerifyProgram;
+
+impl ZkVmProgram for Risc0Groth16VerifyProgram {
+    type Input = Risc0Groth16VerifyInput;
+    type Output = bool;
+
+    fn name() -> String {
+        "risc0_groth16_verify".to_string()
+    }
+
+    fn proof_type() -> zkaleido::ProofType {
+        ProofType::Core
+    }
+
+    fn prepare_input<'a, B>(input: &'a Self::Input) -> ZkVmInputResult<B::Input>
+    where
+        B: zkaleido::ZkVmInputBuilder<'a>,
+    {
+        B::new().write_serde(input)?.build()
+    }
+
+    fn process_output<H>(
+        public_values: &zkaleido::PublicValues,
+    ) -> zkaleido::ZkVmResult<Self::Output>
+    where
+        H: zkaleido::ZkVmHost,
+    {
+        H::extract_serde_public_output(public_values)
+    }
+}
+
+impl ZkVmProgramPerf for Risc0Groth16VerifyProgram {}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use zkaleido::ZkVmProgram;
+    use zkaleido_native_adapter::{NativeHost, NativeMachine};
+
+    use crate::{
+        input::Risc0Groth16VerifyInput, process_groth16_verify_risc0,
+        program::Risc0Groth16VerifyProgram,
+    };
+
+    fn get_native_host() -> NativeHost {
+        NativeHost {
+            process_proof: Arc::new(Box::new(move |zkvm: &NativeMachine| {
+                process_groth16_verify_risc0(zkvm);
+                Ok(())
+            })),
+        }
+    }
+
+    #[test]
+    fn test_native() {
+        let input = Risc0Groth16VerifyInput::load();
+        let host = get_native_host();
+        let receipt = Risc0Groth16VerifyProgram::prove(&input, &host).unwrap();
+        let risc0_verified =
+            Risc0Groth16VerifyProgram::process_output::<NativeHost>(receipt.public_values())
+                .unwrap();
+
+        assert!(risc0_verified);
+    }
+}
diff --git a/examples/groth16-verify-risc0/vk/sp1_groth16_vk.bin b/examples/groth16-verify-risc0/vk/sp1_groth16_vk.bin
diff --git a/examples/groth16-verify-sp1/Cargo.toml b/examples/groth16-verify-sp1/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "groth16-verify-sp1"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde.workspace = true
+zkaleido-sp1-groth16-verifier = { path = "../../adapters/sp1/groth16-verifier" }
+zkaleido = { path = "../../zkaleido" }
+zkaleido-native-adapter = { path = "../../adapters/native" }
+hex.workspace = true
diff --git a/examples/groth16-verify-sp1/src/input.rs b/examples/groth16-verify-sp1/src/input.rs
@@ -0,0 +1,29 @@
+use std::path::PathBuf;
+
+use serde::{Deserialize, Serialize};
+use zkaleido::ProofReceipt;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SP1Groth16VerifyInput {
+    pub sp1_receipt: ProofReceipt,
+    pub sp1_vk: [u8; 32],
+}
+
+impl SP1Groth16VerifyInput {
+    pub fn load() -> Self {
+        let base = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
+        let sp1_vk_hex = "0000e3572a33647cba427acbaecac23a01e237a8140d2c91b3873457beb5be13";
+        let sp1_vk: [u8; 32] = hex::decode(sp1_vk_hex).unwrap().try_into().unwrap();
+        let sp1_proof_file = base.join(format!(
+            "../../adapters/sp1/groth16-verifier/proofs/fibonacci_sp1_0x{}.proof.bin",
+            sp1_vk_hex
+        ));
+        let sp1_receipt = ProofReceipt::load(sp1_proof_file).unwrap();
+
+        SP1Groth16VerifyInput {
+            sp1_receipt,
+            sp1_vk,
+        }
+    }
+}
diff --git a/examples/groth16-verify-sp1/src/lib.rs b/examples/groth16-verify-sp1/src/lib.rs
@@ -1,22 +1,17 @@
 use zkaleido::ZkVmEnv;
 use zkaleido_sp1_groth16_verifier::SP1Groth16Verifier;
 
-use crate::input::Groth16VerifyInput;
+use crate::input::SP1Groth16VerifyInput;
 
 pub mod input;
 pub mod program;
 
-pub fn process_groth16_verify(zkvm: &impl ZkVmEnv) {
-    let Groth16VerifyInput {
-        risc0_receipt,
-        risc0_vk,
+pub fn process_groth16_verify_sp1(zkvm: &impl ZkVmEnv) {
+    let SP1Groth16VerifyInput {
         sp1_receipt,
         sp1_vk,
     } = zkvm.read_serde();
 
-    let risc0_verified =
-        zkaleido_risc0_groth16_verifier::verify_groth16(&risc0_receipt, &risc0_vk).is_ok();
-
     let sp1_verifier =
         SP1Groth16Verifier::load(include_bytes!("../vk/sp1_groth16_vk.bin"), sp1_vk).unwrap();
     let sp1_verified = sp1_verifier
@@ -26,5 +21,5 @@ pub fn process_groth16_verify(zkvm: &impl ZkVmEnv) {
         )
         .is_ok();
 
-    zkvm.commit_serde(&(risc0_verified, sp1_verified));
+    zkvm.commit_serde(&sp1_verified);
 }
diff --git a/examples/groth16-verify-sp1/src/program.rs b/examples/groth16-verify-sp1/src/program.rs
@@ -1,12 +1,12 @@
 use zkaleido::{ProofType, ZkVmInputResult, ZkVmProgram, ZkVmProgramPerf};
 
-use crate::input::Groth16VerifyInput;
+use crate::input::SP1Groth16VerifyInput;
 
-pub struct Groth16VerifyProgram;
+pub struct SP1Groth16VerifyProgram;
 
-impl ZkVmProgram for Groth16VerifyProgram {
-    type Input = Groth16VerifyInput;
-    type Output = (bool, bool);
+impl ZkVmProgram for SP1Groth16VerifyProgram {
+    type Input = SP1Groth16VerifyInput;
+    type Output = bool;
 
     fn name() -> String {
         "groth16_verify".to_string()
@@ -33,7 +33,7 @@ impl ZkVmProgram for Groth16VerifyProgram {
     }
 }
 
-impl ZkVmProgramPerf for Groth16VerifyProgram {}
+impl ZkVmProgramPerf for SP1Groth16VerifyProgram {}
 
 #[cfg(test)]
 mod tests {
@@ -42,25 +42,27 @@ mod tests {
     use zkaleido::ZkVmProgram;
     use zkaleido_native_adapter::{NativeHost, NativeMachine};
 
-    use crate::{program::Groth16VerifyProgram, input::Groth16VerifyInput, process_groth16_verify};
+    use crate::{
+        input::SP1Groth16VerifyInput, process_groth16_verify_sp1, program::SP1Groth16VerifyProgram,
+    };
 
     fn get_native_host() -> NativeHost {
         NativeHost {
             process_proof: Arc::new(Box::new(move |zkvm: &NativeMachine| {
-                process_groth16_verify(zkvm);
+                process_groth16_verify_sp1(zkvm);
                 Ok(())
             })),
         }
     }
 
     #[test]
     fn test_native() {
-        let input = Groth16VerifyInput::load();
+        let input = SP1Groth16VerifyInput::load();
         let host = get_native_host();
-        let receipt = Groth16VerifyProgram::prove(&input, &host).unwrap();
-        let public_params =
-            Groth16VerifyProgram::process_output::<NativeHost>(receipt.public_values()).unwrap();
+        let receipt = SP1Groth16VerifyProgram::prove(&input, &host).unwrap();
+        let is_verified =
+            SP1Groth16VerifyProgram::process_output::<NativeHost>(receipt.public_values()).unwrap();
 
-        assert_eq!(public_params, (true, true));
+        assert!(is_verified);
     }
 }
diff --git a/examples/groth16-verify-sp1/vk/sp1_groth16_vk.bin b/examples/groth16-verify-sp1/vk/sp1_groth16_vk.bin
diff --git a/runner/Cargo.toml b/runner/Cargo.toml
@@ -11,7 +11,8 @@ fibonacci.workspace = true
 fibonacci-composition.workspace = true
 sha2-chain.workspace = true
 schnorr-sig-verify.workspace = true
-groth16-verify.workspace = true
+groth16-verify-sp1.workspace = true
+groth16-verify-risc0.workspace = true
 
 # sp1
 zkaleido-sp1-host = { path = "../adapters/sp1/host", optional = true }
diff --git a/runner/src/programs/groth16_verify.rs b/runner/src/programs/groth16_verify.rs
diff --git a/runner/src/programs/groth16_verify_risc0.rs b/runner/src/programs/groth16_verify_risc0.rs
diff --git a/runner/src/programs/groth16_verify_sp1.rs b/runner/src/programs/groth16_verify_sp1.rs
diff --git a/runner/src/programs/mod.rs b/runner/src/programs/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ methods = [`
`15`	`15`	`"sha2-chain",`
`16`	`16`	`"schnorr-sig-verify",`
`17`	`17`	`"fibonacci-composition",`
`18`		`- "groth16-verify",`
	`18`	`+ "groth16-verify-risc0",`
	`19`	`+ "groth16-verify-sp1",`
`19`	`20`	`]`