fix: clippy

algebraic/Cargo.toml

@@ -27,7 +27,7 @@ anyhow = "1.0.79"
 fnv = { version = "1.0.3", default-features = false }
 num = { version = "0.4.0" }
 byteorder = "1"
-franklin-crypto = { git = "https://github.com/matter-labs/franklin-crypto", branch = "beta", version = "0.0.5"}
+franklin-crypto = { git = "https://github.com/matter-labs/franklin-crypto", branch = "beta", features = ["plonk"], version = "0.0.5"}
 #franklin-crypto = { path = "../../franklin-crypto", features = [ "plonk" ], version = "0.0.5"}
 rand = "0.8.5"
 

recursion/Cargo.toml

@@ -30,10 +30,15 @@ fields = { path = "../fields", default-features = false }
 starky = { path = "../starky", default-features = false }
 algebraic = { path = "../algebraic", default-features = false }
 
-powdr =              { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
-powdr-ast =          { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
-powdr-pil-analyzer = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
-powdr-parser-util = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+#powdr =              { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+#powdr-ast =          { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+#powdr-pil-analyzer = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+#powdr-parser-util  = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+
+powdr =              { path = "../../powdr/powdr", default-features = false }
+powdr-ast =          { path = "../../powdr/ast", default-features = false }
+powdr-pil-analyzer = { path = "../../powdr/pil-analyzer", default-features = false }
+powdr-parser-util  = { path = "../../powdr/parser-util", default-features = false }
 
 [dev-dependencies]
 env_logger = "0.10"

zkvm/Cargo.toml

@@ -10,7 +10,8 @@ itertools = "0.12.0"
 # serialization
 log = "0.4.0"
 
-powdr =         { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+#powdr =         { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1", default-features = false }
+powdr =              { path = "../../powdr/powdr", default-features = false }
 starky =         { path = "../starky" }
 recursion =  { path = "../recursion" }
 

zkvm/program/evm/Cargo.toml

@@ -5,11 +5,10 @@ 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", branch = "avx" }
+powdr-riscv-runtime = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1" }
 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"] }
 k256 = { version = "0.13.3", features = ["ecdsa"], default-features = false }
-ahash = { version = "=0.8.6", default-features = false }
 
 [workspace]

zkvm/program/evm/src/lib.rs

@@ -7,8 +7,8 @@ use revm::{
         calc_excess_blob_gas, keccak256, Env, AccountInfo, Bytecode, TransactTo, U256, SpecId
     },
 };
-//use runtime::{print, get_prover_input, coprocessors::{get_data, get_data_len}};
-use powdr_riscv_runtime::{print, input::get_data_serde};
+
+use powdr_riscv_runtime::{print, io};
 
 use models::*;
 
@@ -29,7 +29,7 @@ pub fn recover_address(private_key: &[u8]) -> Option<Address> {
 
 #[no_mangle]
 fn main() {
-    let suite_json: String = get_data_serde(TEST_CHANNEL);
+    let suite_json: String = io::read(TEST_CHANNEL);
     print!("suite_json: {suite_json}\n");
     let suite = read_suite(&suite_json);
 

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", branch = "avx" }
+powdr-riscv-runtime = { git = "https://github.com/0xEigenLabs/powdr", branch = "eigen/v1" }
 
 [workspace]

zkvm/src/lib.rs

@@ -30,7 +30,7 @@ fn generate_witness_and_prove<F: FieldElement>(
     let start = Instant::now();
     log::debug!("Proving ...");
 
-    pipeline = pipeline.with_backend(BackendType::EStarkStarky, Some("stark_gl".to_string()));
+    pipeline = pipeline.with_backend(BackendType::EStarkStarkyComposite, 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<F: FieldElement, W: std::io::Write>(
 ) -> Result<()> {
     let buf = Vec::new();
     let mut vw = BufWriter::new(buf);
-    pipeline = pipeline.with_backend(BackendType::EStarkStarky, Some("stark_gl".to_string()));
+    pipeline = pipeline.with_backend(BackendType::EStarkStarkyComposite, 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()?)?;
@@ -337,7 +337,7 @@ mod tests {
     }
 
     #[test]
-    #[ignore]
+    #[ignore = "too slow"]
     fn test_zkvm_lr_execute_then_prove() {
         env_logger::try_init().unwrap_or_default();
         //let test_file = "test-vectors/blockInfo.json";