diff --git a/bin-powdr/Cargo.toml b/bin-powdr/Cargo.toml index abf084d0c..1fcf4e42b 100644 --- a/bin-powdr/Cargo.toml +++ b/bin-powdr/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -powdr = { git = "https://github.com/powdr-labs/powdr", branch = "continuations-data-input" } +powdr = { git = "https://github.com/powdr-labs/powdr", branch = "main" } env_logger = "0.10.0" diff --git a/bin-powdr/src/main.rs b/bin-powdr/src/main.rs index 3ca799a68..c83296092 100644 --- a/bin-powdr/src/main.rs +++ b/bin-powdr/src/main.rs @@ -1,13 +1,10 @@ -use powdr::number::GoldilocksField; use powdr::riscv::{compile_rust, CoProcessors}; -use powdr::pipeline::{ - pipeline::Pipeline, - test_util::verify_pipeline -}; +use powdr::GoldilocksField; +use powdr::{pipeline::test_util::verify_pipeline, Pipeline}; use std::path::{Path, PathBuf}; // Step1: set PILCOM to path (https://github.com/0xPolygonHermez/pilcom) -// Step2: cargo run --package bin-powdr --bin bin-powdr --all-features +// Step2: cargo run --package bin-powdr --bin bin-powdr --all-features /// /// Note: /// revm dependencies located in workspace as well as in the guest-powdr/Cargo.toml @@ -28,10 +25,11 @@ fn main() { .unwrap(); println!("Compilation done."); println!("Creating pipeline..."); - let pipeline: Pipeline = - Pipeline::default().from_asm_string(asm_contents, Some(PathBuf::from(asm_file_path))); + let pipeline: Pipeline = Pipeline::default() + .from_asm_string(asm_contents, Some(PathBuf::from(asm_file_path))) + .with_prover_inputs(vec![]); println!("Pipeline done."); println!("Verifying pipeline..."); - verify_pipeline(pipeline, Vec::new(), Vec::new()); + verify_pipeline(pipeline); println!("Verification done."); } diff --git a/guest-powdr/Cargo.toml b/guest-powdr/Cargo.toml index da5e9cc27..c46c9672b 100644 --- a/guest-powdr/Cargo.toml +++ b/guest-powdr/Cargo.toml @@ -10,7 +10,7 @@ zeth-lib = { path = "../lib", default-features = false } zeth-primitives = { path = "../primitives", features = ["revm"] } revm = { git = "https://github.com/powdr-labs/revm", branch = "serde-no-std", default-features = false, features = [ "serde" ] } ruint = { version = "1.10", default-features = false } -powdr_riscv_rt = { git = "https://github.com/powdr-labs/powdr", branch = "continuations-data-input" } +powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", branch = "main" } # TODO: we need to add this for compatibility reasons until we're able to update the nightly we use for riscv compilation ahash = { version = "=0.8.6", default-features = false }