Merge branch 'main' into mpt-storage-not-exist

privacy-scaling-explorations · Feb 2, 2024 · f11b183 · f11b183
2 parents a7dab6f + 90eebff
commit f11b183
Show file tree

Hide file tree

Showing 31 changed files with 134 additions and 148 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ members = [
 ]
 
 [patch.crates-io]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 
 # Definition of benchmarks profile to use.
 [profile.bench]

diff --git a/bus-mapping/Cargo.toml b/bus-mapping/Cargo.toml
@@ -12,7 +12,7 @@ mock = { path = "../mock", optional = true }
 
 ethers-core = "=2.0.10"
 ethers-providers = "=2.0.10"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4.14"
@@ -21,7 +21,7 @@ serde_json = "1.0.66"
 strum = "0.24"
 strum_macros = "0.24"
 revm-precompile = { version = "=2.2.0", default-features = false, optional = true }
- 
+
 [dev-dependencies]
 hex = "0.4.3"
 pretty_assertions = "1.0.0"

diff --git a/circuit-benchmarks/Cargo.toml b/circuit-benchmarks/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 ark-std = { version = "0.3", features = ["print-trace"] }
 zkevm-circuits = { path = "../zkevm-circuits", features = ["test-circuits"] }
 bus-mapping = { path = "../bus-mapping",  features = ["test"] }

diff --git a/eth-types/Cargo.toml b/eth-types/Cargo.toml
@@ -10,7 +10,7 @@ ethers-core = "=2.0.10"
 ethers-signers = "=2.0.10"
 hex = "0.4"
 lazy_static = "1.4"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 regex = "1.5.4"
 serde = {version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"

diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["The appliedzkp team"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 sha3 = "0.7.2"
 eth-types = { path = "../eth-types" }
 digest = "0.7.6"

diff --git a/gadgets/src/batched_is_zero.rs b/gadgets/src/batched_is_zero.rs
@@ -242,7 +242,7 @@ mod test {
         };
         let k = 4;
         let prover = MockProver::<Fr>::run(k, &circuit, vec![]).unwrap();
-        prover.assert_satisfied_par()
+        prover.assert_satisfied()
     }
 
     #[test]

diff --git a/gadgets/src/is_zero.rs b/gadgets/src/is_zero.rs
@@ -171,7 +171,7 @@ mod test {
                 _marker: PhantomData,
             };
             let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
-            prover.assert_satisfied_par()
+            prover.assert_satisfied()
         }};
     }
 
@@ -188,7 +188,7 @@ mod test {
                 _marker: PhantomData,
             };
             let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
-            assert!(prover.verify_par().is_err());
+            assert!(prover.verify().is_err());
         }};
     }
 

diff --git a/gadgets/src/mul_add.rs b/gadgets/src/mul_add.rs
@@ -401,7 +401,7 @@ mod test {
                 _marker: PhantomData,
             };
             let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
-            prover.assert_satisfied_par()
+            prover.assert_satisfied()
         }};
     }
 

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -19,7 +19,7 @@ url = "2.2.2"
 pretty_assertions = "1.0.0"
 log = "0.4.14"
 env_logger = "0.9"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 rand_chacha = "0.3"
 paste = "1.0"
 rand_xorshift = "0.3.0"

diff --git a/integration-tests/src/integration_test_circuits.rs b/integration-tests/src/integration_test_circuits.rs
@@ -340,7 +340,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
         self.test_variadic(&mock_prover);
 
         mock_prover
-            .verify_par()
+            .verify()
             .expect("mock prover verification failed");
     }
 
@@ -465,7 +465,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
                         .unwrap();
                 self.test_root_variadic(&mock_prover);
                 mock_prover
-                    .verify_par()
+                    .verify()
                     .expect("mock prover verification failed");
             }
         } else {

diff --git a/light-client-poc/Cargo.toml b/light-client-poc/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 zkevm-circuits = { path = "../zkevm-circuits", features=["test-circuits"]}
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 eyre = { version  = "0.6.8" }
 hex = "0.4.3"
 num_enum = "0.6.1"

diff --git a/light-client-poc/src/circuit/prover.rs b/light-client-poc/src/circuit/prover.rs
@@ -99,7 +99,7 @@ impl StateUpdateCircuit<Fr> {
 
         let prover =
             MockProver::<Fr>::run(self.degree as u32, self, vec![public_inputs.0]).unwrap();
-        prover.assert_satisfied_at_rows_par(0..num_rows, 0..num_rows);
+        prover.assert_satisfied_at_rows(0..num_rows, 0..num_rows);
     }
 
     pub fn prove(self, keys: &StateUpdateCircuitKeys) -> Result<Vec<u8>> {

diff --git a/testool/Cargo.toml b/testool/Cargo.toml
@@ -32,7 +32,7 @@ yaml-rust = "0.4.5"
 zkevm-circuits = { path="../zkevm-circuits", features=["test-util", "test-circuits"] }
 rand_chacha = "0.3"
 rand = "0.8"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
 urlencoding = "2.1.2"
 
 

diff --git a/testool/src/statetest/executor.rs b/testool/src/statetest/executor.rs
@@ -382,7 +382,7 @@ pub fn run_test(
 
         let prover = MockProver::run(k, &circuit, instance).unwrap();
         prover
-            .verify_par()
+            .verify()
             .map_err(|err| StateTestError::CircuitUnsatisfied {
                 num_failure: err.len(),
                 first_failure: err[0].to_string(),