Update jvm-libp2p to 0.8.8 (#4904)

Consensys · Jan 25, 2022 · 6648486 · 6648486
1 parent ba55402
commit 6648486
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,4 +28,5 @@ For information on changes in released versions of Teku, see the [releases page]
 ### Bug Fixes
 * Rest api endpoints accepting validator IDs will no longer reject valid bytes48 hex strings that are not on the g2 curve.
 * Upgraded discovery to fix `ConcurrentModificationException`.
-* Fixed 503 response from REST APIs when creating an attestation or block based on finalized data.
+* Fixed 503 response from REST APIs when creating an attestation or block based on finalized data.
+* Improved peer validation during libp2p handshake.
diff --git a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/Node.java b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/Node.java
@@ -51,6 +51,7 @@ public abstract class Node {
   protected static final int REST_API_PORT = 9051;
   protected static final int METRICS_PORT = 8008;
   protected static final String CONFIG_FILE_PATH = "/config.yaml";
+  protected static final String PRIVATE_KEY_FILE_PATH = "/private-key.txt";
   protected static final String WORKING_DIRECTORY = "/opt/teku/";
   protected static final String DATA_PATH = WORKING_DIRECTORY + "data/";
   protected static final int P2P_PORT = 9000;

diff --git a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNode.java b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNode.java
@@ -13,7 +13,7 @@
 
 package tech.pegasys.teku.test.acceptance.dsl;
 
-import static java.util.Arrays.asList;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
@@ -27,8 +27,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -566,6 +568,7 @@ public Config() {
       configMap.put("p2p-port", P2P_PORT);
       configMap.put("p2p-advertised-port", P2P_PORT);
       configMap.put("p2p-interface", "0.0.0.0");
+      configMap.put("p2p-private-key-file", PRIVATE_KEY_FILE_PATH);
       configMap.put("Xinterop-genesis-time", 0);
       configMap.put("Xinterop-owned-validator-start-index", 0);
       configMap.put("Xstartup-target-peer-count", 0);
@@ -657,7 +660,7 @@ public Config withRealNetwork() {
 
     public Config withPeers(final TekuNode... nodes) {
       final String peers =
-          asList(nodes).stream().map(TekuNode::getMultiAddr).collect(Collectors.joining(", "));
+          Arrays.stream(nodes).map(TekuNode::getMultiAddr).collect(Collectors.joining(", "));
       LOG.debug("Set peers: {}", peers);
       configMap.put("p2p-static-peers", peers);
       return this;
@@ -678,6 +681,12 @@ public Map<File, String> write() throws Exception {
       configFile.deleteOnExit();
       writeTo(configFile);
       configFiles.put(configFile, CONFIG_FILE_PATH);
+
+      final File privateKeyFile = File.createTempFile("private-key", ".txt");
+      privateKeyFile.deleteOnExit();
+      Files.writeString(
+          privateKeyFile.toPath(), Bytes.wrap(privateKey.bytes()).toHexString(), UTF_8);
+      configFiles.put(privateKeyFile, PRIVATE_KEY_FILE_PATH);
       return configFiles;
     }
 

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -41,7 +41,7 @@ dependencyManagement {
     dependency 'io.protostuff:protostuff-core:1.6.2'
     dependency 'io.protostuff:protostuff-runtime:1.6.2'
 
-    dependency 'io.libp2p:jvm-libp2p-minimal:0.8.7-RELEASE'
+    dependency 'io.libp2p:jvm-libp2p-minimal:0.8.8-RELEASE'
     dependency 'tech.pegasys:jblst:0.3.6-4'
 
     dependency 'org.hdrhistogram:HdrHistogram:2.1.12'

diff --git a/...ing/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PPrivateKeyLoader.java b/...ing/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PPrivateKeyLoader.java
@@ -36,11 +36,6 @@ public LibP2PPrivateKeyLoader(
     this.privateKeyFile = privateKeyFile;
   }
 
-  public static PrivKey loadPrivateKey(
-      KeyValueStore<String, Bytes> keyValueStore, final Optional<String> privateKeyFile) {
-    return new LibP2PPrivateKeyLoader(keyValueStore, privateKeyFile).get();
-  }
-
   @Override
   public PrivKey get() {
     final Bytes privKeyBytes =

diff --git a/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/MultiaddrUtil.java b/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/MultiaddrUtil.java
@@ -55,7 +55,7 @@ public static Multiaddr fromInetSocketAddress(
   }
 
   private static Multiaddr addPeerId(final Multiaddr addr, final NodeId nodeId) {
-    return new Multiaddr(addr, Multiaddr.fromString("/p2p/" + nodeId.toBase58()));
+    return addr.withP2P(PeerId.fromBase58(nodeId.toBase58()));
   }
 
   private static LibP2PNodeId getNodeId(final DiscoveryPeer peer) {