Merge pull request #3802 from tronprotocol/release_4.2.1

Release 4.2.1

Author: tomatoishealthy

chainbase/build.gradle

@@ -40,7 +40,7 @@ dependencies {
     compile group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
     compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.5'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10.3'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.5'
     compile project(":protocol")
     compile project(":common")

common/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     compile "com.madgag.spongycastle:core:1.58.0.0"
     compile "com.madgag.spongycastle:prov:1.58.0.0"
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.5'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10.3'
     compile "com.cedarsoftware:java-util:1.8.0"
     compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.11'

framework/build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
     compile group: 'com.google.inject', name: 'guice', version: '4.1.0'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.5'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10.3'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.5'
 
     compile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.2'
@@ -75,7 +75,7 @@ dependencies {
     // http
     compile 'org.eclipse.jetty:jetty-server:9.4.11.v20180605'
     compile 'org.eclipse.jetty:jetty-servlet:9.4.11.v20180605'
-    compile 'com.alibaba:fastjson:1.2.60'
+    compile 'com.alibaba:fastjson:1.2.70'
     compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
     // end http
 

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

@@ -1320,17 +1320,17 @@ public TransactionInfo getTransactionInfoById(ByteString transactionId) {
     }
     TransactionInfoCapsule transactionInfoCapsule;
     try {
-      transactionInfoCapsule = chainBaseManager.getTransactionHistoryStore()
-          .get(transactionId.toByteArray());
+      transactionInfoCapsule = chainBaseManager.getTransactionRetStore()
+              .getTransactionInfo(transactionId.toByteArray());
     } catch (StoreException e) {
       return null;
     }
     if (transactionInfoCapsule != null) {
       return transactionInfoCapsule.getInstance();
     }
     try {
-      transactionInfoCapsule = chainBaseManager.getTransactionRetStore()
-          .getTransactionInfo(transactionId.toByteArray());
+      transactionInfoCapsule = chainBaseManager.getTransactionHistoryStore()
+              .get(transactionId.toByteArray());
     } catch (BadItemException e) {
       return null;
     }

framework/src/main/java/org/tron/core/db/Manager.java

@@ -1197,6 +1197,7 @@ public TransactionInfo processTransaction(final TransactionCapsule trxCap, Block
     }
     //set the sort order
     trxCap.setOrder(transactionInfo.getFee());
+    trxCap.setTrxTrace(null);
     return transactionInfo.getInstance();
   }
 

framework/src/main/java/org/tron/core/net/messagehandler/FetchInvDataMsgHandler.java

@@ -146,8 +146,6 @@ private void check(PeerConnection peer, FetchInvDataMessage fetchInvDataMsg) thr
       int maxCount = advService.getTrxCount().getCount(60);
       if (fetchCount > maxCount) {
         logger.error("maxCount: " + maxCount + ", fetchCount: " + fetchCount);
-        //        throw new P2pException(TypeEnum.BAD_MESSAGE,
-        //            "maxCount: " + maxCount + ", fetchCount: " + fetchCount);
       }
     } else {
       boolean isAdv = true;
@@ -165,9 +163,6 @@ private void check(PeerConnection peer, FetchInvDataMessage fetchInvDataMsg) thr
         if (outBlockCountIn1min > producedBlockIn2min) {
           logger.error("producedBlockIn2min: " + producedBlockIn2min + ", outBlockCountIn1min: "
               + outBlockCountIn1min);
-          //throw new P2pException(TypeEnum.BAD_MESSAGE, "producedBlockIn2min: "
-          // + producedBlockIn2min
-          //  + ", outBlockCountIn1min: " + outBlockCountIn1min);
         }
       } else {
         if (!peer.isNeedSyncFromUs()) {

framework/src/main/java/org/tron/core/net/messagehandler/TransactionsMsgHandler.java

@@ -37,7 +37,6 @@ public class TransactionsMsgHandler implements TronMsgHandler {
   @Autowired
   private AdvService advService;
 
-  //  private static int TIME_OUT = 10 * 60 * 1000;
   private BlockingQueue<TrxEvent> smartContractQueue = new LinkedBlockingQueue(MAX_TRX_SIZE);
 
   private BlockingQueue<Runnable> queue = new LinkedBlockingQueue();

framework/src/main/java/org/tron/core/net/peer/PeerStatusCheck.java

@@ -27,7 +27,7 @@ public void init() {
       try {
         statusCheck();
       } catch (Exception e) {
-        logger.error("Unhandled exception", e);
+        logger.error("", e);
       }
     }, 5, 2, TimeUnit.SECONDS);
   }

framework/src/main/java/org/tron/core/net/service/AdvService.java

@@ -83,15 +83,15 @@ public void init() {
       try {
         consumerInvToSpread();
       } catch (Exception exception) {
-        logger.error("Spread thread error.", exception.getMessage());
+        logger.error("Spread thread error. {}", exception.getMessage());
       }
     }, 100, 30, TimeUnit.MILLISECONDS);
 
     fetchExecutor.scheduleWithFixedDelay(() -> {
       try {
         consumerInvToFetch();
       } catch (Exception exception) {
-        logger.error("Fetch thread error.", exception.getMessage());
+        logger.error("Fetch thread error. {}", exception.getMessage());
       }
     }, 100, 30, TimeUnit.MILLISECONDS);
   }

framework/src/main/java/org/tron/program/Version.java

@@ -4,7 +4,7 @@ public class Version {
 
   public static final String VERSION_NAME = "GreatVoyage-v4.1.3-199-gc433410f8";
   public static final String VERSION_CODE = "15510";
-  private static final String VERSION = "4.2.0";
+  private static final String VERSION = "4.2.1";
 
   public static String getVersion() {
     return VERSION;