Merge branch 'main' into main

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Next Release
 
 ### Breaking Changes
+- `Xp2p-peer-lower-bound` has been removed. [#7247](https://github.com/hyperledger/besu/pull/7247)
 
 ### Additions and Improvements
 - Support for eth_maxPriorityFeePerGas [#5658](https://github.com/hyperledger/besu/issues/5658)

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

@@ -20,7 +20,6 @@
 import static java.util.Collections.singletonList;
 import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
-import static org.hyperledger.besu.cli.options.unstable.NetworkingOptions.PEER_LOWER_BOUND_FLAG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.isOptionSet;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
@@ -1659,9 +1658,6 @@ private void ensureValidPeerBoundParams() {
     maxPeers = p2PDiscoveryOptionGroup.maxPeers;
     final Boolean isLimitRemoteWireConnectionsEnabled =
         p2PDiscoveryOptionGroup.isLimitRemoteWireConnectionsEnabled;
-    if (isOptionSet(commandLine, PEER_LOWER_BOUND_FLAG)) {
-      logger.warn(PEER_LOWER_BOUND_FLAG + " is deprecated and will be removed soon.");
-    }
     if (isLimitRemoteWireConnectionsEnabled) {
       final float fraction =
           Fraction.fromPercentage(p2PDiscoveryOptionGroup.maxRemoteConnectionsPercentage)

besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NetworkingOptions.java

@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.cli.options.unstable;
 
-import org.hyperledger.besu.cli.DefaultCommandValues;
 import org.hyperledger.besu.cli.options.CLIOptions;
 import org.hyperledger.besu.cli.options.OptionParser;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
@@ -27,9 +26,6 @@
 
 /** The Networking Cli options. */
 public class NetworkingOptions implements CLIOptions<NetworkingConfiguration> {
-  /** The constant PEER_LOWER_BOUND_FLAG */
-  public static final String PEER_LOWER_BOUND_FLAG = "--Xp2p-peer-lower-bound";
-
   private final String INITIATE_CONNECTIONS_FREQUENCY_FLAG =
       "--Xp2p-initiate-connections-frequency";
   private final String CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_FLAG =
@@ -77,13 +73,6 @@ public class NetworkingOptions implements CLIOptions<NetworkingConfiguration> {
       description = "Whether to enable filtering of peers based on the ENR field ForkId)")
   private final Boolean filterOnEnrForkId = NetworkingConfiguration.DEFAULT_FILTER_ON_ENR_FORK_ID;
 
-  @CommandLine.Option(
-      hidden = true,
-      names = PEER_LOWER_BOUND_FLAG,
-      description =
-          "(Deprecated) Lower bound on the target number of P2P connections (default: ${DEFAULT-VALUE})")
-  private final Integer peerLowerBoundConfig = DefaultCommandValues.DEFAULT_MAX_PEERS;
-
   private NetworkingOptions() {}
 
   /**
@@ -130,9 +119,7 @@ public List<String> getCLIOptions() {
             CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_FLAG,
             OptionParser.format(checkMaintainedConnectionsFrequencySec),
             INITIATE_CONNECTIONS_FREQUENCY_FLAG,
-            OptionParser.format(initiateConnectionsFrequencySec),
-            PEER_LOWER_BOUND_FLAG,
-            OptionParser.format((peerLowerBoundConfig)));
+            OptionParser.format(initiateConnectionsFrequencySec));
 
     if (dnsDiscoveryServerOverride.isPresent()) {
       retval.add(DNS_DISCOVERY_SERVER_OVERRIDE_FLAG);

build.gradle

@@ -934,6 +934,10 @@ def calculateVersion() {
   def calVerPattern = ~/\d+\.\d+(\.\d+)?(-.*)?/
 
   if (project.hasProperty('version') && (project.version =~ calVerPattern)) {
+    if (project.hasProperty('versionappendcommit') && project.versionappendcommit == "true") {
+      def gitDetails = getGitCommitDetails(7) // Adjust length as needed
+      return "${project.version}-${gitDetails.hash}"
+    }
     return "${project.version}"
   } else {
     // If no version is supplied or it doesn't match the semantic versioning, calculate from git

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServer.java

@@ -519,6 +519,12 @@ MessageData constructGetTrieNodesResponse(final MessageData message) {
                     }
 
                   } else {
+                    // There must be at least one element in the path otherwise it is invalid
+                    if (triePath.isEmpty()) {
+                      LOGGER.debug("returned empty trie nodes message due to invalid path");
+                      return EMPTY_TRIE_NODES_MESSAGE;
+                    }
+
                     // otherwise the first element should be account hash, and subsequent paths
                     // are compact encoded account storage paths
 

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServerTest.java

@@ -368,6 +368,18 @@ public void assertAccountTriePathRequest() {
     assertThat(trieNodes.size()).isEqualTo(2);
   }
 
+  @Test
+  public void assertAccountTrieRequest_invalidEmptyPath() {
+    insertTestAccounts(acct1);
+    var partialPathToAcct1 = Bytes.fromHexString("0x01"); // first nibble is 1
+    var trieNodeRequest =
+        requestTrieNodes(
+            storageTrie.getRootHash(), List.of(List.of(), List.of(partialPathToAcct1)));
+    assertThat(trieNodeRequest).isNotNull();
+    List<Bytes> trieNodes = trieNodeRequest.nodes(false);
+    assertThat(trieNodes.isEmpty()).isTrue();
+  }
+
   @Test
   public void assertAccountTrieLimitRequest() {
     insertTestAccounts(acct1, acct2, acct3, acct4);

gradle.properties

@@ -1,4 +1,9 @@
 org.gradle.welcome=never
+
+# Optional - set custom build version
+# version=24.5.6-acme
+# versionappendcommit=true
+
 # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)
 org.gradle.jvmargs=-Xmx4g \
 --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \