Don't persist BFT proposed blocks, only committed ones (#7204)

* Don't persist BFT proposed blocks, only committed ones Signed-off-by: Matthew Whitehead <[email protected]> * Fix unit tests, update copyright Signed-off-by: Matthew Whitehead <[email protected]> * Update changelog Signed-off-by: Matthew Whitehead <[email protected]> --------- Signed-off-by: Matthew Whitehead <[email protected]> Signed-off-by: Matt Whitehead <[email protected]>
hyperledger · Jun 13, 2024 · c52975b · c52975b
1 parent c8d0107
commit c52975b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,8 @@
 ### Bug fixes
 - Make `eth_gasPrice` aware of the base fee market [#7102](https://github.com/hyperledger/besu/pull/7102)
 - Validation errors ignored in accounts-allowlist and empty list [#7138](https://github.com/hyperledger/besu/issues/7138)
+- Fix "Invalid block detected" for BFT chains using Bonsai DB [#7204](https://github.com/hyperledger/besu/pull/7204)
+
 ## 24.5.2
 
 ### Upcoming Breaking Changes

diff --git a/...rc/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidator.java b/...rc/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -150,7 +150,7 @@ private boolean validateBlock(final Block block) {
 
     final var validationResult =
         blockValidator.validateAndProcessBlock(
-            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL);
+            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL, false);
 
     if (!validationResult.isSuccessful()) {
       LOG.info(

diff --git a/...est/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidatorTest.java b/...est/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidatorTest.java
@@ -105,7 +105,8 @@ public void validationPassesWhenProposerAndRoundMatchAndBlockIsValid() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     assertThat(payloadValidator.validate(proposal.getSignedPayload())).isTrue();
@@ -129,7 +130,8 @@ public void validationPassesWhenBlockRoundDoesNotMatchProposalRound() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     assertThat(payloadValidator.validate(proposal.getSignedPayload())).isTrue();
@@ -152,7 +154,8 @@ public void validationFailsWhenBlockFailsValidation() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult("Failed"));
 
     assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
@@ -228,7 +231,8 @@ public void validationFailsForBlockWithIncorrectHeight() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
@@ -262,7 +266,8 @@ public void validationForCmsFailsWhenCmsFailsValidation() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
     when(cmsValidator.validate(eq(cms), eq(hashWithoutCms))).thenReturn(false);
 
@@ -297,7 +302,8 @@ public void validationForCmsPassesWhenCmsIsValid() {
             eq(protocolContext),
             eq(block),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
     when(cmsValidator.validate(eq(cms), eq(hashWithoutCms))).thenReturn(true);
 

diff --git a/...t/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidatorTest.java b/...t/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -111,7 +111,8 @@ QbftContext.class, emptyList(), bftExtraDataEncoder),
             eq(protocolContext),
             any(),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
@@ -168,7 +169,8 @@ public void validationFailsIfBlockIsInvalid() {
             eq(protocolContext),
             any(),
             eq(HeaderValidationMode.LIGHT),
-            eq(HeaderValidationMode.FULL)))
+            eq(HeaderValidationMode.FULL),
+            eq(false)))
         .thenReturn(new BlockProcessingResult("Failed"));
 
     assertThat(roundItem.messageValidator.validate(proposal)).isFalse();