fix: update template files

Author: prajwolrg

adapters/native/src/env.rs

@@ -1,6 +1,6 @@
 use std::cell::RefCell;
 
-use zkaleido::{ProofReceipt, ZkVmEnv};
+use zkaleido::ZkVmEnv;
 
 /// Encapsulates the mutable state of the NativeMachine.
 #[derive(Debug, Clone)]
@@ -79,8 +79,6 @@ impl ZkVmEnv for NativeMachine {
         self.commit_buf(&bytes);
     }
 
-    fn verify_groth16_receipt(&self, _receipt: &ProofReceipt, _verification_key: &[u8; 32]) {}
-
     fn verify_native_proof(&self, _vk_digest: &[u32; 8], _public_values: &[u8]) {}
 
     fn read_verified_serde<T: serde::de::DeserializeOwned>(&self, _vk_digest: &[u32; 8]) -> T {

adapters/risc0/guest/src/env.rs

@@ -1,9 +1,6 @@
 use risc0_zkvm::{guest::env, serde::from_slice};
 use serde::{de::DeserializeOwned, Serialize};
-use zkaleido::{ProofReceipt, ZkVmEnv};
-
-#[cfg(not(feature = "mock"))]
-use crate::verify_groth16;
+use zkaleido::ZkVmEnv;
 
 /// An environment adapter for the RISC0 system implementing [`ZkVmEnv`].
 ///
@@ -40,14 +37,6 @@ impl ZkVmEnv for Risc0ZkVmEnv {
         env::verify(vk, public_values).expect("verification failed")
     }
 
-    #[cfg(not(feature = "mock"))]
-    fn verify_groth16_receipt(&self, receipt: &ProofReceipt, verification_key: &[u8; 32]) {
-        verify_groth16(receipt, verification_key).expect("groth16 verification failed");
-    }
-
-    #[cfg(feature = "mock")]
-    fn verify_groth16_receipt(&self, _receipt: &ProofReceipt, _verification_key: &[u8; 32]) {}
-
     fn read_verified_serde<T: DeserializeOwned>(&self, vk_digest: &[u32; 8]) -> T {
         let buf = self.read_verified_buf(vk_digest);
         from_slice(&buf).expect("risc0 zkvm deserialization failed")

adapters/sp1/guest/Cargo.toml

@@ -16,10 +16,10 @@ rustdoc.all = "warn"
 zkaleido.workspace = true
 
 bincode.workspace = true
-cfg-if = { workspace = true, optional = true }
-serde = { workspace = true, optional = true }
+cfg-if.workspace = true
 sha2 = { workspace = true, optional = true }
 sp1-zkvm = "4.1.0"
+serde.workspace = true
 
 [features]
 zkvm-verify = ["sp1-zkvm/verify", "sha2"]

adapters/sp1/guest/src/env.rs

@@ -5,10 +5,7 @@ use sha2::{Digest, Sha256};
 use sp1_zkvm::io;
 #[cfg(feature = "zkvm-verify")]
 use sp1_zkvm::lib::verify::verify_sp1_proof;
-use zkaleido::{ProofReceipt, ZkVmEnv};
-
-#[cfg(not(feature = "mock"))]
-use crate::verify_groth16;
+use zkaleido::ZkVmEnv;
 
 /// An environment adapter for the SP1 proof system implementing [`ZkVmEnv`].
 ///
@@ -51,14 +48,6 @@ impl ZkVmEnv for Sp1ZkVmEnv {
         }
     }
 
-    #[cfg(feature = "mock")]
-    fn verify_groth16_receipt(&self, _receipt: &ProofReceipt, _verification_key: &[u8; 32]) {}
-
-    #[cfg(not(feature = "mock"))]
-    fn verify_groth16_receipt(&self, receipt: &ProofReceipt, verification_key: &[u8; 32]) {
-        verify_groth16(receipt, verification_key).expect("groth16 verification failed");
-    }
-
     fn read_verified_serde<T: DeserializeOwned>(&self, vk_digest: &[u32; 8]) -> T {
         let buf = self.read_verified_buf(vk_digest);
         deserialize(&buf).expect("bincode deserialization failed")

artifacts/risc0/templates/Cargo.toml.tera

@@ -7,7 +7,7 @@ edition = "{{ edition }}"
 
 [dependencies]
 {{ program_dir }} = { path = "../../../examples/{{ program_dir }}" }
-zkaleido-risc0-adapter = { path = "../../../adapters/risc0" }
+zkaleido-risc0-guest-env = { path = "../../../adapters/risc0/guest" }
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }

artifacts/risc0/templates/src/main.rs.tera

@@ -1,5 +1,5 @@
 use {{program}}::process_{{program}};
-use zkaleido_risc0_adapter::Risc0ZkVmEnv;
+use zkaleido_risc0_guest_env::Risc0ZkVmEnv;
 
 pub fn main() {
     process_{{program}}(&Risc0ZkVmEnv)

artifacts/sp1/templates/Cargo.toml.tera

@@ -7,11 +7,11 @@ edition = "{{ edition }}"
 
 [dependencies]
 {{ program_dir }} = { path = "../../../examples/{{ program_dir }}" }
-zkaleido-sp1-adapter = { path = "../../../adapters/sp1/guest", features = ["zkvm"] }
+zkaleido-sp1-guest-env = { path = "../../../adapters/sp1/guest" }
 sp1-zkvm = "4.1.0"
 
 [features]
-mock = ["zkaleido-sp1-adapter/mock"]
+mock = ["zkaleido-sp1-guest-env/mock"]
 
 [patch.crates-io]
 sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }

artifacts/sp1/templates/src/main.rs.tera

@@ -6,7 +6,7 @@
 sp1_zkvm::entrypoint!(main);
 
 use {{program}}::process_{{program}};
-use zkaleido_sp1_adapter::Sp1ZkVmEnv;
+use zkaleido_sp1_guest_env::Sp1ZkVmEnv;
 
 pub fn main() {
     process_{{program}}(&Sp1ZkVmEnv)

runner/src/programs/fibonacci.rs

@@ -8,16 +8,16 @@ fn fib_prover_perf_report(host: &impl ZkVmHostPerf) -> PerformanceReport {
 
 #[cfg(feature = "sp1")]
 pub fn sp1_fib_report() -> PerformanceReport {
-    use zkaleido_sp1_adapter::SP1Host;
     use zkaleido_sp1_artifacts::FIBONACCI_ELF;
+    use zkaleido_sp1_host::SP1Host;
     let host = SP1Host::init(FIBONACCI_ELF);
     fib_prover_perf_report(&host)
 }
 
 #[cfg(feature = "risc0")]
 pub fn risc0_fib_report() -> PerformanceReport {
-    use zkaleido_risc0_adapter::Risc0Host;
     use zkaleido_risc0_artifacts::GUEST_RISC0_FIBONACCI_ELF;
+    use zkaleido_risc0_host::Risc0Host;
     let host = Risc0Host::init(GUEST_RISC0_FIBONACCI_ELF);
     fib_prover_perf_report(&host)
 }

runner/src/programs/fibonacci_composition.rs

@@ -22,19 +22,19 @@ fn fib_composition_prover_perf_report(
 
 #[cfg(feature = "sp1")]
 pub fn sp1_fib_composition_report() -> PerformanceReport {
-    use zkaleido_sp1_adapter::SP1Host;
     use zkaleido_sp1_artifacts::{FIBONACCI_COMPOSITION_ELF, FIBONACCI_ELF};
+    use zkaleido_sp1_host::SP1Host;
     let fib_host = SP1Host::init(FIBONACCI_ELF);
     let fib_composition_host = SP1Host::init(FIBONACCI_COMPOSITION_ELF);
     fib_composition_prover_perf_report(&fib_host, &fib_composition_host)
 }
 
 #[cfg(feature = "risc0")]
 pub fn risc0_fib_composition_report() -> PerformanceReport {
-    use zkaleido_risc0_adapter::Risc0Host;
     use zkaleido_risc0_artifacts::{
         GUEST_RISC0_FIBONACCI_COMPOSITION_ELF, GUEST_RISC0_FIBONACCI_ELF,
     };
+    use zkaleido_risc0_host::Risc0Host;
     let fib_host = Risc0Host::init(GUEST_RISC0_FIBONACCI_ELF);
     let fib_composition_host = Risc0Host::init(GUEST_RISC0_FIBONACCI_COMPOSITION_ELF);
     fib_composition_prover_perf_report(&fib_host, &fib_composition_host)