Merge pull request #2101 from tronprotocol/Odyssey_v3.5.1

Odyssey v3.5.1 (merge to master)

Author: Yrp

.circleci/config.yml

@@ -1,4 +1,3 @@
-
 version: 2
 jobs:
   build:
@@ -13,11 +12,14 @@ jobs:
     working_directory: ~/java-tron
     steps:
     - checkout
+    - run:
+        name: multi_os_result
+        command: curl http://60.205.215.34/multi_os_result
+
     - run:
         name: Daily Build Report
         command: curl http://60.205.215.34/Daily_Build_Task_Report
 
-
     - run:
         name: Download Links
-        command: sh DownloadLinks.sh
+        command: sh DownloadLinks.sh

.travis.yml

@@ -3,8 +3,12 @@ language: java
 jdk: oraclejdk8
 addons:
   ssh_known_hosts:
-  - 47.94.231.67:22008
-  - 47.94.10.122:22008
+    - 47.94.231.67:22008
+    - 47.94.231.67:22008
+    - 47.94.231.67:22008
+    - 47.94.10.122:22008
+    - 47.94.10.122:22008
+    - 47.94.10.122:22008
   sonarcloud:
     organization: tron-zhaohong
     token:
@@ -27,9 +31,6 @@ matrix:
     - bash deploy.sh
 
 
-
-
-
 after_success:
 - "bash <(curl -s https://codecov.io/bash) -t 060bb400-c6fe-4d5f-a6c8-427105c746ac -s build/reports/jacoco/"
 

build.gradle

@@ -88,6 +88,10 @@ if (isWindows()) {
     }
 }
 
+task version(type: Exec) {
+    commandLine 'bash', '-c', './ver.sh'
+}
+
 dependencies {
     //local libraries
     compile fileTree(dir: 'libs', include: '*.jar')
@@ -116,6 +120,8 @@ dependencies {
 
     compile "org.iq80.leveldb:leveldb:0.7"
 
+    compile group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
+
     compile group: leveldbGroup, name: leveldbName, version: leveldbVersion
 
     compile "org.apache.commons:commons-collections4:4.0"
@@ -338,5 +344,6 @@ def binaryRelease(taskName, jarName, mainClass) {
 artifacts {
     archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
             binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'),
-            binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))
-}
+            binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'),
+            binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'))
+}

deploy.sh

@@ -1,73 +1,73 @@
 #!/bin/bash
-stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
-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 3 ]];
-then
-echo $stest_server
-else
+if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
+    stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
     stest_server=""
-  fi
+    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 [ "$stest_server" = "" ]
-then
-echo "All docker server is busy, stest FAILED"
-exit 1
-fi
+    if [[ ${docker_num} -le 3 ]];
+    then
+    echo $stest_server
+    else
+        stest_server=""
+      fi
 
-change_branch_CMD="sed -i '1c branch_name_in_CI=$TRAVIS_BRANCH' /data/workspace/docker_workspace/do_stest.sh"
+    if [ "$stest_server" = "" ]
+    then
+    echo "All docker server is busy, stest FAILED"
+    exit 1
+    fi
 
-if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
-  echo "Init the docker stest env"
-  echo "'$stest_server' is stest server this time"
-  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` &
-  sleep 300 && echo $TRAVIS_BRANCH &
-  wait
-  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 Retry stest task"
-    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` &
-    sleep 300 && echo $TRAVIS_BRANCH &
-    wait
-  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 Retry stest task"
+    change_branch_CMD="sed -i '1c branch_name_in_CI=$TRAVIS_BRANCH' /data/workspace/docker_workspace/do_stest.sh"
+
+    echo "Init the docker stest env"
+    echo "'$stest_server' is stest server this time"
     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` &
     sleep 300 && echo $TRAVIS_BRANCH &
     wait
-  fi
-  echo "stest start"
-  cat $stestlogname | grep "Stest result is:" -A 10000
-  echo "stest end"
+    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 Retry stest task"
+      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` &
+      sleep 300 && echo $TRAVIS_BRANCH &
+      wait
+    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 Retry stest task"
+      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` &
+      sleep 300 && echo $TRAVIS_BRANCH &
+      wait
+    fi
+    echo "stest start"
+    cat $stestlogname | grep "Stest result is:" -A 10000
+    echo "stest end"
 
-  echo $?
-  ret=$(cat $stestlogname | grep "stest FAILED" | wc -l)
+    echo $?
+    ret=$(cat $stestlogname | grep "stest FAILED" | wc -l)
 
-  if [ $ret != 0 ];then
-    echo $ret
-    rm -f $stestlogname
-    exit 1
-  fi
+    if [ $ret != 0 ];then
+      echo $ret
+      rm -f $stestlogname
+      exit 1
+    fi
 fi
 echo "bye bye"
 echo $stest_server
 rm -f $stestlogname
-exit 0
+exit 0

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

@@ -18,7 +18,6 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.BlockStore;
 import org.tron.core.db.Manager;
-import org.tron.core.net.node.Node;
 
 public interface Application {
 
@@ -36,8 +35,6 @@ public interface Application {
 
   void shutdownServices();
 
-  Node getP2pNode();
-
   BlockStore getBlockStoreS();
 
   void addService(Service service);

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

@@ -7,33 +7,23 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.BlockStore;
 import org.tron.core.db.Manager;
-import org.tron.core.net.node.Node;
-import org.tron.core.net.node.NodeDelegate;
-import org.tron.core.net.node.NodeDelegateImpl;
-import org.tron.core.net.node.NodeImpl;
+import org.tron.core.net.TronNetService;
 
 @Slf4j(topic = "app")
 @Component
 public class ApplicationImpl implements Application {
 
-  @Autowired
-  private NodeImpl p2pNode;
-
   private BlockStore blockStoreDb;
   private ServiceContainer services;
-  private NodeDelegate nodeDelegate;
+
+  @Autowired
+  private TronNetService tronNetService;
 
   @Autowired
   private Manager dbManager;
 
   private boolean isProducer;
 
-
-  private void resetP2PNode() {
-    p2pNode.listen();
-    p2pNode.syncFrom(null);
-  }
-
   @Override
   public void setOptions(Args args) {
     // not used
@@ -44,7 +34,6 @@ public void setOptions(Args args) {
   public void init(Args args) {
     blockStoreDb = dbManager.getBlockStore();
     services = new ServiceContainer();
-    nodeDelegate = new NodeDelegateImpl(dbManager);
   }
 
   @Override
@@ -61,18 +50,17 @@ public void initServices(Args args) {
    * start up the app.
    */
   public void startup() {
-    p2pNode.setNodeDelegate(nodeDelegate);
-    resetP2PNode();
+    tronNetService.start();
   }
 
   @Override
   public void shutdown() {
     logger.info("******** begin to shutdown ********");
+    tronNetService.close();
     synchronized (dbManager.getRevokingStore()) {
       closeRevokingStore();
       closeAllStore();
     }
-    closeConnection();
     dbManager.stopRepushThread();
     dbManager.stopRepushTriggerThread();
     EventPluginLoader.getInstance().stopPlugin();
@@ -89,11 +77,6 @@ public void shutdownServices() {
     services.stop();
   }
 
-  @Override
-  public Node getP2pNode() {
-    return p2pNode;
-  }
-
   @Override
   public BlockStore getBlockStoreS() {
     return blockStoreDb;
@@ -112,18 +95,8 @@ public void setIsProducer(boolean producer) {
     isProducer = producer;
   }
 
-  private void closeConnection() {
-    logger.info("******** begin to shutdown connection ********");
-    try {
-      p2pNode.close();
-    } catch (Exception e) {
-      logger.info("failed to close p2pNode. " + e);
-    } finally {
-      logger.info("******** end to shutdown connection ********");
-    }
-  }
-
   private void closeRevokingStore() {
+    logger.info("******** begin to closeRevokingStore ********");
     dbManager.getRevokingStore().shutdown();
   }
 

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

@@ -17,7 +17,6 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.BlockStore;
 import org.tron.core.db.Manager;
-import org.tron.core.net.node.Node;
 
 public class CliApplication implements Application {
 
@@ -27,7 +26,7 @@ public void setOptions(Args args) {
   }
 
   @Override
-  public void init( Args args) {
+  public void init(Args args) {
 
   }
 
@@ -56,11 +55,6 @@ public void shutdownServices() {
 
   }
 
-  @Override
-  public Node getP2pNode() {
-    return null;
-  }
-
   @Override
   public BlockStore getBlockStoreS() {
     return null;

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

@@ -21,6 +21,7 @@
 
 @Slf4j(topic = "app")
 public class ServiceContainer {
+
   private ArrayList<Service> services;
 
   public ServiceContainer() {