Merge branch 'main' into zkbesu

# Conflicts:
#	.github/workflows/verify_artifacts.py

CHANGELOG.md

@@ -1,6 +1,14 @@
 # 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)
+### 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())

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ethereum/CodeDelegationTransactionAcceptanceTest.java

@@ -87,7 +87,7 @@ void tearDown() {
   public void shouldTransferAllEthOfAuthorizerToSponsor() throws IOException {
 
     // 7702 transaction
-    final CodeDelegation authorization =
+    final CodeDelegation codeDelegation =
         org.hyperledger.besu.ethereum.core.CodeDelegation.builder()
             .chainId(BigInteger.valueOf(20211))
             .address(SEND_ALL_ETH_CONTRACT_ADDRESS)
@@ -108,7 +108,7 @@ public void shouldTransferAllEthOfAuthorizerToSponsor() throws IOException {
             .value(Wei.ZERO)
             .payload(Bytes32.leftPad(Bytes.fromHexString(transactionSponsor.getAddress())))
             .accessList(List.of())
-            .codeDelegations(List.of(authorization))
+            .codeDelegations(List.of(codeDelegation))
             .signAndBuild(
                 secp256k1.createKeyPair(
                     secp256k1.createPrivateKey(
@@ -143,7 +143,7 @@ public void shouldCheckNonceAfterNonceIncreaseOfSender() throws IOException {
     final long GAS_LIMIT = 1_000_000L;
     cluster.verify(authorizer.balanceEquals(Amount.ether(90_000)));
 
-    final CodeDelegation authorization =
+    final CodeDelegation codeDelegation =
         org.hyperledger.besu.ethereum.core.CodeDelegation.builder()
             .chainId(BigInteger.valueOf(20211))
             .nonce(
@@ -166,7 +166,7 @@ public void shouldCheckNonceAfterNonceIncreaseOfSender() throws IOException {
             .value(Wei.ZERO)
             .payload(Bytes32.leftPad(Bytes.fromHexString(otherAccount.getAddress())))
             .accessList(List.of())
-            .codeDelegations(List.of(authorization))
+            .codeDelegations(List.of(codeDelegation))
             .signAndBuild(
                 secp256k1.createKeyPair(
                     secp256k1.createPrivateKey(AUTHORIZER_PRIVATE_KEY.toUnsignedBigInteger())));

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

@@ -212,10 +212,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigInteger;
-import java.net.SocketException;
 import java.net.URI;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.GroupPrincipal;
@@ -1433,7 +1431,7 @@ private void configureNativeLibs() {
 
   private void validateOptions() {
     issueOptionWarnings();
-    validateP2PInterface(p2PDiscoveryOptions.p2pInterface);
+    validateP2POptions();
     validateMiningParams();
     validateNatParams();
     validateNetStatsParams();
@@ -1488,20 +1486,18 @@ private void validateMiningParams() {
         commandLine, genesisConfigOptionsSupplier.get(), isMergeEnabled(), logger);
   }
 
+  private void validateP2POptions() {
+    p2PDiscoveryOptions.validate(commandLine, getNetworkInterfaceChecker());
+  }
+
   /**
-   * Validates P2P interface IP address/host name. Visible for testing.
+   * Returns a network interface checker that can be used to validate P2P options.
    *
-   * @param p2pInterface IP Address/host name
+   * @return A {@link P2PDiscoveryOptions.NetworkInterfaceChecker} that checks if a network
+   *     interface is available.
    */
-  protected void validateP2PInterface(final String p2pInterface) {
-    final String failMessage = "The provided --p2p-interface is not available: " + p2pInterface;
-    try {
-      if (!NetworkUtility.isNetworkInterfaceAvailable(p2pInterface)) {
-        throw new ParameterException(commandLine, failMessage);
-      }
-    } catch (final UnknownHostException | SocketException e) {
-      throw new ParameterException(commandLine, failMessage, e);
-    }
+  protected P2PDiscoveryOptions.NetworkInterfaceChecker getNetworkInterfaceChecker() {
+    return NetworkUtility::isNetworkInterfaceAvailable;
   }
 
   private void validateGraphQlOptions() {
@@ -2242,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/cli/options/P2PDiscoveryOptions.java

@@ -25,19 +25,38 @@
 import org.hyperledger.besu.util.number.Percentage;
 
 import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.google.common.net.InetAddresses;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.tuweni.bytes.Bytes;
 import picocli.CommandLine;
 
 /** Command line options for configuring P2P discovery on the node. */
 public class P2PDiscoveryOptions implements CLIOptions<P2PDiscoveryConfiguration> {
 
+  /** Functional interface for checking if a network interface is available. */
+  @FunctionalInterface
+  public interface NetworkInterfaceChecker {
+
+    /**
+     * Checks if the provided network interface is available.
+     *
+     * @param p2pInterface The network interface to check.
+     * @return True if the network interface is available, false otherwise.
+     * @throws UnknownHostException If the host is unknown.
+     * @throws SocketException If there is an error with the socket.
+     */
+    boolean isNetworkInterfaceAvailable(final String p2pInterface)
+        throws UnknownHostException, SocketException;
+  }
+
   /** Default constructor */
   public P2PDiscoveryOptions() {}
 
@@ -217,6 +236,37 @@ public P2PDiscoveryConfiguration toDomainObject() {
         discoveryDnsUrl);
   }
 
+  /**
+   * Validates the provided P2P discovery options.
+   *
+   * @param commandLine The command line object used for parsing and error reporting.
+   * @param networkInterfaceChecker The checker used to validate the network interface.
+   */
+  public void validate(
+      final CommandLine commandLine, final NetworkInterfaceChecker networkInterfaceChecker) {
+    validateP2PHost(commandLine);
+    validateP2PInterface(commandLine, networkInterfaceChecker);
+  }
+
+  private void validateP2PInterface(
+      final CommandLine commandLine, final NetworkInterfaceChecker networkInterfaceChecker) {
+    final String failMessage = "The provided --p2p-interface is not available: " + p2pInterface;
+    try {
+      if (!networkInterfaceChecker.isNetworkInterfaceAvailable(p2pInterface)) {
+        throw new CommandLine.ParameterException(commandLine, failMessage);
+      }
+    } catch (final UnknownHostException | SocketException e) {
+      throw new CommandLine.ParameterException(commandLine, failMessage, e);
+    }
+  }
+
+  private void validateP2PHost(final CommandLine commandLine) {
+    final String failMessage = "The provided --p2p-host is invalid: " + p2pHost;
+    if (!InetAddresses.isInetAddress(p2pHost)) {
+      throw new CommandLine.ParameterException(commandLine, failMessage);
+    }
+  }
+
   @Override
   public List<String> getCLIOptions() {
     return CommandLineUtils.getCLIOptions(this, new P2PDiscoveryOptions());

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

@@ -717,7 +717,8 @@ public BesuController build() {
             syncState,
             transactionPoolConfiguration,
             besuComponent.map(BesuComponent::getBlobCache).orElse(new BlobCache()),
-            miningConfiguration);
+            miningConfiguration,
+            syncConfig.isPeerTaskSystemEnabled());
 
     final List<PeerValidator> peerValidators =
         createPeerValidators(protocolSchedule, peerTaskExecutor);

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)