TEST PR: Feature/block per improvment

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1913,6 +1913,7 @@ public BesuControllerBuilder getControllerBuilder() {
         .pkiBlockCreationConfiguration(maybePkiBlockCreationConfiguration())
         .clock(Clock.systemUTC())
         .isRevertReasonEnabled(isRevertReasonEnabled)
+        .isParallelTxEnabled(dataStorageConfiguration.getUnstable().isParallelTxEnabled())
         .storageProvider(storageProvider)
         .gasLimitCalculator(
             miningParametersSupplier.get().getTargetGasLimit().isPresent()

besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java

@@ -122,6 +122,14 @@ public static class Unstable {
             "Enables code storage using code hash instead of by account hash. (default: ${DEFAULT-VALUE})")
     private boolean bonsaiCodeUsingCodeHashEnabled = DEFAULT_BONSAI_CODE_USING_CODE_HASH_ENABLED;
 
+    @CommandLine.Option(
+        hidden = true,
+        names = {"--Xbonsai-parallel-tx-enabled"},
+        arity = "1",
+        description =
+            "Enables parallelization of transactions to optimize processing speed by concurrently loading and executing necessary data in advance. (default: ${DEFAULT-VALUE})")
+    private Boolean isParallelTxEnabled = false;
+
     /** Default Constructor. */
     Unstable() {}
   }
@@ -142,40 +150,48 @@ public static DataStorageOptions create() {
    * @param syncMode the sync mode
    */
   public void validate(final CommandLine commandLine, final SyncMode syncMode) {
-    if (DataStorageFormat.BONSAI == dataStorageFormat && bonsaiLimitTrieLogsEnabled) {
-      if (SyncMode.FULL == syncMode) {
-        throw new CommandLine.ParameterException(
-            commandLine,
-            String.format(
-                "Cannot enable %s with sync-mode %s. You must set %s or use a different sync-mode",
-                BONSAI_LIMIT_TRIE_LOGS_ENABLED,
-                SyncMode.FULL,
-                BONSAI_LIMIT_TRIE_LOGS_ENABLED + "=false"));
-      }
-      if (bonsaiMaxLayersToLoad < MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT) {
-        throw new CommandLine.ParameterException(
-            commandLine,
-            String.format(
-                BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD + " minimum value is %d",
-                MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT));
-      }
-      if (bonsaiTrieLogPruningWindowSize <= 0) {
-        throw new CommandLine.ParameterException(
-            commandLine,
-            String.format(
-                BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE + "=%d must be greater than 0",
-                bonsaiTrieLogPruningWindowSize));
+    if (DataStorageFormat.BONSAI == dataStorageFormat) {
+      if (bonsaiLimitTrieLogsEnabled) {
+        if (SyncMode.FULL == syncMode) {
+          throw new CommandLine.ParameterException(
+              commandLine,
+              String.format(
+                  "Cannot enable %s with sync-mode %s. You must set %s or use a different sync-mode",
+                  BONSAI_LIMIT_TRIE_LOGS_ENABLED,
+                  SyncMode.FULL,
+                  BONSAI_LIMIT_TRIE_LOGS_ENABLED + "=false"));
+        }
+        if (bonsaiMaxLayersToLoad < MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT) {
+          throw new CommandLine.ParameterException(
+              commandLine,
+              String.format(
+                  BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD + " minimum value is %d",
+                  MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT));
+        }
+        if (bonsaiTrieLogPruningWindowSize <= 0) {
+          throw new CommandLine.ParameterException(
+              commandLine,
+              String.format(
+                  BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE + "=%d must be greater than 0",
+                  bonsaiTrieLogPruningWindowSize));
+        }
+        if (bonsaiTrieLogPruningWindowSize <= bonsaiMaxLayersToLoad) {
+          throw new CommandLine.ParameterException(
+              commandLine,
+              String.format(
+                  BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE
+                      + "=%d must be greater than "
+                      + BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD
+                      + "=%d",
+                  bonsaiTrieLogPruningWindowSize,
+                  bonsaiMaxLayersToLoad));
+        }
       }
-      if (bonsaiTrieLogPruningWindowSize <= bonsaiMaxLayersToLoad) {
+    } else {
+      if (unstableOptions.isParallelTxEnabled) {
         throw new CommandLine.ParameterException(
             commandLine,
-            String.format(
-                BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE
-                    + "=%d must be greater than "
-                    + BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD
-                    + "=%d",
-                bonsaiTrieLogPruningWindowSize,
-                bonsaiMaxLayersToLoad));
+            "Transaction parallelization is not supported unless operating in a 'diffbased' mode, such as Bonsai.");
       }
     }
   }
@@ -198,6 +214,8 @@ public static DataStorageOptions fromConfig(final DataStorageConfiguration domai
         domainObject.getUnstable().getBonsaiFullFlatDbEnabled();
     dataStorageOptions.unstableOptions.bonsaiCodeUsingCodeHashEnabled =
         domainObject.getUnstable().getBonsaiCodeStoredByCodeHashEnabled();
+    dataStorageOptions.unstableOptions.isParallelTxEnabled =
+        domainObject.getUnstable().isParallelTxEnabled();
 
     return dataStorageOptions;
   }
@@ -214,6 +232,7 @@ public DataStorageConfiguration toDomainObject() {
             ImmutableDataStorageConfiguration.Unstable.builder()
                 .bonsaiFullFlatDbEnabled(unstableOptions.bonsaiFullFlatDbEnabled)
                 .bonsaiCodeStoredByCodeHashEnabled(unstableOptions.bonsaiCodeUsingCodeHashEnabled)
+                .isParallelTxEnabled(unstableOptions.isParallelTxEnabled)
                 .build())
         .build();
   }

besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java

@@ -208,6 +208,9 @@ public abstract class BesuControllerBuilder implements MiningParameterOverrides
 
   private int numberOfBlocksToCache = 0;
 
+  /** whether parallel transaction processing is enabled or not */
+  protected boolean isParallelTxEnabled;
+
   /** Instantiates a new Besu controller builder. */
   protected BesuControllerBuilder() {}
 
@@ -529,6 +532,19 @@ public BesuControllerBuilder randomPeerPriority(final Boolean randomPeerPriority
     return this;
   }
 
+  /**
+   * Sets whether parallel transaction processing is enabled. When parallel transaction processing
+   * is enabled, transactions within a block can be processed in parallel and potentially improving
+   * performance
+   *
+   * @param isParallelTxEnabled true to enable parallel transaction
+   * @return the besu controller
+   */
+  public BesuControllerBuilder isParallelTxEnabled(final boolean isParallelTxEnabled) {
+    this.isParallelTxEnabled = isParallelTxEnabled;
+    return this;
+  }
+
   /**
    * Build besu controller.
    *

besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java

@@ -136,7 +136,9 @@ protected ProtocolSchedule createProtocolSchedule() {
         isRevertReasonEnabled,
         evmConfiguration,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java

@@ -368,6 +368,12 @@ public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonE
     return super.isRevertReasonEnabled(isRevertReasonEnabled);
   }
 
+  @Override
+  public BesuControllerBuilder isParallelTxEnabled(final boolean isParallelTxEnabled) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.isParallelTxEnabled(isParallelTxEnabled));
+    return super.isParallelTxEnabled(isParallelTxEnabled);
+  }
+
   @Override
   public BesuControllerBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
     besuControllerBuilderSchedule.values().forEach(b -> b.gasLimitCalculator(gasLimitCalculator));

besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java

@@ -291,7 +291,9 @@ protected ProtocolSchedule createProtocolSchedule() {
         bftExtraDataCodec().get(),
         evmConfiguration,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java

@@ -99,7 +99,9 @@ protected ProtocolSchedule createProtocolSchedule() {
         isRevertReasonEnabled,
         evmConfiguration,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java

@@ -177,7 +177,9 @@ protected ProtocolSchedule createProtocolSchedule() {
         privacyParameters,
         isRevertReasonEnabled,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java

@@ -335,7 +335,9 @@ protected ProtocolSchedule createProtocolSchedule() {
         bftExtraDataCodec().get(),
         evmConfiguration,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java

@@ -382,6 +382,12 @@ public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonE
     return propagateConfig(z -> z.isRevertReasonEnabled(isRevertReasonEnabled));
   }
 
+  @Override
+  public BesuControllerBuilder isParallelTxEnabled(final boolean isParallelTxEnabled) {
+    super.isParallelTxEnabled(isParallelTxEnabled);
+    return propagateConfig(z -> z.isParallelTxEnabled(isParallelTxEnabled));
+  }
+
   @Override
   public BesuControllerBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
     super.gasLimitCalculator(gasLimitCalculator);

besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

@@ -35,6 +35,7 @@
 import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.Collection;
 import java.util.List;
@@ -176,12 +177,21 @@ private static MilestoneStreamingTransitionProtocolSchedule createSchedule(
         new MilestoneStreamingProtocolSchedule(
             (DefaultProtocolSchedule)
                 MainnetProtocolSchedule.fromConfig(
-                    configOptions, MiningParameters.MINING_DISABLED, new BadBlockManager()));
+                    configOptions,
+                    MiningParameters.MINING_DISABLED,
+                    new BadBlockManager(),
+                    false,
+                    new NoOpMetricsSystem()));
     MilestoneStreamingProtocolSchedule postMergeProtocolSchedule =
         new MilestoneStreamingProtocolSchedule(
             (DefaultProtocolSchedule)
                 MergeProtocolSchedule.create(
-                    configOptions, false, MiningParameters.MINING_DISABLED, new BadBlockManager()));
+                    configOptions,
+                    false,
+                    MiningParameters.MINING_DISABLED,
+                    new BadBlockManager(),
+                    false,
+                    new NoOpMetricsSystem()));
     final MilestoneStreamingTransitionProtocolSchedule schedule =
         new MilestoneStreamingTransitionProtocolSchedule(
             preMergeProtocolSchedule, postMergeProtocolSchedule);

besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java

@@ -285,6 +285,7 @@ public void initMocks() throws Exception {
         .thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.clock(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.isRevertReasonEnabled(false)).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.isParallelTxEnabled(false)).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.storageProvider(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.gasLimitCalculator(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.requiredBlocks(any())).thenReturn(mockControllerBuilder);

consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java

@@ -36,6 +36,7 @@
 import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -64,6 +65,9 @@ public class CliqueProtocolSchedule {
    * @param evmConfiguration the evm configuration
    * @param miningParameters the mining parameters
    * @param badBlockManager the cache to use to keep invalid blocks
+   * @param isParallelTxEnabled indicates whether parallel transaction is enabled
+   * @param metricsSystem A metricSystem instance to be able to expose metrics in the underlying
+   *     calls
    * @return the protocol schedule
    */
   public static ProtocolSchedule create(
@@ -74,7 +78,9 @@ public static ProtocolSchedule create(
       final boolean isRevertReasonEnabled,
       final EvmConfiguration evmConfiguration,
       final MiningParameters miningParameters,
-      final BadBlockManager badBlockManager) {
+      final BadBlockManager badBlockManager,
+      final boolean isParallelTxEnabled,
+      final MetricsSystem metricsSystem) {
 
     final CliqueConfigOptions cliqueConfig = config.getCliqueConfigOptions();
 
@@ -110,7 +116,9 @@ public static ProtocolSchedule create(
             isRevertReasonEnabled,
             evmConfiguration,
             miningParameters,
-            badBlockManager)
+            badBlockManager,
+            isParallelTxEnabled,
+            metricsSystem)
         .createProtocolSchedule();
   }
 
@@ -124,6 +132,9 @@ public static ProtocolSchedule create(
    * @param evmConfiguration the evm configuration
    * @param miningParameters the mining parameters
    * @param badBlockManager the cache to use to keep invalid blocks
+   * @param isParallelTxEnabled indicates whether parallel transaction is enabled
+   * @param metricsSystem A metricSystem instance to be able to expose metrics in the underlying
+   *     calls
    * @return the protocol schedule
    */
   @VisibleForTesting
@@ -134,7 +145,9 @@ public static ProtocolSchedule create(
       final boolean isRevertReasonEnabled,
       final EvmConfiguration evmConfiguration,
       final MiningParameters miningParameters,
-      final BadBlockManager badBlockManager) {
+      final BadBlockManager badBlockManager,
+      final boolean isParallelTxEnabled,
+      final MetricsSystem metricsSystem) {
     return create(
         config,
         forksSchedule,
@@ -143,7 +156,9 @@ public static ProtocolSchedule create(
         isRevertReasonEnabled,
         evmConfiguration,
         miningParameters,
-        badBlockManager);
+        badBlockManager,
+        isParallelTxEnabled,
+        metricsSystem);
   }
 
   private static ProtocolSpecBuilder applyCliqueSpecificModifications(