From 73e27ae16e920424a77be597e4d1b15466b368eb Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Mon, 3 Feb 2025 16:12:26 +0200 Subject: feat(zkvms/zkm): Implement proper handling of public and private inputs --- zkvms/zkm/wrapper_macro/src/lib.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'zkvms/zkm/wrapper_macro/src') diff --git a/zkvms/zkm/wrapper_macro/src/lib.rs b/zkvms/zkm/wrapper_macro/src/lib.rs index 57b9d24..4bb580c 100644 --- a/zkvms/zkm/wrapper_macro/src/lib.rs +++ b/zkvms/zkm/wrapper_macro/src/lib.rs @@ -2,17 +2,28 @@ use proc_macro::TokenStream; #[path = "../../../../guests_macro/src/parse_fn.rs"] mod parse_fn; -use crate::parse_fn::{ split_fn, args_split, args_divide_grouped }; +use crate::parse_fn::{ split_fn, args_split, args_divide_public, args_divide_grouped, group_streams }; #[proc_macro] pub fn make_wrapper(item: TokenStream) -> TokenStream { let (name, args, ret) = split_fn(&item); - let (ts_patterns, ts_types) = args_divide_grouped(&args); + let (ts_patterns, _) = args_divide_grouped(&args); + + let public_inputs = toml::from_str::( + include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")) + ) + .unwrap(); + let ((pub_pat, pub_typ), (prv_pat, prv_typ)) = args_divide_public(&args, &public_inputs.keys().collect()); + let ((pub_pat, pub_typ), (prv_pat, prv_typ)) = ( + (group_streams(&pub_pat), group_streams(&pub_typ)), + (group_streams(&prv_pat), group_streams(&prv_typ))); 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!("let {} : {} = read();", pub_pat, pub_typ).parse::()); + out.extend(format!("let {} : {} = read();", prv_pat, prv_typ).parse::()); + out.extend(format!("commit::<{}>(&zkp::{}{});", ret, name, ts_patterns).parse::()); let mut block = TokenStream::new(); -- cgit v1.2.3