upgrade halo2-lib to fix ec pairing (scroll-tech#889)

Kewe63 · Sep 4, 2023 · c41bb7a · c41bb7a
1 parent 4e9d8d2
commit c41bb7a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml
@@ -21,8 +21,8 @@ serde_json = "1.0"
 rand = "0.8"
 
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.3" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.3", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 
 
 [features]

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -35,17 +35,17 @@ serde_json = "1.0.78"
 hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-0901"}
 misc-precompiled-circuit = { package = "misc-precompiled-circuit", git = "https://github.com/scroll-tech/misc-precompiled-circuit.git", tag = "v0.1.0" }
 
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.1", default-features=false, features=["halo2-pse","display"] }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.1", default-features=false, features=["halo2-pse","display"] }
+halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.3", default-features=false, features=["halo2-pse","display"] }
+halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.3", default-features=false, features=["halo2-pse","display"] }
 
 maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_02_02" }
 
 libsecp256k1 = "0.7"
 num-bigint = { version = "0.4" }
 subtle = "2.4"
 rand_chacha = "0.3"
-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.3" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.3", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.4", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 hex = "0.4.3"
 rayon = "1.5"
 once_cell = "1.17.0"

diff --git a/zkevm-circuits/src/ecc_circuit.rs b/zkevm-circuits/src/ecc_circuit.rs
@@ -99,9 +99,9 @@ impl<F: Field> SubCircuitConfig<F> for EccCircuitConfig<F> {
         let num_limbs = 3;
         let limb_bits = 88;
         #[cfg(feature = "onephase")]
-        let num_advice = [33];
+        let num_advice = [35];
         #[cfg(not(feature = "onephase"))]
-        let num_advice = [33, 1];
+        let num_advice = [35, 1];
 
         let fp_config = FpConfig::configure(
             meta,