Skip to content

Commit cf94e9e

Browse files
committed
Squashed merge of the following commits:
commit 1a1aa2f Author: Matthias Seitz <[email protected]> Date: Sat Oct 19 15:18:20 2024 +0200 feat: add map_pool fn (paradigmxyz#11890) commit ddc5ac3 Author: Thomas Coratger <[email protected]> Date: Sat Oct 19 15:12:28 2024 +0200 refactor(rpc): small refactor in `trace_filter` (paradigmxyz#11894) commit 3793b90 Author: Matthias Seitz <[email protected]> Date: Sat Oct 19 15:05:53 2024 +0200 chore: better start finish persisted block logs (paradigmxyz#11893) Co-authored-by: Oliver <[email protected]> commit 3bd695e Author: Oliver <[email protected]> Date: Sat Oct 19 14:48:35 2024 +0200 feat: update el requests for devnet 4 (paradigmxyz#11865) Co-authored-by: Matthias Seitz <[email protected]> commit 2ae9368 Author: Arsenii Kulikov <[email protected]> Date: Sat Oct 19 14:08:34 2024 +0400 refactor: move `EngineValidator` setup to `RpcAddOns` (paradigmxyz#11850) commit da5079d Author: Thomas Coratger <[email protected]> Date: Sat Oct 19 10:28:42 2024 +0200 test(txpool): add unit test for `BlobStoreCanonTracker` (paradigmxyz#11885) commit 2f559c6 Author: Thomas Coratger <[email protected]> Date: Sat Oct 19 10:28:10 2024 +0200 primitives: use alloy `MAXIMUM_EXTRA_DATA_SIZE` constant (paradigmxyz#11881) commit a6daafc Author: Thomas Coratger <[email protected]> Date: Sat Oct 19 10:27:29 2024 +0200 refactor(txpool): small refactor for `InMemoryBlobStore` impl (paradigmxyz#11886) commit a4126b3 Author: greged93 <[email protected]> Date: Sat Oct 19 00:15:08 2024 +0200 feat: tasks executor metrics in grafana (paradigmxyz#11815) Co-authored-by: Dan Cline <[email protected]> commit 655fc1a Author: Thomas Coratger <[email protected]> Date: Sat Oct 19 00:13:02 2024 +0200 rpc: add unit tests for `RpcModuleSelection` (paradigmxyz#11883) commit eee5e0d Author: Thomas Coratger <[email protected]> Date: Fri Oct 18 22:08:09 2024 +0200 bump rust to 1.82 (paradigmxyz#11876) commit a908f97 Author: Matthias Seitz <[email protected]> Date: Fri Oct 18 20:21:55 2024 +0200 chore: simplify update fn (paradigmxyz#11880) commit 587c91f Author: Ayodeji Akinola <[email protected]> Date: Fri Oct 18 16:17:11 2024 +0100 Optimize Sender Recovery Process (paradigmxyz#11385) Merge branch 'main' into fix-feature-propagation
2 parents 0971015 + 1a1aa2f commit cf94e9e

File tree

5 files changed

+76
-19
lines changed

5 files changed

+76
-19
lines changed

Diff for: Cargo.lock

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crates/evm/execution-types/Cargo.toml

+19-5
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,24 @@ reth-primitives = { workspace = true, features = ["arbitrary", "test-utils"] }
3333
[features]
3434
default = ["std"]
3535
optimism = ["reth-primitives/optimism", "revm/optimism"]
36-
serde = ["dep:serde", "reth-trie/serde", "revm/serde"]
36+
serde = [
37+
"dep:serde",
38+
"reth-trie/serde",
39+
"revm/serde",
40+
"alloy-eips/serde",
41+
"alloy-primitives/serde",
42+
"rand/serde"
43+
]
3744
serde-bincode-compat = [
38-
"reth-primitives/serde-bincode-compat",
39-
"reth-trie/serde-bincode-compat",
40-
"serde_with",
45+
"reth-primitives/serde-bincode-compat",
46+
"reth-trie/serde-bincode-compat",
47+
"serde_with",
48+
"alloy-eips/serde-bincode-compat"
49+
]
50+
std = [
51+
"reth-primitives/std",
52+
"alloy-eips/std",
53+
"alloy-primitives/std",
54+
"revm/std",
55+
"serde?/std"
4156
]
42-
std = []

Diff for: crates/node/core/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ tokio.workspace = true
7777
tempfile.workspace = true
7878

7979
[features]
80-
optimism = ["reth-primitives/optimism"]
80+
optimism = [
81+
"reth-primitives/optimism",
82+
"reth-db/optimism"
83+
]
8184
# Features for vergen to generate correct env vars
8285
jemalloc = [
8386
"reth-cli-util/jemalloc"

Diff for: crates/primitives/Cargo.toml

+16-8
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,22 @@ asm-keccak = [
110110
"revm-primitives/asm-keccak"
111111
]
112112
arbitrary = [
113-
"dep:arbitrary",
114-
"alloy-eips/arbitrary",
115-
"rand",
116-
"reth-codec",
117-
"reth-ethereum-forks/arbitrary",
118-
"reth-primitives-traits/arbitrary",
119-
"revm-primitives/arbitrary",
120-
"secp256k1",
113+
"dep:arbitrary",
114+
"alloy-eips/arbitrary",
115+
"rand",
116+
"reth-codec",
117+
"reth-ethereum-forks/arbitrary",
118+
"reth-primitives-traits/arbitrary",
119+
"revm-primitives/arbitrary",
120+
"secp256k1",
121+
"reth-chainspec/arbitrary",
122+
"reth-trie-common/arbitrary",
123+
"alloy-consensus/arbitrary",
124+
"alloy-primitives/arbitrary",
125+
"alloy-rpc-types?/arbitrary",
126+
"alloy-serde?/arbitrary",
127+
"op-alloy-consensus?/arbitrary",
128+
"op-alloy-rpc-types?/arbitrary"
121129
]
122130
secp256k1 = ["dep:secp256k1"]
123131
c-kzg = [

Diff for: crates/transaction-pool/Cargo.toml

+35-5
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,42 @@ serde_json.workspace = true
7272

7373
[features]
7474
default = ["serde"]
75-
serde = ["dep:serde"]
76-
test-utils = ["rand", "paste", "serde"]
75+
serde = [
76+
"dep:serde",
77+
"reth-execution-types/serde",
78+
"reth-eth-wire-types/serde",
79+
"reth-provider/serde",
80+
"alloy-consensus/serde",
81+
"alloy-eips/serde",
82+
"alloy-primitives/serde",
83+
"bitflags/serde",
84+
"parking_lot/serde",
85+
"rand?/serde",
86+
"revm/serde",
87+
"smallvec/serde"
88+
]
89+
test-utils = [
90+
"rand",
91+
"paste",
92+
"serde",
93+
"reth-chain-state/test-utils",
94+
"reth-chainspec/test-utils",
95+
"reth-primitives/test-utils",
96+
"reth-provider/test-utils",
97+
"revm/test-utils"
98+
]
7799
arbitrary = [
78-
"proptest",
79-
"reth-primitives/arbitrary",
80-
"proptest-arbitrary-interop",
100+
"proptest",
101+
"reth-primitives/arbitrary",
102+
"proptest-arbitrary-interop",
103+
"reth-chainspec/arbitrary",
104+
"reth-eth-wire-types/arbitrary",
105+
"alloy-consensus/arbitrary",
106+
"alloy-eips/arbitrary",
107+
"alloy-primitives/arbitrary",
108+
"bitflags/arbitrary",
109+
"revm/arbitrary",
110+
"smallvec/arbitrary"
81111
]
82112

83113
[[bench]]

0 commit comments

Comments
 (0)