update trace logique to fix journal updater issue (#7758)

Signed-off-by: Karim Taam <[email protected]>
hyperledger · Dec 4, 2024 · 6a546c5 · 6a546c5
1 parent 1671306
commit 6a546c5
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
@@ -20,7 +20,6 @@
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceBlock.ChainUpdater;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
@@ -156,14 +155,14 @@ public void trace(
         blocks.get(0).getHash(),
         traceableState -> {
           final WorldUpdater worldStateUpdater = traceableState.updater();
-          final ChainUpdater chainUpdater = new ChainUpdater(traceableState, worldStateUpdater);
           beforeTracing.accept(worldStateUpdater);
           final List<TransactionProcessingResult> results = new ArrayList<>();
           blocks.forEach(
               block -> {
-                results.addAll(trace(blockchain, block, chainUpdater, tracer));
+                results.addAll(trace(blockchain, block, worldStateUpdater, tracer));
+                worldStateUpdater.commit();
               });
-          afterTracing.accept(chainUpdater.getNextUpdater());
+          afterTracing.accept(worldStateUpdater);
           return Optional.of(results);
         });
   }
@@ -178,15 +177,15 @@ private Optional<List<TransactionProcessingResult>> trace(
             blockchainQueries,
             block.getHash(),
             traceableState ->
-                Optional.of(trace(blockchain, block, new ChainUpdater(traceableState), tracer)));
+                Optional.of(trace(blockchain, block, traceableState.updater(), tracer)));
 
     return results;
   }
 
   private List<TransactionProcessingResult> trace(
       final Blockchain blockchain,
       final Block block,
-      final ChainUpdater chainUpdater,
+      final WorldUpdater worldUpdater,
       final BlockAwareOperationTracer tracer) {
     final List<TransactionProcessingResult> results = new ArrayList<>();
     final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
@@ -209,7 +208,6 @@ private List<TransactionProcessingResult> trace(
                               .map(parent -> calculateExcessBlobGasForParent(protocolSpec, parent))
                               .orElse(BlobGas.ZERO));
 
-              final WorldUpdater worldUpdater = chainUpdater.getNextUpdater();
               final TransactionProcessingResult result =
                   transactionProcessor.processTransaction(
                       worldUpdater,