diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-01-28 16:41:53 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-01-28 16:41:53 +0200 |
| commit | 84967ed6643f90027873b470bf7456596e07b246 (patch) | |
| tree | 2e09761039348caaf6066057a22cc678d8d2b9b6 | |
| parent | 0ff0483750eb20d16d69ca25d93e9fb33c1643ba (diff) | |
| download | zkVMs-benchmarks-84967ed6643f90027873b470bf7456596e07b246.tar zkVMs-benchmarks-84967ed6643f90027873b470bf7456596e07b246.tar.gz zkVMs-benchmarks-84967ed6643f90027873b470bf7456596e07b246.zip | |
feat(zkvms_host_io): Implement using a guest's default input
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | zkvms_host_io/src/lib.rs | 13 |
2 files changed, 11 insertions, 4 deletions
@@ -78,7 +78,7 @@ ''; buildPhase = '' - export INPUTS="$PWD/Vertices-010.in" + export INPUTS_DIR="$PWD/${zkpPath}" pushd zkvms/${currentPackage.pname} runHook preBuild diff --git a/zkvms_host_io/src/lib.rs b/zkvms_host_io/src/lib.rs index 74c3992..191d2ad 100644 --- a/zkvms_host_io/src/lib.rs +++ b/zkvms_host_io/src/lib.rs @@ -1,16 +1,18 @@ use clap::{Parser, ValueEnum}; use num_traits::NumCast; use serde::{ Serialize, Deserialize }; +use std::fs::read_to_string; pub use input_macros::foreach_input_field; +static DEFAULT_PUBLIC_INPUT: &str = include_str!(concat!(env!("INPUTS_DIR"), "/default_public_input.toml")); + #[derive(Parser, Debug)] #[command(version, about, long_about = None)] struct Cli { /// What the ZKVM is going to do run_type: RunType, - #[arg(default_value = "./public_input.toml")] - public_input: String, + public_input: Option<String>, } #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] @@ -31,7 +33,12 @@ input_macros::generate_input_struct!(); pub fn read_args() -> RunWith<Input> { let cli = Cli::parse(); - let val: Input = toml::from_str(&std::fs::read_to_string(cli.public_input).unwrap()).unwrap(); + let contents: String = if cli.public_input.is_some() { + read_to_string(cli.public_input.unwrap()).unwrap() + } else { + DEFAULT_PUBLIC_INPUT.to_string() + }; + let val: Input = toml::from_str(&contents).unwrap(); RunWith { run_type: cli.run_type, |