fix(core/txpool,core/txpool/locals): fix local tracker resubmits

[gzliudan]

Summary

The local transaction tracker keeps resubmitting transactions that can never enter the pool again, and keeps tracking transactions the user already replaced. recheck now holds back every tracked transaction priced below the gas schedule floor resolved at the block pending on top of the head, exactly as admission resolves it, and TrackAll drops the transaction a replacement displaces from its nonce. ErrUnderMinGasPrice is pinned as a non-temporary reject, so AddLocal does not track a transaction the floor rejected, while the tracker still holds on to transactions it tracked before the fork so a rollback can recover them. closes #N

Motivation & Context

A gas tier fork (Gas50x, Gas2500x) raises the minimum gas price above transactions that were admitted under the previous tier, and the pool sweeps them out. The tracker kept resubmitting them every minute: recheck ignored the result of the resubmit, and the transactions never went stale because their nonce never advanced, so they stayed tracked and journalled forever and were re-added on every recheck round.

Separately, TrackAll only ever added to the tracked set while the per-nonce SortedMap silently overwrote the entry a replacement displaced. The replaced transaction was therefore never returned by Forward again, stayed tracked forever, was rewritten into the journal on every rotation, and could win the nonce on the next load, resurrecting a transaction the user had already replaced, because rotation writes the tracked set in map order through a non-stable sort.

Changes

• core/txpool/validation.go: extract pendingBlockNumber, the shared helper that resolves the fork tier one past the head; admission validation now goes through it instead of inline arithmetic.
• core/txpool/txpool.go: add TxPool.MinGasPrice, which resolves the floor at the block pending on top of the head with params.GetMinGasPrice.
• core/txpool/locals/tx_tracker.go: recheck resolves the floor once per round and holds back non-special transactions priced below it; they stay tracked so a reorg or a set-head rollback past the fork picks them up again on the next round. Held back transactions break out into a new txpool/local/belowfloor gauge and a below-floor log field.
• core/txpool/locals/tx_tracker.go: TrackAll deletes the displaced transaction from the tracked set when its nonce is taken over, which also converges a journal written by an older version that can hold both a transaction and its replacement.
• core/txpool/locals/errors.go: document that ErrUnderMinGasPrice stays out of IsTemporaryReject, because the floor only rises as the chain advances, and that it must not be used to drop a tracked transaction either, because a rollback past the fork lowers the floor again.
• Tests: TestMinGasPriceResolvesAtPendingBlock, TestMinGasPriceFallsBackWithoutHeadNumber, TestRecheckHoldsBackBelowFloorTransactions, TestRecheckResumesAfterFloorDrops, TestRecheckResubmitsSpecialTransactionBelowFloor, TestIsTemporaryRejectExcludesMinGasPrice, TestAddLocalDoesNotTrackMinGasPriceRejectedTx, TestTrackAllDropsReplacedTransaction, TestRecheckDoesNotResubmitReplacedTransaction, TestJournalRotationDropsReplacedTransaction, TestJournalLoadDropsReplacedTransaction, TestJournalLoadKeepsLastEntryPerNonce; the test environment is now built from an explicit chain config through newTestEnvWithConfig, so tests pin the gas schedule instead of sharing the package level genesis.

Testing

go test ./core/txpool/ ./core/txpool/locals/ -count=1 passes at both commits, each verified in its own worktree, alongside go build ./core/txpool/... and a clean gofmt -l core/txpool/.

Floor resolution is pinned by rewinding the head with SetHead through 200, 199, 198, 99 and 98 with Gas50xBlock=100 and Gas2500xBlock=200, asserting the 2500x, 50x and baseline tiers resolve at head plus one, plus a case for a head that carries no block number. The hold-back is pinned at the boundary: a transaction priced exactly at the floor is resubmitted, one priced a wei below is held back and stays tracked, and resubmission resumes once SetHead rolls the head back before the fork. Special transactions are asserted to be resubmitted below the floor, matching admission and the sweep. Journal convergence is asserted after a rotation from the tracked set and for both file orders on load.

Related Issues

• Builds on feat(core/txpool/legacypool): sweep underpriced transactions on gas tier forks #2532, which added the sweep on gas tier forks that strands these transactions in the pool of a node running the local tracker.

Risk & Impact

Pool admission rules are unchanged; these changes only affect which tracked transactions the local tracker resubmits, and only for nodes running a local tracker with a journal.

Tracking is now narrower: a local transaction rejected for ErrUnderMinGasPrice is no longer tracked, so a later rollback past the fork does not resubmit it and the user has to send it again. That is deliberate and pinned by tests, and it is the only behaviour change visible to submitters.

The floor is resolved from the same pendingBlockNumber helper as admission and from the same height as the sweep, so the three cannot drift apart; a one block lag between p.chain.CurrentBlock() and a subpool's own head can only delay a resubmission by up to one recheck interval around a fork boundary.

The journal format is unchanged. A journal written by an older version that holds both a transaction and its replacement converges to one entry per nonce, where the entry later in the file wins because entries carry no sequence number; the next rotation rewrites the journal from the converged set. The new txpool/local/belowfloor gauge counts only held back transactions that the pool no longer has, so local minus belowfloor is the tracked transactions the pool holds plus the ones resubmitted this round, not just the latter.

Notes for Reviewers

Two commits, bookkeeping first (dropping the replaced transaction) and the price floor second; each builds and passes tests on its own.

The call worth a second look is the asymmetry in errors.go: ErrUnderMinGasPrice is not temporary, so a rejected transaction is not tracked, yet it must never be used to drop an already tracked one, so a rollback can recover it. Both directions are pinned by tests.

TestJournalLoadKeepsLastEntryPerNonce deliberately pins the losing behaviour for journals written by an older version instead of fixing it, since journal entries carry no ordering information.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Team

Run ID: f95b3b84-aea6-4183-85d6-f16a36e890bb

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[Copilot]

Pull request overview

Fixes local transaction tracking so permanently rejected or superseded transactions are removed from memory and disk.

Changes:

• Classifies resubmission errors and untracks permanent rejections.
• Removes superseded same-nonce transactions.
• Rotates journals after removals and adds regression tests.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
core/txpool/locals/tx_tracker.go	Updates resubmission, untracking, and journal rotation logic.
core/txpool/locals/tx_tracker_test.go	Tests rejection, replacement, and journal persistence behavior.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[Copilot]

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Suppressed comments (1)

Previously missed (1) — in code that hasn't changed since the last review.

core/txpool/locals/tx_tracker_test.go:165

• Handle the key-generation error instead of passing a potentially nil key to SignTx; the repository's Go error-handling convention does not allow ignored errors.

	otherKey, _ := crypto.GenerateKey()

[Copilot]

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.