Skip to content

fix(core/txpool/legacypool): fix data race of txlookup access #31641#2194

Merged
AnilChinchawale merged 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:fix-data-race-txlookup-access
Mar 24, 2026
Merged

fix(core/txpool/legacypool): fix data race of txlookup access #31641#2194
AnilChinchawale merged 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:fix-data-race-txlookup-access

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

Proposed changes

Ref: ethereum#31641

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

Copilot AI review requested due to automatic review settings March 17, 2026 02:08
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 17, 2026

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: Pro

Run ID: 15dc3242-ec37-4349-a244-6c286318f7e9

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
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR refactors local transaction handling in the txpool by removing the local flag from the Add APIs and introducing a dedicated local transaction tracker for journaling/resubmission, alongside a new TxPool.Sync() helper for deterministic simulator/test behavior.

Changes:

  • Remove local parameter from txpool.TxPool.Add and txpool.SubPool.Add, updating eth protocol plumbing and tests accordingly.
  • Introduce core/txpool/locals.TxTracker and wire it into eth.New for local tx tracking/journaling/resubmission.
  • Add TxPool.AddLocal(s) helpers and a new TxPool.Sync() method to support deterministic resets in tests/simulations.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
eth/protocol.go Updates txPool interface to match new Add(txs, sync) signature.
eth/protocol_test.go Adjusts protocol tests for updated txpool Add signature.
eth/helper_test.go Updates test txpool stub to match new Add signature.
eth/handler.go Updates p2p tx import path to call Add(txs, sync) without local.
eth/backend.go Wires up locals.TxTracker lifecycle and journal interval sanitization.
eth/api_backend.go Updates RPC tx submission path for new local-tracking flow.
core/txpool/txpool.go Adds local tracking hooks, AddLocal(s), and deterministic Sync() + reset-loop improvements.
core/txpool/txpool_local_test.go Adds unit tests asserting local tracking call order vs add.
core/txpool/subpool.go Updates SubPool interface: removes local parameter and locals API.
core/txpool/locals/tx_tracker.go New local transaction tracker (recheck/resubmit + journaling).
core/txpool/locals/journal.go Fixes package name and tweaks logging verbosity on empty rotation.
core/txpool/legacypool/list.go Exposes SortedMap, removes local-aware pricing behaviors, updates eviction/pricing plumbing.
core/txpool/legacypool/legacypool.go Removes local exemptions/journaling from LegacyPool; adapts to new shared txpool API.
core/txpool/legacypool/legacypool_test.go Updates tests/benchmarks to reflect removal of local exemptions and new semantics.
core/txpool/legacypool/journal_shared.go Adds shared journal helpers for legacypool journals.
contracts/utils.go Switches local tx insertion to TxPool.AddLocal.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +196 to +207
resubmits, rejournal := tracker.recheck(checkJournal)
if len(resubmits) > 0 {
tracker.pool.Add(resubmits, false)
}
if checkJournal {
// Lock to prevent journal.rotate <-> journal.insert (via TrackAll) conflicts
tracker.mu.Lock()
lastJournal = time.Now()
if err := tracker.journal.rotate(rejournal); err != nil {
log.Warn("Transaction journal rotation failed", "err", err)
}
tracker.mu.Unlock()
Comment thread core/txpool/txpool.go Outdated
Comment thread eth/api_backend.go Outdated
Comment thread core/txpool/txpool.go Outdated
@gzliudan gzliudan force-pushed the fix-data-race-txlookup-access branch from d9959e5 to 8937f39 Compare March 17, 2026 06:57
@gzliudan gzliudan force-pushed the fix-data-race-txlookup-access branch 2 times, most recently from 2349a83 to 95546f5 Compare March 18, 2026 06:50
@gzliudan gzliudan force-pushed the fix-data-race-txlookup-access branch from 95546f5 to c9ef0aa Compare March 24, 2026 07:06
@AnilChinchawale AnilChinchawale merged commit f234f06 into XinFinOrg:dev-upgrade Mar 24, 2026
13 checks passed
@gzliudan gzliudan deleted the fix-data-race-txlookup-access branch March 24, 2026 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants