aboutsummaryrefslogtreecommitdiff
path: root/zkvms
diff options
context:
space:
mode:
Diffstat (limited to 'zkvms')
-rw-r--r--zkvms/jolt/Cargo.toml2
-rw-r--r--zkvms/jolt/guest/Cargo.toml17
-rw-r--r--zkvms/jolt/guest/guest.ld27
l---------zkvms/jolt/guest/guests1
l---------zkvms/jolt/guest/guests_macro1
-rw-r--r--zkvms/jolt/guest/src/lib.rs6
-rw-r--r--zkvms/jolt/wrapper_macro/Cargo.toml12
-rw-r--r--zkvms/jolt/wrapper_macro/src/lib.rs151
8 files changed, 217 insertions, 0 deletions
diff --git a/zkvms/jolt/Cargo.toml b/zkvms/jolt/Cargo.toml
index e444c26..09d9c96 100644
--- a/zkvms/jolt/Cargo.toml
+++ b/zkvms/jolt/Cargo.toml
@@ -2,6 +2,8 @@
resolver = "2"
members = [
"host",
+ "guest",
+ "guest/guests/*",
]
[profile.release]
diff --git a/zkvms/jolt/guest/Cargo.toml b/zkvms/jolt/guest/Cargo.toml
new file mode 100644
index 0000000..736873b
--- /dev/null
+++ b/zkvms/jolt/guest/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "guest"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "guest"
+path = "./src/lib.rs"
+
+[features]
+guest = []
+
+[dependencies]
+jolt = { package = "jolt-sdk", path = "/nix/store/q8ix3vj7dw6w57zhjc9wa38vicymql0g-jolt-unstable-2024-12-18/jolt-sdk", features = ["guest-std"] }
+
+zkp = { path = "./src/zkp" }
+wrapper_macro = { version = "0.1.0", path = "../wrapper_macro" }
diff --git a/zkvms/jolt/guest/guest.ld b/zkvms/jolt/guest/guest.ld
new file mode 100644
index 0000000..e4afb7b
--- /dev/null
+++ b/zkvms/jolt/guest/guest.ld
@@ -0,0 +1,27 @@
+MEMORY {
+ program (rwx) : ORIGIN = 0x80000000, LENGTH = 10485760
+}
+
+SECTIONS {
+ .text.boot : {
+ *(.text.boot)
+ } > program
+
+ .text : {
+ *(.text)
+ } > program
+
+ .data : {
+ *(.data)
+ } > program
+
+ .bss : {
+ *(.bss)
+ } > program
+
+ . = ALIGN(8);
+ . = . + 4096;
+ _STACK_PTR = .;
+ . = ALIGN(8);
+ _HEAP_PTR = .;
+}
diff --git a/zkvms/jolt/guest/guests b/zkvms/jolt/guest/guests
new file mode 120000
index 0000000..69bc8ed
--- /dev/null
+++ b/zkvms/jolt/guest/guests
@@ -0,0 +1 @@
+../../../guests \ No newline at end of file
diff --git a/zkvms/jolt/guest/guests_macro b/zkvms/jolt/guest/guests_macro
new file mode 120000
index 0000000..143a0b5
--- /dev/null
+++ b/zkvms/jolt/guest/guests_macro
@@ -0,0 +1 @@
+../../../guests_macro \ No newline at end of file
diff --git a/zkvms/jolt/guest/src/lib.rs b/zkvms/jolt/guest/src/lib.rs
new file mode 100644
index 0000000..3fec863
--- /dev/null
+++ b/zkvms/jolt/guest/src/lib.rs
@@ -0,0 +1,6 @@
+//#![cfg_attr(feature = "guest", no_std)]
+#![no_main]
+
+use wrapper_macro::make_wrapper;
+
+zkp::entrypoint_expr!{}
diff --git a/zkvms/jolt/wrapper_macro/Cargo.toml b/zkvms/jolt/wrapper_macro/Cargo.toml
new file mode 100644
index 0000000..d313884
--- /dev/null
+++ b/zkvms/jolt/wrapper_macro/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "wrapper_macro"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+jolt-sdk-macros = { path = "/nix/store/q8ix3vj7dw6w57zhjc9wa38vicymql0g-jolt-unstable-2024-12-18/jolt-sdk/macros" }
+proc-macro2 = "1.0.93"
+quote = "1.0.38"
diff --git a/zkvms/jolt/wrapper_macro/src/lib.rs b/zkvms/jolt/wrapper_macro/src/lib.rs
new file mode 100644
index 0000000..10e03b0
--- /dev/null
+++ b/zkvms/jolt/wrapper_macro/src/lib.rs
@@ -0,0 +1,151 @@
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+
+#[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();
+ out.extend(format!("zkp::{}{}", name, ts_patterns).parse::<TokenStream>());
+
+ let mut func = TokenStream::new();
+ func.extend(format!("#[jolt::provable(max_input_size = 100000)] fn guest{} -> {} {{ {} }}", args, ret, out).parse::<TokenStream>());
+
+ func.extend(make_build_fn(patterns.clone(), types.clone(), ts_patterns.clone(), ts_types.clone(), ret.clone()));
+ func.extend(make_preprocess_fn(patterns, types, ts_patterns, ts_types, ret));
+ func
+}
+
+// Modified copies of
+// https://github.com/a16z/jolt/blob/fa45507aaddb1815bafd54332e4b14173a7f8699/jolt-sdk/macros/src/lib.rs
+
+fn make_build_fn(
+ patterns: Vec<TokenStream>,
+ types: Vec<TokenStream>,
+ ts_patterns: TokenStream,
+ ts_types: TokenStream,
+ ret: TokenStream,
+) -> TokenStream {
+ let patterns = patterns.iter().map(|p| TokenStream2::from(p.clone()));
+ let types = types.iter().map(|t| TokenStream2::from(t.clone()));
+ let ts_patterns = TokenStream2::from(ts_patterns);
+ let ts_types = TokenStream2::from(ts_types);
+ let ret = if ret.is_empty() { quote!{ () } } else { TokenStream2::from(ret) };
+
+ let imports = make_imports();
+
+ quote! {
+ #[cfg(all(not(target_arch = "wasm32"), not(feature = "guest")))]
+ pub fn guest_closures(elf_path: String) -> (
+ impl Fn(#ts_types) -> (#ret, jolt::JoltHyperKZGProof) + Sync + Send,
+ impl Fn(jolt::JoltHyperKZGProof) -> bool + Sync + Send
+ ) {
+ #imports
+ let (program, preprocessing) = preprocess_guest_elf(elf_path);
+ let program = std::sync::Arc::new(program);
+ let preprocessing = std::sync::Arc::new(preprocessing);
+
+ let program_cp = program.clone();
+ let preprocessing_cp = preprocessing.clone();
+
+ let prove_closure = move |args: #ts_types| {
+ let program = (*program).clone();
+ let preprocessing = (*preprocessing).clone();
+ let #ts_patterns = args;
+ prove_guest(program, preprocessing, #(#patterns),*)
+ };
+
+
+ let verify_closure = move |proof: jolt::JoltHyperKZGProof| {
+ let program = (*program_cp).clone();
+ let preprocessing = (*preprocessing_cp).clone();
+ RV32IJoltVM::verify(preprocessing, proof.proof, proof.commitments, None).is_ok()
+ };
+
+ (prove_closure, verify_closure)
+ }
+ }.into()
+}
+
+fn make_preprocess_fn(
+ patterns: Vec<TokenStream>,
+ types: Vec<TokenStream>,
+ ts_patterns: TokenStream,
+ ts_types: TokenStream,
+ ret: TokenStream,
+) -> TokenStream {
+ let patterns = patterns.iter().map(|p| TokenStream2::from(p.clone()));
+ let types = types.iter().map(|t| TokenStream2::from(t.clone()));
+ let ts_patterns = TokenStream2::from(ts_patterns);
+ let ts_types = TokenStream2::from(ts_types);
+ let ret = if ret.is_empty() { quote!{ () } } else { TokenStream2::from(ret) };
+
+ let imports = make_imports();
+
+ quote! {
+ #[cfg(all(not(target_arch = "wasm32"), not(feature = "guest")))]
+ pub fn preprocess_guest_elf(elf_path: String) -> (
+ jolt::host::Program,
+ jolt::JoltPreprocessing<4, jolt::F, jolt::PCS, jolt::ProofTranscript>
+ ) {
+ #imports
+ use std::{ path::PathBuf, str::FromStr };
+
+ let mut program = Program::new("guest");
+ program.set_func("guest");
+ program.elf = Some(PathBuf::from_str(&elf_path).unwrap());
+ program.set_std(true);
+ program.set_memory_size(10485760);
+ program.set_stack_size(4096);
+ program.set_max_input_size(100000u64);
+ program.set_max_output_size(4096u64);
+ let (bytecode, memory_init) = program.decode();
+ let memory_layout = MemoryLayout::new(100000u64, 4096u64);
+
+ let preprocessing: JoltPreprocessing<4, jolt::F, jolt::PCS, jolt::ProofTranscript> =
+ RV32IJoltVM::preprocess(
+ bytecode,
+ memory_layout,
+ memory_init,
+ 1 << 20,
+ 1 << 20,
+ 1 << 24
+ );
+
+ (program, preprocessing)
+ }
+ }.into()
+}
+
+fn make_imports() -> TokenStream2 {
+ quote! {
+ #[cfg(not(feature = "guest"))]
+ use jolt::{
+ JoltField,
+ host::Program,
+ JoltPreprocessing,
+ Jolt,
+ JoltCommitments,
+ ProofTranscript,
+ RV32IJoltVM,
+ RV32I,
+ RV32IJoltProof,
+ BytecodeRow,
+ MemoryOp,
+ MemoryLayout,
+ MEMORY_OPS_PER_INSTRUCTION,
+ instruction::add::ADDInstruction,
+ tracer,
+ };
+ }
+}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-14 23:36:59 +0000