From da0c1b2ecfc96855b7d3cc86732f530cea6450d5 Mon Sep 17 00:00:00 2001
From: lightsing <light.tsing@gmail.com>
Date: Fri, 10 Oct 2025 10:21:06 +0800
Subject: [PATCH 1/2] upgrade reth

---
 Cargo.lock | 368 +++++++++++++++++++++++++++++++++--------------------
 Cargo.toml |   1 -
 2 files changed, 230 insertions(+), 139 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2759446..e49828c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a3bd0305a44fb457cae77de1e82856eadd42ea3cdf0dae29df32eb3b592979"
+checksum = "6a0dd3ed764953a6b20458b2b7abbfdc93d20d14b38babe1a70fe631a443a9f1"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -106,15 +106,16 @@ dependencies = [
  "rand 0.8.5",
  "secp256k1 0.30.0",
  "serde",
+ "serde_json",
  "serde_with",
  "thiserror",
 ]
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a842b4023f571835e62ac39fb8d523d19fcdbacfa70bf796ff96e7e19586f50"
+checksum = "9556182afa73cddffa91e64a5aa9508d5e8c912b3a15f26998d2388a824d2c7b"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -173,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cd749c57f38f8cbf433e651179fc5a676255e6b95044f467d49255d2b81725a"
+checksum = "305fa99b538ca7006b0c03cfed24ec6d82beda67aac857ef4714be24231d15e6"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -187,6 +188,8 @@ dependencies = [
  "c-kzg",
  "derive_more",
  "either",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
  "serde",
  "serde_with",
  "sha2 0.10.9",
@@ -203,11 +206,30 @@ dependencies = [
  "alloy-eips",
  "alloy-hardforks",
  "alloy-primitives",
+ "alloy-sol-types",
+ "auto_impl",
+ "derive_more",
+ "revm",
+ "thiserror",
+]
+
+[[package]]
+name = "alloy-evm"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06a5f67ee74999aa4fe576a83be1996bdf74a30fce3d248bf2007d6fc7dae8aa"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-hardforks",
+ "alloy-primitives",
+ "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
  "alloy-sol-types",
  "auto_impl",
  "derive_more",
  "op-alloy-consensus",
+ "op-alloy-rpc-types-engine",
  "op-revm",
  "revm",
  "thiserror",
@@ -215,9 +237,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d32cbf6c26d7d87e8a4e5925bbce41456e0bbeed95601add3443af277cd604e"
+checksum = "a272533715aefc900f89d51db00c96e6fd4f517ea081a12fea482a352c8c815c"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -229,9 +251,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-hardforks"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d66cfdf265bf52c0c4a952960c854c3683c71ff2fc02c9b8c317c691fd3bc28"
+checksum = "889eb3949b58368a09d4f16931c660275ef5fb08e5fbd4a96573b19c7085c41f"
 dependencies = [
  "alloy-chains",
  "alloy-eip2124",
@@ -255,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f614019a029c8fec14ae661aa7d4302e6e66bdbfb869dab40e78dcfba935fc97"
+checksum = "d91676d242c0ced99c0dd6d0096d7337babe9457cc43407d26aa6367fcf90553"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -270,9 +292,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8b6d58e98803017bbfea01dde96c4d270a29e7aed3beb65c8d28b5ab464e0e"
+checksum = "77f82150116b30ba92f588b87f08fa97a46a1bd5ffc0d0597efdf0843d36bfda"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -296,9 +318,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db489617bffe14847bf89f175b1c183e5dd7563ef84713936e2c34255cfbd845"
+checksum = "223612259a080160ce839a4e5df0125ca403a1d5e7206cc911cea54af5d769aa"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -336,9 +358,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed90278374435e076a04dbddbb6d714bdd518eb274a64dbd70f65701429dd747"
+checksum = "f7283b81b6f136100b152e699171bc7ed8184a58802accbc91a7df4ebb944445"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -397,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33732242ca63f107f5f8284190244038905fb233280f4b7c41f641d4f584d40d"
+checksum = "1154b12d470bef59951c62676e106f4ce5de73b987d86b9faa935acebb138ded"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -420,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f27c0c41a16cd0af4f5dbf791f7be2a60502ca8b0e840e0ad29803fac2d587"
+checksum = "23cc57ee0c1ac9fb14854195fc249494da7416591dc4a4d981ddfd5dd93b9bce"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -443,23 +465,27 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec35a39206f0e04e8544d763c9fe324cc01f74de8821ef4b61e25ac329682f9"
+checksum = "1d9d173854879bcf26c7d71c1c3911972a3314df526f4349ffe488e676af577d"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
+ "alloy-serde",
  "derive_more",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
+ "serde",
  "strum",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f5812f81c3131abc2cd8953dc03c41999e180cff7252abbccaba68676e15027"
+checksum = "6d7d47bca1a2a1541e4404aa38b7e262bb4dffd9ac23b4f178729a4ddc5a5caa"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -478,9 +504,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dfe41a47805a34b848c83448946ca96f3d36842e8c074bcf8fa0870e337d12"
+checksum = "6a8468f1a7f9ee3bae73c24eead0239abea720dbf7779384b9c7e20d51bfb6b0"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -489,9 +515,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79237b4c1b0934d5869deea4a54e6f0a7425a8cd943a739d6293afdf893d847"
+checksum = "33387c90b0a5021f45a5a77c2ce6c49b8f6980e66a318181468fb24cea771670"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -574,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb43750e137fe3a69a325cd89a8f8e2bbf4f83e70c0f60fbe49f22511ca075e8"
+checksum = "702002659778d89a94cd4ff2044f6b505460df6c162e2f47d1857573845b0ace"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -599,9 +625,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b42c7d8b666eed975739201f407afc3320d3cd2e4d807639c2918fc736ea67"
+checksum = "0d6bdc0830e5e8f08a4c70a4c791d400a86679c694a3b4b986caf26fad680438"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -630,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.0.32"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e434e0917dce890f755ea774f59d6f12557bc8c7dd9fa06456af80cfe0f0181e"
+checksum = "7bf39928a5e70c9755d6811a2928131b53ba785ad37c8bf85c90175b5d43b818"
 dependencies = [
  "alloy-primitives",
  "darling 0.21.3",
@@ -1857,7 +1883,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ethereum_serde_utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dc1355dbb41fbbd34ec28d4fb2a57d9a70c67ac3c19f6a5ca4d4a176b9e997a"
+dependencies = [
+ "alloy-primitives",
+ "hex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "ethereum_ssz"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dcddb2554d19cde19b099fadddde576929d7a4d0c1cd3512d1fd95cf174375c"
+dependencies = [
+ "alloy-primitives",
+ "ethereum_serde_utils",
+ "itertools 0.13.0",
+ "serde",
+ "serde_derive",
+ "smallvec",
+ "typenum",
+]
+
+[[package]]
+name = "ethereum_ssz_derive"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a657b6b3b7e153637dc6bdc6566ad9279d9ee11a15b12cfb24a2e04360637e9f"
+dependencies = [
+ "darling 0.20.11",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -3066,9 +3132,9 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "op-alloy-consensus"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ade20c592484ba1ea538006e0454284174447a3adf9bb59fa99ed512f95493"
+checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -3081,6 +3147,25 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "op-alloy-rpc-types-engine"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14e50c94013a1d036a529df259151991dbbd6cf8dc215e3b68b784f95eec60e6"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives",
+ "alloy-rlp",
+ "alloy-rpc-types-engine",
+ "derive_more",
+ "ethereum_ssz",
+ "ethereum_ssz_derive",
+ "op-alloy-consensus",
+ "snap",
+ "thiserror",
+]
+
 [[package]]
 name = "op-revm"
 version = "10.0.0"
@@ -3599,7 +3684,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3825,13 +3910,13 @@ dependencies = [
 
 [[package]]
 name = "reth-chainspec"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-genesis",
  "alloy-primitives",
  "alloy-trie",
@@ -3845,8 +3930,8 @@ dependencies = [
 
 [[package]]
 name = "reth-codecs"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -3863,10 +3948,9 @@ dependencies = [
 
 [[package]]
 name = "reth-codecs-derive"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -3874,8 +3958,8 @@ dependencies = [
 
 [[package]]
 name = "reth-db-models"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -3884,8 +3968,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-forks"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-eip2124",
  "alloy-hardforks",
@@ -3896,13 +3980,15 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-primitives"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
  "reth-codecs",
  "reth-primitives-traits",
  "serde",
@@ -3911,12 +3997,12 @@ dependencies = [
 
 [[package]]
 name = "reth-evm"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "auto_impl",
  "derive_more",
@@ -3933,12 +4019,12 @@ dependencies = [
 
 [[package]]
 name = "reth-evm-ethereum"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "reth-chainspec",
@@ -3953,10 +4039,10 @@ dependencies = [
 
 [[package]]
 name = "reth-execution-errors"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "alloy-rlp",
  "nybbles",
@@ -3966,12 +4052,12 @@ dependencies = [
 
 [[package]]
 name = "reth-execution-types"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "derive_more",
  "reth-ethereum-primitives",
@@ -3982,8 +4068,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-peers"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -3994,8 +4080,8 @@ dependencies = [
 
 [[package]]
 name = "reth-primitives"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "once_cell",
@@ -4007,8 +4093,8 @@ dependencies = [
 
 [[package]]
 name = "reth-primitives-traits"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4035,8 +4121,8 @@ dependencies = [
 
 [[package]]
 name = "reth-prune-types"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-primitives",
  "derive_more",
@@ -4045,8 +4131,8 @@ dependencies = [
 
 [[package]]
 name = "reth-scroll-chainspec"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -4070,12 +4156,12 @@ dependencies = [
 
 [[package]]
 name = "reth-scroll-evm"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "derive_more",
@@ -4100,8 +4186,8 @@ dependencies = [
 
 [[package]]
 name = "reth-scroll-forks"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -4114,8 +4200,8 @@ dependencies = [
 
 [[package]]
 name = "reth-scroll-primitives"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4131,8 +4217,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages-types"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-primitives",
  "reth-trie-common",
@@ -4140,8 +4226,8 @@ dependencies = [
 
 [[package]]
 name = "reth-static-file-types"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-primitives",
  "derive_more",
@@ -4151,8 +4237,8 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-api"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4173,8 +4259,8 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-errors"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -4189,8 +4275,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4211,8 +4297,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-common"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -4227,8 +4313,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-sparse"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -4243,16 +4329,16 @@ dependencies = [
 
 [[package]]
 name = "reth-zstd-compressors"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "zstd",
 ]
 
 [[package]]
 name = "revm"
-version = "29.0.0"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "29.0.1"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "revm-bytecode",
  "revm-context",
@@ -4270,7 +4356,7 @@ dependencies = [
 [[package]]
 name = "revm-bytecode"
 version = "6.2.2"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "bitvec",
  "phf",
@@ -4280,8 +4366,8 @@ dependencies = [
 
 [[package]]
 name = "revm-context"
-version = "9.0.2"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "9.1.0"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -4296,8 +4382,8 @@ dependencies = [
 
 [[package]]
 name = "revm-context-interface"
-version = "10.1.0"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "10.2.0"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -4312,7 +4398,7 @@ dependencies = [
 [[package]]
 name = "revm-database"
 version = "7.0.5"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "alloy-eips",
  "revm-bytecode",
@@ -4325,7 +4411,7 @@ dependencies = [
 [[package]]
 name = "revm-database-interface"
 version = "7.0.5"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "auto_impl",
  "either",
@@ -4336,8 +4422,8 @@ dependencies = [
 
 [[package]]
 name = "revm-handler"
-version = "10.0.0"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "10.0.1"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "auto_impl",
  "derive-where",
@@ -4354,8 +4440,8 @@ dependencies = [
 
 [[package]]
 name = "revm-inspector"
-version = "10.0.0"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "10.0.1"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "auto_impl",
  "either",
@@ -4371,8 +4457,8 @@ dependencies = [
 
 [[package]]
 name = "revm-interpreter"
-version = "25.0.2"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+version = "25.0.3"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "revm-bytecode",
  "revm-context-interface",
@@ -4383,7 +4469,7 @@ dependencies = [
 [[package]]
 name = "revm-precompile"
 version = "27.0.0"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -4408,7 +4494,7 @@ dependencies = [
 [[package]]
 name = "revm-primitives"
 version = "20.2.1"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -4419,7 +4505,7 @@ dependencies = [
 [[package]]
 name = "revm-scroll"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/scroll-revm#727c40fe86ac165f53505a6efe01bad9b1c502f7"
+source = "git+https://github.com/scroll-tech/scroll-revm#307f050ebe267492c483570356cc44990df42acf"
 dependencies = [
  "auto_impl",
  "enumn",
@@ -4433,7 +4519,7 @@ dependencies = [
 [[package]]
 name = "revm-state"
 version = "7.0.5"
-source = "git+https://github.com/scroll-tech/revm#cc793301c260ce292d8deb59f61bc2a59bd0b991"
+source = "git+https://github.com/scroll-tech/revm#51f65cca104d85ea41125e88d58ece665d1f43c1"
 dependencies = [
  "bitflags",
  "revm-bytecode",
@@ -4635,7 +4721,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4775,7 +4861,7 @@ version = "2.0.0"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.20.1",
  "alloy-network",
  "alloy-primitives",
  "alloy-rpc-types-debug",
@@ -4872,8 +4958,8 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scroll-alloy-consensus"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4888,12 +4974,12 @@ dependencies = [
 
 [[package]]
 name = "scroll-alloy-evm"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-evm",
+ "alloy-evm 0.21.2",
  "alloy-primitives",
  "auto_impl",
  "encoder-standard",
@@ -4906,8 +4992,8 @@ dependencies = [
 
 [[package]]
 name = "scroll-alloy-hardforks"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-hardforks",
  "auto_impl",
@@ -4916,8 +5002,8 @@ dependencies = [
 
 [[package]]
 name = "scroll-alloy-network"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -4931,8 +5017,8 @@ dependencies = [
 
 [[package]]
 name = "scroll-alloy-rpc-types"
-version = "1.7.0"
-source = "git+https://github.com/scroll-tech/reth?branch=scroll#501e5c609bdd13af047f90d764331ba5ad39c34b"
+version = "1.8.2"
+source = "git+https://github.com/scroll-tech/reth?branch=scroll#32019bcde9d08524caad5b359b693e8f0c3951b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5028,9 +5114,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.225"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -5047,18 +5133,18 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.225"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.225"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5240,6 +5326,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "snap"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
+
 [[package]]
 name = "socket2"
 version = "0.6.0"
@@ -5436,7 +5528,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0cdffce..e2804f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,7 +110,6 @@ sbv = { path = "crates/sbv" }
 sbv-core = { path = "crates/core" }
 sbv-kv = { path = "crates/kv" }
 sbv-primitives = { path = "crates/primitives" }
-sbv-precompile = { path = "crates/precompile" }
 sbv-trie = { path = "crates/trie" }
 sbv-helpers = { path = "crates/helpers" }
 sbv-utils = { path = "crates/utils" }

From 59c7b1ca431b00c37d74e12f9e07c2851ff92ee0 Mon Sep 17 00:00:00 2001
From: lightsing <light.tsing@gmail.com>
Date: Fri, 10 Oct 2025 10:37:59 +0800
Subject: [PATCH 2/2] fix upgrade

---
 crates/core/src/executor/scroll.rs                | 6 ++++--
 crates/primitives/src/legacy_types/transaction.rs | 2 +-
 crates/primitives/src/types.rs                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/core/src/executor/scroll.rs b/crates/core/src/executor/scroll.rs
index 69aa4b2..c87cc4e 100644
--- a/crates/core/src/executor/scroll.rs
+++ b/crates/core/src/executor/scroll.rs
@@ -65,8 +65,10 @@ impl<
             .without_state_clear()
             .build();
 
-        let evm = provider.evm_for_block(&mut db, self.block.header());
-        let ctx = provider.context_for_block(self.block);
+        let evm = provider
+            .evm_for_block(&mut db, self.block.header())
+            .expect("infallible");
+        let ctx = provider.context_for_block(self.block).expect("infallible");
         let executor =
             ScrollBlockExecutor::new(evm, ctx, factory.spec(), factory.receipt_builder());
 
diff --git a/crates/primitives/src/legacy_types/transaction.rs b/crates/primitives/src/legacy_types/transaction.rs
index 7e5836a..a37882f 100644
--- a/crates/primitives/src/legacy_types/transaction.rs
+++ b/crates/primitives/src/legacy_types/transaction.rs
@@ -127,7 +127,7 @@ pub struct Transaction {
 impl From<TxEnvelope> for Transaction {
     fn from(tx: TxEnvelope) -> Self {
         #[cfg(feature = "scroll")]
-        use crate::types::reth::primitives::SignedTransaction;
+        use crate::types::consensus::TxHashRef;
 
         Self {
             hash: *tx.tx_hash(),
diff --git a/crates/primitives/src/types.rs b/crates/primitives/src/types.rs
index 3deda02..2a991e7 100644
--- a/crates/primitives/src/types.rs
+++ b/crates/primitives/src/types.rs
@@ -3,7 +3,7 @@ pub mod consensus {
     pub use alloy_consensus::{
         Block, BlockHeader, Header, SignableTransaction, Transaction, TxEip1559, TxEip2930,
         TxEip4844, TxEip4844Variant, TxEip4844WithSidecar, TxEip7702, TxLegacy, Typed2718,
-        transaction::SignerRecoverable,
+        transaction::{SignerRecoverable, TxHashRef},
     };
 
     #[cfg(not(feature = "scroll"))]