Merge remote-tracking branch 'origin/release_v4.7.0' into release_v4.7.0

# Conflicts:
#	framework/src/main/java/org/tron/core/Wallet.java

.gitignore

@@ -31,7 +31,6 @@ shareddata.*
 
 # protobuf generated classes
 src/main/gen
-
 src/main/java/org/tron/core/bftconsensus
 src/test/java/org/tron/consensus2
 src/main/java/META-INF/

chainbase/src/main/java/org/tron/common/overlay/message/Message.java

@@ -69,6 +69,10 @@ public ByteBuf getSendData() {
     return Unpooled.wrappedBuffer(ArrayUtils.add(this.getData(), 0, type));
   }
 
+  public byte[] getSendBytes() {
+    return ArrayUtils.add(this.getData(), 0, type);
+  }
+
   public Sha256Hash getMessageId() {
     return Sha256Hash.of(CommonParameter.getInstance().isECKeyCryptoEngine(),
         getData());

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

@@ -1,6 +1,9 @@
 package org.tron.common.parameter;
 
 import com.beust.jcommander.Parameter;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -11,7 +14,6 @@
 import org.tron.common.config.DbBackupConfig;
 import org.tron.common.logsfilter.EventPluginConfig;
 import org.tron.common.logsfilter.FilterQuery;
-import org.tron.common.overlay.discover.node.Node;
 import org.tron.common.setting.RocksDbSettings;
 import org.tron.core.Constant;
 import org.tron.core.config.args.Overlay;
@@ -390,12 +392,12 @@ public class CommonParameter {
   public GenesisBlock genesisBlock;
   @Getter
   @Setter
-  public List<Node> activeNodes;
+  public List<InetSocketAddress> activeNodes;
   @Getter
   @Setter
-  public List<Node> passiveNodes;
+  public List<InetAddress> passiveNodes;
   @Getter
-  public List<Node> fastForwardNodes;
+  public List<InetSocketAddress> fastForwardNodes;
   @Getter
   public int maxFastForwardNum;
   @Getter

framework/build.gradle

@@ -48,6 +48,8 @@ dependencies {
 
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
 
+    compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v0.1.5'
+
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
 
     compile "com.cedarsoftware:java-util:1.8.0"
@@ -266,14 +268,34 @@ createScript(project, 'org.tron.program.DBConvert', 'DBConvert')
 createScript(project, 'org.tron.tool.litefullnode.LiteFullNodeTool', 'LiteFullNodeTool')
 
 def releaseBinary = hasProperty('binaryRelease') ? getProperty('binaryRelease') : 'true'
+def skipSolidity = hasProperty('skipSolidity') ? true : false
+def skipKeystore = hasProperty('skipKeystore') ? true : false
+def skipConvert = hasProperty('skipConvert') ? true : false
+def skipLite = hasProperty('skipLite') ? true : false
+def skipAll = hasProperty('skipAll') ? true : false
 if (releaseBinary == 'true') {
     artifacts {
-        archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
-                binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'),
-                binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'),
-                binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'),
-                binaryRelease('buildLiteFullNodeToolJar', 'LiteFullNodeTool', 'org.tron.tool.litefullnode.LiteFullNodeTool'))
+        archives(binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
     }
+    if (!skipAll) {
+        if (!skipSolidity) {
+            artifacts {
+                archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'))}
+        }
+        if (!skipKeystore) {
+            artifacts {
+                archives(binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))}
+        }
+        if (!skipConvert) {
+            artifacts {
+                archives(binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'))}
+        }
+        if (!skipLite) {
+            artifacts {
+                archives(binaryRelease('buildLiteFullNodeToolJar', 'LiteFullNodeTool', 'org.tron.tool.litefullnode.LiteFullNodeTool'))}
+        }
+    }
+
 }
 
 task copyToParent(type: Copy) {

framework/src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -12,6 +12,7 @@
 import org.tron.core.metrics.MetricsUtil;
 import org.tron.core.net.TronNetService;
 import org.tron.program.FullNode;
+import org.tron.program.SolidityNode;
 
 @Slf4j(topic = "app")
 @Component
@@ -56,15 +57,19 @@ public void initServices(CommonParameter parameter) {
    * start up the app.
    */
   public void startup() {
-    tronNetService.start();
+    if (!Args.getInstance().isSolidityNode()) {
+      tronNetService.start();
+    }
     consensusService.start();
     MetricsUtil.init();
   }
 
   @Override
   public void shutdown() {
     logger.info("******** start to shutdown ********");
-    tronNetService.stop();
+    if (!Args.getInstance().isSolidityNode()) {
+      tronNetService.close();
+    }
     consensusService.stop();
     synchronized (dbManager.getRevokingStore()) {
       dbManager.getSession().reset();

framework/src/main/java/org/tron/common/application/TronApplicationContext.java

@@ -2,10 +2,8 @@
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.tron.common.overlay.discover.DiscoverServer;
-import org.tron.common.overlay.discover.node.NodeManager;
-import org.tron.common.overlay.server.ChannelManager;
 import org.tron.core.db.Manager;
+import org.tron.core.net.TronNetService;
 
 public class TronApplicationContext extends AnnotationConfigApplicationContext {
 
@@ -31,12 +29,8 @@ public void destroy() {
     appT.shutdownServices();
     appT.shutdown();
 
-    DiscoverServer discoverServer = getBean(DiscoverServer.class);
-    discoverServer.close();
-    ChannelManager channelManager = getBean(ChannelManager.class);
-    channelManager.close();
-    NodeManager nodeManager = getBean(NodeManager.class);
-    nodeManager.close();
+    TronNetService tronNetService = getBean(TronNetService.class);
+    tronNetService.close();
 
     Manager dbManager = getBean(Manager.class);
     dbManager.stopRePushThread();

framework/src/main/java/org/tron/common/backup/BackupManager.java

@@ -3,7 +3,7 @@
 import static org.tron.common.backup.BackupManager.BackupStatusEnum.INIT;
 import static org.tron.common.backup.BackupManager.BackupStatusEnum.MASTER;
 import static org.tron.common.backup.BackupManager.BackupStatusEnum.SLAVER;
-import static org.tron.common.net.udp.message.UdpMessageTypeEnum.BACKUP_KEEP_ALIVE;
+import static org.tron.common.backup.message.UdpMessageTypeEnum.BACKUP_KEEP_ALIVE;
 
 import io.netty.util.internal.ConcurrentSet;
 import java.net.InetAddress;
@@ -14,11 +14,11 @@
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.tron.common.net.udp.handler.EventHandler;
-import org.tron.common.net.udp.handler.MessageHandler;
-import org.tron.common.net.udp.handler.UdpEvent;
-import org.tron.common.net.udp.message.Message;
-import org.tron.common.net.udp.message.backup.KeepAliveMessage;
+import org.tron.common.backup.message.KeepAliveMessage;
+import org.tron.common.backup.message.Message;
+import org.tron.common.backup.socket.EventHandler;
+import org.tron.common.backup.socket.MessageHandler;
+import org.tron.common.backup.socket.UdpEvent;
 import org.tron.common.parameter.CommonParameter;
 
 @Slf4j(topic = "backup")

framework/src/main/java/org/tron/common/net/udp/message/backup/KeepAliveMessage.java → framework/src/main/java/org/tron/common/backup/message/KeepAliveMessage.java

@@ -1,9 +1,8 @@
-package org.tron.common.net.udp.message.backup;
+package org.tron.common.backup.message;
 
-import static org.tron.common.net.udp.message.UdpMessageTypeEnum.BACKUP_KEEP_ALIVE;
+import static org.tron.common.backup.message.UdpMessageTypeEnum.BACKUP_KEEP_ALIVE;
 
-import org.tron.common.net.udp.message.Message;
-import org.tron.common.overlay.discover.node.Node;
+import org.tron.p2p.discover.Node;
 import org.tron.protos.Discover;
 
 public class KeepAliveMessage extends Message {

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

@@ -1,16 +1,11 @@
-package org.tron.common.net.udp.message;
+package org.tron.common.backup.message;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.tron.common.net.udp.message.backup.KeepAliveMessage;
-import org.tron.common.net.udp.message.discover.FindNodeMessage;
-import org.tron.common.net.udp.message.discover.NeighborsMessage;
-import org.tron.common.net.udp.message.discover.PingMessage;
-import org.tron.common.net.udp.message.discover.PongMessage;
-import org.tron.common.overlay.discover.node.Node;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.exception.P2pException;
+import org.tron.p2p.discover.Node;
 import org.tron.protos.Discover.Endpoint;
 
 public abstract class Message {
@@ -33,14 +28,6 @@ public static Message parse(byte[] encode) throws Exception {
     byte type = encode[0];
     byte[] data = ArrayUtils.subarray(encode, 1, encode.length);
     switch (UdpMessageTypeEnum.fromByte(type)) {
-      case DISCOVER_PING:
-        return new PingMessage(data);
-      case DISCOVER_PONG:
-        return new PongMessage(data);
-      case DISCOVER_FIND_NODE:
-        return new FindNodeMessage(data);
-      case DISCOVER_NEIGHBORS:
-        return new NeighborsMessage(data);
       case BACKUP_KEEP_ALIVE:
         return new KeepAliveMessage(data);
       default:

framework/src/main/java/org/tron/common/net/udp/message/UdpMessageTypeEnum.java → framework/src/main/java/org/tron/common/backup/message/UdpMessageTypeEnum.java

@@ -1,18 +1,10 @@
-package org.tron.common.net.udp.message;
+package org.tron.common.backup.message;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum UdpMessageTypeEnum {
 
-  DISCOVER_PING((byte) 0x01),
-
-  DISCOVER_PONG((byte) 0x02),
-
-  DISCOVER_FIND_NODE((byte) 0x03),
-
-  DISCOVER_NEIGHBORS((byte) 0x04),
-
   BACKUP_KEEP_ALIVE((byte) 0x05),
 
   UNKNOWN((byte) 0xFF);