Xdc : Add XdcTestBlockchain for Module testing #9596

Demuirgos · 2025-10-30T02:26:53Z

Adds a lot of fixes and refactor for XDC.

Some Changes to NMC modules, for inherited behavior:
src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs
src/Nethermind/Nethermind.Consensus/Producers/BlockProducerBase.cs

Also fixes an issue with BasicTestBlockchain unrelated to XDC.

dont seal

Copilot

Pull Request Overview

This PR adds XdcTestBlockchain infrastructure for module testing and includes significant refactoring of the XDC consensus implementation. The changes improve testability, fix several bugs, and restructure the XDC module architecture.

Key changes:

Introduced XdcTestBlockchain and related test helpers for comprehensive XDC testing
Refactored SnapshotManager.GetSnapshot() to accept block number and spec instead of hash
Changed SwitchBlock type from UInt256 to long for consistency
Fixed multiple issues in consensus logic, voting, and timeout handling
Enhanced error handling and logging in QuorumCertificateManager

Reviewed Changes

Copilot reviewed 73 out of 73 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
XdcModule.cs	Moved from XdcPlugin.cs; added new service registrations for BlockProcessor, GenesisBuilder, and managers
XdcPlugin.cs	Removed XdcModule class; added MustInitialize property
XdcTestBlockchain.cs	New comprehensive test blockchain implementation with XDC consensus support
SnapshotManager.cs	Refactored GetSnapshot to use block number instead of hash; simplified constructor
XdcHotStuff.cs	Multiple bug fixes in voting, round logic, and leader selection
XdcBlockHeader.cs	Added FromBlockHeader factory method; improved ExtraConsensusData caching
XdcGenesisBuilder.cs	New genesis builder with XDC-specific initialization
QuorumCertificateManager.cs	Enhanced error handling with detailed error messages
Spec/XdcReleaseSpec.cs	Changed SwitchBlock type to long; added GenesisMasterNodes and FromReleaseSpec
Test files	Added comprehensive test coverage for reorg scenarios, blockchain operations
Core changes	Made BlockProcessor methods virtual/protected for inheritance; fixed BasicTestBlockchain

Copilot · 2025-11-12T12:07:14Z

src/Nethermind/Nethermind.Xdc/XdcBlockHeader.cs

+            if (_extraFieldsV2 is not null)
+            {
+                return _extraFieldsV2;
+            }
+
            if (ExtraData is null || ExtraData.Length == 0)
                return null;

-            if (_extraFieldsV2 == null)
-            {
-                //Check V2 consensus version in ExtraData field.
-                if (ExtraData.Length < 3 || ExtraData[0] != XdcConstants.ConsensusVersion)
-                    return null;
-                Rlp.ValueDecoderContext valueDecoderContext = new Rlp.ValueDecoderContext(ExtraData.AsSpan(1));
-                _extraFieldsV2 = _extraConsensusDataDecoder.Decode(ref valueDecoderContext);
-            }
+            //Check V2 consensus version in ExtraData field.
+            if (ExtraData.Length < 3 || ExtraData[0] != XdcConstants.ConsensusVersion)
+                return null;
+            Rlp.ValueDecoderContext valueDecoderContext = new Rlp.ValueDecoderContext(ExtraData.AsSpan(1));
+            _extraFieldsV2 = _extraConsensusDataDecoder.Decode(ref valueDecoderContext);


[nitpick] The early return for cached _extraFieldsV2 at the beginning is good, but the original code checked for null and then decoded. The new code extracts the check out, which improves readability. However, consider adding thread-safety if this property can be accessed concurrently, as the decode operation could happen multiple times.

Copilot · 2025-11-12T12:07:15Z

src/Nethermind/Nethermind.Xdc/VotesManager.cs

+        var xdcHeader = _blockTree.Head?.Header as XdcBlockHeader;
+        IXdcReleaseSpec spec = _specProvider.GetXdcSpec(xdcHeader, xdcHeader.ExtraConsensusData.BlockRound);


Potential null reference exception: xdcHeader could be null from the cast, but line 189 accesses xdcHeader.ExtraConsensusData without null checking. Add a null check before accessing properties.

Copilot · 2025-11-12T12:07:15Z

src/Nethermind/Nethermind.Xdc/TimeoutCertificateManager.cs

+        XdcBlockHeader xdcHeader = _blockTree.Head?.Header as XdcBlockHeader;
+        IXdcReleaseSpec spec = _specProvider.GetXdcSpec(xdcHeader, timeout.Round);


Potential null reference exception: xdcHeader could be null from the cast, but is passed directly to GetXdcSpec without null checking. Add appropriate null validation before use.

src/Nethermind/Nethermind.Xdc/QuorumCertificateManager.cs

Copilot · 2025-11-12T12:07:16Z

src/Nethermind/Nethermind.Xdc.Test/SnapshotManagerTests.cs

-        result.Should().BeEquivalentTo(snapshot);
-    }
-}
+//// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited


The entire test file has been commented out rather than removed or updated. This creates technical debt and should either be updated to work with the new SnapshotManager API or removed entirely. Commented-out code should not be committed.

src/Nethermind/Nethermind.Core.Test/Blockchain/BasicTestBlockchain.cs

src/Nethermind/Nethermind.Xdc.Test/Helpers/XdcModuleTestOverrides.cs

src/Nethermind/Nethermind.Consensus/Processing/GenesisLoader.cs

ak88

Need to revisit how headers can be made more flexible at some point

src/Nethermind/Nethermind.Xdc.Test/XdcHeaderValidatorTests.cs

* Change IPrecompile to use Result<byte[]> allowing to return errors from precompiles (#9561) * Change IPrecompile to use Result<byte[]> * whitespace * fix benchmark * fix tests * Move back DataGasCost to simple long * Some fixes * fixes * refactor * expose precompile error from EVM * ModExpPrecompile should fail on run not on DataGasCost * fixes * Fix tests and bubble up precompile errors * fix build * Another try * Error(2) * Choose substate error * fixes * Simplify handling errors * fix PairingCheckPrecompile * Add syntatic suggar, while preserving lazy evaluation * fix --------- Co-authored-by: lukasz.rozmej <[email protected]> * Update outdated link (#9654) * Feature/xdc prevent finalized reorg (#9655) * override in blocktree * fix * unittest * format * fix * Fix * remove test * cleanup * Do not insert block if invalid fork * format * review comments * format * Update src/Nethermind/Nethermind.Xdc/XdcBlockTree.cs Co-authored-by: Lukasz Rozmej <[email protected]> --------- Co-authored-by: Lukasz Rozmej <[email protected]> * fix: DynamicCallWithInput to skip value for DELEGATECALL/STATICCALL (#9672) * fix: DynamicCallWithInput to skip value for DELEGATECALL/STATICCALL * update test * Route ColumnDb.Remove through Set(null) to use wrapper semantics (#9636) * Changes for test blockchain (#9680) * test blockchain changes * format * Improve diag Docker container (#9635) * Fix bump-version action and adds reviewers as default (#9557) * feat: add reviewers to the bump-version action * feat: use checkout action * Fix free disk space check for non existent directories (HealthChecks) (#9666) * Create non existent db directory to get drive info * Add db folder to ignored to pass tests * Update OP Superchain chains (#9675) Co-authored-by: emlautarom1 <[email protected]> Co-authored-by: Lautaro Emanuel <[email protected]> * Remove Nethermind.Analytics (#9683) * Feature/block production blob limit (#9686) * Introduce BlockProductionBlobLimit to limit number of blobs picked when producing block * Add MaxBlobCount calculation tests * whitespace * Rename * Update src/Nethermind/Nethermind.Config/IBlocksConfig.cs Co-authored-by: Ahmad Bitar <[email protected]> --------- Co-authored-by: Ahmad Bitar <[email protected]> * Fix resource leak in HttpJsonRpcSubmitter (#9687) Update HttpJsonRpcSubmitter.cs * Remove unused BlockFilter.StartBlockNumber and simplify CreateBlockFilter (#9630) * Remove unused BlockFilter.StartBlockNumber and simplify CreateBlockFilter * fix ci * formatting * Revert "Improve Block related caching (#9571)" (#9688) * Revert "Improve Block related caching (#9571)" This reverts commit fe8adcc. * merge fix * Update Dockerfiles (#9689) Co-authored-by: rubo <[email protected]> * Fix Chainspec for Taiko-Hoodi (#9699) fix transition for taiko-hoodi * Xdc : Add XdcTestBlockchain for Module testing (#9596) * start * more dependencies * build * rename * voting * vote task * bit of refactor * invoke block produced dont seal * refactor context * format * timeout missing * block producer * format * basic incomplete setup * test * block production test * format * merge cleanup * merged * use the constant * use timestamp from attributes * Merged * Merged fix * cleanup * fixes * cleanup * commit cert before vote propose in background * merge and refactor * rename * format * comment * refactor to continuous loop * remove TCM * Format * fix * draft implmentation * cleanup * handle regenesis block in XdcTestBlockchain * refactor to inherit from TestBlockchain * register FromXdcContainer * handle _fromContainer from base * attempt rotating signers * test fix * test fix * test and container setup fix * decoder fix * bug fixes * init QC * test xdc sealer rotation * bug fixes and working now * Format * Update packages.lock.json * remove * total difficulty fix * format * override in blocktree * fix * unittest * format * fix build issues * fix * Fix * remove test * fixes * format * cleanup * undo merge and cleanup usings * add custom genesis builder for xdc * format whitespaces * Do not insert block if invalid fork * format * reorg test * revert block processor * revert cloning of header in PrepareBlockForProcessing * reorgs tests working * fix bad db * fix seal validator * fix * format * implement add block without commiting qc and generate extra keys for testing * fix and refactor * optional params * fix * one fix and a bit of refactor * reorg test * rename * return block instead * reorg test * fixes * dont set author * 10 seconds per add block * test blockchain changes * format * fixes for hotstuff module * fix test block producer * fixes for epoch master calculation * format * rename * rollback QC test blockchain order * snapshotmanager tests fixed * format * cleanup * remove TestBlockchainTester * cleanup * small fix in header validator test --------- Co-authored-by: ak88 <[email protected]> Co-authored-by: cicr99 <[email protected]> * XDC - Snapshot Manager refactor (#9695) refactor of snapshot manager * Xdc : Port BlockInfoValidator Module Tests (#9650) * start * more dependencies * build * rename * voting * vote task * bit of refactor * invoke block produced dont seal * refactor context * format * timeout missing * block producer * format * basic incomplete setup * test * block production test * format * merge cleanup * merged * use the constant * use timestamp from attributes * Merged * Merged fix * cleanup * fixes * cleanup * commit cert before vote propose in background * merge and refactor * rename * format * comment * refactor to continuous loop * remove TCM * Format * fix * draft implmentation * cleanup * handle regenesis block in XdcTestBlockchain * refactor to inherit from TestBlockchain * register FromXdcContainer * handle _fromContainer from base * attempt rotating signers * test fix * test fix * test and container setup fix * decoder fix * bug fixes * init QC * test xdc sealer rotation * bug fixes and working now * Format * Update packages.lock.json * remove * draft impl of blockinfo validator tests * total difficulty fix * format * override in blocktree * fix * unittest * format * fix build issues * fix * Fix * remove test * fixes * format * cleanup * undo merge and cleanup usings * add custom genesis builder for xdc * format whitespaces * Do not insert block if invalid fork * format * reorg test * revert block processor * revert cloning of header in PrepareBlockForProcessing * reorgs tests working * fix bad db * fix seal validator * fix * format * implement add block without commiting qc and generate extra keys for testing * fix and refactor * optional params * fix * one fix and a bit of refactor * reorg test * rename * return block instead * reorg test * fixes * fix failing test * dont set author * 10 seconds per add block * test blockchain changes * format * ws fixes * fixes for hotstuff module * fix test block producer * fixes for epoch master calculation * format * rename * rollback QC test blockchain order * CLEANUP * remove unused --------- Co-authored-by: ak88 <[email protected]> Co-authored-by: cicr99 <[email protected]> * Unit tests for commit in XDC QC manager (#9700) unittests * Xdc : Port HeaderValidator Module Tests (#9617) * start * more dependencies * build * rename * voting * vote task * bit of refactor * invoke block produced dont seal * refactor context * format * timeout missing * block producer * format * basic incomplete setup * test * block production test * format * merge cleanup * merged * use the constant * use timestamp from attributes * Merged * Merged fix * cleanup * fixes * cleanup * commit cert before vote propose in background * merge and refactor * rename * format * comment * refactor to continuous loop * remove TCM * Format * fix * draft implmentation * cleanup * handle regenesis block in XdcTestBlockchain * refactor to inherit from TestBlockchain * register FromXdcContainer * handle _fromContainer from base * attempt rotating signers * test fix * test fix * test and container setup fix * draft port of some HeaderValidatorTests * fix build issue * extra tests * decoder fix * handle merge issues * bug fixes * init QC * test xdc sealer rotation * bug fixes and working now * Format * Update packages.lock.json * remove * fix build issues * more build fixes * total difficulty fix * format * override in blocktree * fix * unittest * format * fix build issues * fix * Fix * remove test * fixes * format * cleanup * undo merge and cleanup usings * add custom genesis builder for xdc * format whitespaces * Do not insert block if invalid fork * format * reorg test * revert block processor * revert cloning of header in PrepareBlockForProcessing * reorgs tests working * fix bad db * fix seal validator * fix * format * implement add block without commiting qc and generate extra keys for testing * fix and refactor * optional params * fix * one fix and a bit of refactor * reorg test * rename * return block instead * minor changes and fixes * reorg test * fixes * bring back cache field in sealValidator * dont set author * 10 seconds per add block * test blockchain changes * format * ws fixes * fixes for hotstuff module * fix test block producer * fixes for epoch master calculation * format * rename * rollback QC test blockchain order * cleanup --------- Co-authored-by: ak88 <[email protected]> Co-authored-by: cicr99 <[email protected]> * Update base-sepolia testnet matrix (#9705) chore: update base-sepolia testnet matrix * Comment out Linea in workflows (#9706) chore: comment linea on our workflows --------- Co-authored-by: Alexey Osipov <[email protected]> Co-authored-by: lukasz.rozmej <[email protected]> Co-authored-by: Jaye Turner <[email protected]> Co-authored-by: ak88 <[email protected]> Co-authored-by: Snezhkko <[email protected]> Co-authored-by: radik878 <[email protected]> Co-authored-by: Ruben Buniatyan <[email protected]> Co-authored-by: Marcos Antonio Maceo <[email protected]> Co-authored-by: Damian Orzechowski <[email protected]> Co-authored-by: core-repository-dispatch-app[bot] <173070810+core-repository-dispatch-app[bot]@users.noreply.github.com> Co-authored-by: emlautarom1 <[email protected]> Co-authored-by: Lautaro Emanuel <[email protected]> Co-authored-by: Ahmad Bitar <[email protected]> Co-authored-by: maradini77 <[email protected]> Co-authored-by: GarmashAlex <[email protected]> Co-authored-by: Ben {chmark} Adams <[email protected]> Co-authored-by: Diptanshu Kakwani <[email protected]> Co-authored-by: Ayman Bouchareb <[email protected]> Co-authored-by: ak88 <[email protected]> Co-authored-by: cicr99 <[email protected]> Co-authored-by: Carmen Irene Cabrera Rodríguez <[email protected]>

ak88 and others added 30 commits October 2, 2025 15:44

start

9ea2bfa

more dependencies

47a49e6

build

8d7ef01

Merge branch 'master' into feature/xdc-main-flow

1bd8064

rename

23f9e10

voting

3c429c8

vote task

24b6a53

bit of refactor

9c346f5

invoke block produced

6b350b1

dont seal

refactor context

555bb67

format

f9f4391

timeout missing

91f530d

block producer

3b50c55

format

6fe8a95

basic incomplete setup

a6344ee

test

0bc7152

Merge branch 'master' into feature/xdc-block-builder

e955a1a

block production test

4e63d9e

format

fda2b9b

Merge branch 'master' into feature/xdc-main-flow

36d7508

merge cleanup

b030134

Merge branch 'master' into feature/xdc-main-flow

22ebb78

merged

4edd751

use the constant

c80df36

use timestamp from attributes

83e7fbd

Merge branch 'feature/xdc-block-builder' into feature/xdc-main-flow

15c3f5d

Merged

1b6cbd8

Merged fix

b8d39f5

Merge branch 'master' into feature/xdc-main-flow

aeb2e5a

cleanup

bb95a48

rollback QC test blockchain order

5423911

ak88 marked this pull request as ready for review November 12, 2025 11:48

ak88 requested review from LukaszRozmej, MarekM25, ak88, cicr99 and flcl42 as code owners November 12, 2025 11:48

ak88 requested a review from smartprogrammer93 November 12, 2025 11:54

Demuirgos requested review from Copilot and removed request for LukaszRozmej, MarekM25, ak88, cicr99, flcl42 and smartprogrammer93 November 12, 2025 11:56

Copilot started reviewing on behalf of Demuirgos November 12, 2025 11:56 View session

Copilot finished reviewing on behalf of Demuirgos November 12, 2025 11:58

Copilot AI reviewed Nov 12, 2025

View reviewed changes

ak88 added 5 commits November 12, 2025 13:48

snapshotmanager tests fixed

b82be2c

format

66ec410

cleanup

9a5deb5

remove TestBlockchainTester

20787b4

cleanup

6394d7e

ak88 approved these changes Nov 12, 2025

View reviewed changes

cicr99 reviewed Nov 13, 2025

View reviewed changes

src/Nethermind/Nethermind.Xdc.Test/XdcHeaderValidatorTests.cs Outdated Show resolved Hide resolved

small fix in header validator test

17be3c7

cicr99 approved these changes Nov 13, 2025

View reviewed changes

ak88 merged commit 8276f9e into master Nov 13, 2025
80 checks passed

ak88 deleted the xdc/testing-test-blockchain branch November 13, 2025 12:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Xdc : Add XdcTestBlockchain for Module testing #9596

Xdc : Add XdcTestBlockchain for Module testing #9596

Uh oh!

Demuirgos commented Oct 30, 2025 •

edited by ak88

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Nov 12, 2025

Uh oh!

Copilot AI Nov 12, 2025

Uh oh!

Copilot AI Nov 12, 2025

Uh oh!

Uh oh!

Copilot AI Nov 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ak88 left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		var xdcHeader = _blockTree.Head?.Header as XdcBlockHeader;
		IXdcReleaseSpec spec = _specProvider.GetXdcSpec(xdcHeader, xdcHeader.ExtraConsensusData.BlockRound);

		XdcBlockHeader xdcHeader = _blockTree.Head?.Header as XdcBlockHeader;
		IXdcReleaseSpec spec = _specProvider.GetXdcSpec(xdcHeader, timeout.Round);

Xdc : Add XdcTestBlockchain for Module testing #9596

Xdc : Add XdcTestBlockchain for Module testing #9596

Uh oh!

Conversation

Demuirgos commented Oct 30, 2025 • edited by ak88 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ak88 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Demuirgos commented Oct 30, 2025 •

edited by ak88

Loading