Disable fast sync actions test

.github/pull_request_template.md

@@ -14,6 +14,7 @@
 
 ### Locally, you can run these tests to catch failures early:
 
+- [ ] spotless: `./gradlew spotlessApply`
 - [ ] unit tests: `./gradlew build`
 - [ ] acceptance tests: `./gradlew acceptanceTest`
 - [ ] integration tests: `./gradlew integrationTest`

.github/workflows/sonarcloud.yml

@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up Java
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
         with:

.github/workflows/verify_artifacts.py

@@ -25,7 +25,7 @@ def create_artifact_paths(version):
         # besu/internal/config
         f"{artifacts_base_path}/internal/config/{version}/config-{version}.module",
         f"{artifacts_base_path}/internal/config/{version}/config-{version}.pom",
-        f"{artifacts_base_path}/internal/config/{version}/config-{version}.jar"
+        f"{artifacts_base_path}/internal/config/{version}/config-{version}.jar",
         # bom
         f"{artifacts_base_path}/bom/{version}/bom-{version}.module",
         f"{artifacts_base_path}/bom/{version}/bom-{version}.pom",
@@ -42,11 +42,11 @@ def check_url(url):
 
 def main():
     parser = argparse.ArgumentParser(description='Check besu artifacts')
-    parser.add_argument('--besu_{version}', action="store", dest='besu_{version}', default="")
+    parser.add_argument('--besu_version', action="store", dest='besu_version', default="")
     args = parser.parse_args()
-    print(args.besu_{version})
+    print(args.besu_version)
 
-    artifacts = create_artifact_paths(args.besu_{version})
+    artifacts = create_artifact_paths(args.besu_version)
     print(artifacts)
     for url in artifacts:
         check_url(url)

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
 ## Unreleased
+### Breaking Changes
+### Upcoming Breaking Changes
+### Additions and Improvements
+- Adds timestamps to enable Prague hardfork on Sepolia and Holesky test networks. [#8163](https://github.com/hyperledger/besu/pull/8163)
+- Extend simulate transaction on pending block plugin API [#8174](https://github.com/hyperledger/besu/pull/8174)
+
+### Bug fixes
+
+
+## 25.1.0
 
 ### Breaking Changes
 - `--host-whitelist` has been deprecated since 2020 and this option is removed. Use the equivalent `--host-allowlist` instead. 

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

@@ -183,7 +183,7 @@ public void startNode(final BesuNode node) {
         .vertx(Vertx.vertx())
         .besuController(besuController)
         .ethNetworkConfig(ethNetworkConfig)
-        .discovery(node.isDiscoveryEnabled())
+        .discoveryEnabled(node.isDiscoveryEnabled())
         .p2pAdvertisedHost(node.getHostName())
         .p2pListenPort(0)
         .networkingConfiguration(node.getNetworkingConfiguration())

besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java

@@ -165,7 +165,7 @@ public class RunnerBuilder {
   private NetworkingConfiguration networkingConfiguration = NetworkingConfiguration.create();
   private final Collection<Bytes> bannedNodeIds = new ArrayList<>();
   private boolean p2pEnabled = true;
-  private boolean discovery;
+  private boolean discoveryEnabled;
   private String p2pAdvertisedHost;
   private String p2pListenInterface = NetworkUtility.INADDR_ANY;
   private int p2pListenPort;
@@ -237,11 +237,11 @@ public RunnerBuilder p2pEnabled(final boolean p2pEnabled) {
   /**
    * Enable Discovery.
    *
-   * @param discovery the discovery
+   * @param discoveryEnabled the discoveryEnabled
    * @return the runner builder
    */
-  public RunnerBuilder discovery(final boolean discovery) {
-    this.discovery = discovery;
+  public RunnerBuilder discoveryEnabled(final boolean discoveryEnabled) {
+    this.discoveryEnabled = discoveryEnabled;
     return this;
   }
 
@@ -618,7 +618,7 @@ public Runner build() {
             .setBindHost(p2pListenInterface)
             .setBindPort(p2pListenPort)
             .setAdvertisedHost(p2pAdvertisedHost);
-    if (discovery) {
+    if (discoveryEnabled) {
       final List<EnodeURL> bootstrap;
       if (ethNetworkConfig.bootNodes() == null) {
         bootstrap = EthNetworkConfig.getNetworkConfig(NetworkName.MAINNET).bootNodes();
@@ -636,7 +636,7 @@ public Runner build() {
       discoveryConfiguration.setFilterOnEnrForkId(
           networkingConfiguration.getDiscovery().isFilterOnEnrForkIdEnabled());
     } else {
-      discoveryConfiguration.setActive(false);
+      discoveryConfiguration.setEnabled(false);
     }
 
     final NodeKey nodeKey = besuController.getNodeKey();

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

@@ -2238,7 +2238,7 @@ private Runner synchronize(
             .natMethod(natMethod)
             .natManagerServiceName(unstableNatOptions.getNatManagerServiceName())
             .natMethodFallbackEnabled(unstableNatOptions.getNatMethodFallbackEnabled())
-            .discovery(peerDiscoveryEnabled)
+            .discoveryEnabled(peerDiscoveryEnabled)
             .ethNetworkConfig(ethNetworkConfig)
             .permissioningConfiguration(permissioningConfiguration)
             .p2pAdvertisedHost(p2pAdvertisedHost)

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

@@ -621,7 +621,7 @@ public BesuController build() {
             worldStateHealerSupplier::get);
 
     if (maybeStoredGenesisBlockHash.isEmpty()) {
-      genesisState.writeStateTo(worldStateArchive.getMutable());
+      genesisState.writeStateTo(worldStateArchive.getWorldState());
     }
 
     transactionSimulator =

besu/src/main/java/org/hyperledger/besu/services/BlockSimulatorServiceImpl.java

@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.transaction.BlockStateCall;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.Unstable;
 import org.hyperledger.besu.plugin.data.BlockOverrides;
@@ -135,8 +136,13 @@ private BlockHeader getBlockHeader(final long blockNumber) {
   }
 
   private MutableWorldState getWorldState(final BlockHeader header, final boolean isPersisting) {
+    final WorldStateQueryParams worldStateQueryParams =
+        WorldStateQueryParams.newBuilder()
+            .withBlockHeader(header)
+            .withShouldWorldStateUpdateHead(isPersisting)
+            .build();
     return worldStateArchive
-        .getMutable(header, isPersisting)
+        .getWorldState(worldStateQueryParams)
         .orElseThrow(
             () ->
                 new IllegalArgumentException(

besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java

@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.services;
 
+import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withBlockHeaderAndUpdateNodeHead;
+
 import org.hyperledger.besu.consensus.merge.MergeContext;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -25,7 +27,7 @@
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.storage.BonsaiWorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.diffbased.common.DiffBasedWorldStateProvider;
+import org.hyperledger.besu.ethereum.trie.diffbased.common.provider.DiffBasedWorldStateProvider;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.storage.DiffBasedWorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.data.BlockBody;
@@ -109,7 +111,9 @@ public boolean setHeadUnsafe(final BlockHeader blockHeader, final BlockBody bloc
 
     final MutableBlockchain blockchain = protocolContext.getBlockchain();
 
-    if (worldStateArchive.flatMap(archive -> archive.getMutable(coreHeader, true)).isPresent()) {
+    if (worldStateArchive
+        .flatMap(archive -> archive.getWorldState(withBlockHeaderAndUpdateNodeHead(coreHeader)))
+        .isPresent()) {
       if (coreHeader.getParentHash().equals(blockchain.getChainHeadHash())) {
         LOG.atDebug()
             .setMessage(
@@ -142,7 +146,7 @@ public void disableWorldStateTrie() {
     // TODO maybe find a best way in the future to delete and disable trie
     worldStateArchive.ifPresent(
         archive -> {
-          archive.getDefaultWorldStateConfig().setTrieDisabled(true);
+          archive.getWorldStateSharedSpec().setTrieDisabled(true);
           final DiffBasedWorldStateKeyValueStorage worldStateStorage =
               archive.getWorldStateKeyValueStorage();
           final Optional<Hash> worldStateBlockHash = worldStateStorage.getWorldStateBlockHash();

besu/src/main/java/org/hyperledger/besu/services/TransactionSimulationServiceImpl.java

@@ -14,18 +14,23 @@
  */
 package org.hyperledger.besu.services;
 
+import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.transactionSimulator;
+import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.transactionSimulatorAllowExceedingBalance;
+import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.transactionSimulatorAllowExceedingBalanceAndFutureNonce;
+import static org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams.transactionSimulatorAllowFutureNonce;
+
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.StateOverrideMap;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
 import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.data.ProcessableBlockHeader;
 import org.hyperledger.besu.plugin.data.TransactionSimulationResult;
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 
@@ -51,50 +56,67 @@ public void init(final Blockchain blockchain, final TransactionSimulator transac
     this.transactionSimulator = transactionSimulator;
   }
 
+  @Override
+  public ProcessableBlockHeader simulatePendingBlockHeader() {
+    return transactionSimulator.simulatePendingBlockHeader();
+  }
+
   @Override
   public Optional<TransactionSimulationResult> simulate(
       final Transaction transaction,
       final Optional<StateOverrideMap> maybeStateOverrides,
-      final Optional<Hash> maybeBlockHash,
+      final Hash blockHash,
       final OperationTracer operationTracer,
       final boolean isAllowExceedingBalance) {
 
     final CallParameter callParameter = CallParameter.fromTransaction(transaction);
 
-    if (maybeBlockHash.isPresent()) {
-      final Hash blockHash = maybeBlockHash.get();
+    final var maybeBlockHeader =
+        blockchain.getBlockHeader(blockHash).or(() -> blockchain.getBlockHeaderSafe(blockHash));
 
-      final var maybeBlockHeader =
-          blockchain.getBlockHeader(blockHash).or(() -> blockchain.getBlockHeaderSafe(blockHash));
+    if (maybeBlockHeader.isEmpty()) {
+      return Optional.of(
+          new TransactionSimulationResult(
+              transaction,
+              TransactionProcessingResult.invalid(
+                  ValidationResult.invalid(TransactionInvalidReason.BLOCK_NOT_FOUND))));
+    }
 
-      if (maybeBlockHeader.isEmpty()) {
-        return Optional.of(
-            new TransactionSimulationResult(
-                transaction,
-                TransactionProcessingResult.invalid(
-                    ValidationResult.invalid(TransactionInvalidReason.BLOCK_NOT_FOUND))));
-      }
+    return transactionSimulator
+        .process(
+            callParameter,
+            isAllowExceedingBalance
+                ? transactionSimulatorAllowExceedingBalance()
+                : transactionSimulator(),
+            operationTracer,
+            maybeBlockHeader.get())
+        .map(res -> new TransactionSimulationResult(transaction, res.result()));
+  }
 
-      return transactionSimulator
-          .process(
-              callParameter,
-              isAllowExceedingBalance
-                  ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
-                  : TransactionValidationParams.transactionSimulator(),
-              operationTracer,
-              maybeBlockHeader.get())
-          .map(res -> new TransactionSimulationResult(transaction, res.result()));
-    }
+  @Override
+  public Optional<TransactionSimulationResult> simulate(
+      final Transaction transaction,
+      final Optional<StateOverrideMap> maybeStateOverrides,
+      final ProcessableBlockHeader pendingBlockHeader,
+      final OperationTracer operationTracer,
+      final boolean isAllowExceedingBalance,
+      final boolean isAllowFutureNonce) {
+
+    final CallParameter callParameter = CallParameter.fromTransaction(transaction);
 
     return transactionSimulator
         .processOnPending(
             callParameter,
             maybeStateOverrides,
             isAllowExceedingBalance
-                ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
-                : TransactionValidationParams.transactionSimulator(),
+                ? isAllowFutureNonce
+                    ? transactionSimulatorAllowExceedingBalanceAndFutureNonce()
+                    : transactionSimulatorAllowExceedingBalance()
+                : isAllowFutureNonce
+                    ? transactionSimulatorAllowFutureNonce()
+                    : transactionSimulator(),
             operationTracer,
-            transactionSimulator.simulatePendingBlockHeader())
+            (org.hyperledger.besu.ethereum.core.ProcessableBlockHeader) pendingBlockHeader)
         .map(res -> new TransactionSimulationResult(transaction, res.result()));
   }
 }

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

@@ -63,16 +63,18 @@ public static Collection<Object[]> parameters() {
               new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L),
               new ForkId(Bytes.ofUnsignedInt(0xb96cbd13L), 1677557088L),
               new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 1706655072L),
-              new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 1739980128L),
+              new ForkId(Bytes.ofUnsignedInt(0xbafd09c3L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xbafd09c3L), 0L))
         },
         new Object[] {
           NetworkName.HOLESKY,
           List.of(
               new ForkId(Bytes.ofUnsignedInt(0xc61a6098L), 1696000704L),
               new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 1707305664L),
-              new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 1739352768L),
+              new ForkId(Bytes.ofUnsignedInt(0xf818a0d6L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xf818a0d6L), 0L))
         },
         new Object[] {
           NetworkName.MAINNET,

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

@@ -155,7 +155,7 @@ public void enodeUrlShouldHaveAdvertisedHostWhenDiscoveryDisabled() {
             .p2pListenPort(p2pListenPort)
             .p2pAdvertisedHost(p2pAdvertisedHost)
             .p2pEnabled(true)
-            .discovery(false)
+            .discoveryEnabled(false)
             .besuController(besuController)
             .ethNetworkConfig(mock(EthNetworkConfig.class))
             .metricsSystem(mock(ObservableMetricsSystem.class))
@@ -196,7 +196,7 @@ public void movingAcrossProtocolSpecsUpdatesNodeRecord() {
     when(protocolContext.getBlockchain()).thenReturn(inMemoryBlockchain);
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(p2pListenPort)
             .p2pAdvertisedHost(p2pAdvertisedHost)
@@ -255,7 +255,7 @@ public void whenEngineApiAddedListensOnDefaultPort() {
 
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(30303)
             .p2pAdvertisedHost("127.0.0.1")
@@ -299,7 +299,7 @@ public void whenEngineApiAddedWebSocketReadyOnSamePort() {
 
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(30303)
             .p2pAdvertisedHost("127.0.0.1")
@@ -342,7 +342,7 @@ public void whenEngineApiAddedEthSubscribeAvailable() {
 
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(30303)
             .p2pAdvertisedHost("127.0.0.1")
@@ -387,7 +387,7 @@ public void noEngineApiNoServiceForMethods() {
 
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(30303)
             .p2pAdvertisedHost("127.0.0.1")

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

@@ -215,7 +215,7 @@ private void syncFromGenesis(
     final RunnerBuilder runnerBuilder =
         new RunnerBuilder()
             .vertx(vertx)
-            .discovery(true)
+            .discoveryEnabled(true)
             .p2pAdvertisedHost(listenHost)
             .p2pListenPort(0)
             .metricsSystem(noOpMetricsSystem)