feat(net): merge release v2.0.0 into main

.gitignore

@@ -30,3 +30,4 @@ shareddata.*
 /.settings/
 /.apt_generated/
 
+/src/test/java/org/tron/p2p/dns/PublishTest.java

README.md

@@ -1,5 +1,9 @@
 # libp2p
-libp2p is a p2p network SDK implemented in java language. The functional modules that have been implemented so far include node discovery, connection management, and so on. Subsequent versions will implement more functions.
+libp2p is a p2p network SDK implemented in java language. The functional modules that have been implemented so far include
+* node discovery by p2p, include ipv4 and ipv6,
+* tcp connection management,
+* publish nodes on dns domain and node discovery by dns,
+* support compressed message transmission among nodes
 
 # Build
 Building libp2p requires `git` and `Oracle JDK 1.8` to be installed, other JDK versions are not supported yet. Make sure you operate on `Linux` and `MacOS` operating systems.
@@ -25,7 +29,7 @@ then run the following command to start the node:
 ```bash
 $ nohup java -jar libp2p.jar [options] >> start.log 2>&1 &
 ```
-See the manual for details on [options](https://github.com/tronprotocol/libp2p/tree/main/src/main/java/org/tron/p2p/example/README.md)
+See the manual for details on [options](https://github.com/tronprotocol/libp2p/tree/develop/src/main/java/org/tron/p2p/example/README.md)
 
 ## How to include the dependency
 ### Gradle Setting
@@ -39,32 +43,39 @@ repositories {
 Then add the required packages as dependencies. Please add dependencies locally.
 ```bash
 dependencies {
-	compile group: 'io.github.tronprotocol', name: 'libp2p', version: '0.1.4'
+    implementation group: 'io.github.tronprotocol', name: 'libp2p', version: '2.0.0'
 }
 ```
 Or if you are using the jar files as your dependencies:
 ```bash
 dependencies {
-    compile fileTree(dir:'your path', include: '*.jar')
+    implementation fileTree(dir:'libs', include: 'libp2p.jar')
 }
 ```
 
 ### Maven Setting
 ```bash
 <repositories>
-	<repository>
-		<id>central-repos</id>
+    <repository>
+        <id>central-repos</id>
         <name>Central Repository</name>
         <url>https://repo.maven.apache.org/maven2</url>
-	</repository>
+    </repository>
 </repositories>
 
 <dependency>
-	<groupId>io.github.tronprotocol</groupId>
-	<artifactId>libp2p</artifactId>
-	<version>0.1.4</version>
+    <groupId>io.github.tronprotocol</groupId>
+    <artifactId>libp2p</artifactId>
+    <version>2.0.0</version>
 </dependency>
 ```
 
 ## Example
-For some examples please check our [example package](https://github.com/tronprotocol/libp2p/tree/main/src/main/java/org/tron/p2p/example). 
+For some examples please check our [example package](https://github.com/tronprotocol/libp2p/tree/develop/src/main/java/org/tron/p2p/example). 
+
+# Integrity Check
+* After February 21, 2023， releases are signed the gpg key:
+  ```
+  pub: 1254 F859 D2B1 BD9F 66E7 107D F859 BCB4 4A28 290B
+  uid: build@tron.network
+  ```

build.gradle

@@ -1,5 +1,5 @@
 group 'io.github.tronprotocol'
-version '0.1.5'
+version '2.0.0'
 
 buildscript {
     repositories {
@@ -16,12 +16,8 @@ apply plugin: 'java'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'application'
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-apply plugin: "io.github.gradle-nexus.publish-plugin"
 
 def protobufVersion = "3.21.12"
-
 def grpcVersion = "1.52.1"
 
 mainClassName = 'org.tron.p2p.example.StartApp'
@@ -60,19 +56,37 @@ buildscript {
 dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 
+    implementation group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.8.4'
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
-    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9'
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
     implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: protobufVersion
     implementation group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
     implementation group: 'commons-cli', name: 'commons-cli', version: '1.5.0'
 
-    compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.24'
-    testImplementation group: 'org.projectlombok', name: 'lombok', version: '1.18.24'
-    annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.24'
+    compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.12'
+    testImplementation group: 'org.projectlombok', name: 'lombok', version: '1.18.12'
+    annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.12'
+
+    implementation group: 'dnsjava', name: 'dnsjava', version: '3.5.2'
+    implementation group: 'org.web3j', name: 'crypto', version: '5.0.0'
+    implementation('software.amazon.awssdk:route53:2.18.41', {
+        exclude group: 'io.netty', module: 'netty-codec-http2'
+        exclude group: 'io.netty', module: 'netty-codec-http'
+        exclude group: 'io.netty', module: 'netty-common'
+        exclude group: 'io.netty', module: 'netty-buffer'
+        exclude group: 'io.netty', module: 'netty-transport'
+        exclude group: 'io.netty', module: 'netty-codec'
+        exclude group: 'io.netty', module: 'netty-handler'
+        exclude group: 'io.netty', module: 'netty-resolver'
+        exclude group: 'io.netty', module: 'netty-transport-classes-epoll'
+        exclude group: 'io.netty', module: 'netty-transport-native-unix-common'
+    })
+    implementation group: 'com.aliyun', name: 'alidns20150109', version: '3.0.1'
+    implementation group: 'xerces', name: 'xercesImpl', version: '2.11.0'
 }
 
 tasks.matching { it instanceof Test }.all {
@@ -158,64 +172,4 @@ artifacts {
     archives javadocJar, sourcesJar
 }
 
-publishing {
-
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-            artifact sourcesJar
-            artifact javadocJar
-            pom {
-                name = 'libp2p'
-                description = 'libp2p is a p2p network SDK implemented in java language.'
-                url = 'https://github.com/tronprotocol/libp2p'
-                licenses {
-                    license {
-                        name = 'The Apache Software License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        name = 'chengtx01'
-                        email = 'ctxhorse@gmail.com'
-                    }
-                    developer {
-                        name = 'jiangyuanshu'
-                        email = '317787106@qq.com'
-                    }
-                    developer {
-                        name = 'wubin01'
-                        email = 'wb_bupt@163.com'
-                    }
-                }
-                scm {
-                    url = 'https://github.com/tronprotocol/libp2p'
-                    connection = 'scm:git:git://github.com/tronprotocol/libp2p.git'
-                    developerConnection = 'scm:git:ssh://git@github.com:tronprotocol/libp2p.git'
-                }
-            }
-        }
-    }
-}
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            //only for users registered in Sonatype after 24 Feb 2021
-            nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
-            snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-            username = "${sonatypeUsername}"
-            password = "${sonatypePassword}"
-        }
-    }
-}
-
-
-signing {
-    // https://discuss.gradle.org/t/use-of-signing-plugin-with-gpg-agent-fails-with-gradle-5-x/38351/2
-    useGpgCmd()
-    sign publishing.publications.mavenJava
-}
-
 

src/main/java/org/tron/p2p/P2pConfig.java

@@ -2,24 +2,35 @@
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import lombok.Data;
+import org.tron.p2p.dns.update.PublishConfig;
 import org.tron.p2p.utils.NetUtil;
 
 @Data
 public class P2pConfig {
+
   private List<InetSocketAddress> seedNodes = new CopyOnWriteArrayList<>();
   private List<InetSocketAddress> activeNodes = new CopyOnWriteArrayList<>();
   private List<InetAddress> trustNodes = new CopyOnWriteArrayList<>();
   private byte[] nodeID = NetUtil.getNodeId();
-  private String ip = NetUtil.getExternalIp();
+  private String ip = NetUtil.getExternalIpV4();
+  private String ipv6 = NetUtil.getExternalIpV6();
   private int port = 18888;
-  private int version = 1;
+  private int networkId = 1;
   private int minConnections = 8;
   private int maxConnections = 50;
   private int minActiveConnections = 2;
   private int maxConnectionsWithSameIp = 2;
   private boolean discoverEnable = true;
   private boolean disconnectionPolicyEnable = false;
+  private boolean nodeDetectEnable = false;
+
+  //dns read config
+  private List<String> treeUrls = new ArrayList<>();
+
+  //dns publish config
+  private PublishConfig publishConfig = new PublishConfig();
 }

src/main/java/org/tron/p2p/P2pService.java

@@ -1,13 +1,19 @@
 package org.tron.p2p;
 
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.p2p.base.Parameter;
 import org.tron.p2p.connection.Channel;
 import org.tron.p2p.connection.ChannelManager;
 import org.tron.p2p.discover.Node;
 import org.tron.p2p.discover.NodeManager;
+import org.tron.p2p.dns.DnsManager;
 import org.tron.p2p.exception.P2pException;
 import org.tron.p2p.stats.P2pStats;
 import org.tron.p2p.stats.StatsManager;
@@ -21,10 +27,12 @@ public void start(P2pConfig p2pConfig) {
     Parameter.p2pConfig = p2pConfig;
     NodeManager.init();
     ChannelManager.init();
+    DnsManager.init();
     log.info("P2p service started");
   }
 
   public void close() {
+    DnsManager.close();
     NodeManager.close();
     ChannelManager.close();
     log.info("P2p service closed");
@@ -34,10 +42,15 @@ public void register(P2pEventHandler p2PEventHandler) throws P2pException {
     Parameter.addP2pEventHandle(p2PEventHandler);
   }
 
+  @Deprecated
   public void connect(InetSocketAddress address) {
     ChannelManager.connect(address);
   }
 
+  public ChannelFuture connect(Node node, ChannelFutureListener future) {
+    return ChannelManager.connect(node, future);
+  }
+
   public P2pStats getP2pStats() {
     return statsManager.getP2pStats();
   }
@@ -47,15 +60,24 @@ public List<Node> getTableNodes() {
   }
 
   public List<Node> getConnectableNodes() {
-    return NodeManager.getConnectableNodes();
+    Set<Node> nodes = new HashSet<>();
+    nodes.addAll(NodeManager.getConnectableNodes());
+    nodes.addAll(DnsManager.getDnsNodes());
+    return new ArrayList<>(nodes);
   }
 
   public List<Node> getAllNodes() {
-    return NodeManager.getAllNodes();
+    Set<Node> nodes = new HashSet<>();
+    nodes.addAll(NodeManager.getAllNodes());
+    nodes.addAll(DnsManager.getDnsNodes());
+    return new ArrayList<>(nodes);
   }
 
   public void updateNodeId(Channel channel, String nodeId) {
     ChannelManager.updateNodeId(channel, nodeId);
   }
 
+  public int getVersion() {
+    return Parameter.version;
+  }
 }

src/main/java/org/tron/p2p/base/Constant.java

@@ -3,7 +3,8 @@
 public class Constant {
 
   public static final int NODE_ID_LEN = 64;
-
   public static final String AMAZONAWS_URL = "http://checkip.amazonaws.com";
-
+  public static final String IDENT_URL = "https://v6.ident.me";
+  public static final String ipV4Hex = "00000000"; //32 bit
+  public static final String ipV6Hex = "00000000000000000000000000000000"; //128 bit
 }

src/main/java/org/tron/p2p/base/Parameter.java

@@ -4,15 +4,22 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.protobuf.ByteString;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 import org.tron.p2p.P2pConfig;
 import org.tron.p2p.P2pEventHandler;
 import org.tron.p2p.exception.P2pException;
 import org.tron.p2p.exception.P2pException.TypeEnum;
+import org.tron.p2p.protos.Discover;
+import org.tron.p2p.utils.ByteArray;
 
 @Data
 public class Parameter {
 
+  public static int version = 1;
+
   public static final int TCP_NETTY_WORK_THREAD_NUM = 0;
 
   public static final int UDP_NETTY_WORK_THREAD_NUM = 1;
@@ -46,4 +53,19 @@ public static void addP2pEventHandle(P2pEventHandler p2PEventHandler) throws P2p
     }
     handlerList.add(p2PEventHandler);
   }
+
+  public static Discover.Endpoint getHomeNode() {
+    Discover.Endpoint.Builder builder = Discover.Endpoint.newBuilder()
+      .setNodeId(ByteString.copyFrom(Parameter.p2pConfig.getNodeID()))
+      .setPort(Parameter.p2pConfig.getPort());
+    if (StringUtils.isNotEmpty(Parameter.p2pConfig.getIp())) {
+      builder.setAddress(ByteString.copyFrom(
+        ByteArray.fromString(Parameter.p2pConfig.getIp())));
+    }
+    if (StringUtils.isNotEmpty(Parameter.p2pConfig.getIpv6())) {
+      builder.setAddressIpv6(ByteString.copyFrom(
+        ByteArray.fromString(Parameter.p2pConfig.getIpv6())));
+    }
+    return builder.build();
+  }
 }