Merge branch 'release_v4.7.2' into optimize_intranet

# Conflicts:
#	framework/src/main/java/org/tron/core/config/args/Args.java

Author: jwrct

build.gradle

@@ -89,4 +89,3 @@ gradle.buildFinished {
         }
     }
 }
-

common/build.gradle

@@ -53,6 +53,7 @@ dependencies {
     compile 'org.aspectj:aspectjrt:1.8.13'
     compile 'org.aspectj:aspectjweaver:1.8.13'
     compile 'org.aspectj:aspectjtools:1.8.13'
+    compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v0.2.19'
     compile project(":protocol")
 }
 

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -22,6 +22,7 @@
 import org.tron.core.config.args.Overlay;
 import org.tron.core.config.args.SeedNode;
 import org.tron.core.config.args.Storage;
+import org.tron.p2p.dns.update.PublishConfig;
 
 public class CommonParameter {
 
@@ -189,6 +190,16 @@ public class CommonParameter {
   @Getter
   @Setter
   public String p2pNodeId;
+  @Getter
+  @Setter
+  public boolean nodeEnableIpv6 = false;
+  @Getter
+  @Setter
+  public List<String> dnsTreeUrls;
+  @Getter
+  @Setter
+  public PublishConfig dnsPublishConfig;
+
   //If you are running a solidity node for java tron, this flag is set to true
   @Getter
   @Setter
@@ -323,6 +334,9 @@ public class CommonParameter {
   public boolean isOpenFullTcpDisconnect;
   @Getter
   @Setter
+  public boolean nodeDetectEnable;
+  @Getter
+  @Setter
   public int allowMultiSign;
   @Getter
   @Setter
@@ -399,6 +413,12 @@ public class CommonParameter {
   @Setter
   public RateLimiterInitialization rateLimiterInitialization;
   @Getter
+  @Setter
+  public int rateLimiterGlobalQps;
+  @Getter
+  @Setter
+  public int rateLimiterGlobalIpQps;
+  @Getter
   public DbBackupConfig dbBackupConfig;
   @Getter
   public RocksDbSettings rocksDBCustomSettings;

common/src/main/java/org/tron/core/Constant.java

@@ -103,6 +103,22 @@ public class Constant {
 
   public static final String NODE_P2P_PING_INTERVAL = "node.p2p.pingInterval";
   public static final String NODE_P2P_VERSION = "node.p2p.version";
+  public static final String NODE_ENABLE_IPV6  = "node.enableIpv6";
+  public static final String NODE_DNS_TREE_URLS = "node.dns.treeUrls";
+  public static final String NODE_DNS_PUBLISH = "node.dns.publish";
+  public static final String NODE_DNS_DOMAIN = "node.dns.dnsDomain";
+  public static final String NODE_DNS_CHANGE_THRESHOLD = "node.dns.changeThreshold";
+  public static final String NODE_DNS_MAX_MERGE_SIZE = "node.dns.maxMergeSize";
+  public static final String NODE_DNS_PRIVATE = "node.dns.dnsPrivate";
+  public static final String NODE_DNS_KNOWN_URLS = "node.dns.knownUrls";
+  public static final String NODE_DNS_STATIC_NODES = "node.dns.staticNodes";
+  public static final String NODE_DNS_SERVER_TYPE = "node.dns.serverType";
+  public static final String NODE_DNS_ACCESS_KEY_ID = "node.dns.accessKeyId";
+  public static final String NODE_DNS_ACCESS_KEY_SECRET = "node.dns.accessKeySecret";
+  public static final String NODE_DNS_ALIYUN_ENDPOINT = "node.dns.aliyunDnsEndpoint";
+  public static final String NODE_DNS_AWS_REGION = "node.dns.awsRegion";
+  public static final String NODE_DNS_AWS_HOST_ZONE_ID = "node.dns.awsHostZoneId";
+
   public static final String NODE_RPC_PORT = "node.rpc.port";
   public static final String NODE_RPC_SOLIDITY_PORT = "node.rpc.solidityPort";
   public static final String NODE_RPC_PBFT_PORT = "node.rpc.PBFTPort";
@@ -175,6 +191,8 @@ public class Constant {
 
   public static final String NODE_IS_OPEN_FULL_TCP_DISCONNECT = "node.isOpenFullTcpDisconnect";
 
+  public static final String NODE_DETECT_ENABLE = "node.nodeDetectEnable";
+
   public static final String NODE_MAX_TRANSACTION_PENDING_SIZE = "node.maxTransactionPendingSize";
 
   public static final String NODE_PENDING_TRANSACTION_TIMEOUT = "node.pendingTransactionTimeout";
@@ -235,6 +253,10 @@ public class Constant {
 
   public static final String RATE_LIMITER = "rate.limiter";
 
+  public static final String RATE_LIMITER_GLOBAL_QPS = "rate.limiter.global.qps";
+
+  public static final String RATE_LIMITER_GLOBAL_IP_QPS = "rate.limiter.global.ip.qps";
+
   public static final String COMMITTEE_CHANGED_DELEGATION = "committee.changedDelegation";
 
   public static final String CRYPTO_ENGINE = "crypto.engine";

common/src/main/java/org/tron/core/config/args/SeedNode.java

@@ -1,5 +1,6 @@
 package org.tron.core.config.args;
 
+import java.net.InetSocketAddress;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,5 +9,5 @@ public class SeedNode {
 
   @Getter
   @Setter
-  private List<String> ipList;
+  private List<InetSocketAddress> addressList;
 }

framework/build.gradle

@@ -48,8 +48,6 @@ dependencies {
 
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
 
-    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '0.1.4'
-
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
 
     compile "com.cedarsoftware:java-util:1.8.0"

framework/src/main/java/org/tron/common/backup/message/Message.java

@@ -20,7 +20,8 @@ public Message(UdpMessageTypeEnum type, byte[] data) {
 
   public static Node getNode(Endpoint endpoint) {
     Node node = new Node(endpoint.getNodeId().toByteArray(),
-        ByteArray.toStr(endpoint.getAddress().toByteArray()), endpoint.getPort());
+        ByteArray.toStr(endpoint.getAddress().toByteArray()),
+        ByteArray.toStr(endpoint.getAddressIpv6().toByteArray()), endpoint.getPort());
     return node;
   }
 

framework/src/main/java/org/tron/core/Wallet.java

@@ -2644,7 +2644,8 @@ public NodeList listNodes() {
         nodeListBuilder.addNodes(Node.newBuilder().setAddress(
             Address.newBuilder()
                 .setHost(ByteString
-                    .copyFrom(ByteArray.fromString(node.getHost())))
+                    .copyFrom(ByteArray.fromString(
+                        node.getPreferInetSocketAddress().getAddress().getHostAddress())))
                 .setPort(node.getPort())));
       });
     }