From 0da8cf202224ec09b1b18ff008619d8bccb06c4f Mon Sep 17 00:00:00 2001 From: Terry <644052732@qq.com> Date: Tue, 21 May 2024 04:18:00 +0800 Subject: [PATCH 1/3] chore: choose powdr binary-mux2 (#255) --- recursion/Cargo.toml | 6 +++--- zkvm/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recursion/Cargo.toml b/recursion/Cargo.toml index c104f943..f8ecadb0 100644 --- a/recursion/Cargo.toml +++ b/recursion/Cargo.toml @@ -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" diff --git a/zkvm/Cargo.toml b/zkvm/Cargo.toml index 16848282..068e8b3f 100644 --- a/zkvm/Cargo.toml +++ b/zkvm/Cargo.toml @@ -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" } From e060097bac1b7c5118c6e93c28ecdb68d06d0e28 Mon Sep 17 00:00:00 2001 From: Terry <644052732@qq.com> Date: Tue, 21 May 2024 11:36:45 +0800 Subject: [PATCH 2/3] fix: fix zkvm --- zkvm/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zkvm/src/lib.rs b/zkvm/src/lib.rs index a1a08422..d71e9f9f 100644 --- a/zkvm/src/lib.rs +++ b/zkvm/src/lib.rs @@ -30,7 +30,7 @@ fn generate_witness_and_prove( 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); @@ -43,7 +43,7 @@ fn generate_verifier( ) -> 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 = serde_json::from_slice(&vw.into_inner()?)?; From e030ede4916d45081e6f167b84b706471c4e576f Mon Sep 17 00:00:00 2001 From: Terry <644052732@qq.com> Date: Fri, 31 May 2024 17:27:36 +0800 Subject: [PATCH 3/3] fix: fix lint --- algebraic/src/lib.rs | 1 - plonky/Cargo.toml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/algebraic/src/lib.rs b/algebraic/src/lib.rs index 2fcf23c2..c75362a7 100644 --- a/algebraic/src/lib.rs +++ b/algebraic/src/lib.rs @@ -1,5 +1,4 @@ #![allow(clippy::unit_arg)] -#![cfg_attr(feature = "avx512", feature(stdsimd))] #[macro_use] extern crate serde; diff --git a/plonky/Cargo.toml b/plonky/Cargo.toml index 0d8ba2ef..bcd98c1a 100644 --- a/plonky/Cargo.toml +++ b/plonky/Cargo.toml @@ -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 = []