From 196c375d213890acb57cdea106aaa282409ecad7 Mon Sep 17 00:00:00 2001 From: Sergio Chouhy Date: Thu, 17 Jul 2025 11:34:56 -0300 Subject: [PATCH] wip --- risc0-selective-privacy-poc/Cargo.toml | 4 +--- .../examples/private_execution.rs | 2 +- .../examples/public_execution.rs | 9 ++++++--- .../outer_methods/guest/Cargo.toml | 11 ----------- .../{outer_methods => program_methods}/Cargo.toml | 2 +- .../{outer_methods => program_methods}/build.rs | 0 .../guest/Cargo.toml | 2 +- .../guest/src/bin/outer.rs | 0 .../guest/src/bin/pinata.rs | 0 .../guest/src/bin/transfer.rs | 0 .../guest/src/bin/transfer_multiple.rs | 0 .../{outer_methods => program_methods}/src/lib.rs | 0 risc0-selective-privacy-poc/src/lib.rs | 2 +- risc0-selective-privacy-poc/src/program/mod.rs | 5 +++-- .../transfer_methods/Cargo.toml | 10 ---------- risc0-selective-privacy-poc/transfer_methods/build.rs | 3 --- .../transfer_methods/src/lib.rs | 1 - 17 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 risc0-selective-privacy-poc/outer_methods/guest/Cargo.toml rename risc0-selective-privacy-poc/{outer_methods => program_methods}/Cargo.toml (85%) rename risc0-selective-privacy-poc/{outer_methods => program_methods}/build.rs (100%) rename risc0-selective-privacy-poc/{transfer_methods => program_methods}/guest/Cargo.toml (91%) rename risc0-selective-privacy-poc/{outer_methods => program_methods}/guest/src/bin/outer.rs (100%) rename risc0-selective-privacy-poc/{transfer_methods => program_methods}/guest/src/bin/pinata.rs (100%) rename risc0-selective-privacy-poc/{transfer_methods => program_methods}/guest/src/bin/transfer.rs (100%) rename risc0-selective-privacy-poc/{transfer_methods => program_methods}/guest/src/bin/transfer_multiple.rs (100%) rename risc0-selective-privacy-poc/{outer_methods => program_methods}/src/lib.rs (100%) delete mode 100644 risc0-selective-privacy-poc/transfer_methods/Cargo.toml delete mode 100644 risc0-selective-privacy-poc/transfer_methods/build.rs delete mode 100644 risc0-selective-privacy-poc/transfer_methods/src/lib.rs diff --git a/risc0-selective-privacy-poc/Cargo.toml b/risc0-selective-privacy-poc/Cargo.toml index 0228bc8..055271f 100644 --- a/risc0-selective-privacy-poc/Cargo.toml +++ b/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" diff --git a/risc0-selective-privacy-poc/examples/private_execution.rs b/risc0-selective-privacy-poc/examples/private_execution.rs index 36f25c4..c8ee654 100644 --- a/risc0-selective-privacy-poc/examples/private_execution.rs +++ b/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]; diff --git a/risc0-selective-privacy-poc/examples/public_execution.rs b/risc0-selective-privacy-poc/examples/public_execution.rs index 03d3256..a72a490 100644 --- a/risc0-selective-privacy-poc/examples/public_execution.rs +++ b/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::(&[sender, receiver_1, receiver_2], &balance_to_move).unwrap(); + let inputs_outputs = nssa::execute::( + &[sender, receiver_1, receiver_2], + &balance_to_move, + ) + .unwrap(); println!( "sender_before: {:?}, sender_after: {:?}", diff --git a/risc0-selective-privacy-poc/outer_methods/guest/Cargo.toml b/risc0-selective-privacy-poc/outer_methods/guest/Cargo.toml deleted file mode 100644 index 4585a49..0000000 --- a/risc0-selective-privacy-poc/outer_methods/guest/Cargo.toml +++ /dev/null @@ -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"} diff --git a/risc0-selective-privacy-poc/outer_methods/Cargo.toml b/risc0-selective-privacy-poc/program_methods/Cargo.toml similarity index 85% rename from risc0-selective-privacy-poc/outer_methods/Cargo.toml rename to risc0-selective-privacy-poc/program_methods/Cargo.toml index 1f5e9ec..24c192c 100644 --- a/risc0-selective-privacy-poc/outer_methods/Cargo.toml +++ b/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" diff --git a/risc0-selective-privacy-poc/outer_methods/build.rs b/risc0-selective-privacy-poc/program_methods/build.rs similarity index 100% rename from risc0-selective-privacy-poc/outer_methods/build.rs rename to risc0-selective-privacy-poc/program_methods/build.rs diff --git a/risc0-selective-privacy-poc/transfer_methods/guest/Cargo.toml b/risc0-selective-privacy-poc/program_methods/guest/Cargo.toml similarity index 91% rename from risc0-selective-privacy-poc/transfer_methods/guest/Cargo.toml rename to risc0-selective-privacy-poc/program_methods/guest/Cargo.toml index f1dffe8..5263dd9 100644 --- a/risc0-selective-privacy-poc/transfer_methods/guest/Cargo.toml +++ b/risc0-selective-privacy-poc/program_methods/guest/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "transfer" +name = "programs" version = "0.1.0" edition = "2021" diff --git a/risc0-selective-privacy-poc/outer_methods/guest/src/bin/outer.rs b/risc0-selective-privacy-poc/program_methods/guest/src/bin/outer.rs similarity index 100% rename from risc0-selective-privacy-poc/outer_methods/guest/src/bin/outer.rs rename to risc0-selective-privacy-poc/program_methods/guest/src/bin/outer.rs diff --git a/risc0-selective-privacy-poc/transfer_methods/guest/src/bin/pinata.rs b/risc0-selective-privacy-poc/program_methods/guest/src/bin/pinata.rs similarity index 100% rename from risc0-selective-privacy-poc/transfer_methods/guest/src/bin/pinata.rs rename to risc0-selective-privacy-poc/program_methods/guest/src/bin/pinata.rs diff --git a/risc0-selective-privacy-poc/transfer_methods/guest/src/bin/transfer.rs b/risc0-selective-privacy-poc/program_methods/guest/src/bin/transfer.rs similarity index 100% rename from risc0-selective-privacy-poc/transfer_methods/guest/src/bin/transfer.rs rename to risc0-selective-privacy-poc/program_methods/guest/src/bin/transfer.rs diff --git a/risc0-selective-privacy-poc/transfer_methods/guest/src/bin/transfer_multiple.rs b/risc0-selective-privacy-poc/program_methods/guest/src/bin/transfer_multiple.rs similarity index 100% rename from risc0-selective-privacy-poc/transfer_methods/guest/src/bin/transfer_multiple.rs rename to risc0-selective-privacy-poc/program_methods/guest/src/bin/transfer_multiple.rs diff --git a/risc0-selective-privacy-poc/outer_methods/src/lib.rs b/risc0-selective-privacy-poc/program_methods/src/lib.rs similarity index 100% rename from risc0-selective-privacy-poc/outer_methods/src/lib.rs rename to risc0-selective-privacy-poc/program_methods/src/lib.rs diff --git a/risc0-selective-privacy-poc/src/lib.rs b/risc0-selective-privacy-poc/src/lib.rs index 2d07b59..a44ae55 100644 --- a/risc0-selective-privacy-poc/src/lib.rs +++ b/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; diff --git a/risc0-selective-privacy-poc/src/program/mod.rs b/risc0-selective-privacy-poc/src/program/mod.rs index bc0d6a0..af1ede3 100644 --- a/risc0-selective-privacy-poc/src/program/mod.rs +++ b/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]; diff --git a/risc0-selective-privacy-poc/transfer_methods/Cargo.toml b/risc0-selective-privacy-poc/transfer_methods/Cargo.toml deleted file mode 100644 index 523dc0a..0000000 --- a/risc0-selective-privacy-poc/transfer_methods/Cargo.toml +++ /dev/null @@ -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"] diff --git a/risc0-selective-privacy-poc/transfer_methods/build.rs b/risc0-selective-privacy-poc/transfer_methods/build.rs deleted file mode 100644 index 08a8a4e..0000000 --- a/risc0-selective-privacy-poc/transfer_methods/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - risc0_build::embed_methods(); -} diff --git a/risc0-selective-privacy-poc/transfer_methods/src/lib.rs b/risc0-selective-privacy-poc/transfer_methods/src/lib.rs deleted file mode 100644 index 1bdb308..0000000 --- a/risc0-selective-privacy-poc/transfer_methods/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -include!(concat!(env!("OUT_DIR"), "/methods.rs"));