Release v0.6.x (#792)

* fix: replace branch with tag for `halo2-lib`, `snark-verifier` and `mpt-circuit` (#779) * Replace branch with tag for `halo2-lib`, `snark-verifier` and `mpt-circuit`. * Update `snark-verifier` to `v0.1.1`. * tag snark verifier * tag mpt circuit * fix false alarm panic inside aggregator * fix false alarm panic inside aggregator --------- Co-authored-by: Steven <[email protected]>
scroll-tech · Aug 21, 2023 · 1093f5e · 1093f5e
1 parent 0a2a602
commit 1093f5e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 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", branch = "develop" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 
 
 [features]

diff --git a/aggregator/src/util.rs b/aggregator/src/util.rs
@@ -157,24 +157,25 @@ pub(crate) fn assert_conditional_equal<F: Field>(
 
 #[inline]
 // assert a \in (b1, b2, b3)
+// TODO: return Error::Synthesis?
 pub(crate) fn assert_exist<F: Field>(
     a: &AssignedCell<F, F>,
     b1: &AssignedCell<F, F>,
     b2: &AssignedCell<F, F>,
     b3: &AssignedCell<F, F>,
 ) {
-    let mut t1 = F::default();
-    let mut t2 = F::default();
-    let mut t3 = F::default();
-    let mut t4 = F::default();
-    a.value().map(|f| t1 = *f);
-    b1.value().map(|f| t2 = *f);
-    b2.value().map(|f| t3 = *f);
-    b3.value().map(|f| t4 = *f);
-    assert!(
-        t1 == t2 || t1 == t3 || t1 == t4,
-        "t1: {t1:?}\nt2: {t2:?}\nt3: {t3:?}\nt4: {t4:?}\n",
-    )
+    let _ = a
+        .value()
+        .zip(b1.value())
+        .zip(b2.value())
+        .zip(b3.value())
+        .error_if_known_and(|(((&a, &b1), &b2), &b3)| {
+            assert!(
+                a == b1 || a == b2 || a == b3,
+                "a: {a:?}\nb1: {b1:?}\nb2: {b2:?}\nb3: {b3:?}\n",
+            );
+            !(a == b1 || a == b2 || a == b3)
+        });
 }
 
 #[inline]

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -33,20 +33,19 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.78"
 
 hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-0723"}
-#mpt-circuits = { package = "halo2-mpt-circuits", path = "../../mpt-circuit" }
 misc-precompiled-circuit = { package = "rmd160-circuits", git = "https://github.com/scroll-tech/misc-precompiled-circuit.git", branch = "integration" }
 
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] }
+halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.0", default-features=false, features=["halo2-pse","display"] }
+halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.0", 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", branch = "develop" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 hex = "0.4.3"
 rayon = "1.5"
 once_cell = "1.17.0"
@@ -85,4 +84,4 @@ onephase = [] # debug only
 zktrie = []
 poseidon-codehash = []
 
-debug-annotations = []
+debug-annotations = []
diff --git a/zktrie/Cargo.toml b/zktrie/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
-mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", branch = "v0.5" }
+mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", tag = "v0.5.1" }
 zktrie = { git = "https://github.com/scroll-tech/zktrie.git", branch = "v0.6" }
 hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-0723"}
 bus-mapping = { path = "../bus-mapping" }