From 6ba2b36271cbe1f6df1f794c3340763dd846f46f Mon Sep 17 00:00:00 2001
From: Zhang Zhuo <mycinbrin@gmail.com>
Date: Wed, 10 Apr 2024 11:34:23 +0800
Subject: [PATCH] change poseidon hash branch

---
 Cargo.lock     | 38 ++++++++++++++++++++++++++++++++++----
 Cargo.toml     |  2 +-
 rust-toolchain |  2 +-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c73041..fc5f023 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -928,7 +928,7 @@ dependencies = [
  "num",
  "num-bigint",
  "once_cell",
- "poseidon-circuit",
+ "poseidon-circuit 0.1.0 (git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-1201)",
  "regex",
  "serde",
  "serde_json",
@@ -1249,7 +1249,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "plotters",
- "poseidon-circuit",
+ "poseidon-circuit 0.1.0 (git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main)",
  "rand",
  "rand_chacha",
  "serde",
@@ -1274,7 +1274,7 @@ dependencies = [
  "log",
  "num-bigint",
  "num-traits",
- "poseidon-circuit",
+ "poseidon-circuit 0.1.0 (git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-1201)",
  "rand",
  "rand_chacha",
  "serde",
@@ -1645,7 +1645,7 @@ dependencies = [
  "lazy_static",
  "log",
  "num-bigint",
- "poseidon-circuit",
+ "poseidon-circuit 0.1.0 (git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-1201)",
  "zktrie",
 ]
 
@@ -1971,6 +1971,21 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "poseidon-circuit"
+version = "0.1.0"
+source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#babf5f6a69bec40b2e6523df317c073dcd0b1f97"
+dependencies = [
+ "bitvec",
+ "ff",
+ "halo2_proofs",
+ "lazy_static",
+ "log",
+ "rand",
+ "rand_xorshift",
+ "thiserror",
+]
+
 [[package]]
 name = "poseidon-circuit"
 version = "0.1.0"
@@ -3043,3 +3058,18 @@ source = "git+https://github.com/scroll-tech/zktrie.git?tag=v0.7.1#a12f2f262ad3e
 dependencies = [
  "gobuild",
 ]
+
+[[patch.unused]]
+name = "ethers"
+version = "2.0.7"
+source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba"
+
+[[patch.unused]]
+name = "ethers-etherscan"
+version = "2.0.7"
+source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba"
+
+[[patch.unused]]
+name = "ethers-providers"
+version = "2.0.7"
+source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba"
diff --git a/Cargo.toml b/Cargo.toml
index 6deab6a..0942253 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 ethers-core = "=2.0.7"
 itertools = "0.10.5"
-hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-1201" }
+hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" }
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 rand = "0.8"
 lazy_static = "1.4.0"
diff --git a/rust-toolchain b/rust-toolchain
index 97a0c7b..27c108b 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-10-27
\ No newline at end of file
+nightly-2023-12-03