Skip to content

Commit

Permalink
fix:bump to powdr binary mux2 (#259)
Browse files Browse the repository at this point in the history
* chore: choose powdr binary-mux2 (#255)

* fix: fix zkvm

* fix: fix lint
  • Loading branch information
captainlee1024 authored May 31, 2024
1 parent cf405b2 commit 69de4af
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
1 change: 0 additions & 1 deletion algebraic/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![allow(clippy::unit_arg)]
#![cfg_attr(feature = "avx512", feature(stdsimd))]

#[macro_use]
extern crate serde;
Expand Down
1 change: 1 addition & 0 deletions plonky/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ env_logger = "0.10"
default = ["bellman_vk_codegen/multicore", "franklin-crypto/multicore", "ethabi", "recursive_aggregation_circuit/multicore"]
profiler = ["ark-std/print-trace"]
avx512 = ["fields/avx512"]
wasm = []
6 changes: 3 additions & 3 deletions recursion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ starky = { path = "../starky", default-features = false }
plonky = { path = "../plonky", default-features = false }
algebraic = { path = "../algebraic", default-features = false }

powdr = { git = "https://github.com/eigmax/powdr", branch = "feature-starky-avx512", default-features = false }
powdr-ast = { git = "https://github.com/eigmax/powdr", branch = "feature-starky-avx512", default-features = false }
powdr-pil-analyzer = { git = "https://github.com/eigmax/powdr", branch = "feature-starky-avx512", default-features = false }
powdr = { git = "https://github.com/0xEigenLabs/powdr", branch = "binary-mux2", default-features = false }
powdr-ast = { git = "https://github.com/0xEigenLabs/powdr", branch = "binary-mux2", default-features = false }
powdr-pil-analyzer = { git = "https://github.com/0xEigenLabs/powdr", branch = "binary-mux2", default-features = false }

[dev-dependencies]
env_logger = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion zkvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ itertools = "0.12.0"
# serialization
log = "0.4.0"

powdr = { git = "https://github.com/eigmax/powdr", branch = "feature-starky-avx512", default-features = false }
powdr = { git = "https://github.com/0xEigenLabs/powdr", branch = "binary-mux2", default-features = false }
starky = { path = "../starky" }
recursion = { path = "../recursion" }

Expand Down
4 changes: 2 additions & 2 deletions zkvm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn generate_witness_and_prove<F: FieldElement>(
let start = Instant::now();
log::debug!("Proving ...");

pipeline = pipeline.with_backend(BackendType::EStarkStarky);
pipeline = pipeline.with_backend(BackendType::EStarkStarky, Some("stark_gl".to_string()));
pipeline.compute_proof().unwrap();
let duration = start.elapsed();
log::debug!("Proving took: {:?}", duration);
Expand All @@ -43,7 +43,7 @@ fn generate_verifier<F: FieldElement, W: std::io::Write>(
) -> Result<()> {
let buf = Vec::new();
let mut vw = BufWriter::new(buf);
pipeline = pipeline.with_backend(BackendType::EStarkStarky);
pipeline = pipeline.with_backend(BackendType::EStarkStarky, Some("stark_gl".to_string()));
pipeline.export_verification_key(&mut vw).unwrap();
log::debug!("Export verification key done");
let mut setup: StarkSetup<MerkleTreeGL> = serde_json::from_slice(&vw.into_inner()?)?;
Expand Down

0 comments on commit 69de4af

Please sign in to comment.