feat: Support testnet sync

- Add testnet S3 bucket - Use testnet RPC properly - Use testnet chainspec on pseudo peer
fix: Initialize DB with HL-specific tables on init-state
2025-12-06 10:59:55 +00:00 · 2025-08-22 10:40:36 -04:00 · 2025-08-22 10:40:14 -04:00 · 2025-08-22 10:39:25 -04:00 · 2025-08-22 10:38:52 -04:00 · 2025-08-22 23:10:22 +09:00
14 changed files with 351 additions and 217 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -6683,7 +6683,7 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
 [[package]]
 name = "reth"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-rpc-types",
 "aquamarine",
@ -6729,7 +6729,7 @@ dependencies = [
 [[package]]
 name = "reth-basic-payload-builder"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -6753,7 +6753,7 @@ dependencies = [
 [[package]]
 name = "reth-chain-state"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -6784,7 +6784,7 @@ dependencies = [
 [[package]]
 name = "reth-chainspec"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-chains",
 "alloy-consensus",
@ -6804,7 +6804,7 @@ dependencies = [
 [[package]]
 name = "reth-cli"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-genesis",
 "clap",
@ -6818,7 +6818,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-commands"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "ahash",
 "alloy-chains",
@ -6898,7 +6898,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-runner"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "reth-tasks",
 "tokio",
@ -6908,7 +6908,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-util"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -6926,7 +6926,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -6946,7 +6946,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs-derive"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "convert_case",
 "proc-macro2",
@ -6957,7 +6957,7 @@ dependencies = [
 [[package]]
 name = "reth-config"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "eyre",
 "humantime-serde",
@ -6972,7 +6972,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -6985,7 +6985,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-common"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -6997,7 +6997,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-debug-client"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7022,7 +7022,7 @@ dependencies = [
 [[package]]
 name = "reth-db"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "derive_more",
@ -7048,7 +7048,7 @@ dependencies = [
 [[package]]
 name = "reth-db-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-genesis",
@ -7076,7 +7076,7 @@ dependencies = [
 [[package]]
 name = "reth-db-common"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-genesis",
@ -7106,7 +7106,7 @@ dependencies = [
 [[package]]
 name = "reth-db-models"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -7121,7 +7121,7 @@ dependencies = [
 [[package]]
 name = "reth-discv4"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -7147,7 +7147,7 @@ dependencies = [
 [[package]]
 name = "reth-discv5"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -7171,7 +7171,7 @@ dependencies = [
 [[package]]
 name = "reth-dns-discovery"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "data-encoding",
@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "reth-downloaders"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7225,7 +7225,7 @@ dependencies = [
 [[package]]
 name = "reth-ecies"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "aes",
 "alloy-primitives",
@ -7256,7 +7256,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-local"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -7278,7 +7278,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7303,7 +7303,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-service"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "futures",
 "pin-project",
@ -7326,7 +7326,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-tree"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7373,7 +7373,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-util"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-rpc-types-engine",
@ -7401,7 +7401,7 @@ dependencies = [
 [[package]]
 name = "reth-era"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7417,7 +7417,7 @@ dependencies = [
 [[package]]
 name = "reth-era-downloader"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "bytes",
@ -7432,7 +7432,7 @@ dependencies = [
 [[package]]
 name = "reth-era-utils"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -7456,7 +7456,7 @@ dependencies = [
 [[package]]
 name = "reth-errors"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "reth-consensus",
 "reth-execution-errors",
@ -7467,7 +7467,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-chains",
 "alloy-primitives",
@ -7496,7 +7496,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-chains",
 "alloy-consensus",
@ -7520,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-cli"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "clap",
 "eyre",
@ -7541,7 +7541,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-consensus"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7557,7 +7557,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-engine-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -7575,7 +7575,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-forks"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eip2124",
 "alloy-hardforks",
@ -7589,7 +7589,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-payload-builder"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7616,7 +7616,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7634,7 +7634,7 @@ dependencies = [
 [[package]]
 name = "reth-etl"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "rayon",
 "reth-db-api",
@ -7644,7 +7644,7 @@ dependencies = [
 [[package]]
 name = "reth-evm"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7667,7 +7667,7 @@ dependencies = [
 [[package]]
 name = "reth-evm-ethereum"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7688,7 +7688,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-errors"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-evm",
 "alloy-primitives",
@ -7701,7 +7701,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7719,7 +7719,7 @@ dependencies = [
 [[package]]
 name = "reth-exex"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7757,7 +7757,7 @@ dependencies = [
 [[package]]
 name = "reth-exex-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -7771,7 +7771,7 @@ dependencies = [
 [[package]]
 name = "reth-fs-util"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "serde",
 "serde_json",
@ -7781,7 +7781,7 @@ dependencies = [
 [[package]]
 name = "reth-invalid-block-hooks"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -7809,7 +7809,7 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "bytes",
 "futures",
@ -7829,7 +7829,7 @@ dependencies = [
 [[package]]
 name = "reth-libmdbx"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "bitflags 2.9.2",
 "byteorder",
@ -7846,7 +7846,7 @@ dependencies = [
 [[package]]
 name = "reth-mdbx-sys"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "bindgen 0.70.1",
 "cc",
@ -7855,7 +7855,7 @@ dependencies = [
 [[package]]
 name = "reth-metrics"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "futures",
 "metrics",
@ -7867,7 +7867,7 @@ dependencies = [
 [[package]]
 name = "reth-net-banlist"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 ]
@ -7875,7 +7875,7 @@ dependencies = [
 [[package]]
 name = "reth-net-nat"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "futures-util",
 "if-addrs",
@ -7889,7 +7889,7 @@ dependencies = [
 [[package]]
 name = "reth-network"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7944,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "reth-network-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -7969,7 +7969,7 @@ dependencies = [
 [[package]]
 name = "reth-network-p2p"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "reth-network-peers"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -8006,7 +8006,7 @@ dependencies = [
 [[package]]
 name = "reth-network-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eip2124",
 "humantime-serde",
@ -8020,7 +8020,7 @@ dependencies = [
 [[package]]
 name = "reth-nippy-jar"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "anyhow",
 "bincode",
@ -8037,7 +8037,7 @@ dependencies = [
 [[package]]
 name = "reth-node-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-rpc-types-engine",
 "eyre",
@ -8061,7 +8061,7 @@ dependencies = [
 [[package]]
 name = "reth-node-builder"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "reth-node-core"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8180,7 +8180,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethereum"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-network",
@ -8218,7 +8218,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethstats"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -8242,7 +8242,7 @@ dependencies = [
 [[package]]
 name = "reth-node-events"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8266,7 +8266,7 @@ dependencies = [
 [[package]]
 name = "reth-node-metrics"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "eyre",
 "http 1.3.1",
@ -8287,7 +8287,7 @@ dependencies = [
 [[package]]
 name = "reth-node-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "reth-chainspec",
 "reth-db-api",
@ -8299,7 +8299,7 @@ dependencies = [
 [[package]]
 name = "reth-optimism-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8318,7 +8318,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-builder"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-rpc-types",
@ -8338,7 +8338,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-builder-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "pin-project",
 "reth-payload-primitives",
@ -8350,7 +8350,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -8369,7 +8369,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-validator"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-rpc-types-engine",
@ -8379,7 +8379,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "c-kzg",
@ -8393,7 +8393,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives-traits"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8426,7 +8426,7 @@ dependencies = [
 [[package]]
 name = "reth-provider"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8471,7 +8471,7 @@ dependencies = [
 [[package]]
 name = "reth-prune"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8499,7 +8499,7 @@ dependencies = [
 [[package]]
 name = "reth-prune-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "arbitrary",
@ -8513,7 +8513,7 @@ dependencies = [
 [[package]]
 name = "reth-ress-protocol"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -8532,7 +8532,7 @@ dependencies = [
 [[package]]
 name = "reth-ress-provider"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -8559,7 +8559,7 @@ dependencies = [
 [[package]]
 name = "reth-revm"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "reth-primitives-traits",
@ -8572,7 +8572,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-dyn-abi",
@ -8648,7 +8648,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-genesis",
@ -8676,7 +8676,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-builder"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-network",
 "alloy-provider",
@ -8714,7 +8714,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-convert"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-json-rpc",
@ -8733,7 +8733,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-engine-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -8763,7 +8763,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-dyn-abi",
@ -8807,7 +8807,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8851,7 +8851,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-layer"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-rpc-types-engine",
 "http 1.3.1",
@ -8865,7 +8865,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-server-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -8881,7 +8881,7 @@ dependencies = [
 [[package]]
 name = "reth-stages"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -8925,7 +8925,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -8952,7 +8952,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "arbitrary",
@ -8966,7 +8966,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "parking_lot",
@ -8986,7 +8986,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file-types"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "clap",
@ -8998,7 +8998,7 @@ dependencies = [
 [[package]]
 name = "reth-storage-api"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -9021,7 +9021,7 @@ dependencies = [
 [[package]]
 name = "reth-storage-errors"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-eips",
 "alloy-primitives",
@ -9037,7 +9037,7 @@ dependencies = [
 [[package]]
 name = "reth-tasks"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "auto_impl",
 "dyn-clone",
@ -9055,7 +9055,7 @@ dependencies = [
 [[package]]
 name = "reth-tokio-util"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "tokio",
 "tokio-stream",
@ -9065,7 +9065,7 @@ dependencies = [
 [[package]]
 name = "reth-tracing"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "clap",
 "eyre",
@ -9080,7 +9080,7 @@ dependencies = [
 [[package]]
 name = "reth-transaction-pool"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -9120,7 +9120,7 @@ dependencies = [
 [[package]]
 name = "reth-trie"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-eips",
@ -9145,7 +9145,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-common"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-consensus",
 "alloy-primitives",
@ -9171,7 +9171,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-db"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "reth-db-api",
@ -9184,7 +9184,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-parallel"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -9209,7 +9209,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-sparse"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -9228,7 +9228,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-sparse-parallel"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "alloy-primitives",
 "alloy-rlp",
@ -9246,7 +9246,7 @@ dependencies = [
 [[package]]
 name = "reth-zstd-compressors"
 version = "1.6.0"
-source = "git+https://github.com/sprites0/reth?rev=57f199982fe5911e11be126451b4ea6c1b0a5f4a#57f199982fe5911e11be126451b4ea6c1b0a5f4a"
+source = "git+https://github.com/sprites0/reth?rev=eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc#eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc"
 dependencies = [
 "zstd",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -25,43 +25,43 @@ lto = "fat"
 codegen-units = 1

 [dependencies]
-reth = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-cli = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-cli-commands = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-basic-payload-builder = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-db = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-db-api = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-chainspec = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-cli-util = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-discv4 = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-engine-primitives = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-ethereum-forks = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-ethereum-payload-builder = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-ethereum-primitives = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-eth-wire = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-eth-wire-types = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-evm = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-evm-ethereum = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-node-core = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-revm = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-network = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-network-p2p = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-network-api = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-node-ethereum = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-network-peers = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-payload-primitives = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-primitives = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-primitives-traits = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-provider = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a", features = ["test-utils"] }
-reth-rpc = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-rpc-eth-api = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-rpc-engine-api = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-tracing = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-trie-common = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-trie-db = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-codecs = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-transaction-pool = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
-reth-stages-types = { git = "https://github.com/sprites0/reth", rev = "57f199982fe5911e11be126451b4ea6c1b0a5f4a" }
+reth = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-cli = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-cli-commands = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-basic-payload-builder = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-db = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-db-api = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-chainspec = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-cli-util = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-discv4 = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-engine-primitives = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-ethereum-forks = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-ethereum-payload-builder = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-ethereum-primitives = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-eth-wire = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-eth-wire-types = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-evm = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-evm-ethereum = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-node-core = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-revm = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-network = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-network-p2p = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-network-api = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-node-ethereum = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-network-peers = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-payload-primitives = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-primitives = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-primitives-traits = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-provider = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc", features = ["test-utils"] }
+reth-rpc = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-rpc-eth-api = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-rpc-engine-api = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-tracing = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-trie-common = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-trie-db = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-codecs = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-transaction-pool = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
+reth-stages-types = { git = "https://github.com/sprites0/reth", rev = "eef450bf795d4b33d67fa6e4b7cc351f9c87bfdc" }
 revm = { version = "28.0.1", default-features = false }

 # alloy dependencies
--- a/src/chainspec/hl.rs
+++ b/src/chainspec/hl.rs
@ -34,12 +34,10 @@ pub static HL_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
    ])
 });

-/// The Hyperliqiud Mainnet spec
-pub fn hl_mainnet() -> ChainSpec {
+pub fn hl_chainspec(chain: Chain, genesis: &'static str) -> ChainSpec {
    ChainSpec {
-        chain: Chain::from_named(NamedChain::Hyperliquid),
-        genesis: serde_json::from_str(include_str!("genesis.json"))
-            .expect("Can't deserialize Hyperliquid Mainnet genesis json"),
+        chain,
+        genesis: serde_json::from_str(genesis).expect("Can't deserialize Hyperliquid genesis json"),
        genesis_header: empty_genesis_header(),
        paris_block_and_final_difficulty: Some((0, U256::from(0))),
        hardforks: HL_HARDFORKS.clone(),
@ -48,6 +46,18 @@ pub fn hl_mainnet() -> ChainSpec {
    }
 }

+/// The Hyperliqiud Mainnet spec
+pub fn hl_mainnet() -> ChainSpec {
+    hl_chainspec(Chain::from_named(NamedChain::Hyperliquid), include_str!("genesis.json"))
+}
+
+/// The Hyperliqiud Testnet spec
+pub fn hl_testnet() -> ChainSpec {
+    // Note: Testnet sync starts from snapshotted state [1] instead of genesis block.
+    // So the `alloc` field is not used, which makes it fine to reuse mainnet genesis file.
+    hl_chainspec(Chain::from_id_unchecked(998), include_str!("genesis.json"))
+}
+
 /// Empty genesis header for Hyperliquid Mainnet.
 ///
 /// The exact value is not known per se, but the parent hash of block 1 is known to be
--- a/src/chainspec/mod.rs
+++ b/src/chainspec/mod.rs
@ -152,4 +152,12 @@ impl HlChainSpec {
            _ => unreachable!("Unreachable since ChainSpecParser won't return other chains"),
        }
    }
+
+    pub fn official_s3_bucket(self) -> &'static str {
+        match self.inner.chain().id() {
+            MAINNET_CHAIN_ID => "hl-mainnet-evm-blocks",
+            TESTNET_CHAIN_ID => "hl-testnet-evm-blocks",
+            _ => unreachable!("Unreachable since ChainSpecParser won't return other chains"),
+        }
+    }
 }
--- a/src/chainspec/parser.rs
+++ b/src/chainspec/parser.rs
@ -1,11 +1,11 @@
-use crate::chainspec::HlChainSpec;
+use crate::chainspec::{hl::hl_testnet, HlChainSpec};

 use super::hl::hl_mainnet;
 use reth_cli::chainspec::ChainSpecParser;
 use std::sync::Arc;

 /// Chains supported by HyperEVM. First value should be used as the default.
-pub const SUPPORTED_CHAINS: &[&str] = &["mainnet"];
+pub const SUPPORTED_CHAINS: &[&str] = &["mainnet", "testnet"];

 /// Hyperliquid chain specification parser.
 #[derive(Debug, Clone, Default)]
@ -27,6 +27,7 @@ impl ChainSpecParser for HlChainSpecParser {
 pub fn chain_value_parser(s: &str) -> eyre::Result<Arc<HlChainSpec>> {
    match s {
        "mainnet" => Ok(Arc::new(HlChainSpec { inner: hl_mainnet() })),
+        "testnet" => Ok(Arc::new(HlChainSpec { inner: hl_testnet() })),
        _ => Err(eyre::eyre!("Unsupported chain: {}", s)),
    }
 }
--- a/src/hl_node_compliance.rs
+++ b/src/hl_node_compliance.rs
@ -1,7 +1,6 @@
-use alloy_consensus::TxReceipt;
+use alloy_consensus::{transaction::TransactionMeta, TxReceipt};
 use alloy_eips::{BlockId, BlockNumberOrTag};
 use alloy_json_rpc::RpcObject;
-use alloy_network::ReceiptResponse;
 use alloy_primitives::{B256, U256};
 use alloy_rpc_types::{
    pubsub::{Params, SubscriptionKind},
@ -14,17 +13,19 @@ use reth::{
    api::FullNodeComponents, builder::rpc::RpcContext, rpc::result::internal_rpc_err,
    tasks::TaskSpawner,
 };
-use reth_primitives_traits::BlockBody as _;
+use reth_primitives_traits::{BlockBody as _, SignedTransaction};
 use reth_provider::{BlockIdReader, BlockReader, BlockReaderIdExt, ReceiptProvider};
 use reth_rpc::{EthFilter, EthPubSub};
 use reth_rpc_eth_api::{
+    helpers::{EthBlocks, EthTransactions, LoadReceipt},
+    transaction::ConvertReceiptInput,
    EthApiServer, EthApiTypes, EthFilterApiServer, EthPubSubApiServer, FullEthApiTypes, RpcBlock,
-    RpcHeader, RpcNodeCore, RpcNodeCoreExt, RpcReceipt, RpcTransaction, RpcTxReq,
+    RpcConvert, RpcHeader, RpcNodeCoreExt, RpcReceipt, RpcTransaction, RpcTxReq,
 };
 use serde::Serialize;
-use std::{marker::PhantomData, sync::Arc};
+use std::{borrow::Cow, marker::PhantomData, sync::Arc};
 use tokio_stream::{Stream, StreamExt};
-use tracing::{trace, Instrument};
+use tracing::{info, trace, Instrument};

 use crate::{
    node::primitives::{HlPrimitives, TransactionSigned},
@ -40,6 +41,9 @@ pub trait EthWrapper:
        RpcHeader<Self::NetworkTypes>,
    > + FullEthApiTypes<Primitives = HlPrimitives>
    + RpcNodeCoreExt<Provider: BlockReader<Block = HlBlock>>
+    + EthBlocks
+    + EthTransactions
+    + LoadReceipt
    + 'static
 {
 }
@ -52,8 +56,10 @@ impl<
                RpcReceipt<Self::NetworkTypes>,
                RpcHeader<Self::NetworkTypes>,
            > + FullEthApiTypes<Primitives = HlPrimitives>
-            + RpcNodeCoreExt
-            + RpcNodeCore<Provider: BlockReader<Block = HlBlock>>
+            + RpcNodeCoreExt<Provider: BlockReader<Block = HlBlock>>
+            + EthBlocks
+            + EthTransactions
+            + LoadReceipt
            + 'static,
    > EthWrapper for T
 {
@ -128,7 +134,7 @@ impl<Eth: EthWrapper> EthFilterApiServer<RpcTransaction<Eth::NetworkTypes>>
        let logs = EthFilterApiServer::logs(&*self.filter, filter).await?;
        let provider = self.provider.clone();

-        Ok(logs.into_iter().filter_map(|log| exclude_system_tx::<Eth>(log, &provider)).collect())
+        Ok(logs.into_iter().filter_map(|log| adjust_log::<Eth>(log, &provider)).collect())
    }
 }

@ -174,9 +180,7 @@ impl<Eth: EthWrapper> EthPubSubApiServer<RpcTransaction<Eth::NetworkTypes>>
                };
                let _ = pipe_from_stream(
                    sink,
-                    pubsub
-                        .log_stream(filter)
-                        .filter_map(|log| exclude_system_tx::<Eth>(log, &provider)),
+                    pubsub.log_stream(filter).filter_map(|log| adjust_log::<Eth>(log, &provider)),
                )
                .await;
            } else {
@ -188,7 +192,7 @@ impl<Eth: EthWrapper> EthPubSubApiServer<RpcTransaction<Eth::NetworkTypes>>
    }
 }

-fn exclude_system_tx<Eth: EthWrapper>(mut log: Log, provider: &Eth::Provider) -> Option<Log> {
+fn adjust_log<Eth: EthWrapper>(mut log: Log, provider: &Eth::Provider) -> Option<Log> {
    let transaction_index = log.transaction_index?;
    let log_index = log.log_index?;

@ -306,6 +310,9 @@ pub trait EthBlockApi<B: RpcObject, R: RpcObject> {
        &self,
        number: BlockNumberOrTag,
    ) -> RpcResult<Option<U256>>;
+
+    #[method(name = "getTransactionReceipt")]
+    async fn transaction_receipt(&self, hash: B256) -> RpcResult<Option<R>>;
 }

 macro_rules! engine_span {
@ -318,7 +325,7 @@ fn is_system_tx(tx: &TransactionSigned) -> bool {
    tx.is_system_transaction()
 }

-fn exclude_system_tx_from_block<Eth: EthWrapper>(
+fn adjust_block<Eth: EthWrapper>(
    recovered_block: &RpcBlock<Eth::NetworkTypes>,
    eth_api: &Eth,
 ) -> RpcBlock<Eth::NetworkTypes> {
@ -339,9 +346,86 @@ fn exclude_system_tx_from_block<Eth: EthWrapper>(
    new_block
 }

-fn system_tx_count_for_block<Eth: EthWrapper>(eth_api: &Eth, number: BlockId) -> usize {
+async fn adjust_block_receipts<Eth: EthWrapper>(
+    block_id: BlockId,
+    eth_api: &Eth,
+) -> Result<Option<(usize, Vec<RpcReceipt<Eth::NetworkTypes>>)>, Eth::Error> {
+    // Modified from EthBlocks::block_receipt. See `NOTE` comment below.
+    let system_tx_count = system_tx_count_for_block(eth_api, block_id);
+    if let Some((block, receipts)) = EthBlocks::load_block_and_receipts(eth_api, block_id).await? {
+        let block_number = block.number;
+        let base_fee = block.base_fee_per_gas;
+        let block_hash = block.hash();
+        let excess_blob_gas = block.excess_blob_gas;
+        let timestamp = block.timestamp;
+        let mut gas_used = 0;
+        let mut next_log_index = 0;
+
+        let inputs = block
+            .transactions_recovered()
+            .zip(receipts.iter())
+            .enumerate()
+            .filter_map(|(idx, (tx, receipt))| {
+                if receipt.cumulative_gas_used() == 0 {
+                    // NOTE: modified to exclude system tx
+                    return None;
+                }
+                let meta = TransactionMeta {
+                    tx_hash: *tx.tx_hash(),
+                    index: (idx - system_tx_count) as u64,
+                    block_hash,
+                    block_number,
+                    base_fee,
+                    excess_blob_gas,
+                    timestamp,
+                };
+
+                let input = ConvertReceiptInput {
+                    receipt: Cow::Borrowed(receipt),
+                    tx,
+                    gas_used: receipt.cumulative_gas_used() - gas_used,
+                    next_log_index,
+                    meta,
+                };
+
+                gas_used = receipt.cumulative_gas_used();
+                next_log_index += receipt.logs().len();
+
+                Some(input)
+            })
+            .collect::<Vec<_>>();
+
+        return eth_api
+            .tx_resp_builder()
+            .convert_receipts(inputs)
+            .map(|receipts| Some((system_tx_count, receipts)));
+    }
+
+    Ok(None)
+}
+
+async fn adjust_transaction_receipt<Eth: EthWrapper>(
+    tx_hash: B256,
+    eth_api: &Eth,
+) -> Result<Option<RpcReceipt<Eth::NetworkTypes>>, Eth::Error> {
+    match eth_api.load_transaction_and_receipt(tx_hash).await? {
+        Some((_, meta, _)) => {
+            // LoadReceipt::block_transaction_receipt loads the block again, so loading blocks again doesn't hurt performance much
+            info!("block hash: {:?}", meta.block_hash);
+            let Some((system_tx_count, block_receipts)) =
+                adjust_block_receipts(meta.block_hash.into(), eth_api).await?
+            else {
+                unreachable!();
+            };
+            Ok(Some(block_receipts.into_iter().nth(meta.index as usize - system_tx_count).unwrap()))
+        }
+        None => Ok(None),
+    }
+}
+
+fn system_tx_count_for_block<Eth: EthWrapper>(eth_api: &Eth, block_id: BlockId) -> usize {
    let provider = eth_api.provider();
-    let block = provider.block_by_id(number).unwrap().unwrap();
+    let block = provider.block_by_id(block_id).unwrap().unwrap();
    let system_tx_count = block.body.transactions().iter().filter(|tx| is_system_tx(tx)).count();
    system_tx_count
 }
@ -351,6 +435,7 @@ impl<Eth: EthWrapper> EthBlockApiServer<RpcBlock<Eth::NetworkTypes>, RpcReceipt<
    for HlNodeBlockFilterHttp<Eth>
 where
    Eth: EthApiTypes + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
 {
    /// Handler for: `eth_getBlockByHash`
    async fn block_by_hash(
@ -359,7 +444,7 @@ where
        full: bool,
    ) -> RpcResult<Option<RpcBlock<Eth::NetworkTypes>>> {
        let res = self.eth_api.block_by_hash(hash, full).instrument(engine_span!()).await?;
-        Ok(res.map(|block| exclude_system_tx_from_block(&block, &*self.eth_api)))
+        Ok(res.map(|block| adjust_block(&block, &*self.eth_api)))
    }

    /// Handler for: `eth_getBlockByNumber`
@ -370,7 +455,7 @@ where
    ) -> RpcResult<Option<RpcBlock<Eth::NetworkTypes>>> {
        trace!(target: "rpc::eth", ?number, ?full, "Serving eth_getBlockByNumber");
        let res = self.eth_api.block_by_number(number, full).instrument(engine_span!()).await?;
-        Ok(res.map(|block| exclude_system_tx_from_block(&block, &*self.eth_api)))
+        Ok(res.map(|block| adjust_block(&block, &*self.eth_api)))
    }

    /// Handler for: `eth_getBlockTransactionCountByHash`
@ -379,8 +464,8 @@ where
        let res =
            self.eth_api.block_transaction_count_by_hash(hash).instrument(engine_span!()).await?;
        Ok(res.map(|count| {
-            count -
-                U256::from(system_tx_count_for_block(&*self.eth_api, BlockId::Hash(hash.into())))
+            count
+                - U256::from(system_tx_count_for_block(&*self.eth_api, BlockId::Hash(hash.into())))
        }))
    }

@ -400,16 +485,24 @@ where
        }))
    }

+    async fn transaction_receipt(
+        &self,
+        hash: B256,
+    ) -> RpcResult<Option<RpcReceipt<Eth::NetworkTypes>>> {
+        trace!(target: "rpc::eth", ?hash, "Serving eth_getTransactionReceipt");
+        let eth_api = &*self.eth_api;
+        Ok(adjust_transaction_receipt(hash, eth_api).instrument(engine_span!()).await?)
+    }
+
    /// Handler for: `eth_getBlockReceipts`
    async fn block_receipts(
        &self,
        block_id: BlockId,
    ) -> RpcResult<Option<Vec<RpcReceipt<Eth::NetworkTypes>>>> {
        trace!(target: "rpc::eth", ?block_id, "Serving eth_getBlockReceipts");
-        let res = self.eth_api.block_receipts(block_id).instrument(engine_span!()).await?;
-        Ok(res.map(|receipts| {
-            receipts.into_iter().filter(|receipt| receipt.cumulative_gas_used() > 0).collect()
-        }))
+        let result =
+            adjust_block_receipts(block_id, &*self.eth_api).instrument(engine_span!()).await?;
+        Ok(result.map(|(_, receipts)| receipts))
    }
 }

@ -420,6 +513,7 @@ where
    Node: FullNodeComponents,
    Node::Provider: BlockIdReader + BlockReader<Block = crate::HlBlock>,
    EthApi: EthWrapper,
+    ErrorObject<'static>: From<EthApi::Error>,
 {
    ctx.modules.replace_configured(
        HlNodeFilterHttp::new(
--- a/src/node/cli.rs
+++ b/src/node/cli.rs
@ -1,6 +1,6 @@
 use crate::{
    chainspec::{parser::HlChainSpecParser, HlChainSpec},
-    node::{consensus::HlConsensus, evm::config::HlEvmConfig, HlNode},
+    node::{consensus::HlConsensus, evm::config::HlEvmConfig, storage::tables::Tables, HlNode},
    pseudo_peer::BlockSourceArgs,
 };
 use clap::{Args, Parser};
@ -14,8 +14,8 @@ use reth::{
 };
 use reth_chainspec::EthChainSpec;
 use reth_cli::chainspec::ChainSpecParser;
-use reth_cli_commands::launcher::FnLauncher;
-use reth_db::DatabaseEnv;
+use reth_cli_commands::{common::EnvironmentArgs, launcher::FnLauncher};
+use reth_db::{init_db, mdbx::init_db_for, DatabaseEnv};
 use reth_tracing::FileWorkerGuard;
 use std::{
    fmt::{self},
@ -123,6 +123,8 @@ where
                runner.run_blocking_until_ctrl_c(command.execute::<HlNode>())
            }
            Commands::InitState(command) => {
+                // Need to invoke `init_db_for` to create `BlockReadPrecompileCalls` table
+                Self::init_db(&command.env)?;
                runner.run_blocking_until_ctrl_c(command.execute::<HlNode>())
            }
            Commands::DumpGenesis(command) => runner.run_blocking_until_ctrl_c(command.execute()),
@ -156,4 +158,12 @@ where
        let guard = self.logs.init_tracing()?;
        Ok(guard)
    }
+
+    fn init_db(env: &EnvironmentArgs<C>) -> eyre::Result<()> {
+        let data_dir = env.datadir.clone().resolve_datadir(env.chain.chain());
+        let db_path = data_dir.db();
+        init_db(db_path.clone(), env.db.database_args())?;
+        init_db_for::<_, Tables>(db_path, env.db.database_args())?;
+        Ok(())
+    }
 }
--- a/src/node/network/mod.rs
+++ b/src/node/network/mod.rs
@ -245,7 +245,7 @@ where

        ctx.task_executor().spawn_critical("pseudo peer", async move {
            let block_source =
-                block_source_config.create_cached_block_source(next_block_number).await;
+                block_source_config.create_cached_block_source((&*chain_spec).clone(), next_block_number).await;
            start_pseudo_peer(chain_spec, local_node_record.to_string(), block_source)
                .await
                .unwrap();
--- a/src/node/types/mod.rs
+++ b/src/node/types/mod.rs
@ -7,7 +7,7 @@ use alloy_rlp::{Decodable, Encodable, RlpDecodable, RlpEncodable};
 use bytes::BufMut;
 use serde::{Deserialize, Serialize};

-use crate::{chainspec::MAINNET_CHAIN_ID, HlBlock};
+use crate::HlBlock;

 pub type ReadPrecompileCall = (Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>);

@ -50,13 +50,13 @@ pub struct BlockAndReceipts {
 }

 impl BlockAndReceipts {
-    pub fn to_reth_block(self) -> HlBlock {
+    pub fn to_reth_block(self, chain_id: u64) -> HlBlock {
        let EvmBlock::Reth115(block) = self.block;
        block.to_reth_block(
            self.read_precompile_calls.clone(),
            self.highest_precompile_address,
            self.system_txs.clone(),
-            MAINNET_CHAIN_ID,
+            chain_id,
        )
    }

--- a/src/pseudo_peer/config.rs
+++ b/src/pseudo_peer/config.rs
@ -1,8 +1,7 @@
-use super::{
-    consts::DEFAULT_S3_BUCKET,
-    sources::{
+use crate::chainspec::HlChainSpec;
+
+use super::sources::{
    BlockSourceBoxed, CachedBlockSource, HlNodeBlockSource, LocalBlockSource, S3BlockSource,
-    },
 };
 use aws_config::BehaviorVersion;
 use std::{env::home_dir, path::PathBuf, sync::Arc};
@ -15,16 +14,14 @@ pub struct BlockSourceConfig {

 #[derive(Debug, Clone)]
 pub enum BlockSourceType {
+    S3Default,
    S3 { bucket: String },
    Local { path: PathBuf },
 }

 impl BlockSourceConfig {
    pub async fn s3_default() -> Self {
-        Self {
-            source_type: BlockSourceType::S3 { bucket: DEFAULT_S3_BUCKET.to_string() },
-            block_source_from_node: None,
-        }
+        Self { source_type: BlockSourceType::S3Default, block_source_from_node: None }
    }

    pub async fn s3(bucket: String) -> Self {
@ -53,17 +50,10 @@ impl BlockSourceConfig {
        self
    }

-    pub async fn create_block_source(&self) -> BlockSourceBoxed {
+    pub async fn create_block_source(&self, chain_spec: HlChainSpec) -> BlockSourceBoxed {
        match &self.source_type {
-            BlockSourceType::S3 { bucket } => {
-                let client = aws_sdk_s3::Client::new(
-                    &aws_config::defaults(BehaviorVersion::latest())
-                        .region("ap-northeast-1")
-                        .load()
-                        .await,
-                );
-                Arc::new(Box::new(S3BlockSource::new(client, bucket.clone())))
-            }
+            BlockSourceType::S3Default => s3_block_source(chain_spec.official_s3_bucket()).await,
+            BlockSourceType::S3 { bucket } => s3_block_source(bucket).await,
            BlockSourceType::Local { path } => {
                Arc::new(Box::new(LocalBlockSource::new(path.clone())))
            }
@ -89,10 +79,21 @@ impl BlockSourceConfig {
        ))
    }

-    pub async fn create_cached_block_source(&self, next_block_number: u64) -> BlockSourceBoxed {
-        let block_source = self.create_block_source().await;
+    pub async fn create_cached_block_source(
+        &self,
+        chain_spec: HlChainSpec,
+        next_block_number: u64,
+    ) -> BlockSourceBoxed {
+        let block_source = self.create_block_source(chain_spec).await;
        let block_source =
            self.create_block_source_from_node(next_block_number, block_source).await;
        Arc::new(Box::new(CachedBlockSource::new(block_source)))
    }
 }
+
+async fn s3_block_source(bucket: impl AsRef<str>) -> BlockSourceBoxed {
+    let client = aws_sdk_s3::Client::new(
+        &aws_config::defaults(BehaviorVersion::latest()).region("ap-northeast-1").load().await,
+    );
+    Arc::new(Box::new(S3BlockSource::new(client, bucket.as_ref().to_string())))
+}
--- a/src/pseudo_peer/consts.rs
+++ b/src/pseudo_peer/consts.rs
@ -1,2 +1 @@
 pub const MAX_CONCURRENCY: usize = 100;
-pub const DEFAULT_S3_BUCKET: &str = "hl-mainnet-evm-blocks";
--- a/src/pseudo_peer/mod.rs
+++ b/src/pseudo_peer/mod.rs
@ -50,6 +50,7 @@ pub async fn start_pseudo_peer(

    // Create network manager
    let (mut network, start_tx) = create_network_manager::<BlockSourceBoxed>(
+        (*chain_spec).clone(),
        destination_peer,
        block_source.clone(),
        blockhash_cache.clone(),
--- a/src/pseudo_peer/network.rs
+++ b/src/pseudo_peer/network.rs
@ -1,9 +1,5 @@
 use super::service::{BlockHashCache, BlockPoller};
-use crate::{
-    chainspec::{parser::chain_value_parser, HlChainSpec},
-    node::network::HlNetworkPrimitives,
-    HlPrimitives,
-};
+use crate::{chainspec::HlChainSpec, node::network::HlNetworkPrimitives, HlPrimitives};
 use reth_network::{
    config::{rng_secret_key, SecretKey},
    NetworkConfig, NetworkManager, PeersConfig,
@ -19,6 +15,7 @@ pub struct NetworkBuilder {
    boot_nodes: Vec<TrustedPeer>,
    discovery_port: u16,
    listener_port: u16,
+    chain_spec: HlChainSpec,
 }

 impl Default for NetworkBuilder {
@ -29,6 +26,7 @@ impl Default for NetworkBuilder {
            boot_nodes: vec![],
            discovery_port: 0,
            listener_port: 0,
+            chain_spec: HlChainSpec::default(),
        }
    }
 }
@ -55,6 +53,11 @@ impl NetworkBuilder {
        self
    }

+    pub fn with_chain_spec(mut self, chain_spec: HlChainSpec) -> Self {
+        self.chain_spec = chain_spec;
+        self
+    }
+
    pub async fn build<BS>(
        self,
        block_source: Arc<Box<dyn super::sources::BlockSource>>,
@ -65,13 +68,15 @@ impl NetworkBuilder {
            .peer_config(self.peer_config)
            .discovery_port(self.discovery_port)
            .listener_port(self.listener_port);
+        let chain_id = self.chain_spec.inner.chain().id();

-        let (block_poller, start_tx) = BlockPoller::new_suspended(block_source, blockhash_cache);
+        let (block_poller, start_tx) =
+            BlockPoller::new_suspended(chain_id, block_source, blockhash_cache);
        let config = builder.block_import(Box::new(block_poller)).build(Arc::new(NoopProvider::<
            HlChainSpec,
            HlPrimitives,
        >::new(
-            chain_value_parser("mainnet").unwrap(),
+            self.chain_spec.into(),
        )));

        let network = NetworkManager::new(config).await.map_err(|e| eyre::eyre!(e))?;
@ -80,12 +85,14 @@ impl NetworkBuilder {
 }

 pub async fn create_network_manager<BS>(
+    chain_spec: HlChainSpec,
    destination_peer: String,
    block_source: Arc<Box<dyn super::sources::BlockSource>>,
    blockhash_cache: BlockHashCache,
 ) -> eyre::Result<(NetworkManager<HlNetworkPrimitives>, mpsc::Sender<()>)> {
    NetworkBuilder::default()
        .with_boot_nodes(vec![TrustedPeer::from_str(&destination_peer).unwrap()])
+        .with_chain_spec(chain_spec)
        .build::<BS>(block_source, blockhash_cache)
        .await
 }
--- a/src/pseudo_peer/service.rs
+++ b/src/pseudo_peer/service.rs
@ -42,6 +42,7 @@ pub fn new_blockhash_cache() -> BlockHashCache {
 /// A block poller that polls blocks from `BlockSource` and sends them to the `block_tx`
 #[derive(Debug)]
 pub struct BlockPoller {
+    chain_id: u64,
    block_rx: mpsc::Receiver<(u64, BlockAndReceipts)>,
    task: JoinHandle<eyre::Result<()>>,
    blockhash_cache: BlockHashCache,
@ -51,6 +52,7 @@ impl BlockPoller {
    const POLL_INTERVAL: Duration = Duration::from_millis(25);

    pub fn new_suspended<BS: BlockSource>(
+        chain_id: u64,
        block_source: BS,
        blockhash_cache: BlockHashCache,
    ) -> (Self, mpsc::Sender<()>) {
@ -59,7 +61,7 @@ impl BlockPoller {
        let (block_tx, block_rx) = mpsc::channel(100);
        let block_tx_clone = block_tx.clone();
        let task = tokio::spawn(Self::task(start_rx, block_source, block_tx_clone));
-        (Self { block_rx, task, blockhash_cache: blockhash_cache.clone() }, start_tx)
+        (Self { chain_id, block_rx, task, blockhash_cache: blockhash_cache.clone() }, start_tx)
    }

    #[allow(unused)]
@ -98,7 +100,7 @@ impl BlockImport<HlNewBlock> for BlockPoller {
        match Pin::new(&mut self.block_rx).poll_recv(_cx) {
            Poll::Ready(Some((number, block))) => {
                debug!("Polled block: {}", number);
-                let reth_block = block.to_reth_block();
+                let reth_block = block.to_reth_block(self.chain_id);
                let hash = reth_block.header.hash_slow();
                self.blockhash_cache.write().insert(hash, number);
                let td = U128::from(reth_block.header.difficulty);
@ -167,6 +169,7 @@ impl<BS: BlockSource> PseudoPeer<BS> {
        &mut self,
        eth_req: IncomingEthRequest<HlNetworkPrimitives>,
    ) -> eyre::Result<()> {
+        let chain_id = self.chain_spec.inner.chain().id();
        match eth_req {
            IncomingEthRequest::GetBlockHeaders {
                peer_id: _,
@ -189,7 +192,7 @@ impl<BS: BlockSource> PseudoPeer<BS> {
                    }
                }
                .into_par_iter()
-                .map(|block| block.to_reth_block().header.clone())
+                .map(|block| block.to_reth_block(chain_id).header.clone())
                .collect::<Vec<_>>();

                let _ = response.send(Ok(BlockHeaders(block_headers)));
@ -207,7 +210,7 @@ impl<BS: BlockSource> PseudoPeer<BS> {
                    .collect_blocks(numbers)
                    .await
                    .into_iter()
-                    .map(|block| block.to_reth_block().body)
+                    .map(|block| block.to_reth_block(chain_id).body)
                    .collect::<Vec<_>>();

                let _ = response.send(Ok(BlockBodies(block_bodies)));
Author	SHA1	Message	Date
sprites0	b6d5031865	feat: Support testnet sync - Add testnet S3 bucket - Use testnet RPC properly - Use testnet chainspec on pseudo peer	2025-08-22 10:40:36 -04:00
sprites0	7daf203bc2	fix: Initialize DB with HL-specific tables on init-state	2025-08-22 10:40:14 -04:00
sprites0	20610ccc82	chore: Patch reth to allow zero state root on init-state	2025-08-22 10:39:25 -04:00
sprites0	6543fac314	feat: Add testnet chainspec	2025-08-22 10:38:52 -04:00
sprites0	26c1973503	Merge pull request #34 from hl-archive-node/fix/hl-node-compliance-receipts fix: Fix block and transaction receipts' gas and transaction index	2025-08-22 23:10:22 +09:00
sprites0	095ad0f65d	fix: Fix block and transaction receipts' gas and transaction index	2025-08-22 10:09:35 -04:00