Merge branch 'master' of https://github.com/tronprotocol/java-tron

Author: nanfengpo

.travis.yml

@@ -3,7 +3,8 @@ language: java
 jdk: oraclejdk8
 addons:
   ssh_known_hosts:
-  - 47.93.9.236:22008
+  - 47.94.231.67:22008
+  - 47.94.10.122:22008
   sonarcloud:
     organization: tron-zhaohong
     token:
@@ -14,6 +15,11 @@ cache:
 script:
 - sh tron.sh
 - "./gradlew build"
+- "./gradlew jacocoTestReport"
+- bash deploy.sh
+
+after_success:
+- "bash <(curl -s https://codecov.io/bash) -t 060bb400-c6fe-4d5f-a6c8-427105c746ac -s build/reports/jacoco/"
 
 skip_build:
 - README.md：

README.md

@@ -12,14 +12,18 @@
 
 
 <p align="center">
-  <a href="https://tronfoundation.slack.com/">
-    <img src="https://img.shields.io/badge/chat-on%20slack-brightgreen.svg">
+  <a href="https://discord.gg/GsRgsTD">
+    <img src="https://img.shields.io/badge/chat-on%20discord-brightgreen.svg">
   </a>
 
   <a href="https://travis-ci.org/tronprotocol/java-tron">
     <img src="https://travis-ci.org/tronprotocol/java-tron.svg?branch=develop">
   </a>
 
+  <a href="https://codecov.io/gh/tronprotocol/java-tron">
+    <img src="https://codecov.io/gh/tronprotocol/java-tron/branch/develop/graph/badge.svg" />
+  </a>
+  
   <a href="https://github.com/tronprotocol/java-tron/issues">
     <img src="https://img.shields.io/github/issues/tronprotocol/java-tron.svg">
   </a>
@@ -41,7 +45,7 @@
   <a href="#how-to-build">How to Build</a> •
   <a href="#running">How to Run</a> •
   <a href="#links">Links</a> •
-  <a href="http://wiki.tron.network">Wiki</a> •
+  <a href="http://developers.tron.network">Documentation</a> •
   <a href="CONTRIBUTING.md">Contributing</a> •
   <a href="#community">Community</a>
 </p>
@@ -332,22 +336,22 @@ Then, run `FullNode::main()` again.
 
 # Quick Start
 
-Read the [Quick Start](http://wiki.tron.network/en/latest/The_TRON_Network.html#how-to-build).
+Read the [Quick Start](https://developers.tron.network/docs/getting-started-1).
 
 # Advanced Configurations
 
 Read the [Advanced Configurations](src/main/java/org/tron/core/config/README.md).
 
 # Developer Community
 
-* [Slack](https://tronfoundation.slack.com/) Please email [email protected] for a developer invite
+* [Discord](https://discord.gg/GsRgsTD) Please join our Developer Discord
+* [Gitter](https://gitter.im/tronprotocol/allcoredev) the core dev gitter
 
 # Links
 
 * [Website](https://tron.network/)
-* [Documentation](https://github.com/tronprotocol/java-tron)
+* [Documentation](http://developers.tron.network)
 * [Blog](https://tronprotocol.github.io/tron-blog/)
-* [TRON Wiki](http://wiki.tron.network/en/latest/)
 
 # Projects
 

TRON_Protobuf_Protocol_document.md

@@ -703,6 +703,8 @@ Input, transaction and block header all require signature.
     `TotalTransaction` takes a parameter of `EmptyMessage`, and returns `NumberMessage` object.  
     __`getTransactionById`__:  
     `getTransactionById` takes a parameter of `BytesMessage`, and returns `Transaction` object.  
+    __`getTransactionInfoById`__:  
+        `getTransactionInfoById` takes a parameter of `BytesMessage`, and returns `TransactionInfo` object.
     __`getTransactionsByTimeStamp`__:  
     `getTransactionsByTimeStamp` takes a parameter of `TimeMessage`, and returns `TransactionList` object.  
     __`getTransactionsFromThis`__:  

build.gradle

@@ -23,6 +23,9 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 apply plugin: 'maven-publish'
 
+jar.enabled = false
+shadowJar.enabled = false
+
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'
@@ -166,6 +169,8 @@ dependencies {
     compile 'org.eclipse.jetty:jetty-servlet:9.4.11.v20180605'
     compile 'com.alibaba:fastjson:1.2.47'
     // end http
+
+    compile "io.vavr:vavr:0.9.2"
 }
 
 check.dependsOn 'lint'
@@ -267,6 +272,9 @@ task stest(type: Test) {
 
     useTestNG {
         suites(file('src/test/resources/testng.xml'))
+        parallel 'tests'
+        threadCount 4
+
     }
 
     testLogging {
@@ -283,7 +291,7 @@ task stest(type: Test) {
 
 jacocoTestReport {
     reports {
-        xml.enabled false
+        xml.enabled true
         csv.enabled false
         html.destination file("${buildDir}/jacocoHtml")
     }

deploy.sh

@@ -1,23 +1,72 @@
 #!/bin/bash
+stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
+#testnet=(
+#47.94.231.67
+#47.94.10.122
+#)
+stest_server=""
+docker_num_in_67=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
+docker_num_in_67=`echo $docker_num_in_67 | tr -d "\r"`
+docker_num_in_122=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
+docker_num_in_122=`echo $docker_num_in_122 | tr -d "\r"`
+if [ $docker_num_in_67 -le $docker_num_in_122 ];
+  then
+  docker_num=$docker_num_in_67
+  stest_server=47.94.231.67
+  else
+    docker_num=$docker_num_in_122
+    stest_server=47.94.10.122
+fi
+
+if [[ ${docker_num} -le 4 ]];
+then
+echo $stest_server
+else
+    stest_server=""
+  fi
+
+if [ "$stest_server" = "" ]
+then
+echo "All docker server is busy, stest FAILED"
+exit 1
+fi
+
+change_branch_CMD="sed -i '1c branch_name_in_CI=$TRAVIS_BRANCH' /data/workspace/docker_workspace/do_stest.sh"
 
 echo "$TRAVIS_BRANCH"
 
-if [ "$TRAVIS_BRANCH" = "develop" ];then
+if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" || "$TRAVIS_BRANCH" = "Odyssey_v3.2.1" ]];then
   echo "init env"
-  ssh [email protected] -p 22008 sh /home/tron/workspace/deploy_all.sh
+  ssh java-tron@$stest_server -p 22008 $change_branch_CMD
+  ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1
+  if [[ `find $stestlogname -type f | xargs grep "Connection refused"` =~ "Connection refused" || `find $stestlogname -type f | xargs grep "stest FAILED"` =~ "stest FAILED" ]];
+  then
+    rm -f $stestlogname
+    echo "first if"
+    ssh java-tron@$stest_server -p 22008 $change_branch_CMD
+    ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1
+  fi
+  if [[ `find $stestlogname -type f | xargs grep "Connection refused"` =~ "Connection refused" || `find $stestlogname -type f | xargs grep "stest FAILED"` =~ "stest FAILED" ]];
+  then
+    rm -f $stestlogname
+    echo "second if"
+    ssh java-tron@$stest_server -p 22008 $change_branch_CMD
+    ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1
+  fi
   echo "stest start"
-  ./gradlew stest | tee stest.log
+  cat $stestlogname | grep "Stest result is:" -A 10000
   echo "stest end"
 
   echo $?
-  ret=$(cat stest.log | grep "stest FAILED" | wc -l)
+  ret=$(cat $stestlogname | grep "stest FAILED" | wc -l)
 
   if [ $ret != 0 ];then
     echo $ret
+    rm -f $stestlogname
     exit 1
   fi
-
 fi
 echo "bye bye"
-
+echo $stest_server
+rm -f $stestlogname
 exit 0

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

@@ -24,9 +24,10 @@ public class ApplicationImpl implements Application {
 
   @Autowired
   private Manager dbManager;
-  
+
   private boolean isProducer;
 
+
   private void resetP2PNode() {
     p2pNode.listen();
     p2pNode.syncFrom(null);
@@ -124,6 +125,11 @@ private void closeRevokingStore() {
   }
 
   private void closeAllStore() {
+//    if (dbManager.getRevokingStore().getClass() == SnapshotManager.class) {
+//      ((SnapshotManager) dbManager.getRevokingStore()).getDbs().forEach(IRevokingDB::close);
+//    } else {
+//      dbManager.closeAllStore();
+//    }
     dbManager.closeAllStore();
   }
 

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

@@ -2,31 +2,45 @@
 
 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;
 
 public class TronApplicationContext extends AnnotationConfigApplicationContext {
 
-    public TronApplicationContext() {
-    }
+  public TronApplicationContext() {
+  }
 
-    public TronApplicationContext(DefaultListableBeanFactory beanFactory) {
-        super(beanFactory);
-    }
+  public TronApplicationContext(DefaultListableBeanFactory beanFactory) {
+    super(beanFactory);
+  }
 
-    public TronApplicationContext(Class<?>... annotatedClasses) {
-        super(annotatedClasses);
-    }
+  public TronApplicationContext(Class<?>... annotatedClasses) {
+    super(annotatedClasses);
+  }
 
-    public TronApplicationContext(String... basePackages) {
-        super(basePackages);
-    }
+  public TronApplicationContext(String... basePackages) {
+    super(basePackages);
+  }
 
-    @Override
-    public void destroy() {
+  @Override
+  public void destroy() {
 
-        Manager dbManager = getBean(Manager.class);
-        dbManager.stopRepushThread();
+    Application appT = ApplicationFactory.create(this);
+    appT.shutdownServices();
+    appT.shutdown();
 
-        super.destroy();
-    }
+    DiscoverServer discoverServer = getBean(DiscoverServer.class);
+    discoverServer.close();
+    ChannelManager channelManager = getBean(ChannelManager.class);
+    channelManager.close();
+    NodeManager nodeManager = getBean(NodeManager.class);
+    nodeManager.close();
+    
+    Manager dbManager = getBean(Manager.class);
+    dbManager.stopRepushThread();
+
+    super.destroy();
+  }
 }

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

@@ -6,6 +6,7 @@
 import static org.tron.common.net.udp.message.UdpMessageTypeEnum.BACKUP_KEEP_ALIVE;
 
 import io.netty.util.internal.ConcurrentSet;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Set;
 import java.util.concurrent.Executors;
@@ -31,6 +32,8 @@ public class BackupManager implements EventHandler{
 
   private int port = args.getBackupPort();
 
+  private String localIp = "";
+
   private Set<String> members = new ConcurrentSet<>();
 
   private ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
@@ -41,7 +44,7 @@ public class BackupManager implements EventHandler{
 
   private volatile long lastKeepAliveTime;
 
-  private volatile long keepAliveTimeout = 3000;
+  private volatile long keepAliveTimeout = 10_000;
 
   private volatile boolean isInit = false;
 
@@ -71,11 +74,19 @@ public void init() {
     }
     isInit = true;
 
+    try{
+      localIp = InetAddress.getLocalHost().getHostAddress();
+    }catch (Exception e){
+      logger.warn("Get local ip failed.");
+    }
+
     for (String member : args.getBackupMembers()) {
-      members.add(member);
+      if (!localIp.equals(member)){
+        members.add(member);
+      }
     }
 
-    logger.info("Backup members: size= {}, {}", members.size(), members);
+    logger.info("Backup localIp:{}, members: size= {}, {}", localIp, members.size(), members);
 
     setStatus(INIT);
 
@@ -118,16 +129,20 @@ public void handleEvent(UdpEvent udpEvent) {
     lastKeepAliveTime = System.currentTimeMillis();
 
     KeepAliveMessage keepAliveMessage = (KeepAliveMessage) msg;
+    int peerPriority = keepAliveMessage.getPriority();
+    String peerIp = sender.getAddress().getHostAddress();
 
-    if (status.equals(MASTER) && (keepAliveMessage.getFlag() &&
-        keepAliveMessage.getPriority() > priority)){
+    if (status.equals(INIT) && (keepAliveMessage.getFlag() || peerPriority > priority)){
       setStatus(SLAVER);
       return;
     }
 
-    if (status.equals(INIT) &&
-        (keepAliveMessage.getFlag() || keepAliveMessage.getPriority() > priority)){
+    if (status.equals(MASTER) && keepAliveMessage.getFlag()){
+      if (peerPriority > priority){
+        setStatus(SLAVER);
+      }else if (peerPriority == priority && localIp.compareTo(peerIp) < 0){
         setStatus(SLAVER);
+      }
     }
   }