Merge pull request #3875 from tronprotocol/release_v4.2.2.1

Release v4.2.2.1

Author: zhang0125

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

@@ -717,6 +717,7 @@ public boolean pushTransaction(final TransactionCapsule trx)
 
         try (ISession tmpSession = revokingStore.buildSession()) {
           processTransaction(trx, null);
+          trx.setTrxTrace(null);
           pendingTransactions.add(trx);
           tmpSession.merge();
         }
@@ -1207,7 +1208,6 @@ 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/program/Version.java

@@ -4,7 +4,7 @@ public class Version {
 
   public static final String VERSION_NAME = "GreatVoyage-v4.2.1-62-g0ba5c5c77";
   public static final String VERSION_CODE = "15584";
-  private static final String VERSION = "4.2.2";
+  private static final String VERSION = "4.2.2.1";
 
   public static String getVersion() {
     return VERSION;