chore: use powdr to get vk (#238)

* fix: bump to main

* fix: bump to main

* chore: update dependencies

* feat: export circom verifier

* fix: remove existing path

---------

Co-authored-by: Ubuntu <devadmin@zkevm-prover-uat-vm1.qf0bt0i4yvdutbhtrpicnmptkg.ix.internal.cloudapp.net>

Author: eigmax

dsl_compile/src/input_user.rs

@@ -2,6 +2,7 @@ use crate::errors::{bail, DslError, Result};
 use ansi_term::Colour;
 use std::path::{Path, PathBuf};
 
+#[allow(dead_code)]
 pub struct Input {
     pub input_program: PathBuf,
     pub out_r1cs: PathBuf,

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-pil-analyzer = { git = "https://github.com/eigmax/powdr.git", branch = "main" }
-powdr-number       = { git = "https://github.com/eigmax/powdr.git", branch = "main" }
-powdr-ast          = { git = "https://github.com/eigmax/powdr.git", branch = "main" }
+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" }
 
 [dev-dependencies]
 env_logger = "0.10"

recursion/src/pilcom.rs

@@ -1,20 +1,21 @@
 //! Poring from https://github.com/powdr-labs/powdr.git.
+use std::rc::Rc;
 mod export;
 mod expression_counter;
 
-use powdr_number::GoldilocksField;
+pub use export::export;
+
+use powdr::number::GoldilocksField;
 use starky::types::PIL;
 use std::path::Path;
 
 pub fn compile_pil_from_str(pil_str: &str) -> PIL {
     let analyze = powdr_pil_analyzer::analyze_string::<GoldilocksField>(pil_str);
-
-    export::export(&analyze)
+    export(Rc::new(analyze))
 }
 pub fn compile_pil_from_path(pil_path: &str) -> PIL {
-    let analyze = powdr_pil_analyzer::analyze::<GoldilocksField>(Path::new(pil_path));
-
-    export::export(&analyze)
+    let analyze = powdr_pil_analyzer::analyze_file::<GoldilocksField>(Path::new(pil_path));
+    export(Rc::new(analyze))
 }
 
 #[cfg(test)]

recursion/src/pilcom/export.rs

@@ -1,5 +1,5 @@
 //! porting it from powdr
-use powdr_number::FieldElement;
+use powdr::number::FieldElement;
 use std::cmp;
 use std::collections::HashMap;
 use std::path::PathBuf;
@@ -36,8 +36,8 @@ struct Exporter<'a, T> {
     number_q: u64,
 }
 
-pub fn export<T: FieldElement>(analyzed: &Analyzed<T>) -> PIL {
-    let mut exporter = Exporter::new(analyzed);
+pub fn export<T: FieldElement>(analyzed: std::rc::Rc<Analyzed<T>>) -> PIL {
+    let mut exporter = Exporter::new(&analyzed);
     let mut publics = Vec::new();
     let mut pol_identities = Vec::new();
     let mut plookup_identities = Vec::new();
@@ -48,11 +48,13 @@ pub fn export<T: FieldElement>(analyzed: &Analyzed<T>) -> PIL {
             StatementIdentifier::Definition(name) => {
                 if let Some((poly, value)) = analyzed.intermediate_columns.get(name) {
                     assert_eq!(poly.kind, SymbolKind::Poly(PolynomialType::Intermediate));
-                    let expression_id = exporter.extract_expression(value, 1);
-                    assert_eq!(
-                        expression_id,
-                        exporter.intermediate_poly_expression_ids[&poly.id] as usize
-                    );
+                    for ((_, id), value) in poly.array_elements().zip(value) {
+                        let expression_id = exporter.extract_expression(value, 1);
+                        assert_eq!(
+                            expression_id,
+                            exporter.intermediate_poly_expression_ids[&id.id] as usize
+                        );
+                    }
                 }
             }
             StatementIdentifier::PublicDeclaration(name) => {
@@ -284,6 +286,15 @@ impl<'a, T: FieldElement> Exporter<'a, T> {
                     ..DEFAULT_EXPR
                 },
             ),
+            Expression::Challenge(challenge) => (
+                0,
+                StarkyExpr {
+                    op: "challenge".to_string(),
+                    deg: 0,
+                    id: Some(challenge.id as usize),
+                    ..DEFAULT_EXPR
+                },
+            ),
             Expression::Number(value) => (
                 0,
                 StarkyExpr {

recursion/src/pilcom/expression_counter.rs

@@ -21,7 +21,9 @@ pub fn compute_intermediate_expression_ids<T>(analyzed: &Analyzed<T>) -> HashMap
                     poly.expression_count()
                 } else if let Some((poly, _)) = analyzed.intermediate_columns.get(name) {
                     assert!(poly.kind == SymbolKind::Poly(PolynomialType::Intermediate));
-                    ids.insert(poly.id, expression_counter as u64);
+                    for (index, (_, id)) in poly.array_elements().enumerate() {
+                        ids.insert(id.id, (expression_counter + index) as u64);
+                    }
                     poly.expression_count()
                 } else {
                     unreachable!()
@@ -49,7 +51,11 @@ impl<Expr> ExpressionCounter for Identity<Expr> {
 
 impl ExpressionCounter for Symbol {
     fn expression_count(&self) -> usize {
-        (self.kind == SymbolKind::Poly(PolynomialType::Intermediate)).into()
+        if self.kind == SymbolKind::Poly(PolynomialType::Intermediate) {
+            self.length.unwrap_or(1) as usize
+        } else {
+            0
+        }
     }
 }
 

starkjs/fibonacci/fibonacci.pil

@@ -3,9 +3,9 @@ namespace Fibonacci(%N);
     pol constant L1, LLAST;
     pol commit l1,l2;
 
-    pol l2c = l2;
+    //pol l2c = l2;
 
-    public in1 = l2c(0);
+    public in1 = l2(0);
     public in2 = l1(0);
     public out = l1(%N-1);
 

zkvm/Cargo.toml

@@ -10,17 +10,9 @@ itertools = "0.12.0"
 # serialization
 log = "0.4.0"
 
-#powdr-backend =        { git = "https://github.com/powdr-labs/powdr", rev = "97ea8d0" }
-#powdr-pipeline =       { git = "https://github.com/powdr-labs/powdr", rev = "97ea8d0" }
-#powdr-riscv =          { git = "https://github.com/powdr-labs/powdr", rev = "97ea8d0" }
-#powdr-riscv-executor = { git = "https://github.com/powdr-labs/powdr", rev = "97ea8d0" }
-#powdr-number =         { git = "https://github.com/powdr-labs/powdr", rev = "97ea8d0" }
-
-powdr-backend =        { git = "https://github.com/eigmax/powdr", branch = "main" }
-powdr-pipeline =       { git = "https://github.com/eigmax/powdr", branch = "main" }
-powdr-riscv =          { git = "https://github.com/eigmax/powdr", branch = "main" }
-powdr-riscv-executor = { git = "https://github.com/eigmax/powdr", branch = "main" }
-powdr-number =         { git = "https://github.com/eigmax/powdr", branch = "main" }
+powdr =         { git = "https://github.com/powdr-labs/powdr", rev = "450e3f1" }
+starky =         { path = "../starky" }
+recursion =  { path = "../recursion" }
 
 hex = "0.4.3"
 thiserror = "1.0"

zkvm/vm/evm/Cargo.toml renamed to 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/eigmax/powdr", branch = "main" }
+powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", rev = "450e3f1" }
 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"] }

zkvm/vm/evm/README.md renamed to zkvm/program/evm/README.md

@@ -18,6 +18,7 @@ use alloc::string::String;
 use alloc::string::ToString;
 
 use k256::ecdsa::SigningKey;
+const TEST_CHANNEL: u32 = 1;
 
 /// Recover the address from a private key (SigningKey).
 pub fn recover_address(private_key: &[u8]) -> Option<Address> {
@@ -28,7 +29,7 @@ pub fn recover_address(private_key: &[u8]) -> Option<Address> {
 
 #[no_mangle]
 fn main() {
-    let suite_json: String = get_data_serde(666);
+    let suite_json: String = get_data_serde(TEST_CHANNEL);
     print!("suite_json: {suite_json}\n");
     let suite = read_suite(&suite_json);
 

zkvm/vm/evm/rust-toolchain.toml renamed to zkvm/program/evm/rust-toolchain.toml

@@ -6,7 +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/eigmax/powdr", branch = "main" }
-
+powdr-riscv-runtime = { git = "https://github.com/powdr-labs/powdr", rev = "450e3f1" }
 
 [workspace]