Skip to content

fix(consensus/XDPoS,core): stop fabricating verify batch blocks, close #2253#2298

Open
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-invalid-merkle-root
Open

fix(consensus/XDPoS,core): stop fabricating verify batch blocks, close #2253#2298
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-invalid-merkle-root

Conversation

@gzliudan
Copy link
Copy Markdown
Collaborator

@gzliudan gzliudan commented Apr 10, 2026

Proposed changes

Avoid exposing in-flight verify batch headers as empty placeholder blocks. Wire real batch blocks into full block imports while keeping header-only verification limited to header lookups, so consensus code cannot observe fabricated bodies during VerifyHeaders.

Add unit coverage for verifyChainReader and an engine v2 regression test for block lookups during batch verification.

fix #2253

test: sync testnet from genesis block, passed all blocks

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 April 10, 2026 16:11
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 10, 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: f8b7d25a-9368-4f45-b15f-e0dfe4835a06

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

Fixes XDPoS header-batch verification so consensus code can’t observe “fabricated” empty blocks for in-flight headers during VerifyHeaders, while still allowing full block imports to provide real batch blocks for GetBlock lookups.

Changes:

  • Introduces an XDPoS verify-batch ChainReader wrapper that shadows headers but does not fabricate placeholder blocks (unless real blocks are explicitly provided).
  • Wires the wrapper into header-only verification (HeaderChain.ValidateHeaderChain) and full block imports (BlockChain.insertChain) with engine-specific handling for XDPoS.
  • Adds unit tests for the verify-batch reader and an engine v2 regression test to ensure GetBlock doesn’t return fabricated batch blocks during header verification (HookPenalty path).

Reviewed changes

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

Show a summary per file
File Description
core/headerchain.go Uses an XDPoS-specific verify-batch ChainReader when validating header chains.
core/blockchain.go Passes real batch blocks to the verify-batch ChainReader during full block imports.
consensus/XDPoS/XDPoS.go Switches to the new exported verify-batch reader constructor.
consensus/XDPoS/verify_chain_reader.go Stops creating header-only placeholder blocks; optionally exposes real blocks when provided.
consensus/XDPoS/verify_chain_reader_test.go Expands unit coverage for header shadowing and block lookup behavior.
consensus/tests/engine_v2_tests/verify_header_test.go Adds regression coverage ensuring batch GetBlock lookups don’t see fabricated blocks during verification.

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

@gzliudan gzliudan changed the title fix(consensus/XDPoS,core): stop fabricating verify batch blocks fix(consensus/XDPoS,core): stop fabricating verify batch blocks, close #2253 Apr 10, 2026
…XinFinOrg#2253

Avoid exposing in-flight verify batch headers as empty placeholder blocks.
Wire real batch blocks into full block imports while keeping header-only
verification limited to header lookups, so consensus code cannot observe
fabricated bodies during VerifyHeaders.

Add unit coverage for verifyChainReader and an engine v2 regression test for
block lookups during batch verification.
@gzliudan gzliudan force-pushed the fix-invalid-merkle-root branch from ce1e38d to 7ccdbd8 Compare April 10, 2026 21:40
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.

2 participants