Skip to content

Commit

Permalink
Squashed merge of the following commits:
Browse files Browse the repository at this point in the history
commit 1a1aa2f
Author: Matthias Seitz <[email protected]>
Date:   Sat Oct 19 15:18:20 2024 +0200

    feat: add map_pool fn (#11890)

commit ddc5ac3
Author: Thomas Coratger <[email protected]>
Date:   Sat Oct 19 15:12:28 2024 +0200

    refactor(rpc): small refactor in `trace_filter` (#11894)

commit 3793b90
Author: Matthias Seitz <[email protected]>
Date:   Sat Oct 19 15:05:53 2024 +0200

    chore: better start finish persisted block logs (#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 (#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` (#11850)

commit da5079d
Author: Thomas Coratger <[email protected]>
Date:   Sat Oct 19 10:28:42 2024 +0200

    test(txpool): add unit test for `BlobStoreCanonTracker` (#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 (#11881)

commit a6daafc
Author: Thomas Coratger <[email protected]>
Date:   Sat Oct 19 10:27:29 2024 +0200

    refactor(txpool): small refactor for `InMemoryBlobStore` impl
(#11886)

commit a4126b3
Author: greged93 <[email protected]>
Date:   Sat Oct 19 00:15:08 2024 +0200

    feat: tasks executor metrics in grafana (#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` (#11883)

commit eee5e0d
Author: Thomas Coratger <[email protected]>
Date:   Fri Oct 18 22:08:09 2024 +0200

    bump rust to 1.82 (#11876)

commit a908f97
Author: Matthias Seitz <[email protected]>
Date:   Fri Oct 18 20:21:55 2024 +0200

    chore: simplify update fn (#11880)

commit 587c91f
Author: Ayodeji Akinola <[email protected]>
Date:   Fri Oct 18 16:17:11 2024 +0100

    Optimize Sender Recovery Process (#11385)
Merge branch 'main' into fix-feature-propagation
  • Loading branch information
liamaharon committed Oct 19, 2024
2 parents 0971015 + 1a1aa2f commit aba5cb7
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 19 deletions.
24 changes: 19 additions & 5 deletions crates/evm/execution-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,24 @@ reth-primitives = { workspace = true, features = ["arbitrary", "test-utils"] }
[features]
default = ["std"]
optimism = ["reth-primitives/optimism", "revm/optimism"]
serde = ["dep:serde", "reth-trie/serde", "revm/serde"]
serde = [
"dep:serde",
"reth-trie/serde",
"revm/serde",
"alloy-eips/serde",
"alloy-primitives/serde",
"rand/serde"
]
serde-bincode-compat = [
"reth-primitives/serde-bincode-compat",
"reth-trie/serde-bincode-compat",
"serde_with",
"reth-primitives/serde-bincode-compat",
"reth-trie/serde-bincode-compat",
"serde_with",
"alloy-eips/serde-bincode-compat"
]
std = [
"reth-primitives/std",
"alloy-eips/std",
"alloy-primitives/std",
"revm/std",
"serde?/std"
]
std = []
5 changes: 4 additions & 1 deletion crates/node/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ tokio.workspace = true
tempfile.workspace = true

[features]
optimism = ["reth-primitives/optimism"]
optimism = [
"reth-primitives/optimism",
"reth-db/optimism"
]
# Features for vergen to generate correct env vars
jemalloc = [
"reth-cli-util/jemalloc"
Expand Down
24 changes: 16 additions & 8 deletions crates/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,22 @@ asm-keccak = [
"revm-primitives/asm-keccak"
]
arbitrary = [
"dep:arbitrary",
"alloy-eips/arbitrary",
"rand",
"reth-codec",
"reth-ethereum-forks/arbitrary",
"reth-primitives-traits/arbitrary",
"revm-primitives/arbitrary",
"secp256k1",
"dep:arbitrary",
"alloy-eips/arbitrary",
"rand",
"reth-codec",
"reth-ethereum-forks/arbitrary",
"reth-primitives-traits/arbitrary",
"revm-primitives/arbitrary",
"secp256k1",
"reth-chainspec/arbitrary",
"reth-trie-common/arbitrary",
"alloy-consensus/arbitrary",
"alloy-primitives/arbitrary",
"alloy-rpc-types?/arbitrary",
"alloy-serde?/arbitrary",
"op-alloy-consensus?/arbitrary",
"op-alloy-rpc-types?/arbitrary"
]
secp256k1 = ["dep:secp256k1"]
c-kzg = [
Expand Down
40 changes: 35 additions & 5 deletions crates/transaction-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,42 @@ serde_json.workspace = true

[features]
default = ["serde"]
serde = ["dep:serde"]
test-utils = ["rand", "paste", "serde"]
serde = [
"dep:serde",
"reth-execution-types/serde",
"reth-eth-wire-types/serde",
"reth-provider/serde",
"alloy-consensus/serde",
"alloy-eips/serde",
"alloy-primitives/serde",
"bitflags/serde",
"parking_lot/serde",
"rand?/serde",
"revm/serde",
"smallvec/serde"
]
test-utils = [
"rand",
"paste",
"serde",
"reth-chain-state/test-utils",
"reth-chainspec/test-utils",
"reth-primitives/test-utils",
"reth-provider/test-utils",
"revm/test-utils"
]
arbitrary = [
"proptest",
"reth-primitives/arbitrary",
"proptest-arbitrary-interop",
"proptest",
"reth-primitives/arbitrary",
"proptest-arbitrary-interop",
"reth-chainspec/arbitrary",
"reth-eth-wire-types/arbitrary",
"alloy-consensus/arbitrary",
"alloy-eips/arbitrary",
"alloy-primitives/arbitrary",
"bitflags/arbitrary",
"revm/arbitrary",
"smallvec/arbitrary"
]

[[bench]]
Expand Down

0 comments on commit aba5cb7

Please sign in to comment.