diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-03-21 13:01:42 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-04-04 11:03:00 +0300 |
| commit | 2c82f0faf8371c9da8c9c16f69eb935addd5c76b (patch) | |
| tree | 521b55cd71800320b3696c14b7c872535ec75378 /zkvms | |
| parent | 4fc242cd3de1168e207d86a11894c81f16eaf8fc (diff) | |
| download | zkVMs-benchmarks-2c82f0faf8371c9da8c9c16f69eb935addd5c76b.tar zkVMs-benchmarks-2c82f0faf8371c9da8c9c16f69eb935addd5c76b.tar.gz zkVMs-benchmarks-2c82f0faf8371c9da8c9c16f69eb935addd5c76b.zip | |
feat(zkvms/jolt): Add libcxx and openssl dependencies, upper bound for bytemuck_derive
Diffstat (limited to 'zkvms')
| -rw-r--r-- | zkvms/jolt/default.nix | 6 | ||||
| -rw-r--r-- | zkvms/jolt/host/Cargo.lock | 6 | ||||
| -rw-r--r-- | zkvms/jolt/host/Cargo.toml | 1 | ||||
| -rw-r--r-- | zkvms/jolt/host/src/main.rs | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/zkvms/jolt/default.nix b/zkvms/jolt/default.nix index e749ac4..533dc13 100644 --- a/zkvms/jolt/default.nix +++ b/zkvms/jolt/default.nix @@ -1,5 +1,5 @@ { zkvmLib, stdenv, lib, just, metacraft-labs, pkg-config, openssl -, craneLib-default, }: +, craneLib-default, libcxx, }: let commonArgs = { pname = "jolt"; @@ -12,7 +12,7 @@ let (unions [ ./. ../../guests ../../guests_macro ../../zkvms_host_io ]); }; - nativeBuildInputs = [ metacraft-labs.jolt openssl pkg-config ]; + nativeBuildInputs = [ metacraft-labs.jolt openssl pkg-config libcxx ]; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.jolt; @@ -37,6 +37,8 @@ in zkvmLib.buildPackage craneLib (commonArgs // { preRunBinaries = [ metacraft-labs.jolt ]; + preRunLibraries = [ openssl ]; + preRun = '' export ELF_PATH="$out/bin/guest" ''; diff --git a/zkvms/jolt/host/Cargo.lock b/zkvms/jolt/host/Cargo.lock index 7b5c1f5..d06ba03 100644 --- a/zkvms/jolt/host/Cargo.lock +++ b/zkvms/jolt/host/Cargo.lock @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "binius_field" version = "0.2.0" -source = "git+https://gitlab.com/UlvetannaOSS/binius#8e7a024c1d998b8f03654b60f43a1d91d68f2e6c" +source = "git+https://gitlab.com/UlvetannaOSS/binius#eabc127ff7dd79fed2b33e89040040a3828db014" dependencies = [ "binius_maybe_rayon", "binius_utils", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "binius_maybe_rayon" version = "0.2.0" -source = "git+https://gitlab.com/UlvetannaOSS/binius#8e7a024c1d998b8f03654b60f43a1d91d68f2e6c" +source = "git+https://gitlab.com/UlvetannaOSS/binius#eabc127ff7dd79fed2b33e89040040a3828db014" dependencies = [ "cfg-if", "either", @@ -469,7 +469,7 @@ dependencies = [ [[package]] name = "binius_utils" version = "0.2.0" -source = "git+https://gitlab.com/UlvetannaOSS/binius#8e7a024c1d998b8f03654b60f43a1d91d68f2e6c" +source = "git+https://gitlab.com/UlvetannaOSS/binius#eabc127ff7dd79fed2b33e89040040a3828db014" dependencies = [ "auto_impl", "binius_maybe_rayon", diff --git a/zkvms/jolt/host/Cargo.toml b/zkvms/jolt/host/Cargo.toml index ee1d0cb..532e1b3 100644 --- a/zkvms/jolt/host/Cargo.toml +++ b/zkvms/jolt/host/Cargo.toml @@ -21,6 +21,7 @@ ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "op [dependencies] jolt-sdk = { path = "/nix/store/zgrhjdmxaijxw6kx6b0k2yxigrrb3f94-jolt-unstable-2025-03-12/jolt-sdk", features = ["host"] } jolt-core = { path = "/nix/store/zgrhjdmxaijxw6kx6b0k2yxigrrb3f94-jolt-unstable-2025-03-12/jolt-core" } +bytemuck_derive = "<1.9.0" # >=1.9.0 supports rust v1.84.0 and up guest = { path = "../guest" } zkvms_host_io = { path = "../../../zkvms_host_io" } diff --git a/zkvms/jolt/host/src/main.rs b/zkvms/jolt/host/src/main.rs index 36ce7dc..aa6b898 100644 --- a/zkvms/jolt/host/src/main.rs +++ b/zkvms/jolt/host/src/main.rs @@ -3,8 +3,6 @@ use zkvms_host_io::{ RunType::{Execute, Prove, Verify}, }; -type Input = (Vec<Vec<bool>>, u32, Vec<Vec<u32>>); - pub fn main() { let run_info = read_args(); if run_info.run_type == Execute { |