feat: mv lookup transition phase 1 (#498)

zkonduit · Sep 27, 2023 · 602d5b9 · 602d5b9
1 parent 723b054
commit 602d5b9
Show file tree

Hide file tree

Showing 6 changed files with 12,626 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,8 +13,8 @@ crate-type = ["cdylib", "rlib"]
 
 
 [dependencies]
-halo2_gadgets = { git = "https://github.com/zkonduit/halo2", branch= "ac/parallel-lookup-permute", default_features = false }
-halo2_proofs = { git = "https://github.com/zkonduit/halo2", branch= "ac/parallel-lookup-permute", default_features = false }
+halo2_gadgets = { git = "https://github.com/zkonduit/halo2", branch= "ac/mv-lookup2", default_features = false }
+halo2_proofs = { git = "https://github.com/zkonduit/halo2", branch= "ac/mv-lookup2", default_features = false }
 halo2curves = { version = "0.1.0" }
 rand = { version = "0.8", default_features = false }
 itertools = { version = "0.10.3", default_features = false }
@@ -24,8 +24,8 @@ serde_json = { version = "1.0.97", default_features = false, features = ["float_
 log = { version = "0.4.17", default_features = false, optional = true }
 thiserror = { version = "1.0.38", default_features = false }
 hex = { version = "0.4.3", default_features = false }
-halo2_wrong_ecc = { git = "https://github.com/zkonduit/halo2wrong", branch = "ac/parallel-lookup-permute", default_features=false, package = "ecc" }
-snark-verifier = { git = "https://github.com/zkonduit/snark-verifier", branch = "ac/parallel-lookup-permute", features=["derive_serde"]}
+halo2_wrong_ecc = { git = "https://github.com/zkonduit/halo2wrong", branch = "ac/mv-lookup", default_features=false, package = "ecc" }
+snark-verifier = { git = "https://github.com/zkonduit/snark-verifier", branch = "ac/mv-lookup", features=["derive_serde"]}
 rayon = { version = "1.7.0",  default_features = false }
 bincode = { version = "1.3.3", default_features = false }
 ark-std = { version = "^0.3.0", default-features = false }

diff --git a/examples/test_failure.proof b/examples/test_failure.proof
diff --git a/examples/test_failure_aggr.proof b/examples/test_failure_aggr.proof
diff --git a/src/circuit/ops/chip.rs b/src/circuit/ops/chip.rs
@@ -304,7 +304,7 @@ impl<F: PrimeField + TensorType + PartialOrd> BaseConfig<F> {
         for x in 0..input.num_cols() {
             let qlookup = cs.complex_selector();
             selectors.insert((nl.clone(), x), qlookup);
-            let _ = cs.lookup(Op::<F>::as_string(nl), |cs| {
+            let _ = cs.lookup("", |cs| {
                 let qlookup = cs.query_selector(qlookup);
                 let not_qlookup = Expression::Constant(<F as Field>::ONE) - qlookup.clone();
                 let (default_x, default_y): (F, F) = nl.default_pair();

diff --git a/src/pfsys/evm/aggregation.rs b/src/pfsys/evm/aggregation.rs
@@ -204,7 +204,10 @@ impl AggregationCircuit {
                 &snark.instances,
                 &mut transcript,
             )
-            .map_err(|_| AggregationError::ProofRead)?;
+            .map_err(|e| {
+                log::error!("{:?}", e);
+                AggregationError::ProofRead
+            })?;
             let mut accum = PlonkSuccinctVerifier::verify(
                 svk,
                 snark.protocol.as_ref().unwrap(),