From ed6901beb52ec2132d5da3176608a0d0eb7df1b3 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Thu, 16 Jan 2025 12:49:46 +0200 Subject: feat(zkvms); Add zkm guest and it's macro --- zkvms/zkm/guest/Cargo.toml | 13 +++++++++++++ zkvms/zkm/guest/guests | 1 + zkvms/zkm/guest/guests_macro | 1 + zkvms/zkm/guest/src/main.rs | 14 ++++++++++++++ zkvms/zkm/wrapper_macro/Cargo.toml | 7 +++++++ zkvms/zkm/wrapper_macro/src/lib.rs | 23 +++++++++++++++++++++++ 6 files changed, 59 insertions(+) create mode 100644 zkvms/zkm/guest/Cargo.toml create mode 120000 zkvms/zkm/guest/guests create mode 120000 zkvms/zkm/guest/guests_macro create mode 100644 zkvms/zkm/guest/src/main.rs create mode 100644 zkvms/zkm/wrapper_macro/Cargo.toml create mode 100644 zkvms/zkm/wrapper_macro/src/lib.rs (limited to 'zkvms/zkm') diff --git a/zkvms/zkm/guest/Cargo.toml b/zkvms/zkm/guest/Cargo.toml new file mode 100644 index 0000000..36b84ba --- /dev/null +++ b/zkvms/zkm/guest/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "guest" +version = "0.1.0" +edition = "2021" + +[workspace] + +[dependencies] +# THESE DEPENDENCIES NEED TO BE PRESENT IN THE HOST CARGO.TOML +zkm-runtime = { path = "/nix/store/h9s6kmnx7iafllv10wqhjix5kpyfsh37-zkm-unstable-2025-01-05/runtime/entrypoint" } + +zkp = { path = "./src/zkp" } +wrapper_macro = { version = "0.1.0", path = "../wrapper_macro" } diff --git a/zkvms/zkm/guest/guests b/zkvms/zkm/guest/guests new file mode 120000 index 0000000..69bc8ed --- /dev/null +++ b/zkvms/zkm/guest/guests @@ -0,0 +1 @@ +../../../guests \ No newline at end of file diff --git a/zkvms/zkm/guest/guests_macro b/zkvms/zkm/guest/guests_macro new file mode 120000 index 0000000..143a0b5 --- /dev/null +++ b/zkvms/zkm/guest/guests_macro @@ -0,0 +1 @@ +../../../guests_macro \ No newline at end of file diff --git a/zkvms/zkm/guest/src/main.rs b/zkvms/zkm/guest/src/main.rs new file mode 100644 index 0000000..21fb641 --- /dev/null +++ b/zkvms/zkm/guest/src/main.rs @@ -0,0 +1,14 @@ +#![no_std] +#![no_main] + +use wrapper_macro::make_wrapper; + +extern crate alloc; +use alloc::vec::Vec; +use zkm_runtime::io::{ read, commit }; + +zkm_runtime::entrypoint!(main); + +pub fn main() { + zkp::entrypoint_expr!() +} diff --git a/zkvms/zkm/wrapper_macro/Cargo.toml b/zkvms/zkm/wrapper_macro/Cargo.toml new file mode 100644 index 0000000..14348e5 --- /dev/null +++ b/zkvms/zkm/wrapper_macro/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "wrapper_macro" +version = "0.1.0" +edition = "2021" + +[lib] +proc-macro = true diff --git a/zkvms/zkm/wrapper_macro/src/lib.rs b/zkvms/zkm/wrapper_macro/src/lib.rs new file mode 100644 index 0000000..86594e6 --- /dev/null +++ b/zkvms/zkm/wrapper_macro/src/lib.rs @@ -0,0 +1,23 @@ +use proc_macro::TokenStream; + +#[path = "../../../../guests_macro/src/parse_fn.rs"] +mod parse_fn; +use crate::parse_fn::{ split_fn, args_split, args_divide, group_streams }; + +#[proc_macro] +pub fn make_wrapper(item: TokenStream) -> TokenStream { + let (name, args, ret) = split_fn(&item); + + let (patterns, types) = args_divide(&args); + let ts_patterns = group_streams(&patterns); + let ts_types = group_streams(&types); + + let mut out = TokenStream::new(); + // NOTE: The first read returns public data, the second returns private + out.extend(format!("let {} : {} = read();", ts_patterns, ts_types).parse::()); + out.extend(format!("commit::<{}>(&zkp::{}{});", ret, name, ts_patterns).parse::()); + + let mut block = TokenStream::new(); + block.extend(format!("{{ {} }}", out).parse::()); + block +} -- cgit v1.2.3