From 1070391642dd64b2d68b47ec246cba9e35bd3c15 Mon Sep 17 00:00:00 2001
From: Zhang Zhuo <mycinbrin@gmail.com>
Date: Wed, 13 Dec 2023 14:13:50 +0800
Subject: [PATCH] unify halo2curves version

---
 Cargo.lock               | 24 +++---------------------
 Cargo.toml               |  1 +
 halo2_gadgets/Cargo.toml |  2 +-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a36d84c12..7a0fd1b201 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -859,7 +859,7 @@ dependencies = [
  "ff",
  "group",
  "halo2_proofs",
- "halo2curves 0.3.2",
+ "halo2curves",
  "lazy_static",
  "plotters",
  "pprof",
@@ -885,7 +885,7 @@ dependencies = [
  "getrandom",
  "group",
  "gumdrop",
- "halo2curves 0.1.0",
+ "halo2curves",
  "lazy_static",
  "log",
  "num-bigint",
@@ -923,24 +923,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "halo2curves"
-version = "0.3.2"
-source = "git+https://github.com/privacy-scaling-explorations/halo2curves?tag=0.3.2#9f5c50810bbefe779ee5cf1d852b2fe85dc35d5e"
-dependencies = [
- "ff",
- "group",
- "lazy_static",
- "num-bigint",
- "num-traits",
- "pasta_curves",
- "paste",
- "rand",
- "rand_core",
- "static_assertions",
- "subtle",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
@@ -1415,7 +1397,7 @@ name = "poseidon"
 version = "0.2.0"
 source = "git+https://github.com/scroll-tech/poseidon.git?branch=main#5787dd3d2ce7a9e9601a035c396ac0c03449b54d"
 dependencies = [
- "halo2curves 0.1.0",
+ "halo2curves",
  "subtle",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index b7878ae843..68165eaf41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "halo2",
     "halo2_gadgets",
diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml
index 136ef63a16..b495dc7350 100644
--- a/halo2_gadgets/Cargo.toml
+++ b/halo2_gadgets/Cargo.toml
@@ -28,7 +28,7 @@ ff = { version = "0.13", features = ["bits"] }
 group = "0.13"
 halo2_proofs = { version = "0.2", path = "../halo2_proofs" }
 lazy_static = "1"
-halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', tag = "0.3.2" }
+halo2curves = { version = "0.1.0"}
 proptest = { version = "1.0.0", optional = true }
 rand = "0.8"
 subtle = "2.3"