Enable Quorum/IBFT1 to Besu migration #8262

pullurib · 2025-02-06T23:43:26Z

PR description

Restored and updated the removed IBFT1 code required for parsing and validating IBFT1 extra data.
Made required changes to enable transitioning to QBFT after IBFT1 block import.
Added test for importing IBFT1 blocks into a Besu network that transitions to QBFT after the imported IBFT1 blocks.
Added an end-to-end test case to simulate a 5-node Besu network and validate the block import and transition process.

Signed-off-by: Bhanu Pulluri <[email protected]>

…t timing issues Signed-off-by: Bhanu Pulluri <[email protected]>

…o quorum-ibft1-migration

besu/build.gradle

besu/src/main/java/org/hyperledger/besu/controller/BesuController.java

besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java

consensus/ibftlegacy/build.gradle

...sus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java

besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java

…esuControllerBuilder.java Co-authored-by: Matt Whitehead <[email protected]> Signed-off-by: Bhanu Pulluri <[email protected]>

Signed-off-by: Bhanu Pulluri <[email protected]>

…o quorum-ibft1-migration

…s in consensus schedule Signed-off-by: Bhanu Pulluri <[email protected]>

matthew1001 · 2025-02-25T15:12:40Z

I've approved the PR @pullurib, couple of last comments:

It's probably worth @jframe having a look at these changes if he has some time
The gradle verification changes look like we're pulling in some old versions of tuweni. Can you do a build & trivy scan to see if those versions have HIGH or CRITICAL CVEs in? I wonder if we can just bump the version to use the one currently in main?

…rollers in migration Signed-off-by: Bhanu Pulluri <[email protected]>

Signed-off-by: Bhanu Pulluri <[email protected]>

macfarla · 2025-02-27T00:44:20Z

haven't reviewed in detail but could use a changelog entry :)

Signed-off-by: Bhanu Pulluri <[email protected]>

…o quorum-ibft1-migration

acceptance-tests/tests/src/test/resources/qbft/migration-ibft1/qbft-migration.json

besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraData.java

consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftLegacyContext.java

...sus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java

.../java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java

...s/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataCodec.java

.../main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java

...sts/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bftsoak/BftMiningSoakTest.java

Signed-off-by: Bhanu Pulluri <[email protected]>

* Enable Quorum/IBFT1 to Besu migration Signed-off-by: Bhanu Pulluri <[email protected]> * Fix BftMining acceptance test Signed-off-by: Bhanu Pulluri <[email protected]> * Introduce delay after London fork update in BFT mining test to prevent timing issues Signed-off-by: Bhanu Pulluri <[email protected]> * Update besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java Co-authored-by: Matt Whitehead <[email protected]> Signed-off-by: Bhanu Pulluri <[email protected]> * Review changes Signed-off-by: Bhanu Pulluri <[email protected]> * update creating additional JSON RPC methods for all controllerbuidlers in consensus schedule Signed-off-by: Bhanu Pulluri <[email protected]> * Create ethprotocol manager and plugin factory for both consensus controllers in migration Signed-off-by: Bhanu Pulluri <[email protected]> * Refactor resource files Signed-off-by: Bhanu Pulluri <[email protected]> * fix verification metadata Signed-off-by: Bhanu Pulluri <[email protected]> * fix regression Signed-off-by: Bhanu Pulluri <[email protected]> * update changelog Signed-off-by: Bhanu Pulluri <[email protected]> * Fix controller selection at the transition block Signed-off-by: Bhanu Pulluri <[email protected]> * Review changes Signed-off-by: Bhanu Pulluri <[email protected]> * Revert BftExtraData changes Signed-off-by: Bhanu Pulluri <[email protected]> --------- Signed-off-by: Bhanu Pulluri <[email protected]> Signed-off-by: Bhanu Pulluri <[email protected]> Co-authored-by: Bhanu Pulluri <[email protected]> Co-authored-by: Matt Whitehead <[email protected]> Co-authored-by: Matt Whitehead <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> Signed-off-by: Marcos Serradilla Diez <[email protected]>

Enable Quorum/IBFT1 to Besu migration

14c401d

Signed-off-by: Bhanu Pulluri <[email protected]>

pullurib mentioned this pull request Feb 6, 2025

Quorum/IBFT to Besu/QBFT migration #8224

Closed

Bhanu Pulluri and others added 4 commits February 10, 2025 02:52

Fix BftMining acceptance test

d5cf8fd

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'main' into quorum-ibft1-migration

c79cf36

Signed-off-by: Bhanu Pulluri <[email protected]>

Introduce delay after London fork update in BFT mining test to preven…

1112fab

…t timing issues Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'quorum-ibft1-migration' of github.com:pullurib/besu int…

9c35bb6

…o quorum-ibft1-migration

matthew1001 reviewed Feb 12, 2025

View reviewed changes

pullurib and others added 4 commits February 13, 2025 02:13

Update besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyB…

c78c53d

…esuControllerBuilder.java Co-authored-by: Matt Whitehead <[email protected]> Signed-off-by: Bhanu Pulluri <[email protected]>

Review changes

828b257

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'quorum-ibft1-migration' of github.com:pullurib/besu int…

9a10a01

…o quorum-ibft1-migration

update creating additional JSON RPC methods for all controllerbuidler…

58d2563

…s in consensus schedule Signed-off-by: Bhanu Pulluri <[email protected]>

matthew1001 approved these changes Feb 25, 2025

View reviewed changes

Bhanu Pulluri added 4 commits February 26, 2025 14:40

Create ethprotocol manager and plugin factory for both consensus cont…

ca49542

…rollers in migration Signed-off-by: Bhanu Pulluri <[email protected]>

merge main

6b8c5db

Signed-off-by: Bhanu Pulluri <[email protected]>

Refactor resource files

cdeb2e0

Signed-off-by: Bhanu Pulluri <[email protected]>

fix verification metadata

1906973

Signed-off-by: Bhanu Pulluri <[email protected]>

Bhanu Pulluri and others added 4 commits February 27, 2025 10:45

fix regression

e013749

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'main' into quorum-ibft1-migration

f8511da

update changelog

996dffd

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'main' into quorum-ibft1-migration

4269f49

macfarla requested a review from jframe March 3, 2025 23:19

Bhanu Pulluri added 2 commits March 5, 2025 13:12

Fix controller selection at the transition block

0851661

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'quorum-ibft1-migration' of github.com:pullurib/besu int…

2ab9f6c

…o quorum-ibft1-migration

jframe reviewed Mar 6, 2025

View reviewed changes

Bhanu Pulluri and others added 4 commits March 7, 2025 16:30

Review changes

74575e0

Signed-off-by: Bhanu Pulluri <[email protected]>

Revert BftExtraData changes

c566e41

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'main' into quorum-ibft1-migration

60a5ab4

Signed-off-by: Bhanu Pulluri <[email protected]>

Merge branch 'main' into quorum-ibft1-migration

7ecdb22

jframe approved these changes Mar 12, 2025

View reviewed changes

Merge branch 'main' into quorum-ibft1-migration

c0a32bb

matthew1001 enabled auto-merge (squash) March 12, 2025 12:56

Merge branch 'main' into quorum-ibft1-migration

67ecec6

matthew1001 merged commit 2db46e9 into hyperledger:main Mar 12, 2025
43 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable Quorum/IBFT1 to Besu migration #8262

Enable Quorum/IBFT1 to Besu migration #8262

pullurib commented Feb 6, 2025 •

edited

Loading

matthew1001 commented Feb 25, 2025

macfarla commented Feb 27, 2025

Enable Quorum/IBFT1 to Besu migration #8262

Enable Quorum/IBFT1 to Besu migration #8262

Conversation

pullurib commented Feb 6, 2025 • edited Loading

PR description

matthew1001 commented Feb 25, 2025

macfarla commented Feb 27, 2025

pullurib commented Feb 6, 2025 •

edited

Loading