Don't persist IBFT2 proposal blocks, just validate them (#7631)

* Don't persist IBFT2 proposal blocks, just validate them Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> * Tidy up changelog Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> --------- Signed-off-by: Matthew Whitehead <matthew1001@gmail.com> Signed-off-by: Matt Whitehead <matthew.whitehead@kaleido.io>
hyperledger · Sep 20, 2024 · e721237 · e721237
1 parent e1f4489
commit e721237
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@
 - Fix mounted data path directory permissions for besu user [#7575](https://github.com/hyperledger/besu/pull/7575)
 - Fix for `debug_traceCall` to handle transactions without specified gas price. [#7510](https://github.com/hyperledger/besu/pull/7510)
 - Corrects a regression where custom plugin services are not initialized correctly. [#7625](https://github.com/hyperledger/besu/pull/7625)
-
+- Fix for IBFT2 chains using the BONSAI DB format [#7631](https://github.com/hyperledger/besu/pull/7631)
 
 ## 24.9.1
 

diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/RoundTimer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/RoundTimer.java
@@ -81,7 +81,7 @@ public synchronized void startTimer(final ConsensusRoundIdentifier round) {
     // Once we are up to round 2 start logging round expiries
     if (round.getRoundNumber() >= 2) {
       LOG.info(
-          "QBFT round {} expired. Moved to round {} which will expire in {} seconds",
+          "BFT round {} expired. Moved to round {} which will expire in {} seconds",
           round.getRoundNumber() - 1,
           round.getRoundNumber(),
           (expiryTime / 1000));

diff --git a/...s/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java b/...s/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java
@@ -78,7 +78,9 @@ public boolean validateProposal(final Proposal msg) {
       return false;
     }
 
-    if (!validateBlock(msg.getBlock())) {
+    // We want to validate the block but not persist it yet as it's just a proposal. If it turns
+    // out to be an accepted block it will be persisted at block import time
+    if (!validateBlockWithoutPersisting(msg.getBlock())) {
       return false;
     }
 
@@ -93,14 +95,14 @@ public boolean validateProposal(final Proposal msg) {
         msg.getSignedPayload(), msg.getBlock(), blockInterface);
   }
 
-  private boolean validateBlock(final Block block) {
+  private boolean validateBlockWithoutPersisting(final Block block) {
 
     final BlockValidator blockValidator =
         protocolSchedule.getByBlockHeader(block.getHeader()).getBlockValidator();
 
     final var validationResult =
         blockValidator.validateAndProcessBlock(
-            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL);
+            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL, false);
 
     if (validationResult.isFailed()) {
       LOG.info(

diff --git a/...ft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java b/...ft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java
@@ -113,7 +113,7 @@ public void setup() {
 
     when(protocolSpec.getBlockValidator()).thenReturn(blockValidator);
     when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
-    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
+    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any(), eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     when(roundChangeCertificateValidator.validateProposalMessageMatchesLatestPrepareCertificate(
@@ -168,7 +168,7 @@ public void ifProposalConsistencyChecksFailProposalIsIllegal() {
 
   @Test
   public void blockValidationFailureFailsValidation() {
-    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
+    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any(), eq(false)))
         .thenReturn(new BlockProcessingResult("Failed"));
 
     final Proposal proposalMsg =