Do not launch state root pre-computation in Forest mode

Signed-off-by: Miroslav Kovar <[email protected]>

Author: mirgee

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

@@ -1170,8 +1170,6 @@ static ProtocolSpecBuilder amsterdamDefinition(
             isBlockAccessListEnabled,
             metricsSystem)
         .blockAccessListFactory(new BlockAccessListFactory(isBlockAccessListEnabled, true))
-        // TODO: Currently we will be starting the BAL state root future on Amsterdam even if
-        // Forest is enabled so will not be used
         .stateRootCommitterFactory(new StateRootCommitterFactoryBal(false, BAL_ROOT_TIMEOUT))
         .hardforkId(AMSTERDAM);
   }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/staterootcommitter/StateRootCommitterFactoryBal.java

@@ -18,6 +18,7 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessList;
+import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.BonsaiWorldStateProvider;
 import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BlockAccessListStateRootHashCalculator;
 
 import java.time.Duration;
@@ -49,6 +50,11 @@ public StateRootCommitter forBlock(
       return new StateRootCommitterImplSync();
     }
 
+    // This is temporary workaround to not launch state root pre-computation in Forest mode
+    if (!(protocolContext.getWorldStateArchive() instanceof BonsaiWorldStateProvider)) {
+      return new StateRootCommitterImplSync();
+    }
+
     final CompletableFuture<Hash> balRootFuture =
         BlockAccessListStateRootHashCalculator.computeStateRootFromBlockAccessListAsync(
             protocolContext, blockHeader, maybeBal.get());