Share state privisoning logic between ParallelBlockTransactionProcessor implementations

Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com>

Author: mirgee

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

@@ -27,7 +27,6 @@
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessList.BlockAccessListBuilder;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldState;
-import org.hyperledger.besu.ethereum.trie.pathbased.common.provider.WorldStateQueryParams;
 import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.PathBasedWorldState;
 import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.accumulator.PathBasedWorldStateUpdateAccumulator;
 import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
@@ -70,26 +69,10 @@ protected ParallelizedTransactionContext runTransaction(
       final Wei blobGasPrice,
       final Optional<BlockAccessListBuilder> blockAccessListBuilder) {
 
-    final BlockHeader parentHeader =
-        protocolContext
-            .getBlockchain()
-            .getBlockHeader(blockHeader.getParentHash())
-            .orElseThrow(
-                () ->
-                    new IllegalStateException(
-                        "Parent header not found for block " + blockHeader.getHash()));
-
-    try (BonsaiWorldState ws =
-        (BonsaiWorldState)
-            protocolContext
-                .getWorldStateArchive()
-                .getWorldState(
-                    WorldStateQueryParams.withBlockHeaderAndNoUpdateNodeHead(parentHeader))
-                .orElseThrow(
-                    () ->
-                        new IllegalStateException(
-                            "World state not found for parent block " + parentHeader.getHash()))) {
+    final BonsaiWorldState ws = getWorldState(protocolContext, blockHeader);
+    if (ws == null) return null;
 
+    try {
       ws.disableCacheMerkleTrieLoader();
       final ParallelizedTransactionContext.Builder ctxBuilder =
           new ParallelizedTransactionContext.Builder();
@@ -126,6 +109,8 @@ protected ParallelizedTransactionContext runTransaction(
       ctxBuilder.transactionAccumulator(blockUpdater).transactionProcessingResult(result);
 
       return ctxBuilder.build();
+    } finally {
+      ws.close();
     }
   }
 

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

@@ -22,6 +22,8 @@
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessList.BlockAccessListBuilder;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.trie.pathbased.common.provider.WorldStateQueryParams;
 import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 
@@ -67,6 +69,22 @@ public void runAsyncBlock(
     }
   }
 
+  protected BonsaiWorldState getWorldState(
+      final ProtocolContext protocolContext, final BlockHeader blockHeader) {
+
+    final BlockHeader chainHeadHeader = protocolContext.getBlockchain().getChainHeadHeader();
+    if (!chainHeadHeader.getHash().equals(blockHeader.getParentHash())) {
+      return null;
+    }
+
+    return (BonsaiWorldState)
+        protocolContext
+            .getWorldStateArchive()
+            .getWorldState(
+                WorldStateQueryParams.withBlockHeaderAndNoUpdateNodeHead(chainHeadHeader))
+            .orElse(null);
+  }
+
   protected abstract ParallelizedTransactionContext runTransaction(
       ProtocolContext protocolContext,
       BlockHeader blockHeader,

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

@@ -26,7 +26,6 @@
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessList.BlockAccessListBuilder;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldState;
-import org.hyperledger.besu.ethereum.trie.pathbased.common.provider.WorldStateQueryParams;
 import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.PathBasedWorldState;
 import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.accumulator.PathBasedWorldStateUpdateAccumulator;
 import org.hyperledger.besu.evm.account.MutableAccount;
@@ -85,22 +84,11 @@ protected ParallelizedTransactionContext runTransaction(
       final BlockHashLookup blockHashLookup,
       final Wei blobGasPrice,
       final Optional<BlockAccessListBuilder> blockAccessListBuilder) {
-    final BlockHeader chainHeadHeader = protocolContext.getBlockchain().getChainHeadHeader();
-    if (!chainHeadHeader.getHash().equals(blockHeader.getParentHash())) {
-      return null;
-    }
 
-    try (BonsaiWorldState ws =
-        (BonsaiWorldState)
-            protocolContext
-                .getWorldStateArchive()
-                .getWorldState(
-                    WorldStateQueryParams.withBlockHeaderAndNoUpdateNodeHead(chainHeadHeader))
-                .orElse(null)) {
-      if (ws == null) {
-        return null;
-      }
+    final BonsaiWorldState ws = getWorldState(protocolContext, blockHeader);
+    if (ws == null) return null;
 
+    try {
       ws.disableCacheMerkleTrieLoader();
       final ParallelizedTransactionContext.Builder contextBuilder =
           new ParallelizedTransactionContext.Builder();
@@ -165,6 +153,8 @@ public void traceBeforeRewardTransaction(
     } catch (Exception ex) {
       // no op as failing to get worldstate
       return null;
+    } finally {
+      ws.close();
     }
   }