Merge branch 'main' into improve-performance-of-peerselector-peers

Author: Matilda-Clerke

CHANGELOG.md

@@ -16,6 +16,7 @@
 ### Additions and Improvements
 - Performance: Optimise EIP-196 AltBn128: EcAdd 33-128% faster, EcMul 8% faster [#9570](https://github.com/hyperledger/besu/pull/9570)
 - Update to Netty 4.2.9.Final [#9587](https://github.com/hyperledger/besu/pull/9587)
+- Update to log4j 2.25.3 [#9600](https://github.com/hyperledger/besu/pull/9600)
 
 ##  25.12.0
 

app/src/main/java/org/hyperledger/besu/cli/options/BalConfigurationOptions.java

@@ -32,6 +32,13 @@ public BalConfigurationOptions() {}
       description = "Allows disabling BAL-based optimizations.")
   boolean balOptimizationEnabled = true;
 
+  @CommandLine.Option(
+      names = {"--Xbal-perfect-parallelization-enabled"},
+      hidden = true,
+      description =
+          "Allows disabling BAL-based perfect parallelization even when BALs are present.")
+  boolean balPerfectParallelizationEnabled = true;
+
   @CommandLine.Option(
       names = {"--Xbal-lenient-on-state-root-mismatch"},
       hidden = true,
@@ -65,6 +72,13 @@ public BalConfigurationOptions() {}
       description = "Timeout in milliseconds when waiting for the BAL-computed state root.")
   private long balStateRootTimeoutMs = Duration.ofSeconds(1).toMillis();
 
+  @CommandLine.Option(
+      names = {"--Xbal-processing-timeout"},
+      hidden = true,
+      paramLabel = "<INTEGER>",
+      description = "Timeout in milliseconds when waiting for BAL transaction processing results.")
+  private long balProcessingTimeoutMs = Duration.ofSeconds(1).toMillis();
+
   /**
    * Builds the immutable {@link BalConfiguration} corresponding to the parsed CLI options.
    *
@@ -74,10 +88,12 @@ public BalConfiguration toDomainObject() {
     return ImmutableBalConfiguration.builder()
         .isBalApiEnabled(balApiEnabled)
         .isBalOptimisationEnabled(balOptimizationEnabled)
+        .isPerfectParallelizationEnabled(balPerfectParallelizationEnabled)
         .shouldLogBalsOnMismatch(balLogBalsOnMismatch)
         .isBalLenientOnStateRootMismatch(balLenientOnStateRootMismatch)
         .isBalStateRootTrusted(balTrustStateRoot)
         .balStateRootTimeout(Duration.ofMillis(balStateRootTimeoutMs))
+        .balProcessingTimeout(Duration.ofMillis(balProcessingTimeoutMs))
         .build();
   }
 }

config/src/main/java/org/hyperledger/besu/config/CheckpointConfigOptions.java

@@ -90,6 +90,13 @@ Map<String, Object> asMap() {
 
   @Override
   public String toString() {
-    return "CheckpointConfigOptions{" + "checkpointConfigRoot=" + checkpointConfigRoot + '}';
+    return "CheckpointConfigOptions{"
+        + "totaldifficulty="
+        + getTotalDifficulty().orElse("empty")
+        + ", number="
+        + (getNumber().isPresent() ? getNumber().getAsLong() : "empty")
+        + ", hash="
+        + getHash().orElse("empty")
+        + '}';
   }
 }

ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/AddOperationBenchmark.java

@@ -15,13 +15,13 @@
 package org.hyperledger.besu.ethereum.vm.operations;
 
 import org.hyperledger.besu.evm.frame.MessageFrame;
-import org.hyperledger.besu.evm.operation.AddOperation;
+import org.hyperledger.besu.evm.operation.AddOperationOptimized;
 import org.hyperledger.besu.evm.operation.Operation;
 
 public class AddOperationBenchmark extends BinaryOperationBenchmark {
 
   @Override
   protected Operation.OperationResult invoke(final MessageFrame frame) {
-    return AddOperation.staticOperation(frame);
+    return AddOperationOptimized.staticOperation(frame);
   }
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java

@@ -186,6 +186,7 @@ public static BlockHeaderBuilder fromBuilder(final BlockHeaderBuilder fromBuilde
             .baseFee(fromBuilder.baseFee)
             .prevRandao(fromBuilder.mixHashOrPrevRandao)
             .withdrawalsRoot(fromBuilder.withdrawalsRoot)
+            .blobGasUsed(fromBuilder.blobGasUsed)
             .excessBlobGas(fromBuilder.excessBlobGas)
             .parentBeaconBlockRoot(fromBuilder.parentBeaconBlockRoot)
             .requestsHash(fromBuilder.requestsHash)

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

@@ -36,6 +36,7 @@
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessList.BlockAccessListBuilder;
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.BlockAccessListFactory;
 import org.hyperledger.besu.ethereum.mainnet.block.access.list.PartialBlockAccessView;
+import org.hyperledger.besu.ethereum.mainnet.parallelization.PreprocessingContext;
 import org.hyperledger.besu.ethereum.mainnet.requests.RequestProcessingContext;
 import org.hyperledger.besu.ethereum.mainnet.requests.RequestProcessorCoordinator;
 import org.hyperledger.besu.ethereum.mainnet.staterootcommitter.StateRootCommitter;
@@ -85,7 +86,7 @@ TransactionReceipt create(
 
   protected final boolean skipZeroBlockRewards;
   private final ProtocolSchedule protocolSchedule;
-  private final BalConfiguration balConfiguration;
+  protected final BalConfiguration balConfiguration;
 
   protected final MiningBeneficiaryCalculator miningBeneficiaryCalculator;
   private BlockImportTracerProvider blockImportTracerProvider = null;
@@ -232,7 +233,8 @@ public BlockProcessingResult processBlock(
               miningBeneficiary,
               blockHashLookup,
               blobGasPrice,
-              blockAccessListBuilder);
+              blockAccessListBuilder,
+              maybeBlockBal);
 
       boolean parallelizedTxFound = false;
       int nbParallelTx = 0;
@@ -558,8 +560,6 @@ abstract boolean rewardCoinbase(
       final List<BlockHeader> ommers,
       final boolean skipZeroBlockRewards);
 
-  public interface PreprocessingContext {}
-
   public interface PreprocessingFunction {
     Optional<PreprocessingContext> run(
         final ProtocolContext protocolContext,
@@ -568,7 +568,8 @@ Optional<PreprocessingContext> run(
         final Address miningBeneficiary,
         final BlockHashLookup blockHashLookup,
         final Wei blobGasPrice,
-        final Optional<BlockAccessListBuilder> blockAccessListBuilder);
+        final Optional<BlockAccessListBuilder> blockAccessListBuilder,
+        final Optional<BlockAccessList> maybeBlockBal);
 
     class NoPreprocessing implements PreprocessingFunction {
 
@@ -580,7 +581,8 @@ public Optional<PreprocessingContext> run(
           final Address miningBeneficiary,
           final BlockHashLookup blockHashLookup,
           final Wei blobGasPrice,
-          final Optional<BlockAccessListBuilder> blockAccessListBuilder) {
+          final Optional<BlockAccessListBuilder> blockAccessListBuilder,
+          final Optional<BlockAccessList> maybeBlockBal) {
         return Optional.empty();
       }
     }

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

@@ -42,6 +42,12 @@ default boolean isBalStateRootTrusted() {
     return false;
   }
 
+  /** Returns whether BAL perfect parallelization is enabled. */
+  @Value.Default
+  default boolean isPerfectParallelizationEnabled() {
+    return true;
+  }
+
   /**
    * Returns whether mismatches between BAL and synchronously computed state roots should only log
    * an error instead of throwing an exception.
@@ -62,4 +68,10 @@ default boolean shouldLogBalsOnMismatch() {
   default Duration getBalStateRootTimeout() {
     return Duration.ofSeconds(1);
   }
+
+  /** Returns the timeout to use when waiting for BAL transaction processing results. */
+  @Value.Default
+  default Duration getBalProcessingTimeout() {
+    return Duration.ofSeconds(1);
+  }
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/block/access/list/PartialBlockAccessView.java

@@ -144,6 +144,24 @@ public List<StorageSlotKey> getStorageReads() {
     public List<SlotChange> getStorageChanges() {
       return storageChanges;
     }
+
+    @Override
+    public String toString() {
+      return "AccountChanges{"
+          + "address="
+          + address
+          + ", storageChanges="
+          + storageChanges
+          + ", storageReads="
+          + storageReads
+          + ", postBalance="
+          + postBalance
+          + ", postBalance="
+          + postBalance
+          + ", newCode="
+          + newCode
+          + '}';
+    }
   }
 
   /** Builder for PartialBlockAccessView. */