Skip to content

fix(eth): initialize engine with finalized chain config, fix #2138#2180

Open
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-sync-from-genesis
Open

fix(eth): initialize engine with finalized chain config, fix #2138#2180
gzliudan wants to merge 1 commit intoXinFinOrg:dev-upgradefrom
gzliudan:fix-sync-from-genesis

Conversation

@gzliudan
Copy link
Collaborator

@gzliudan gzliudan commented Mar 13, 2026

Proposed changes

Reorder initialization in eth.New so the effective chain config is resolved and persisted via core.SetupGenesisBlock before creating the consensus engine.

Background:

  • On first sync from genesis, LoadChainConfig could return a stored/incomplete config (notably with XDPoS.V2 unset in legacy testnet setups).
  • Creating XDPoS before finalizing genesis config could trigger mainnet V2 fallback and log/behavior mismatches around SwitchBlock.

Proof:
Add a log in function func (x *XDPoS) VerifyHeaders:

	log.Info("VerifyHeaders",
		"switch block in chain config", chain.Config().XDPoS.V2.SwitchBlock.Uint64(),
		"switch block in V2 config", x.config.V2.SwitchBlock.Uint64(),
	)

Result:

"switch block in chain config"=56,828,700 "switch block in V2 config"=80,370,000

What changed:

  • Replace early LoadChainConfig usage with SetupGenesisBlock in eth.New.
  • Keep ConfigCompatError semantics consistent with core/blockchain initialization: fail only on non-compat errors.
  • Initialize consensus engine after finalized chainConfig is available.

Result:

  • Consensus engine now starts with finalized network config on first boot.
  • Avoids incorrect V2 fallback parameters (e.g. wrong SwitchBlock) during initial testnet sync.

Tests:

  • Added regression tests in eth/backend_test.go to cover legacy missing-V2 repair and SetupGenesisBlock idempotency.

fix #2138

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

@coderabbitai
Copy link

coderabbitai bot commented Mar 13, 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: 61a559be-0e6e-468f-ba2c-8c4ba5f58b93

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
📝 Coding Plan
  • Generate coding plan for human review comments

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.

Tip

CodeRabbit can suggest fixes for GitHub Check annotations.

Configure the reviews.tools.github-checks setting to adjust the time to wait for GitHub Checks to complete.

Copy link

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 addresses a sync failure at the first XDPoS v2 block when syncing from genesis (#2138) by ensuring the effective genesis/chain configuration is resolved (and stored when possible) before the consensus engine is constructed.

Changes:

  • Replace core.LoadChainConfig with core.SetupGenesisBlock during eth.New initialization.
  • Construct the consensus engine after resolving the chain config, and reuse the instance when building the Ethereum service.

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

Comment on lines 133 to +144
@@ -141,6 +141,7 @@ func New(stack *node.Node, config *ethconfig.Config, XDCXServ *XDCx.XDCX, lendin
networkID = chainConfig.ChainID.Uint64()
}
common.CopyConstants(networkID)
engine := CreateConsensusEngine(stack, chainConfig, chainDb)
Comment on lines 131 to +144
@@ -141,6 +141,7 @@ func New(stack *node.Node, config *ethconfig.Config, XDCXServ *XDCx.XDCX, lendin
networkID = chainConfig.ChainID.Uint64()
}
common.CopyConstants(networkID)
engine := CreateConsensusEngine(stack, chainConfig, chainDb)
Comment on lines +131 to +132
// Resolve and persist the effective chain config before constructing
// the consensus engine so it always initializes with final network settings.
@gzliudan gzliudan force-pushed the fix-sync-from-genesis branch from 1676ccd to 72382c3 Compare March 13, 2026 02:21
@gzliudan gzliudan changed the title fix(eth): setup genesis config before engine init, fix #2138 fix(eth): initialize engine with finalized chain config, fix #2138 Mar 13, 2026
…g#2138

Reorder initialization in eth.New so the effective chain config is resolved and persisted via core.SetupGenesisBlock before creating the consensus engine.

Background:
- On first sync from genesis, LoadChainConfig could return a stored/incomplete config (notably with XDPoS.V2 unset in legacy testnet setups).
- Creating XDPoS before finalizing genesis config could trigger mainnet V2 fallback and log/behavior mismatches around SwitchBlock.

What changed:
- Replace early LoadChainConfig usage with SetupGenesisBlock in eth.New.
- Keep ConfigCompatError semantics consistent with core/blockchain initialization: fail only on non-compat errors.
- Initialize consensus engine after finalized chainConfig is available.

Result:
- Consensus engine now starts with finalized network config on first boot.
- Avoids incorrect V2 fallback parameters (e.g. wrong SwitchBlock) during initial testnet sync.

Tests:
- Added regression tests in eth/backend_test.go to cover legacy missing-V2 repair and SetupGenesisBlock idempotency.
@gzliudan gzliudan force-pushed the fix-sync-from-genesis branch from 72382c3 to 372c5c4 Compare March 13, 2026 02:28
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.

3 participants