diff --git a/Cargo.lock b/Cargo.lock
index 41e7c019b3..e17053cc5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -48,7 +48,7 @@ dependencies = [
  "ethers-core 2.0.7",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "log",
  "rand",
  "serde",
@@ -147,7 +147,7 @@ dependencies = [
  "ark-std 0.4.0",
  "derivative",
  "digest 0.10.7",
- "itertools 0.10.5",
+ "itertools",
  "num-bigint",
  "num-traits",
  "paste",
@@ -493,7 +493,7 @@ dependencies = [
  "gadgets",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "keccak256",
  "lazy_static",
  "log",
@@ -581,9 +581,9 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.17.0"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -655,7 +655,7 @@ dependencies = [
  "ethers",
  "ethers-signers",
  "halo2_proofs",
- "itertools 0.10.5",
+ "itertools",
  "keccak256",
  "log",
  "mock",
@@ -942,7 +942,7 @@ dependencies = [
  "clap 2.34.0",
  "criterion-plot",
  "csv",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "num-traits",
  "oorandom",
@@ -964,7 +964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
 dependencies = [
  "cast",
- "itertools 0.10.5",
+ "itertools",
 ]
 
 [[package]]
@@ -1294,15 +1294,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -1313,18 +1304,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys",
-]
-
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -1552,7 +1531,7 @@ dependencies = [
  "halo2-base",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "num",
  "num-bigint",
@@ -1630,16 +1609,16 @@ dependencies = [
  "ethers-middleware",
  "ethers-providers",
  "ethers-signers",
- "ethers-solc",
+ "ethers-solc 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethers-addressbook"
-version = "2.0.10"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e9e8acd0ed348403cc73a670c24daba3226c40b98dc1a41903766b3ab6240a"
+checksum = "7b856b7b8ff5c961093cb8efe151fbcce724b451941ce20781de11a531ccd578"
 dependencies = [
- "ethers-core 2.0.10",
+ "ethers-core 2.0.7",
  "once_cell",
  "serde",
  "serde_json",
@@ -1647,15 +1626,16 @@ dependencies = [
 
 [[package]]
 name = "ethers-contract"
-version = "2.0.10"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d79269278125006bb0552349c03593ffa9702112ca88bc7046cc669f148fb47c"
+checksum = "e066a0d9cfc70c454672bf16bb433b0243427420076dc5b2f49c448fb5a10628"
 dependencies = [
- "const-hex",
  "ethers-contract-abigen",
  "ethers-contract-derive",
- "ethers-core 2.0.10",
+ "ethers-core 2.0.7",
+ "ethers-providers",
  "futures-util",
+ "hex",
  "once_cell",
  "pin-project",
  "serde",
@@ -1665,16 +1645,16 @@ dependencies = [
 
 [[package]]
 name = "ethers-contract-abigen"
-version = "2.0.10"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95a43c939b2e4e2f3191c5ad4a1f279780b8a39139c9905b43a7433531e2ab"
+checksum = "c113e3e86b6bc16d98484b2c3bb2d01d6fed9f489fe2e592e5cc87c3024d616b"
 dependencies = [
  "Inflector",
- "const-hex",
  "dunce",
- "ethers-core 2.0.10",
+ "ethers-core 2.0.7",
  "ethers-etherscan",
  "eyre",
+ "hex",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -1689,14 +1669,14 @@ dependencies = [
 
 [[package]]
 name = "ethers-contract-derive"
-version = "2.0.10"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9ce44906fc871b3ee8c69a695ca7ec7f70e50cb379c9b9cb5e532269e492f6"
+checksum = "8c3fb5adee25701c79ec58fcf2c63594cd8829bc9ad6037ff862d5a111101ed2"
 dependencies = [
  "Inflector",
- "const-hex",
  "ethers-contract-abigen",
- "ethers-core 2.0.10",
+ "ethers-core 2.0.7",
+ "hex",
  "proc-macro2",
  "quote",
  "serde_json",
@@ -1710,6 +1690,7 @@ source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd6
 dependencies = [
  "arrayvec",
  "bytes",
+ "cargo_metadata",
  "chrono",
  "elliptic-curve 0.13.6",
  "ethabi",
@@ -1717,12 +1698,14 @@ dependencies = [
  "hex",
  "k256 0.13.1",
  "num_enum 0.6.1",
+ "once_cell",
  "open-fastrlp",
  "rand",
  "rlp",
  "serde",
  "serde_json",
  "strum 0.24.1",
+ "syn 2.0.39",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -1737,7 +1720,6 @@ checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad"
 dependencies = [
  "arrayvec",
  "bytes",
- "cargo_metadata",
  "chrono",
  "const-hex",
  "elliptic-curve 0.13.6",
@@ -1745,14 +1727,12 @@ dependencies = [
  "generic-array",
  "k256 0.13.1",
  "num_enum 0.7.1",
- "once_cell",
  "open-fastrlp",
  "rand",
  "rlp",
  "serde",
  "serde_json",
  "strum 0.25.0",
- "syn 2.0.39",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -1761,12 +1741,11 @@ dependencies = [
 
 [[package]]
 name = "ethers-etherscan"
-version = "2.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045"
+version = "2.0.7"
+source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba"
 dependencies = [
- "ethers-core 2.0.10",
- "ethers-solc",
+ "ethers-core 2.0.7",
+ "ethers-solc 2.0.7 (git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7)",
  "reqwest",
  "semver 1.0.20",
  "serde",
@@ -1860,16 +1839,15 @@ dependencies = [
 
 [[package]]
 name = "ethers-solc"
-version = "2.0.10"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de34e484e7ae3cab99fbfd013d6c5dc7f9013676a4e0e414d8b12e1213e8b3ba"
+checksum = "a81c89f121595cf8959e746045bb8b25a6a38d72588561e1a3b7992fc213f674"
 dependencies = [
  "cfg-if 1.0.0",
- "const-hex",
- "dirs",
  "dunce",
- "ethers-core 2.0.10",
+ "ethers-core 2.0.7",
  "glob",
+ "hex",
  "home",
  "md-5",
  "num_cpus",
@@ -1890,6 +1868,35 @@ dependencies = [
  "yansi",
 ]
 
+[[package]]
+name = "ethers-solc"
+version = "2.0.7"
+source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dunce",
+ "ethers-core 2.0.7",
+ "glob",
+ "hex",
+ "home",
+ "md-5",
+ "num_cpus",
+ "once_cell",
+ "path-slash",
+ "rayon",
+ "regex",
+ "semver 1.0.20",
+ "serde",
+ "serde_json",
+ "solang-parser",
+ "thiserror",
+ "tiny-keccak",
+ "tokio",
+ "tracing",
+ "walkdir",
+ "yansi",
+]
+
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
@@ -2359,11 +2366,11 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 [[package]]
 name = "halo2-base"
 version = "0.2.2"
-source = "git+https://github.com/scroll-tech/halo2-lib?branch=sync-ff-0.13#17318039da63711d307fac5013a4ada227b456fe"
+source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#b7c53bb7456063936f4ca6df8fa8e751d9c17d85"
 dependencies = [
  "ff 0.13.0",
  "halo2_proofs",
- "itertools 0.10.5",
+ "itertools",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -2374,12 +2381,12 @@ dependencies = [
 [[package]]
 name = "halo2-ecc"
 version = "0.2.2"
-source = "git+https://github.com/scroll-tech/halo2-lib?branch=sync-ff-0.13#17318039da63711d307fac5013a4ada227b456fe"
+source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#b7c53bb7456063936f4ca6df8fa8e751d9c17d85"
 dependencies = [
  "ff 0.13.0",
  "group 0.13.0",
  "halo2-base",
- "itertools 0.10.5",
+ "itertools",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -2393,7 +2400,7 @@ dependencies = [
 [[package]]
 name = "halo2-gate-generator"
 version = "0.1.0"
-source = "git+https://github.com/zhenfeizhang/halo2gategen/?branch=sync-ff-0.13#0ada1c8079dece0df1d4730f0afb9380066b6932"
+source = "git+https://github.com/scroll-tech/halo2gategen#8ccf462e1eff4ed0e602d7ba19771b2c53dee0e3"
 dependencies = [
  "halo2_proofs",
  "lazy_static",
@@ -2409,18 +2416,20 @@ dependencies = [
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=sync-ff-0.13#42a18aa89867c21e5ad1657e829ccab2a6be0ec1"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.7.2#0e0307da87b877c0d29fc0374857b578fc2dbd3d"
 dependencies = [
+ "env_logger",
  "ethers-core 2.0.10",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "log",
  "num-bigint",
  "num-traits",
  "poseidon-circuit",
  "rand",
+ "rand_chacha",
  "serde",
  "serde_json",
  "strum 0.24.1",
@@ -2431,7 +2440,7 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.2.0"
-source = "git+https://github.com/scroll-tech/halo2.git?branch=sync-ff-0.13#ae6e02cf54e6bcaa056427c5acc61e33c7bfb66d"
+source = "git+https://github.com/scroll-tech/halo2.git?branch=v1.0#44dbed4515984bbc14cb8283e273794b03c28afa"
 dependencies = [
  "ark-std 0.3.0",
  "blake2b_simd",
@@ -2836,15 +2845,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -2909,7 +2909,7 @@ dependencies = [
  "env_logger",
  "eth-types",
  "halo2_proofs",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "log",
  "num-bigint",
@@ -2921,20 +2921,20 @@ dependencies = [
 
 [[package]]
 name = "lalrpop"
-version = "0.20.0"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
+checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
 dependencies = [
  "ascii-canvas",
  "bit-set",
  "diff",
  "ena",
  "is-terminal",
- "itertools 0.10.5",
+ "itertools",
  "lalrpop-util",
  "petgraph",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.6.29",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2943,9 +2943,9 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-util"
-version = "0.20.0"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
+checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
 
 [[package]]
 name = "lazy_static"
@@ -3098,17 +3098,16 @@ dependencies = [
 [[package]]
 name = "misc-precompiled-circuit"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/misc-precompiled-circuit.git?branch=sync-ff-0.13#a620c79eeee48be051af908eb2812a40b525293e"
+source = "git+https://github.com/scroll-tech/misc-precompiled-circuit.git?branch=sync-ff-0.13#e2c4b034d7f121c24bd9c3124e51dc26f9ddb598"
 dependencies = [
  "halo2-gate-generator",
  "halo2_proofs",
- "lazy_static",
  "num-bigint",
  "rand",
  "serde",
  "serde_json",
- "strum 0.24.1",
- "strum_macros 0.24.3",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
  "subtle",
 ]
 
@@ -3120,7 +3119,7 @@ dependencies = [
  "ethers-core 2.0.7",
  "ethers-signers",
  "external-tracer",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "log",
  "rand",
@@ -3354,12 +3353,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "os_str_bytes"
 version = "6.6.1"
@@ -3726,7 +3719,7 @@ dependencies = [
 [[package]]
 name = "poseidon"
 version = "0.2.0"
-source = "git+https://github.com/scroll-tech/poseidon.git?branch=sync-ff-0.13#5787dd3d2ce7a9e9601a035c396ac0c03449b54d"
+source = "git+https://github.com/scroll-tech/poseidon.git?branch=main#5787dd3d2ce7a9e9601a035c396ac0c03449b54d"
 dependencies = [
  "halo2curves",
  "subtle",
@@ -3735,7 +3728,7 @@ dependencies = [
 [[package]]
 name = "poseidon-circuit"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=sync-ff-0.13#cdc20edfa1265cd396f1a1d02b6c2781a1910f7f"
+source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-1201#c6f058bcf3bb0c7933d1979563c414f5cc480f25"
 dependencies = [
  "bitvec",
  "ff 0.13.0",
@@ -3903,7 +3896,7 @@ dependencies = [
  "git-version",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "log",
  "log4rs",
  "mpt-zktrie",
@@ -4049,9 +4042,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
@@ -4759,14 +4752,14 @@ dependencies = [
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=sync-ff-0.13#dcfd5928e9b757ae9a76fd8b5fa92e8ea9dfaa7e"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c1121a855564936a267b37bc9c27306de3eb3b"
 dependencies = [
  "bytes",
  "ethereum-types",
  "halo2-base",
  "halo2-ecc",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "num-bigint",
  "num-integer",
@@ -4783,14 +4776,14 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=sync-ff-0.13#dcfd5928e9b757ae9a76fd8b5fa92e8ea9dfaa7e"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c1121a855564936a267b37bc9c27306de3eb3b"
 dependencies = [
  "bincode",
  "ethereum-types",
  "ff 0.13.0",
  "halo2-base",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "log",
  "num-bigint",
@@ -4825,11 +4818,11 @@ dependencies = [
 
 [[package]]
 name = "solang-parser"
-version = "0.3.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb9fa2fa2fa6837be8a2495486ff92e3ffe68a99b6eeba288e139efdd842457"
+checksum = "4a94494913728908efa7a25a2dd2e4f037e714897985c24273c40596638ed909"
 dependencies = [
- "itertools 0.11.0",
+ "itertools",
  "lalrpop",
  "lalrpop-util",
  "phf",
@@ -4968,13 +4961,13 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "svm-rs"
-version = "0.3.3"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20689c7d03b6461b502d0b95d6c24874c7d24dea2688af80486a130a06af3b07"
+checksum = "3a04fc4f5cd35c700153b233f5575ccb3237e0f941fa5049d9e98254d10bf2fe"
 dependencies = [
- "dirs",
  "fs2",
  "hex",
+ "home",
  "once_cell",
  "reqwest",
  "semver 1.0.20",
@@ -5096,7 +5089,7 @@ dependencies = [
  "halo2_proofs",
  "handlebars",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "keccak256",
  "log",
  "mock",
@@ -5937,7 +5930,7 @@ dependencies = [
  "halo2-ecc",
  "halo2_proofs",
  "hex",
- "itertools 0.10.5",
+ "itertools",
  "keccak256",
  "lazy_static",
  "log",
@@ -6000,8 +5993,3 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "ethers-etherscan"
-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 72702edbde..6807d9f3f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,10 +31,10 @@ ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "
 ethers-providers = "=2.0.7"
 ethers-signers = "=2.0.7"
 ff = "0.13"
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "sync-ff-0.13" }
-hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "sync-ff-0.13" }
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-ff-0.13", default-features=false, features=["halo2-pse","display"] }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-ff-0.13", default-features=false, features=["halo2-pse","display"] }
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.0" }
+hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-1201" }
+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"] }
 hex = "0.4"
 itertools = "0.10"
 lazy_static = "1.4"
@@ -53,8 +53,8 @@ regex = "1.5"
 serde = {version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha3 = "0.10"
-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "sync-ff-0.13" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "sync-ff-0.13", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+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"] }
 strum = "0.24"
 strum_macros = "0.24"
 subtle = "2.4"
@@ -65,11 +65,10 @@ url = "2.2"
 ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
 ethers-etherscan = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
 [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "sync-ff-0.13" }
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.0" }
 [patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
-poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "sync-ff-0.13" }
-# [patch."https://github.com/privacy-scaling-explorations/halo2wrong.git"]
-# maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-ecc-snark-verifier-0323" }
+poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" }
+
 
 # Definition of benchmarks profile to use.
 [profile.bench]
diff --git a/eth-types/src/lib.rs b/eth-types/src/lib.rs
index 70125dc4d1..506abe7f7d 100644
--- a/eth-types/src/lib.rs
+++ b/eth-types/src/lib.rs
@@ -3,6 +3,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 // Temporary until we have more of the crate implemented.
 #![allow(dead_code)]
+#![allow(incomplete_features)]
 // We want to have UPPERCASE idents sometimes.
 #![allow(non_snake_case)]
 // Catch documentation errors caused by code changes.
diff --git a/gadgets/src/evm_word.rs b/gadgets/src/evm_word.rs
index 1019304f1e..d88c15e10c 100644
--- a/gadgets/src/evm_word.rs
+++ b/gadgets/src/evm_word.rs
@@ -255,7 +255,7 @@ mod tests {
             assert_eq!(
                 prover.verify(),
                 Err(vec![VerifyFailure::Lookup {
-                    name: "Encoded word / Pub inputs".to_string(),
+                    name: "Encoded word / Pub inputs",
                     lookup_index: 32,
                     location: FailureLocation::InRegion {
                         region: halo2_proofs::dev::metadata::Region::from((
diff --git a/gadgets/src/monotone.rs b/gadgets/src/monotone.rs
index 072e8ba90d..bd84cf0b3a 100644
--- a/gadgets/src/monotone.rs
+++ b/gadgets/src/monotone.rs
@@ -233,7 +233,7 @@ mod test {
             vec![1, 2, 2, 4, 4],
             Err(vec![
                 Lookup {
-                    name: "Range check".to_string(),
+                    name: "Range check",
                     lookup_index: 0,
                     location: FailureLocation::InRegion {
                         region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
@@ -241,7 +241,7 @@ mod test {
                     },
                 },
                 Lookup {
-                    name: "Range check".to_string(),
+                    name: "Range check",
                     lookup_index: 0,
                     location: FailureLocation::InRegion {
                         region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
@@ -254,7 +254,7 @@ mod test {
         try_test_circuit(
             vec![1, 2, 3, 4, 105],
             Err(vec![Lookup {
-                name: "Range check".to_string(),
+                name: "Range check",
                 lookup_index: 0,
                 location: FailureLocation::InRegion {
                     region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
@@ -266,7 +266,7 @@ mod test {
         try_test_circuit(
             vec![1, 2, 3, 103, 4],
             Err(vec![Lookup {
-                name: "Range check".to_string(),
+                name: "Range check",
                 lookup_index: 0,
                 location: FailureLocation::InRegion {
                     region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
@@ -289,7 +289,7 @@ mod test {
         try_test_circuit(
             vec![1, 2, 3, 4, 105],
             Err(vec![Lookup {
-                name: "Range check".to_string(),
+                name: "Range check",
                 lookup_index: 0,
                 location: FailureLocation::InRegion {
                     region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
@@ -301,7 +301,7 @@ mod test {
         try_test_circuit(
             vec![1, 2, 3, 103, 4],
             Err(vec![Lookup {
-                name: "Range check".to_string(),
+                name: "Range check",
                 lookup_index: 0,
                 location: FailureLocation::InRegion {
                     region: halo2_proofs::dev::metadata::Region::from((1, "witness")),
diff --git a/zktrie/Cargo.toml b/zktrie/Cargo.toml
index 1399948a3c..42e0522ef0 100644
--- a/zktrie/Cargo.toml
+++ b/zktrie/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 
 [dependencies]
 halo2_proofs.workspace = true
-mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", branch = "sync-ff-0.13" }
+mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", tag = "v0.7.2" }
 zktrie = { git = "https://github.com/scroll-tech/zktrie.git", tag = "v0.7.1" }
 hash-circuit.workspace = true
 eth-types = { path = "../eth-types" }