wip

risc0-selective-privacy-poc/Cargo.toml

@@ -6,9 +6,7 @@ edition = "2021"
 [dependencies]
 risc0-zkvm = "2.2"
 core = { path = "core" }
-transfer-methods = { path = "transfer_methods" }
-transfer-multiple-methods = { path = "transfer_multiple_methods" }
-outer-methods = { path = "outer_methods" }
+program-methods = { path = "program_methods" }
 serde = "1.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 rand = "0.8"

risc0-selective-privacy-poc/examples/private_execution.rs

@@ -5,8 +5,8 @@ use core::{
     types::{Address, AuthenticationPath, Commitment, Nullifier},
 };
 use nssa::program::TransferMultipleProgram;
-use outer_methods::OUTER_ID;
 use sparse_merkle_tree::SparseMerkleTree;
+use program_methods::OUTER_ID;
 
 fn mint_fresh_account(address: Address) -> Account {
     let nonce = [0; 8];

risc0-selective-privacy-poc/examples/public_execution.rs

@@ -1,5 +1,5 @@
-use risc0_zkvm::{default_executor, ExecutorEnv};
 use core::account::Account;
+use risc0_zkvm::{default_executor, ExecutorEnv};
 
 use nssa;
 
@@ -31,8 +31,11 @@ pub fn main() {
 
     let balance_to_move = vec![10, 20];
 
-    let inputs_outputs =
-        nssa::execute::<TransferMultipleProgram>(&[sender, receiver_1, receiver_2], &balance_to_move).unwrap();
+    let inputs_outputs = nssa::execute::<TransferMultipleProgram>(
+        &[sender, receiver_1, receiver_2],
+        &balance_to_move,
+    )
+    .unwrap();
 
     println!(
         "sender_before: {:?}, sender_after: {:?}",

risc0-selective-privacy-poc/outer_methods/guest/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "outer"
-version = "0.1.0"
-edition = "2021"
-
-[workspace]
-
-[dependencies]
-risc0-zkvm = { version = "2.2.0", default-features = false, features = ['std'] }
-core = {path = "../../core" }
-transfer-methods = {path = "../../transfer_methods"}

risc0-selective-privacy-poc/program_methods/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "outer-methods"
+name = "program-methods"
 version = "0.1.0"
 edition = "2021"
 

risc0-selective-privacy-poc/program_methods/guest/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "transfer"
+name = "programs"
 version = "0.1.0"
 edition = "2021"
 

risc0-selective-privacy-poc/src/lib.rs

@@ -3,10 +3,10 @@ use core::{
     input::InputVisibiility,
     types::{Commitment, Nonce, Nullifier},
 };
-use outer_methods::{OUTER_ELF, OUTER_ID};
 use program::Program;
 use rand::{rngs::OsRng, Rng};
 use risc0_zkvm::{default_executor, default_prover, ExecutorEnv, ExecutorEnvBuilder, Receipt};
+use program_methods::{OUTER_ELF, OUTER_ID};
 
 pub mod program;
 

risc0-selective-privacy-poc/src/program/mod.rs

@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
-use transfer_methods::{PINATA_ELF, PINATA_ID, TRANSFER_ELF, TRANSFER_ID};
-use transfer_multiple_methods::{TRANSFER_MULTIPLE_ELF, TRANSFER_MULTIPLE_ID};
+use program_methods::{
+    PINATA_ELF, PINATA_ID, TRANSFER_ELF, TRANSFER_ID, {TRANSFER_MULTIPLE_ELF, TRANSFER_MULTIPLE_ID},
+};
 
 pub trait Program {
     const PROGRAM_ID: [u32; 8];

risc0-selective-privacy-poc/transfer_methods/Cargo.toml

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

risc0-selective-privacy-poc/transfer_methods/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}

risc0-selective-privacy-poc/transfer_methods/src/lib.rs

@@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));