10000 Enable Quorum/IBFT1 to Besu migration by pullurib · Pull Request #8262 · hyperledger/besu · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Enable Quorum/IBFT1 to Besu migration #8262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 25 commits into from
Mar 12, 2025
Merged

Enable Quorum/IBFT1 to Besu migration #8262

merged 25 commits into from
Mar 12, 2025

Conversation

pullurib
Copy link
Contributor
@pullurib pullurib commented Feb 6, 2025 •
edited
Loading

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.

Enable Quorum/IBFT1 to Besu migration
14c401d 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@pullurib pullurib mentioned this pull request Feb 6, 2025
Closed
Bhanu Pulluri and others added 4 commits February 10, 2025 02:52
Fix BftMining acceptance test
d5cf8fd 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@pullurib
Merge branch 'main' into quorum-ibft1-migration
c79cf36 
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>
Introduce delay after London fork update in BFT mining test to preven…
1112fab 
…t timing issues

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Merge branch 'quorum-ibft1-migration' of github.com:pullurib/besu int…
9c35bb6 
…o quorum-ibft1-migration
matthew1001
matthew1001 reviewed Feb 12, 2025
View reviewed changes
pullurib and others added 4 commits February 13, 2025 02:13
@pullurib @matthew1001
Update besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyB…
c78c53d 
…esuControllerBuilder.java

Co-authored-by: Matt Whitehead <matthew1001@hotmail.com>
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>
828b257 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
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 <bhanu.pulluri@kaleido.io>
@matthew1001
Copy link
Contributor

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?

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 <bhanu.pulluri@kaleido.io>
merge main
6b8c5db 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Refactor resource files
cdeb2e0 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
fix verification metadata
1906973 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@macfarla
Copy link
Contributor

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

Bhanu Pulluri and others added 4 commits February 27, 2025 10:45
fix regression
e013749 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@matthew1001
Merge branch 'main' into quorum-ibft1-migration
f8511da
update changelog
996dffd 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@pullurib
Merge branch 'main' into quorum-ibft1-migration
4269f49
@macfarla 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 <bhanu.pulluri@kaleido.io>
Merge branch 'quorum-ibft1-migration' of github.com:pullurib/besu int…
2ab9f6c 
…o quorum-ibft1-migration
jframe
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 <bhanu.pulluri@kaleido.io>
Revert BftExtraData changes
c566e41 
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
@pullurib
Merge branch 'main' into quorum-ibft1-migration
60a5ab4 
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>
@pullurib
Merge branch 'main' into quorum-ibft1-migration
7ecdb22
@matthew1001 matthew1001 enabled auto-merge (squash) March 12, 2025 12:56
@matthew1001 matthew1001 merged commit 2db46e9 into hyperledger:main Mar 12, 2025
43 checks passed
marcosio pushed a commit to IoBuilders/besu that referenced this pull request Mar 12, 2025
@pullurib @matthew1001
@macfarla @marcosio
Enable Quorum/IBFT1 to Besu migration (hyperledger#8262)
9cabbc5 
* Enable Quorum/IBFT1 to Besu migration

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Fix BftMining acceptance test

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Introduce delay after London fork update in BFT mining test to prevent timing issues

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

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

Co-authored-by: Matt Whitehead <matthew1001@hotmail.com>
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>

* Review changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* update creating additional JSON RPC methods for all controllerbuidlers in consensus schedule

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Create ethprotocol manager and plugin factory for both consensus controllers in migration

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Refactor resource files

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* fix verification metadata

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* fix regression

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* update changelog

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Fix controller selection at the transition block

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Review changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

* Revert BftExtraData changes

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>

---------

Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Signed-off-by: Bhanu Pulluri <59369753+pullurib@users.noreply.github.com>
Co-authored-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Co-authored-by: Matt Whitehead <matthew1001@hotmail.com>
Co-authored-by: Matt Whitehead <matthew.whitehead@kaleido.io>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Marcos Serradilla Diez <marcos@io.builders>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jframe jframe jframe approved these changes

@matthew1001 matthew1001 matthew1001 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pullurib @matthew1001 @macfarla @jframe
0