github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into alexey/receipts-log-filter-is-back

Browse Source
This commit is contained in:
Alexey Shekhirin
2025-11-10 22:56:17 +00:00
parent dd1190f88b cbc80bab7f
commit a02168fc48
8 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/zepter.yaml
View File

@@ -12,7 +12,7 @@ workflows:
# Check that `A` activates the features of `B`.
"propagate-feature",
# These are the features to check:
"--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,js-tracer",
"--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,js-tracer,portable",
# Do not try to add a new section to `[features]` of `A` only because `B` exposes that feature. There are edge-cases where this is still needed, but we can add them manually.
"--left-side-feature-missing=ignore",
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.

24
Cargo.lock generated
View File

@@ -6260,9 +6260,9 @@ dependencies = [
[[package]]
name = "op-revm"
version = "12.0.1"
version = "12.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcd8cb3274e87936b595eb2247ad3bda146695fceb7159afa76010529af53553"
checksum = "e31622d03b29c826e48800f4c8f389c8a9c440eb796a3e35203561a288f12985"
dependencies = [
"auto_impl",
"revm",
@@ -10954,9 +10954,9 @@ dependencies = [
[[package]]
name = "revm"
version = "31.0.1"
version = "31.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93df0ff5eb70facbc872f82da4b815d7bd8e36b7ee525c637cabcb2a6af8a708"
checksum = "bb67a5223602113cae59a305acde2d9936bc18f2478dda879a6124b267cebfb6"
dependencies = [
"revm-bytecode",
"revm-context",
@@ -10985,9 +10985,9 @@ dependencies = [
[[package]]
name = "revm-context"
version = "11.0.1"
version = "11.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583c80d674f51b28a0d0a7309bda0867bcb0fd41b4e34976eded145edbb089fc"
checksum = "92850e150f4f99d46c05a20ad0cd09286a7ad4ee21866fffb87101de6e602231"
dependencies = [
"bitvec",
"cfg-if",
@@ -11018,9 +11018,9 @@ dependencies = [
[[package]]
name = "revm-database"
version = "9.0.4"
version = "9.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a4505d9688482fe0c3b8c09d9afbc4656e2bf9b48855e1c86c93bd4508e496a"
checksum = "7b6c15bb255481fcf29f5ef7c97f00ed4c28a6ab6c490d77b990d73603031569"
dependencies = [
"alloy-eips",
"revm-bytecode",
@@ -11045,9 +11045,9 @@ dependencies = [
[[package]]
name = "revm-handler"
version = "12.0.1"
version = "12.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3da9e26f05ed723cf423b92f012a7775eef9e7d897633d11ec83535e92cda2d"
checksum = "b45418ed95cfdf0cb19effdbb7633cf2144cab7fb0e6ffd6b0eb9117a50adff6"
dependencies = [
"auto_impl",
"derive-where",
@@ -11064,9 +11064,9 @@ dependencies = [
[[package]]
name = "revm-inspector"
version = "12.0.1"
version = "12.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57afb06e5985dbd2e8a48a3e6727cb0dd45148e4e6e028ac8222e262e440d3de"
checksum = "c99801eac7da06cc112df2244bd5a64024f4ef21240e923b26e73c4b4a0e5da6"
dependencies = [
"auto_impl",
"either",

10
Cargo.toml
View File

@@ -466,17 +466,17 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }
# revm
revm = { version = "31.0.1", default-features = false }
revm = { version = "31.0.2", default-features = false }
revm-bytecode = { version = "7.1.1", default-features = false }
revm-database = { version = "9.0.4", default-features = false }
revm-database = { version = "9.0.5", default-features = false }
revm-state = { version = "8.1.1", default-features = false }
revm-primitives = { version = "21.0.2", default-features = false }
revm-interpreter = { version = "29.0.1", default-features = false }
revm-inspector = { version = "12.0.1", default-features = false }
revm-context = { version = "11.0.1", default-features = false }
revm-inspector = { version = "12.0.2", default-features = false }
revm-context = { version = "11.0.2", default-features = false }
revm-context-interface = { version = "12.0.1", default-features = false }
revm-database-interface = { version = "8.0.5", default-features = false }
op-revm = { version = "12.0.1", default-features = false }
op-revm = { version = "12.0.2", default-features = false }
revm-inspectors = "0.32.0"
# eth

12
crates/ethereum/reth/Cargo.toml
View File

@@ -144,6 +144,11 @@ rpc = [
"dep:alloy-rpc-types-engine",
]
tasks = ["dep:reth-tasks"]
jemalloc = [
"reth-cli-util?/jemalloc",
"reth-ethereum-cli?/jemalloc",
"reth-node-core?/jemalloc",
]
js-tracer = [
"rpc",
"reth-rpc/js-tracer",
@@ -152,6 +157,13 @@ js-tracer = [
"reth-rpc-eth-types?/js-tracer",
]
network = ["dep:reth-network", "tasks", "dep:reth-network-api", "dep:reth-eth-wire"]
otlp = [
"reth-ethereum-cli?/otlp",
"reth-node-core?/otlp",
]
portable = [
"reth-revm?/portable",
]
provider = ["storage-api", "tasks", "dep:reth-provider", "dep:reth-db", "dep:reth-codecs"]
storage-api = ["dep:reth-storage-api"]
trie = ["dep:reth-trie"]

6
crates/optimism/evm/Cargo.toml
View File

@@ -75,5 +75,9 @@ std = [
"op-alloy-rpc-types-engine/std",
"reth-storage-errors/std",
]
portable = ["reth-revm/portable"]
portable = [
"reth-revm/portable",
"op-revm/portable",
"revm/portable",
]
rpc = ["reth-rpc-eth-api", "reth-optimism-primitives/serde", "reth-optimism-primitives/reth-codec"]

13
crates/optimism/reth/Cargo.toml
View File

@@ -126,6 +126,11 @@ rpc = [
"dep:reth-optimism-rpc",
]
tasks = ["dep:reth-tasks"]
jemalloc = [
"reth-cli-util?/jemalloc",
"reth-node-core?/jemalloc",
"reth-optimism-cli?/jemalloc",
]
js-tracer = [
"rpc",
"reth-rpc/js-tracer",
@@ -134,6 +139,14 @@ js-tracer = [
"reth-rpc-eth-types?/js-tracer",
]
network = ["dep:reth-network", "tasks", "dep:reth-network-api", "dep:reth-eth-wire"]
otlp = [
"reth-node-core?/otlp",
"reth-optimism-cli?/otlp",
]
portable = [
"reth-optimism-evm?/portable",
"reth-revm?/portable",
]
provider = ["storage-api", "tasks", "dep:reth-provider", "dep:reth-db", "dep:reth-codecs"]
pool = ["dep:reth-transaction-pool"]
storage-api = ["dep:reth-storage-api"]

3
crates/static-file/types/src/segment.rs
View File

@@ -42,6 +42,9 @@ impl StaticFileSegment {
pub const fn as_str(&self) -> &'static str {
// `strum` doesn't generate a doc comment for `into_str` when using `IntoStaticStr` derive
// macro, so we need to manually implement it.
//
// NOTE: this name cannot have underscores in it, as underscores are used as delimiters in
// static file paths, for fetching static files for a specific block range
match self {
Self::Headers => "headers",
Self::Transactions => "transactions",

2
crates/trie/parallel/src/proof_task.rs
View File

@@ -174,7 +174,7 @@ impl ProofWorkerHandle {
drop(parent_span);
let parent_span =
debug_span!(target: "trie::proof_task", "account proof workers", ?storage_worker_count)
debug_span!(target: "trie::proof_task", "account proof workers", ?account_worker_count)
.entered();
// Spawn account workers
for worker_id in 0..account_worker_count {