[r3.4→main] Cherry-pick PRs from release/3.4#20519
Merged
AskAlexSharov merged 10 commits intomainfrom Apr 14, 2026
Merged
Conversation
- Cherry-pick of #20370 --------- Co-authored-by: yperbasis <andrey.ashikhmin@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Muzry <muzrry@gmail.com> Co-authored-by: muzry.li <muzry.li1@ambergroup.io>
`OnNewBlock` was passing the chaindata `coreTx` into `getCachedBlobTxnLocked`, but that function reads `kv.PoolTransaction` — a table that lives in the txpool DB, not chaindata. MDBX therefore can't find the table and the call fails on every blob-txn unwind path, producing warnings like: ``` [fetch] onNewBlock err="TxPool.getCachedBlobTxnLocked: Get: 32, label: chaindata, ... ``` Fix: open a RO tx on `poolDB` and pass that into `getCachedBlobTxnLocked`. The tx is opened before `p.lock` is acquired, which preserves the existing RoTx→p.lock ordering documented in `pool.go` to avoid deadlocks.
AskAlexSharov
requested review from
Giulio2002,
mh0lt,
mriccobene,
sudeepdino008,
taratorio and
yperbasis
as code owners
AskAlexSharov
commented
Apr 13, 2026
AskAlexSharov
changed the title
stubExecutionServer was replaced by stubExecutionModule on main; the cherry-picked method references a nonexistent type. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
yperbasis
approved these changes
Apr 13, 2026
The cherry-picked PR #20489 added p.poolDB.BeginRo() in OnNewBlock, but several tests pass nil for poolDB since they don't exercise blob txn paths. Guard the BeginRo call and skip blob cache lookups when poolDB is nil.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cherry-pick latest 20 PRs from release/3.4 to main (15 already applied, 5 new):
xdeps #20457 — up x depsoldPrunemethod #20469 — attempt to drop oldPrune methodUnwindbeyond data in snapshots not allowed #20517 — teach: Unwind beyond data in snapshots not allowed