Reset ws before retrying block processing (besu-eth#9113)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: georgereuben <reubengeorge101@gmail.com>

Author: 2 people

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java

@@ -259,6 +259,9 @@ public BlockProcessingResult processBlock(
                 "block did not consume expected blob gas: header %d, transactions %d",
                 headerBlobGasUsed, currentBlobGasUsed);
         LOG.error(errorMessage);
+        if (worldState instanceof BonsaiWorldState) {
+          ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+        }
         return new BlockProcessingResult(Optional.empty(), errorMessage);
       }
     }
@@ -271,6 +274,9 @@ public BlockProcessingResult processBlock(
             .processWithdrawals(maybeWithdrawals.get(), worldState.updater());
       } catch (final Exception e) {
         LOG.error("failed processing withdrawals", e);
+        if (worldState instanceof BonsaiWorldState) {
+          ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+        }
         return new BlockProcessingResult(Optional.empty(), e);
       }
     }
@@ -287,6 +293,9 @@ public BlockProcessingResult processBlock(
       }
     } catch (final Exception e) {
       LOG.error("failed processing requests", e);
+      if (worldState instanceof BonsaiWorldState) {
+        ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+      }
       return new BlockProcessingResult(Optional.empty(), e);
     }
 
@@ -296,12 +305,15 @@ public BlockProcessingResult processBlock(
       final Hash headerRequestsHash = optionalRequestsHash.get();
       Hash calculatedRequestHash = BodyValidation.requestsHash(requests);
       if (!calculatedRequestHash.equals(headerRequestsHash)) {
-        return new BlockProcessingResult(
-            Optional.empty(),
-            "Requests hash mismatch, calculated: "
-                + calculatedRequestHash.toHexString()
-                + " header: "
-                + headerRequestsHash.toHexString());
+        String errorMessage =
+            String.format(
+                "Requests hash mismatch, calculated: %s header: %s",
+                calculatedRequestHash.toHexString(), headerRequestsHash.toHexString());
+        LOG.error(errorMessage);
+        if (worldState instanceof BonsaiWorldState) {
+          ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+        }
+        return new BlockProcessingResult(Optional.empty(), errorMessage);
       }
     }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/parallelization/MainnetParallelBlockProcessor.java

@@ -30,6 +30,8 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
 import org.hyperledger.besu.ethereum.mainnet.systemcall.BlockProcessingContext;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
 import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
@@ -147,6 +149,9 @@ public BlockProcessingResult processBlock(
           "Parallel transaction processing failure. Falling back to non-parallel processing for block #{} ({})",
           block.getHeader().getNumber(),
           block.getHash());
+      if (worldState instanceof BonsaiWorldState) {
+        ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+      }
       return super.processBlock(protocolContext, blockchain, worldState, block);
     }
     return blockProcessingResult;