chore: bump powdr labs

0xEigenLabs · Apr 16, 2024 · 237e782 · 237e782
1 parent 6589363
commit 237e782
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/recursion/Cargo.toml b/recursion/Cargo.toml
@@ -33,13 +33,10 @@ starky = { path = "../starky", default-features = false }
 plonky = { path = "../plonky", default-features = false }
 algebraic = { path = "../algebraic", default-features = false }
 
-#powdr              = { git = "https://github.com/powdr-labs/powdr.git", rev = "450e3f1" }
-#powdr-ast          = { git = "https://github.com/powdr-labs/powdr.git", rev = "450e3f1" }
-#powdr-pil-analyzer = { git = "https://github.com/powdr-labs/powdr.git", rev = "450e3f1" }
-#
-powdr              = { git = "https://github.com/eigmax/powdr.git", branch = "patch-1" }
-powdr-ast          = { git = "https://github.com/eigmax/powdr.git", branch = "patch-1" }
-powdr-pil-analyzer = { git = "https://github.com/eigmax/powdr.git", branch = "patch-1" }
+powdr              = { git = "https://github.com/powdr-labs/powdr.git", branch = "avx" }
+powdr-ast          = { git = "https://github.com/powdr-labs/powdr.git", branch = "avx" }
+powdr-pil-analyzer = { git = "https://github.com/powdr-labs/powdr.git", branch = "avx" }
+
 
 [dev-dependencies]
 env_logger = "0.10"

diff --git 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 = "patch-1" }
+powdr =         { git = "https://github.com/powdr-labs/powdr", branch = "avx" }
 starky =         { path = "../starky" }
 recursion =  { path = "../recursion" }
 

diff --git a/zkvm/program/evm/Cargo.toml b/zkvm/program/evm/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 revm = { git = "https://github.com/powdr-labs/revm", branch = "serde-no-std", default-features = false, features = [ "serde" ] }
-powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", rev = "450e3f1" }
+powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", branch = "avx" }
 models = { git = "https://github.com/eigmax/powdr-revme", branch = "continuations", package = "models" }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }

diff --git a/zkvm/program/evm/src/lib.rs b/zkvm/program/evm/src/lib.rs
@@ -8,7 +8,7 @@ use revm::{
     },
 };
 //use runtime::{print, get_prover_input, coprocessors::{get_data, get_data_len}};
-use powdr_riscv_runtime::{print, coprocessors::get_data_serde};
+use powdr_riscv_runtime::{print, input::get_data_serde};
 
 use models::*;
 

diff --git a/zkvm/program/lr/Cargo.toml b/zkvm/program/lr/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", rev = "450e3f1" }
+powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", branch = "avx" }
 
 [workspace]
diff --git a/zkvm/src/lib.rs b/zkvm/src/lib.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use powdr::backend::BackendType;
 use powdr::number::{DegreeType, FieldElement, GoldilocksField};
 use powdr::riscv::continuations::{rust_continuations, rust_continuations_dry_run};
-use powdr::riscv::{compile_rust, CoProcessors};
+use powdr::riscv::{compile_rust, Runtime};
 use powdr::Pipeline;
 use recursion::pilcom::export as pil_export;
 use starky::{
@@ -101,7 +101,7 @@ pub fn zkvm_execute_and_prove(task: &str, suite_json: String, output_path: &str)
         &format!("program/{task}"),
         Path::new(output_path),
         force_overwrite,
-        &CoProcessors::base().with_poseidon(),
+        &Runtime::base().with_poseidon(),
         with_bootloader,
     )
     .ok_or_else(|| vec!["could not compile rust".to_string()])
@@ -168,7 +168,7 @@ pub fn zkvm_generate_chunks(
         workspace,
         Path::new(output_path),
         force_overwrite,
-        &CoProcessors::base().with_poseidon(),
+        &Runtime::base().with_poseidon(),
         with_bootloader,
     )
     .ok_or_else(|| vec!["could not compile rust".to_string()])
@@ -283,7 +283,7 @@ mod tests {
     use num_traits::identities::Zero;
     use std::io::{Read, Write};
 
-    // RUST_MIN_STACK=2073741821 RUST_LOG=debug proxychains nohup cargo test --release test_zkvm_prove -- --nocapture  &
+    // RUST_MIN_STACK=2073741821 RUST_LOG=debug nohup cargo test --release test_zkvm_prove -- --nocapture  &
     #[test]
     #[ignore]
     fn test_zkvm_prove() {