fix: p2p add more enr url

thinkAfCod · Apr 21, 2024 · a9eb615 · a9eb615
1 parent c90b5f1
commit a9eb615
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/hildr-node/src/main/java/io/optimism/network/DiscV5Service.java b/hildr-node/src/main/java/io/optimism/network/DiscV5Service.java
@@ -193,13 +193,14 @@ public SafeFuture<Collection<DiscoveryPeer>> searchForPeers() {
 
     private List<NodeRecord> filterByOpStackDataEnr(final Collection<NodeRecord> nodeRecords) {
         return nodeRecords.stream()
-                .filter(nodeRecord -> nodeRecord.containsKey(OP_STACK)
-                        && OpStackEnrData.decode((Bytes) nodeRecord.get(OP_STACK))
-                                .getChainId()
-                                .equals(chainId)
-                        && OpStackEnrData.decode((Bytes) nodeRecord.get(OP_STACK))
-                                .getVersion()
-                                .isZero())
+                .filter(nodeRecord -> {
+                    if (!nodeRecord.containsKey(OP_STACK)) {
+                        return false;
+                    }
+                    OpStackEnrData enrData = OpStackEnrData.decode((Bytes) nodeRecord.get(OP_STACK));
+                    return enrData.getChainId().equals(chainId)
+                            && enrData.getVersion().isZero();
+                })
                 .collect(toList());
     }
 

diff --git a/hildr-node/src/main/java/io/optimism/network/NodeRecordConverter.java b/hildr-node/src/main/java/io/optimism/network/NodeRecordConverter.java
@@ -25,7 +25,15 @@ public NodeRecordConverter() {}
      * @return the optional
      */
     public Optional<DiscoveryPeer> convertToDiscoveryPeer(final NodeRecord nodeRecord) {
-        return nodeRecord.getTcpAddress().map(address -> socketAddressToDiscoveryPeer(nodeRecord, address));
+        if (nodeRecord.getTcpAddress().isPresent()) {
+            return Optional.of(socketAddressToDiscoveryPeer(
+                    nodeRecord, nodeRecord.getTcpAddress().get()));
+        } else if (nodeRecord.getUdpAddress().isPresent()) {
+            return Optional.of(socketAddressToDiscoveryPeer(
+                    nodeRecord, nodeRecord.getUdpAddress().get()));
+        } else {
+            return Optional.empty();
+        }
     }
 
     private static DiscoveryPeer socketAddressToDiscoveryPeer(

diff --git a/hildr-node/src/main/java/io/optimism/network/OpStackNetwork.java b/hildr-node/src/main/java/io/optimism/network/OpStackNetwork.java
@@ -51,6 +51,12 @@ public class OpStackNetwork {
             "enr:-Ku4QG-2_Md3sZIAUebGYT6g0SMskIml77l6yR-M_JXc-UdNHCmHQeOiMLbylPejyJsdAPsTHJyjJB2sYGDLe0dn8uYBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhBLY-NyJc2VjcDI1NmsxoQORcM6e19T1T9gi7jxEZjk_sjVLGFscUNqAY9obgZaxbIN1ZHCCIyg",
             "enr:-Ku4QPn5eVhcoF1opaFEvg1b6JNFD2rqVkHQ8HApOKK61OIcIXD127bKWgAtbwI7pnxx6cDyk_nI88TrZKQaGMZj0q0Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhDayLMaJc2VjcDI1NmsxoQK2sBOLGcUb4AwuYzFuAVCaNHA-dy24UuEKkeFNgCVCsIN1ZHCCIyg",
             "enr:-Ku4QEWzdnVtXc2Q0ZVigfCGggOVB2Vc1ZCPEc6j21NIFLODSJbvNaef1g4PxhPwl_3kax86YPheFUSLXPRs98vvYsoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhDZBrP2Jc2VjcDI1NmsxoQM6jr8Rb1ktLEsVcKAPa08wCsKUmvoQ8khiOl_SLozf9IN1ZHCCIyg",
+            // Base
+            "enr:-J24QNz9lbrKbN4iSmmjtnr7SjUMk4zB7f1krHZcTZx-JRKZd0kA2gjufUROD6T3sOWDVDnFJRvqBBo62zuF-hYCohOGAYiOoEyEgmlkgnY0gmlwhAPniryHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQKNVFlCxh_B-716tTs-h1vMzZkSs1FTu_OYTNjgufplG4N0Y3CCJAaDdWRwgiQG",
+            "enr:-J24QH-f1wt99sfpHy4c0QJM-NfmsIfmlLAMMcgZCUEgKG_BBYFc6FwYgaMJMQN5dsRBJApIok0jFn-9CS842lGpLmqGAYiOoDRAgmlkgnY0gmlwhLhIgb2Hb3BzdGFja4OFQgCJc2VjcDI1NmsxoQJ9FTIv8B9myn1MWaC_2lJ-sMoeCDkusCsk4BYHjjCq04N0Y3CCJAaDdWRwgiQG",
+            "enr:-J24QDXyyxvQYsd0yfsN0cRr1lZ1N11zGTplMNlW4xNEc7LkPXh0NAJ9iSOVdRO95GPYAIc6xmyoCCG6_0JxdL3a0zaGAYiOoAjFgmlkgnY0gmlwhAPckbGHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQJwoS7tzwxqXSyFL7g0JM-KWVbgvjfB8JA__T7yY_cYboN0Y3CCJAaDdWRwgiQG",
+            "enr:-J24QHmGyBwUZXIcsGYMaUqGGSl4CFdx9Tozu-vQCn5bHIQbR7On7dZbU61vYvfrJr30t0iahSqhc64J46MnUO2JvQaGAYiOoCKKgmlkgnY0gmlwhAPnCzSHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQINc4fSijfbNIiGhcgvwjsjxVFJHUstK9L1T8OTKUjgloN0Y3CCJAaDdWRwgiQG",
+            "enr:-J24QG3ypT4xSu0gjb5PABCmVxZqBjVw9ca7pvsI8jl4KATYAnxBmfkaIuEqy9sKvDHKuNCsy57WwK9wTt2aQgcaDDyGAYiOoGAXgmlkgnY0gmlwhDbGmZaHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQIeAK_--tcLEiu7HvoUlbV52MspE0uCocsx1f_rYvRenIN0Y3CCJAaDdWRwgiQG",
             // Teku team (Consensys)
             "enr:-KG4QOtcP9X1FbIMOe17QNMKqDxCpm14jcX5tiOE4_TyMrFqbmhPZHK_ZPG2Gxb1GE2xdtodOfx9-cgvNtxnRyHEmC0ghGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQDE8KdiXNlY3AyNTZrMaEDhpehBDbZjM_L9ek699Y7vhUJ-eAdMyQW_Fil522Y0fODdGNwgiMog3VkcIIjKA",
             "enr:-KG4QDyytgmE4f7AnvW-ZaUOIi9i79qX4JwjRAiXBZCU65wOfBu-3Nb5I7b_Rmg3KCOcZM_C3y5pg7EBU5XGrcLTduQEhGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQ2_DUbiXNlY3AyNTZrMaEDKnz_-ps3UUOfHWVYaskI5kWYO_vtYMGYCQRAR3gHDouDdGNwgiMog3VkcIIjKA",

diff --git a/hildr-utilities/src/main/java/io/optimism/utilities/rpc/Web3jProvider.java b/hildr-utilities/src/main/java/io/optimism/utilities/rpc/Web3jProvider.java
@@ -57,7 +57,7 @@ public static Tuple2<Web3j, Web3jService> create(String url) {
             web3Srv = new HttpService(url, okHttpClient);
         } else if (Web3jProvider.isWs(url)) {
             final var web3finalSrv = new WebSocketService(url, true);
-            var logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+            var logger = LoggerFactory.getLogger("org.web3j.protocol.websocket");
             if (logger instanceof ch.qos.logback.classic.Logger) {
                 var level = LOGGER.isTraceEnabled()
                         ? ch.qos.logback.classic.Level.TRACE