basic crates structure

Author: jonas089

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["service", "crypto", "client", "voting-tree"]
+members = ["service", "crypto", "client", "voting-tree", "risc0-types", "risc0-verifier"]
 
 [profile.dev]
 opt-level = 3

Cargo.toml

@@ -9,4 +9,4 @@ voting-tree = {path="../voting-tree"}
 crypto = {path="../crypto"}
 pgp = "0.13"
 serde = {version="1", features=["derive"]}
-risc0-zkvm = { version = "0.21.0", default-features = false }
+risc0-types = {path="../risc0-types"}

client/Cargo.toml

@@ -1,3 +1,2 @@
-pub mod prover;
 pub mod storage;
-pub mod verifier;
+pub mod prover;

client/src/lib.rs

@@ -3,7 +3,7 @@
 // that the merkle proof of that leaf is valid for one of the roots in a given list
 
 use std::path::PathBuf;
-
+use risc0_types::{CircuitInputs, CircuitOutputs};
 // private inputs: tree snapshot, public key
 // public inputs/outputs: list of roots
 // public outputs: nullifier
@@ -14,20 +14,6 @@ use crypto::identity::{Identity, Nullifier, UniqueIdentity};
 use serde::{Deserialize, Serialize};
 use voting_tree::VotingTree;
 
-#[derive(Serialize, Deserialize)]
-pub struct CircuitInputs {
-    pub root_history: Vec<TreeRoot>,
-    pub snapshot: VotingTree,
-    pub nullifier: Nullifier,
-    pub public_key_path: PathBuf, // todo: serialize / deserialize pgp public key
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CircuitOutputs {
-    pub nullifier: Nullifier,
-    pub root_history: Vec<TreeRoot>,
-}
-
 pub fn prover_logic(inputs: &mut CircuitInputs) -> CircuitOutputs {
     let mut gpg_signer: GpgSigner = GpgSigner {
         secret_key_asc_path: None,

client/src/prover/logic.rs

@@ -7,4 +7,4 @@ edition = "2021"
 risc0-build = { version = "0.21.0" }
 
 [package.metadata.risc0]
-methods = ["voting-guest"]
+methods = ["voting"]

risc0-circuit/methods/voting-guest/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "voting"
+version = "0.1.0"
+edition = "2021"
+
+[workspace]
+
+[dependencies]
+# If you want to try (experimental) std support, add `features = [ "std" ]` to risc0-zkvm
+risc0-zkvm = { version = "0.21.0", default-features = false, features=["std"] }
+client = {path="../../../client"}
+risc0-types = {path="../../../risc0-types"}

risc0-circuit/methods/voting-guest/src/main.rs

@@ -0,0 +1,12 @@
+#![no_main]
+use risc0_zkvm::guest::env;
+use risc0_types::{CircuitInputs, CircuitOutputs};
+use client::prover::logic::prover_logic;
+risc0_zkvm::guest::entry!(main);
+
+
+fn main() {
+    let input: CircuitInputs = env::read();
+    
+    env::commit(&input);
+}

risc0-circuit/.gitignore risc0-circuits/.gitignore

@@ -0,0 +1,9 @@
+[package]
+name = "risc0-types"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+voting-tree = {path="../voting-tree"}
+serde={version="1", features=["derive"]}

risc0-circuit/.vscode/settings.json risc0-circuits/.vscode/settings.json

@@ -0,0 +1,17 @@
+use std::path::PathBuf;
+
+use voting_tree::VotingTree;
+use serde::{Serialize, Deserialize};
+#[derive(Serialize, Deserialize)]
+pub struct CircuitInputs {
+    pub root_history: Vec<Vec<u8>>,
+    pub snapshot: VotingTree,
+    pub nullifier: Vec<u8>,
+    pub public_key_path: PathBuf, // todo: serialize / deserialize pgp public key
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct CircuitOutputs {
+    pub nullifier: Vec<u8>,
+    pub root_history: Vec<Vec<u8>>,
+}

risc0-circuit/Cargo.toml risc0-circuits/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "risc0-verifier"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+risc0-zkvm = { version = "0.21.0", default-features=false, features=["std", "prove"] }

risc0-circuit/LICENSE risc0-circuits/LICENSE

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

risc0-circuit/README.md risc0-circuits/README.md

@@ -1,8 +1,5 @@
 // Verify the receipt, check the journal root_history and add the nullifier to state
-use crate::storage::TreeRoot;
-use crypto::identity::Nullifier;
 use risc0_zkvm::Receipt;
-
-pub fn verify_receipt(receipt: Receipt, root_history: Vec<TreeRoot>) -> Nullifier {
+pub fn verify_receipt(receipt: Receipt, root_history: Vec<Vec<u8>>) -> Vec<u8> {
     todo!("verify receipt and check that root is in root_history")
 }

risc0-circuit/methods/Cargo.toml risc0-circuits/methods/Cargo.toml

@@ -10,7 +10,6 @@ use std::collections::HashSet;
 // for the user
 use client::{
     storage::{InMemoryTreeState, Snapshot},
-    verifier::verify_receipt,
 };
 use crypto::identity::{Identity, Nullifier};
 use risc0_zkvm::Receipt;