Merge pull request tronprotocol#4387 from tronprotocol/feature/generate_block_optimization

feature(block ): Optimize pack transaction into block.

Author: halibobo1205

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

@@ -1310,23 +1310,23 @@ public TransactionInfo processTransaction(final TransactionCapsule trxCap, Block
 
     if (Objects.nonNull(blockCap)) {
       trace.setResult();
+      if (trace.checkNeedRetry()) {
+        String txId = Hex.toHexString(trxCap.getTransactionId().getBytes());
+        logger.info("Retry for tx id: {}", txId);
+        trace.init(blockCap, eventPluginLoaded);
+        trace.checkIsConstant();
+        trace.exec();
+        trace.setResult();
+        logger.info("Retry result when push:{}, for tx id: {}, tx resultCode in receipt: {}",
+            blockCap.hasWitnessSignature(), txId, trace.getReceipt().getResult());
+      }
       if (blockCap.hasWitnessSignature()) {
-        if (trace.checkNeedRetry()) {
-          String txId = Hex.toHexString(trxCap.getTransactionId().getBytes());
-          logger.info("Retry for tx id: {}", txId);
-          trace.init(blockCap, eventPluginLoaded);
-          trace.checkIsConstant();
-          trace.exec();
-          trace.setResult();
-          logger.info("Retry result for tx id: {}, tx resultCode in receipt: {}",
-              txId, trace.getReceipt().getResult());
-        }
         trace.check();
       }
     }
 
     trace.finalization();
-    if (Objects.nonNull(blockCap) && getDynamicPropertiesStore().supportVM()) {
+    if (getDynamicPropertiesStore().supportVM()) {
       trxCap.setResult(trace.getTransactionContext());
     }
     chainBaseManager.getTransactionStore().put(trxCap.getTransactionId().getBytes(), trxCap);