Skip to content

refactor(txpool): remove wrapper type #27841#2124

Merged
AnilChinchawale merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:core-types-blobtx-blobs
Mar 11, 2026
Merged

refactor(txpool): remove wrapper type #27841#2124
AnilChinchawale merged 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:core-types-blobtx-blobs

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

@gzliudan gzliudan commented Mar 2, 2026

Proposed changes

Partial backport of PR ethereum#27841 which only limited to txpool wrapper removal.

  • Migrate txpool interfaces/call sites from *txpool.Transaction to *types.Transaction
  • Update eth/miner/contracts paths and related tests accordingly
  • No intended behavior change

Blob sidecar validation/handling changes from upstream are not included here.

Ref: ethereum#27841

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 2, 2026 10:55
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 2, 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: e9e7c361-a4f9-4c8c-807f-f394941dab20

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
  • Post copyable unit tests in a comment

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 txpool-facing APIs to remove the *txpool.Transaction wrapper and use *types.Transaction directly across txpool interfaces and key call sites (miner + eth protocol/backend), aiming to keep runtime behavior unchanged while simplifying types.

Changes:

  • Removed txpool.Transaction wrapper usage from txpool interfaces (SubPool, TxPool, LegacyPool) and LazyTransaction.Resolve.
  • Updated miner transaction handling and ordering logic/tests to work with *types.Transaction directly.
  • Updated eth protocol, sync, handler, and API backend paths (plus tests/helpers) to pass/consume *types.Transaction directly.

Reviewed changes

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

Show a summary per file
File Description
miner/worker.go Adjusts miner’s lazy-tx construction and resolved-tx usage to *types.Transaction.
miner/ordering.go Updates ordering logic to operate on resolved *types.Transaction directly.
miner/ordering_test.go Updates ordering tests to reflect the new lazy/resolved transaction types.
eth/sync.go Sync loop now extracts resolved *types.Transaction directly from lazy txs.
eth/protocol.go Updates the txPool interface to accept []*types.Transaction.
eth/protocol_test.go Updates protocol tests to fill the pool with *types.Transaction directly.
eth/helper_test.go Updates test txpool implementation to match the new interface types.
eth/handler.go Removes wrapper conversion before calling txpool.Add.
eth/api_backend.go Updates SendTx / pool getters to use *types.Transaction directly.
core/txpool/txpool.go Changes TxPool Get/Add signatures and internal splitting/filtering to use *types.Transaction.
core/txpool/subpool.go Removes txpool.Transaction wrapper type; LazyTransaction and SubPool operate on *types.Transaction.
core/txpool/legacypool/legacypool.go Updates pending lazy txs, Add, and Get to use *types.Transaction directly.
contracts/utils.go Updates contract helper to add signed txs to the pool without wrapper allocation.

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

Comment thread core/txpool/legacypool/legacypool.go Outdated
Comment thread miner/worker.go Outdated
@gzliudan gzliudan force-pushed the core-types-blobtx-blobs branch from e14b116 to 57803df Compare March 2, 2026 11:37
@gzliudan gzliudan changed the title refactor(txpool): remove txpool.Transaction wrapper from pool call stes #27841 refactor(txpool): remove wrapper type #27841 Mar 2, 2026
@gzliudan gzliudan force-pushed the core-types-blobtx-blobs branch 3 times, most recently from 7c4f058 to 45e3d6e Compare March 3, 2026 10:19
@AnilChinchawale
Copy link
Copy Markdown
Member

@gzliudan conflict

@gzliudan
Copy link
Copy Markdown
Collaborator Author

@gzliudan conflict

done

Partial backport of ethereum/go-ethereum PR ethereum#27841, limited to txpool wrapper removal.

- Migrate txpool interfaces/call sites from `*txpool.Transaction` to `*types.Transaction`
- Update eth/miner/contracts paths and related tests accordingly
- No intended behavior change

Blob sidecar validation/handling changes from upstream are not included here.
@gzliudan gzliudan force-pushed the core-types-blobtx-blobs branch from 9d3ea62 to af833b5 Compare March 11, 2026 03:25
@AnilChinchawale AnilChinchawale merged commit c762053 into XinFinOrg:dev-upgrade Mar 11, 2026
9 checks passed
@gzliudan gzliudan deleted the core-types-blobtx-blobs branch March 11, 2026 03:31
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