From 773610c2f460b6a1a18828f9130b4b6236268b9e Mon Sep 17 00:00:00 2001
From: Sergio Chouhy <sergio.chouhy@gmail.com>
Date: Thu, 7 Aug 2025 13:49:07 -0300
Subject: [PATCH] wip?

---
 Cargo.toml                                    |  6 ----
 encryption-demo/Cargo.toml                    | 17 ++++++++--
 encryption-demo/guest/Cargo.toml              | 13 --------
 encryption-demo/guest/src/main.rs             |  1 -
 encryption-demo/host/Cargo.toml               | 15 ---------
 encryption-demo/host/src/main.rs              | 32 -------------------
 encryption-demo/methods/Cargo.toml            | 10 ++++++
 encryption-demo/{host => methods}/build.rs    |  0
 encryption-demo/methods/guest/Cargo.toml      |  9 ++++++
 encryption-demo/methods/guest/src/bin/test.rs |  6 ++++
 encryption-demo/methods/src/lib.rs            |  2 ++
 encryption-demo/src/main.rs                   | 29 +++++++++++++++++
 12 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100644 Cargo.toml
 delete mode 100644 encryption-demo/guest/Cargo.toml
 delete mode 100644 encryption-demo/guest/src/main.rs
 delete mode 100644 encryption-demo/host/Cargo.toml
 delete mode 100644 encryption-demo/host/src/main.rs
 create mode 100644 encryption-demo/methods/Cargo.toml
 rename encryption-demo/{host => methods}/build.rs (100%)
 create mode 100644 encryption-demo/methods/guest/Cargo.toml
 create mode 100644 encryption-demo/methods/guest/src/bin/test.rs
 create mode 100644 encryption-demo/methods/src/lib.rs
 create mode 100644 encryption-demo/src/main.rs

diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 127f1e9..0000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[workspace]
-resolver = "2"
-members = [
-    "guest",
-    "host",
-]
diff --git a/encryption-demo/Cargo.toml b/encryption-demo/Cargo.toml
index 26a793e..6f4c58c 100644
--- a/encryption-demo/Cargo.toml
+++ b/encryption-demo/Cargo.toml
@@ -1,3 +1,14 @@
-[workspace]
-resolver = "2"
-members = ["guest", "host"]
+[package]
+name = "encryption-demo"
+version = "0.12.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = "2.2"
+methods = { path = "methods" }
+
+[features]
+cuda = ["risc0-zkvm/cuda"]
+default = []
+prove = ["risc0-zkvm/prove"]
+
diff --git a/encryption-demo/guest/Cargo.toml b/encryption-demo/guest/Cargo.toml
deleted file mode 100644
index 59cefb5..0000000
--- a/encryption-demo/guest/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name    = "guest"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-risc0-zkvm = { version = "2.3.1", default-features = false }
-chacha20   = "0.9"
-cipher     = { version = "0.4", default-features = false }
-
-[[bin]]
-name = "guest"
-path = "src/main.rs"
\ No newline at end of file
diff --git a/encryption-demo/guest/src/main.rs b/encryption-demo/guest/src/main.rs
deleted file mode 100644
index f328e4d..0000000
--- a/encryption-demo/guest/src/main.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() {}
diff --git a/encryption-demo/host/Cargo.toml b/encryption-demo/host/Cargo.toml
deleted file mode 100644
index 35aef02..0000000
--- a/encryption-demo/host/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name    = "host"
-version = "0.1.0"
-edition = "2021"
-build   = "build.rs"
-
-[dependencies]
-risc0-zkvm  = { version = "2.3.1", features = ["std"] }
-hex         = "0.4"
-
-[build-dependencies]
-risc0-build = "2.3.1"
-
-[package.metadata.risc0]
-methods = ["/Users/mellaz/Documents/nssa-zkvms/nescience-zkvm-testing/encryption-demo/guest"]
diff --git a/encryption-demo/host/src/main.rs b/encryption-demo/host/src/main.rs
deleted file mode 100644
index 3da01f8..0000000
--- a/encryption-demo/host/src/main.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));
-
-use risc0_zkvm::{Prover, Receipt};
-use hex::encode;
-
-fn main() -> anyhow::Result<()> {
-    // Example inputs
-    let key       = [0x42u8; 32];
-    let nonce     = [0x24u8; 12];
-    let plaintext = b"Hello, RISC Zero ChaCha20 demo!";
-
-    // 1) Create the prover with the embedded guest code
-    let mut prover = Prover::new(&GUEST_ELF, &GUEST_ID)?;
-
-    // 2) Supply inputs
-    prover.add_input_u8_slice(&key);
-    prover.add_input_u8_slice(&nonce);
-    prover.add_input_u8_slice(plaintext);
-
-    // 3) Run, getting a Receipt (proof + journal)
-    let receipt: Receipt = prover.run()?;
-
-    // 4) (Optionally) verify the proof
-    receipt.verify(&GUEST_ID)?;
-
-    // 5) Extract and print the ciphertext
-    let ct: &[u8] = receipt.get_journal_bytes();
-    println!("Ciphertext: {}", encode(ct));
-
-    Ok(())
-}
-
diff --git a/encryption-demo/methods/Cargo.toml b/encryption-demo/methods/Cargo.toml
new file mode 100644
index 0000000..1d2543e
--- /dev/null
+++ b/encryption-demo/methods/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "methods"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+risc0-build = { version = "2.2" }
+
+[package.metadata.risc0]
+methods = ["guest"]
diff --git a/encryption-demo/host/build.rs b/encryption-demo/methods/build.rs
similarity index 100%
rename from encryption-demo/host/build.rs
rename to encryption-demo/methods/build.rs
diff --git a/encryption-demo/methods/guest/Cargo.toml b/encryption-demo/methods/guest/Cargo.toml
new file mode 100644
index 0000000..77f35de
--- /dev/null
+++ b/encryption-demo/methods/guest/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name    = "guest"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = { version = "2.2.0", default-features = false, features = ['std'] }
+# chacha20   = "0.9"
+# cipher     = { version = "0.4", default-features = false }
diff --git a/encryption-demo/methods/guest/src/bin/test.rs b/encryption-demo/methods/guest/src/bin/test.rs
new file mode 100644
index 0000000..9c0e75f
--- /dev/null
+++ b/encryption-demo/methods/guest/src/bin/test.rs
@@ -0,0 +1,6 @@
+use risc0_zkvm::guest::env;
+
+fn main() {
+    let a: u128 = env::read();
+    env::commit(&a);
+}
diff --git a/encryption-demo/methods/src/lib.rs b/encryption-demo/methods/src/lib.rs
new file mode 100644
index 0000000..7b08660
--- /dev/null
+++ b/encryption-demo/methods/src/lib.rs
@@ -0,0 +1,2 @@
+include!(concat!(env!("OUT_DIR"), "/methods.rs"));
+
diff --git a/encryption-demo/src/main.rs b/encryption-demo/src/main.rs
new file mode 100644
index 0000000..77583d6
--- /dev/null
+++ b/encryption-demo/src/main.rs
@@ -0,0 +1,29 @@
+// use risc0_zkvm::{Prover, Receipt};
+// use hex::encode;
+
+fn main() {
+    // // Example inputs
+    // let key       = [0x42u8; 32];
+    // let nonce     = [0x24u8; 12];
+    // let plaintext = b"Hello, RISC Zero ChaCha20 demo!";
+    //
+    // // 1) Create the prover with the embedded guest code
+    // let mut prover = Prover::new(&GUEST_ELF, &GUEST_ID)?;
+    //
+    // // 2) Supply inputs
+    // prover.add_input_u8_slice(&key);
+    // prover.add_input_u8_slice(&nonce);
+    // prover.add_input_u8_slice(plaintext);
+    //
+    // // 3) Run, getting a Receipt (proof + journal)
+    // let receipt: Receipt = prover.run()?;
+    //
+    // // 4) (Optionally) verify the proof
+    // receipt.verify(&GUEST_ID)?;
+    //
+    // // 5) Extract and print the ciphertext
+    // let ct: &[u8] = receipt.get_journal_bytes();
+    // println!("Ciphertext: {}", encode(ct));
+    //
+}
+