aboutsummaryrefslogtreecommitdiff
path: root/zkvms/risc0
diff options
context:
space:
mode:
Diffstat (limited to 'zkvms/risc0')
-rw-r--r--zkvms/risc0/guest/src/main.rs4
-rw-r--r--zkvms/risc0/host/src/main.rs18
-rw-r--r--zkvms/risc0/wrapper_macro/src/lib.rs15
3 files changed, 20 insertions, 17 deletions
diff --git a/zkvms/risc0/guest/src/main.rs b/zkvms/risc0/guest/src/main.rs
index 2097259..796c663 100644
--- a/zkvms/risc0/guest/src/main.rs
+++ b/zkvms/risc0/guest/src/main.rs
@@ -1,6 +1,6 @@
-use wrapper_macro::make_wrapper;
-use risc0_zkvm::guest::env::{ read, commit };
+use risc0_zkvm::guest::env::{commit, read};
use std::collections::*;
+use wrapper_macro::make_wrapper;
fn main() {
zkp::entrypoint_expr!()
diff --git a/zkvms/risc0/host/src/main.rs b/zkvms/risc0/host/src/main.rs
index c214c4e..e61692b 100644
--- a/zkvms/risc0/host/src/main.rs
+++ b/zkvms/risc0/host/src/main.rs
@@ -1,7 +1,10 @@
-use zkvms_host_io::{Input, Output, foreach_input_field, benchmarkable, read_args, RunType::{ Execute, Prove, Verify }};
-use risc0_zkvm::{default_prover, default_executor, ExecutorEnv, Receipt};
-use risc0_zkp::core::digest::Digest;
use hex::FromHex;
+use risc0_zkp::core::digest::Digest;
+use risc0_zkvm::{default_executor, default_prover, ExecutorEnv, Receipt};
+use zkvms_host_io::{
+ benchmarkable, foreach_input_field, read_args, Input, Output,
+ RunType::{Execute, Prove, Verify},
+};
// https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L280-L284
static HELLO_GUEST_ELF: &[u8] = include_bytes!("./guest");
@@ -11,7 +14,7 @@ static HELLO_GUEST_ID: &str = env!("GUEST_ID");
fn build_env(input: &Input) -> ExecutorEnv {
let mut builder = ExecutorEnv::builder();
- foreach_input_field!{
+ foreach_input_field! {
builder.write(&input.yield).unwrap();
}
builder.build().unwrap()
@@ -25,10 +28,7 @@ fn prove(env: ExecutorEnv) -> Receipt {
}
fn journal(receipt: Receipt) -> Output {
- receipt
- .journal
- .decode()
- .unwrap()
+ receipt.journal.decode().unwrap()
}
fn main() {
@@ -56,7 +56,7 @@ fn main() {
let receipt = prove(env);
println!("Output from journal: {:?}", journal(receipt));
},
- Verify => benchmarkable!{
+ Verify => benchmarkable! {
// https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L197-L199
let guest_id: Digest = Digest::from_hex(HELLO_GUEST_ID).unwrap();
diff --git a/zkvms/risc0/wrapper_macro/src/lib.rs b/zkvms/risc0/wrapper_macro/src/lib.rs
index 24eddd4..7fa328b 100644
--- a/zkvms/risc0/wrapper_macro/src/lib.rs
+++ b/zkvms/risc0/wrapper_macro/src/lib.rs
@@ -2,7 +2,7 @@ use proc_macro::TokenStream;
#[path = "../../../../guests_macro/src/parse_fn.rs"]
mod parse_fn;
-use crate::parse_fn::{ split_fn, args_split, args_divide_public, args_divide_grouped };
+use crate::parse_fn::{args_divide_grouped, args_divide_public, args_split, split_fn};
/// Create a body, which reads all inputs, stores them in variables, then
/// commits the ones, defined as public in `default_public_input.toml` to the
@@ -40,11 +40,14 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
out.extend(format!("let {} = read();", arg).parse::<TokenStream>());
}
- let public_inputs = toml::from_str::<toml::Table>(
- include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml"))
- )
- .unwrap();
- let public_patterns = args_divide_public(&args, &public_inputs.keys().collect()).0.0;
+ let public_inputs = toml::from_str::<toml::Table>(include_str!(concat!(
+ env!("INPUTS_DIR"),
+ "/default_public_input.toml"
+ )))
+ .unwrap();
+ let public_patterns = args_divide_public(&args, &public_inputs.keys().collect())
+ .0
+ .0;
for pattern in public_patterns.iter() {
out.extend(format!("commit(&{});", pattern).parse::<TokenStream>());
}