robust to future protocols

Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com>

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java

@@ -106,8 +106,9 @@ public EthPeer(
     peerValidators.forEach(peerValidator -> validationStatus.put(peerValidator, false));
     fullyValidated.set(peerValidators.isEmpty());
 
-    // todo : make this robust to future protocols
-    final boolean supportsRequestId = getAgreedCapabilities().contains(EthProtocol.ETH66);
+    final boolean supportsRequestId =
+        getAgreedCapabilities().stream()
+            .anyMatch(capability -> capability.compareTo(EthProtocol.ETH66) >= 0);
     this.headersRequestManager = new RequestManager(this, supportsRequestId);
     this.bodiesRequestManager = new RequestManager(this, supportsRequestId);
     this.receiptsRequestManager = new RequestManager(this, supportsRequestId);

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java

@@ -22,13 +22,15 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Represents a client capability.
  *
  * @see <a href= "https://github.com/ethereum/devp2p/blob/master/devp2p.md">Capability wire
  *     format</a>
  */
-public class Capability {
+public class Capability implements Comparable<Capability> {
   private final String name;
   private final int version;
 
@@ -85,4 +87,9 @@ public int hashCode() {
   public String toString() {
     return name + "/" + version;
   }
+
+  @Override
+  public int compareTo(@NotNull final Capability that) {
+    return Integer.compare(this.getVersion(), that.getVersion());
+  }
 }