Skip to content

fix(engine): revert #23541 and #23578#23646

Merged
mediocregopher merged 3 commits into
mainfrom
mediocregopher/revert-23541-23578-v2
Apr 20, 2026
Merged

fix(engine): revert #23541 and #23578#23646
mediocregopher merged 3 commits into
mainfrom
mediocregopher/revert-23541-23578-v2

Conversation

@mediocregopher
Copy link
Copy Markdown
Member

@mediocregopher mediocregopher commented Apr 20, 2026 •
edited
Loading

Reverts the newPayload backpressure timing changes from #23541 and #23578.

This restores the previous benchmark and prometheus latency behavior while keeping the Persist Wait summary row from #23541, since that table addition is still useful on its own.

Co-Authored-By: Brian Picciano 933154+mediocregopher@users.noreply.github.com

Prompted by: mediocregopher

@mediocregopher
revert(engine): revert #23541 and #23578
63ee381 
This reverts commit 93b2201 and commit cf29b3f.

Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019daa9e-42a5-74da-a301-2dcd4474bf17
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher mediocregopher added the A-engine Related to the engine implementation label Apr 20, 2026
@mediocregopher mediocregopher self-assigned this Apr 20, 2026
@mediocregopher mediocregopher added A-observability Related to tracing, metrics, logs and other observability tools A-reth-bench-compare For things related to reth-bench-compare C-bug An unexpected or incorrect behavior labels Apr 20, 2026
@mediocregopher mediocregopher mentioned this pull request Apr 20, 2026
Closed
@mediocregopher
fix(bench): keep persist wait in summary table
21bd006 
Keep the persist wait row and paired significance data in the benchmark summaries while leaving the reverted latency timing behavior unchanged.

Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019daa9e-42a5-74da-a301-2dcd4474bf17
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher mediocregopher removed the A-reth-bench-compare For things related to reth-bench-compare label Apr 20, 2026
@mediocregopher
chore(bench): trim cosmetic script diffs
e192024 
Restore the original comments and spacing so the persist wait summary change stays minimal.

Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019daa9e-42a5-74da-a301-2dcd4474bf17
Co-authored-by: Amp <amp@ampcode.com>
@mediocregopher mediocregopher marked this pull request as ready for review April 20, 2026 11:33
@mediocregopher mediocregopher added this pull request to the merge queue Apr 20, 2026
Merged via the queue into main with commit c527c2e Apr 20, 2026
35 checks passed
@mediocregopher mediocregopher deleted the mediocregopher/revert-23541-23578-v2 branch April 20, 2026 13:33
This was referenced Apr 21, 2026
Closed
Merged
crazywriter1 pushed a commit to crazywriter1/tempo that referenced this pull request Apr 23, 2026
@decofe @shekhirin
deps: update reth from main (2026-04-23) (tempoxyz#3698)
328c734 
Automated nightly update of reth dependencies from `paradigmxyz/reth`
main branch.

## Upstream reth changes


[`98ebc34...7839f3d`](paradigmxyz/reth@98ebc34...7839f3d)

🔗 Amp thread:
https://ampcode.com/threads/T-019db884-a7c3-738b-8f38-cc04f8942d8a
**Engine**
- Suppress persistence during payload building
([#23618](paradigmxyz/reth#23618))
- Align Amsterdam endpoint validation
([#23625](paradigmxyz/reth#23625))
- Revert [#23541](paradigmxyz/reth#23541) and
[#23578](paradigmxyz/reth#23578)
([#23646](paradigmxyz/reth#23646))
- Let consensus impls control which errors are transient
([#23668](paradigmxyz/reth#23668))
- Configure invalid header cache hit eviction
([#23670](paradigmxyz/reth#23670))

**Perf**
- Relax executor reset thresholds for re-execute
([#23617](paradigmxyz/reth#23617))
- Replace `BTreeMap` with `imbl::OrdMap` in `BestTransactions`
([#23621](paradigmxyz/reth#23621))
- Avoid reopening `.csoff` on every changeset lookup
([#23687](paradigmxyz/reth#23687))
- Disable read tx timeout during re-execute
([#23680](paradigmxyz/reth#23680))

**P2P / Net**
- Add snap/2 wire helpers and messages
([#23611](paradigmxyz/reth#23611))
- Optionally fetch BAL with full blocks
([#23629](paradigmxyz/reth#23629))
- Discv5 enabled by default
([#23686](paradigmxyz/reth#23686))

**DB**
- Add `reth db migrate-v2` for v1→v2 storage migration
([#23422](paradigmxyz/reth#23422))
- Detect and warn about ZFS
([#23685](paradigmxyz/reth#23685))

**BAL**
- Scaffold BAL store abstraction
([#23596](paradigmxyz/reth#23596))
- Enable BAL building in ethereum payload
([#23597](paradigmxyz/reth#23597))
- Add parallelization and batch IO flags
([#23663](paradigmxyz/reth#23663))

**Refactor**
- Make `WorkerPool` lazy by default
([#23627](paradigmxyz/reth#23627))
- Encapsulate state fetching in db provider
([#23656](paradigmxyz/reth#23656))
- Remove `TrieNodeProvider`
([#23658](paradigmxyz/reth#23658))
- Unify opaque consensus error helpers
([#23669](paradigmxyz/reth#23669))

**Payload**
- Add gas limit and slot number to `BlockOrPayload`
([#23624](paradigmxyz/reth#23624),
[#23626](paradigmxyz/reth#23626))

**Bench**
- Add CLI flag to fetch balances by default; require local benchmark
data ([#23655](paradigmxyz/reth#23655),
[#23679](paradigmxyz/reth#23679))

**Deps**
- Bump alloy crates to 2.0.1
([#23677](paradigmxyz/reth#23677)),
rustls-webpki
([#23681](paradigmxyz/reth#23681)), weekly
`cargo update`
([#23628](paradigmxyz/reth#23628))

**Testing**
- Remove unsafe `env::set_var(RUST_LOG)` from tests
([#23672](paradigmxyz/reth#23672))
- Address nightly clippy warnings
([#23630](paradigmxyz/reth#23630))

## Migrations

🔗 Amp thread:
https://ampcode.com/threads/T-019db884-dc46-71f5-a823-00c3a16191d4
- **Reth dependency bump**: All `reth-*` git dependencies updated from
rev `98ebc34` to `7839f3d`
- **Alloy version bump**: `alloy-*` crates updated from `2.0.0` to
`2.0.1`; `alloy-evm` changed from `0.33.2` to `0.33.0`
- **`ConsensusError::Other` → `ConsensusError::msg`**: All
`ConsensusError::Other(...)` calls migrated to
`ConsensusError::msg(...)`, which accepts `&str`/`impl Display` directly
instead of requiring `String` (removes `.to_string()` calls for string
literals)
- **`deny.toml` license exceptions**: Added MPL-2.0 exceptions for
`bitmaps`, `imbl`, and `imbl-sized-chunks` (new transitive dependencies)

[GitHub
Workflow](https://github.com/tempoxyz/tempo/actions/runs/24816009191)

---------

Co-authored-by: Alexey Shekhirin <github@shekhirin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shekhirin shekhirin shekhirin approved these changes

@mattsse mattsse Awaiting requested review from mattsse mattsse is a code owner

@Rjected Rjected Awaiting requested review from Rjected Rjected is a code owner

@gakonst gakonst Awaiting requested review from gakonst gakonst is a code owner

Assignees

@mediocregopher mediocregopher

Labels

A-engine Related to the engine implementation A-observability Related to tracing, metrics, logs and other observability tools C-bug An unexpected or incorrect behavior

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mediocregopher @shekhirin