chore: merge upstream v2.1.0 into develop-v2.1#182

Open

chee-chyuan wants to merge 130 commits into

chee-chyuan commented May 5, 2026

Merges upstream v2.1.0 into a new develop-v2.1 branch based on develop-v2.

Conflicts resolved keeping BNB-specific additions:

reth-core git dependency branch updated v0.1.1-v2 → v0.3.0-v2
Retained rust-eth-triedb dependencies and triedb imports
Kept [patch] sections for BNB git sources
Kept record_eth_message_metric / MAX_MESSAGE_SIZE in eth-wire
Kept mod migrate alongside upstream's new mod migrate_v2
Merged ExecutionWitnessMode, B256Set, B256Map additions from upstream
Combined RUSTSEC advisory exemptions from both sides

decofe and others added 30 commits

April 7, 2026 13:00


          fix(ci): pin CPU frequency to nominal clock in bench workflow (#23370)

4178e63

Co-authored-by: Sergei Shulepov <[email protected]>


          fix: use named systemd scope for reliable reth cleanup in benchmarks …

ed8bfca

…(#23374)

Co-authored-by: Sergei Shulepov <[email protected]>


          perf(provider): avoid full receipt clone in tx-range query (#23187)

c924902

Co-authored-by: Matthias Seitz <[email protected]>


          perf: use sort_unstable in CLI, networking, and RPC hot paths (#23364)

390def9

Co-authored-by: Matthias Seitz <[email protected]>


          refactor(engine): use Mutex instead of RwLock in PayloadExecutionCach…

83e6677

…e (#23387)

Co-authored-by: Sergei Shulepov <[email protected]>


          fix: add --kill to all schelk recover calls (#23384)

e6f1c2c

Co-authored-by: Sergei Shulepov <[email protected]>


          fix(engine): disable payload state hook when BAL is present (#23393)

3248af3

Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Amp <[email protected]>


          fix: add full recover fallback (#23390)

e4cf0ab


          chore: add reth 2.0 banner image (#23402)

5bfe2c8


          fix(reth-bb): use noop consensus (#23399)

b27b3e0

Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Amp <[email protected]>


          refactor: support modifying next_available_nonce_for (#23409)

3d5057b


          perf(storage): use sort_unstable in safe paths (#23386)

91b8e1a


          fix(ci): handle stale minio cache in bench build script (#23415)

346f0e5

Co-authored-by: Alexey Shekhirin <[email protected]>


          ci(bench): always send Slack notification for nightly bench runs (#23…

d56b1be

…417)

Co-authored-by: Alexey Shekhirin <[email protected]>


          chore(ci): add set -x to all GHA bash scripts (#23413)

f29c83d

Co-authored-by: Sergei Shulepov <[email protected]>


          feat: implement Bal Client for eth 71 (#22605)

5f2f490

Co-authored-by: Ishika Choudhury <[email protected]>
Co-authored-by: Matthias Seitz <[email protected]>


          fix(pruning): avoid unused import warning in checkpoint (#23412)

c9866e2


          fix: properly validate authorities in the pool (#23406)

ac31207


          chore: remove migrate-trie-to-packed example (#23385)

44bcf5e

Co-authored-by: Sergei Shulepov <[email protected]>
Co-authored-by: Sergei Shulepov <[email protected]>


          chore(deps): bump actions/deploy-pages from 4 to 5 (#23408)

20c75ab

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(engine): rename to_multi_proof to to_sparse_trie_task in prewar…

3b50450

…m (#23418)

Co-authored-by: Brian Picciano <[email protected]>


          fix: add no-list in order to avoid prefix matching (#23420)

d68dc83


          chore: update README logo to Reth v2.0 branding (#23421)

76bdfb3

Co-authored-by: Amp <[email protected]>


          fix(download): show error on retry and reset counter on progress (#23…

0ed4739

…426)


          fix(cli): use recent speed instead of all-time average for download E…

cecbb4c

…TA (#23425)


          ci: bump MSRV job runner to depot-ubuntu-latest-8 (#23432)

13ae241

Co-authored-by: Alexey Shekhirin <[email protected]>


          chore(deps): bump tokio from 1.51.0 to 1.51.1 in the cargo-weekly gro…

608c967

…up (#23410)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          docs: update README for Reth 2.0 (#23424)

53e1ec8

Co-authored-by: Amp <[email protected]>


          perf(engine): improve BAL prewarm sparse-trie streaming (#23423)

828965c

Co-authored-by: Derek Cofausper <[email protected]>
Co-authored-by: Brian Picciano <[email protected]>
Co-authored-by: Amp <[email protected]>


          bench: add release regression mode (#23416)

53fe0a0

Co-authored-by: Amp <[email protected]>

chee-chyuan requested a review from joey0612 as a code owner

May 5, 2026 08:40

chee-chyuan added the dependencies label

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix: resolve CI failures after v2.1.0 merge

7093d7d

- Fix fmt: remove extra blank line in ethstream.rs
- Fix typo: "ype" -> "type" in pool.rs
- Fix deny: remove stale RUSTSEC ignore entries no longer in dep tree,
  add RUSTSEC-2026-0104/0118/0119 for rustls-webpki and hickory-proto
- Regenerate Cargo.lock with BNB git deps (reth-core v0.3.0-v2, reth-bsc-triedb)

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(eth-wire): remove duplicate MAX_MESSAGE_SIZE definition, fix fmt

2c482e4

MAX_MESSAGE_SIZE was moved to reth-eth-wire-types in v2.1.0 (#22668),
so the local definition in ethstream.rs conflicted with the import.
Also apply nightly fmt wrap to pool.rs doc comment.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix: add missing BlockHeader methods to CustomRpcHeader, remove unuse…

3d8e63f

…d import

alloy_consensus::BlockHeader gained block_access_list_hash and slot_number
in v2.1.0; delegate both to self.inner in CustomRpcHeader.
Remove unused revm::context::result::ExecutionResult import from execute.rs.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.

chee-chyuan force-pushed the develop-v2.1 branch from 3d8e63f to 9e01833 Compare

May 5, 2026 09:08

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.

chee-chyuan force-pushed the develop-v2.1 branch from 9e01833 to 3d8e63f Compare

May 5, 2026 09:10

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(rocksdb): borrow Arc<BoundColumnFamily> at call sites

13e3522

get_cf and iterator_cf expect &Arc<BoundColumnFamily<'_>> but were
receiving Arc<BoundColumnFamily<'_>> after the v2.1.0 API change.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix: add install_state_hook to TrieDB PayloadHandle, fix fmt

d6b3faa

PayloadHandle gained install_state_hook in v2.1.0; the BNB TrieDB
prefetch path was missing it. Set to false since state_root_handle
is None (no sparse trie to stream state updates into).

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(rpc): add block_timestamp to TransactionInfo in debug.rs

eba47fc

alloy_rpc_types_eth::TransactionInfo gained a required block_timestamp
field in v2.1.0. Set it from evm_env.block_env.timestamp().saturating_to()
at both initializer sites in debug.rs.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(clippy): use .values() instead of destructuring map iter

6f742a5

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(rpc): replace deprecated gas_used() with tx_gas_used(); fix forma…

0df1b4d

…t width lint

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          chore(docs): regenerate CLI reference docs

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(clippy): remove redundant & in format arguments in compact test v…

db60893

…ectors

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.


          fix(clippy): restore & for HashSet::contains; use .values() in beacon…

0d22ce4

… sidecar

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

hashdit-bot Bot commented May 5, 2026

PR Review Bot Error

The bot encountered a fatal error. Please contact Hashdit Bot administrator.

github-actions Bot added the S-stale label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies S-stale