2 files changed, 23 insertions, 10 deletions
diff --git a/zkvms/zkwasm/wrapper_macro/Cargo.toml b/zkvms/zkwasm/wrapper_macro/Cargo.toml
index 14348e5..6223ed8 100644
--- a/zkvms/zkwasm/wrapper_macro/Cargo.toml
+++ b/zkvms/zkwasm/wrapper_macro/Cargo.toml
@@ -5,3 +5,6 @@ edition = "2021"
 
 [lib]
 proc-macro = true
+
+[dependencies]
+toml = "0.8.19"
diff --git a/zkvms/zkwasm/wrapper_macro/src/lib.rs b/zkvms/zkwasm/wrapper_macro/src/lib.rs
index edb2fcd..8fe7fd0 100644
--- a/zkvms/zkwasm/wrapper_macro/src/lib.rs
+++ b/zkvms/zkwasm/wrapper_macro/src/lib.rs
@@ -2,15 +2,9 @@ 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 mut out = TokenStream::new();
+use crate::parse_fn::{ split_fn, args_divide_grouped, args_divide_public, group_streams };
 
+fn insert_reads(out: &mut TokenStream, patterns: &Vec<TokenStream>, types: &Vec<TokenStream>, readfn: &str) {
     for i in 0..patterns.len() {
         let type_note: String = format!("{}", types[i])
             .chars()
@@ -20,10 +14,26 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
                  _  => c,
             })
             .collect();
-        out.extend(format!("let {} : {} = read!({});", patterns[i], types[i], type_note).parse::<TokenStream>());
+        out.extend(format!("let {} : {} = read!({} {});", patterns[i], types[i], type_note, readfn).parse::<TokenStream>());
     }
+}
+
+#[proc_macro]
+pub fn make_wrapper(item: TokenStream) -> TokenStream {
+    let (name, args, ret) = split_fn(&item);
+
+    let public_inputs = toml::from_str::<toml::Table>(
+            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 mut out = TokenStream::new();
+
+    insert_reads(&mut out, &pub_pat, &pub_typ, "read_public");
+    insert_reads(&mut out, &prv_pat, &prv_typ, "read_private");
 
-    let ts_patterns = group_streams(&patterns);
+    let (ts_patterns, _) = args_divide_grouped(&args);
 
     out.extend(format!("let result = zkp::{}{}; assert(result); write(result as u64);", name, ts_patterns).parse::<TokenStream>());