Merge branch 'v1.0' of github.com:scroll-tech/halo2 into v1.0

scroll-tech · Dec 5, 2023 · 8deec99 · 8deec99
2 parents 45c4539 + 44dbed4
commit 8deec99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml
@@ -55,7 +55,7 @@ blake2b_simd = "1"
 sha3 = "0.9.1"
 subtle = "2.3"
 cfg-if = "0.1"
-poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "sync-ff-0.13" }
+poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" }
 num-integer = "0.1"
 num-bigint = { version = "0.4", features = ["rand"] }