Upgrade risczero v2.0 (#1)

* feat: upgrade to risczero 2.0, move to workspace deps
* feat: read slice for perf, print hex hash for debug
* 3MB input data testing (guest stack overflows?)
* feat: crate for shared constants
---------
Signed-off-by: Nuke <[email protected]>

Author: nuke-web3

Cargo.lock

@@ -1,8 +1,25 @@
 [workspace]
 resolver = "2"
-members = ["demo-ChaCha","host", "methods"]
+members = [ "common","demo-ChaCha","host", "methods", "methods/guest"]
 default-members = ["host"]
 
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+
+[workspace.dependencies]
+methods = { path = "methods" }
+host = { path = "host" }
+common = { path = "common" }
+
+chacha20 = "0.9.1"
+hex-literal = "1.0.0"
+
+risc0-zkvm = { version = "2.0",  default-features = false, features = ['std'] }
+risc0-build = "2.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+serde = "1.0"
+
 # Always optimize; building and running the guest takes much longer without optimization.
 [profile.dev]
 opt-level = 3

Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "common"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]

common/Cargo.toml

@@ -0,0 +1 @@
+pub const INPUT_BYTES_LENGTH: usize = 300_000;

common/src/lib.rs

@@ -1,8 +1,8 @@
 [package]
 name = "demo-ChaCha"
-version = "0.1.0"
-edition = "2024"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
-chacha20 = "0.9.1"
-hex-literal = "1.0.0"
+chacha20.workspace = true
+hex-literal.workspace = true

demo-ChaCha/Cargo.toml

@@ -1,5 +1,5 @@
-use chacha20::ChaCha20;
 use chacha20::cipher::{KeyIvInit, StreamCipher, StreamCipherSeek};
+use chacha20::ChaCha20;
 use hex_literal::hex;
 
 fn main() {

demo-ChaCha/src/main.rs

@@ -1,13 +1,14 @@
 [package]
 name = "host"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
-chacha20 = "0.9.1"
-hex-literal = "1.0.0"
+methods.workspace = true
+common.workspace = true
 
-methods = { path = "../methods" }
-risc0-zkvm = { version = "1.2.5" }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-serde = "1.0"
+chacha20.workspace = true
+hex-literal.workspace = true
+risc0-zkvm = { workspace = true,  default-features = true }
+tracing-subscriber.workspace = true
+serde.workspace = true

host/Cargo.toml

@@ -1,11 +1,13 @@
-use chacha20::cipher::{KeyIvInit, StreamCipher, StreamCipherSeek};
+use chacha20::cipher::{KeyIvInit, StreamCipher};
 use chacha20::ChaCha20;
-use hex_literal::hex;
 
 // These constants represent the RISC-V ELF and the image ID generated by risc0-build.
 // The ELF is used for proving and the ID is used for verification.
-use methods::{GUEST_ENCRYPT_ELF, GUEST_ENCRYPT_ID};
-use risc0_zkvm::{default_prover, sha::Digest, ExecutorEnv};
+use methods::GUEST_ENCRYPT_ELF;
+use risc0_zkvm::sha::rust_crypto::{Digest, Sha256};
+use risc0_zkvm::{default_prover, ExecutorEnv};
+
+use common::INPUT_BYTES_LENGTH;
 
 fn main() {
     // Initialize tracing. In order to view logs, run `RUST_LOG=info cargo run`
@@ -19,17 +21,13 @@ fn main() {
     let nonce = [0x24; 12];
 
     // 16 byte test
-    let plaintext = hex!("00010203 04050607 08090A0B 0C0D0E0F");
-    println!("Plaintext bytes: {:?}", plaintext);
+    let plaintext = [0; INPUT_BYTES_LENGTH];
 
     // zkVM
     let env = ExecutorEnv::builder()
-        .write(&key)
-        .unwrap()
-        .write(&nonce)
-        .unwrap()
-        .write(&plaintext)
-        .unwrap()
+        .write_slice(&key)
+        .write_slice(&nonce)
+        .write_slice(&plaintext)
         .build()
         .unwrap();
 
@@ -43,26 +41,43 @@ fn main() {
     // extract the receipt.
     let receipt = prove_info.receipt;
 
-    let mut output: (Digest, [u8; 16]) = receipt.journal.decode().unwrap();
-    println!("zkVM -> plaintext hash:   {:?}", output.0);
-    println!("zkVM -> ciphertext bytes: {:?}", output.1);
+    let output = receipt.journal.bytes.clone();
+    // sha256 = 16 bytes committed first
+    let output_digest: [u8; 32] = output[..32].try_into().expect("sha256 hash reading erorr");
+    // Ciphertext is the rest of the journal bytes
+    let mut output_buffer: [u8; INPUT_BYTES_LENGTH] = output[32..]
+        .try_into()
+        .expect("Ciphertext unable to populate buffer");
+
+    println!(
+        "zkVM  -> plaintext hash: 0x{}",
+        bytes_to_hex(&output_digest)
+    );
 
-    let ciphertext = hex!("e405626e 4f1236b3 670ee428 332ea20e");
-    println!("expected output bytes: {:?}", ciphertext);
+    // Check against the input
+    let input_plaintext_digest = Sha256::digest(&plaintext);
+    println!(
+        "Input -> plaintext hash: 0x{}",
+        bytes_to_hex(&input_plaintext_digest)
+    );
 
-    // The receipt was verified at the end of proving, but the below code is an
-    // example of how someone else could verify this receipt.
-    receipt.verify(GUEST_ENCRYPT_ID).unwrap();
-    println!("Reciept from zkVM OK!");
+    let ciphertext_digest = Sha256::digest(&output_buffer);
+    println!(
+        "zkVM -> ciphertext hash: 0x{}",
+        bytes_to_hex(&ciphertext_digest)
+    );
 
     // Key and IV must be references to the `GenericArray` type.
     // Here we use the `Into` trait to convert arrays into it.
     let mut cipher = ChaCha20::new(&key.into(), &nonce.into());
 
-    // ChaCha ciphers support seeking
-    cipher.seek(0u32);
-
     // decrypt ciphertext by applying keystream again
-    cipher.apply_keystream(&mut output.1);
-    assert_eq!(output.1, plaintext);
+    cipher.apply_keystream(&mut output_buffer);
+    assert_eq!(output_buffer, plaintext);
+    println!("Decryption of zkVM ciphertext matches input!")
+}
+
+fn bytes_to_hex(bytes: &[u8]) -> String {
+    let digest_hex: String = bytes.iter().map(|b| format!("{:02x}", b)).collect();
+    digest_hex
 }

host/src/main.rs

@@ -1,10 +1,10 @@
 [package]
 name = "methods"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [build-dependencies]
-risc0-build = { version = "1.2.5" }
+risc0-build.workspace = true
 
 [package.metadata.risc0]
 methods = ["guest"]

methods/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "guest_encrypt"
-version = "0.1.0"
-edition = "2021"
-
-[workspace]
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
-risc0-zkvm = { version = "1.2.5", default-features = false, features = ['std'] }
-chacha20 = "0.9.1"
+common.workspace = true
+
+risc0-zkvm = { workspace = true,  default-features = false, features = ['std'] }
+chacha20.workspace = true