Merge pull request #5181 from halibobo1205/feat/merge_master

merge master to release_v4.7.2

Author: halibobo1205

chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java

@@ -192,6 +192,12 @@ public void payEnergyBill(DynamicPropertiesStore dynamicPropertiesStore,
       AccountCapsule caller,
       long percent, long originEnergyLimit, EnergyProcessor energyProcessor, long now)
       throws BalanceInsufficientException {
+
+    // Reset origin energy usage here! Because after stake 2.0, this field are reused for
+    // recording pre-merge frozen energy for origin account. If total energy usage is zero, this
+    // field will be a dirty record.
+    this.setOriginEnergyUsage(0);
+
     if (receipt.getEnergyUsageTotal() <= 0) {
       return;
     }

chainbase/src/main/java/org/tron/core/store/TransactionRetStore.java

@@ -14,6 +14,7 @@
 import org.tron.core.db.TransactionStore;
 import org.tron.core.db.TronStoreWithRevoking;
 import org.tron.core.exception.BadItemException;
+import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.TransactionInfo;
 
 @Slf4j(topic = "DB")
@@ -54,6 +55,17 @@ public TransactionInfoCapsule getTransactionInfo(byte[] key) throws BadItemExcep
     ByteString id = ByteString.copyFrom(key);
     for (TransactionInfo transactionResultInfo : result.getInstance().getTransactioninfoList()) {
       if (transactionResultInfo.getId().equals(id)) {
+        Protocol.ResourceReceipt receipt = transactionResultInfo.getReceipt();
+        // If query a result with dirty origin usage in receipt, we just reset it.
+        if (receipt.getEnergyUsageTotal() == 0 && receipt.getOriginEnergyUsage() > 0) {
+          transactionResultInfo =
+              transactionResultInfo.toBuilder()
+                  .setReceipt(
+                      receipt.toBuilder()
+                          .clearOriginEnergyUsage()
+                          .build())
+                  .build();
+        }
         return new TransactionInfoCapsule(transactionResultInfo);
       }
     }

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -298,7 +298,7 @@ private void callContract(TriggerSmartContract request,
       retBuilder.setResult(false).setCode(response_code.CONTRACT_EXE_ERROR)
           .setMessage(ByteString.copyFromUtf8(e.getClass() + " : " + e.getMessage()));
       trxExtBuilder.setResult(retBuilder);
-      logger.warn("When run constant call in VM, failed for reason: " + e.getMessage());
+      logger.warn("When run constant call in VM, have RuntimeException: " + e.getMessage());
     } catch (Exception e) {
       retBuilder.setResult(false).setCode(response_code.OTHER_ERROR)
           .setMessage(ByteString.copyFromUtf8(e.getClass() + " : " + e.getMessage()));
@@ -1886,7 +1886,7 @@ private void callContract(TriggerSmartContract request,
         retBuilder.setResult(false).setCode(response_code.CONTRACT_EXE_ERROR)
             .setMessage(ByteString.copyFromUtf8(e.getClass() + " : " + e.getMessage()));
         trxExtBuilder.setResult(retBuilder);
-        logger.warn("When run constant call in VM, failed for reason: " + e.getMessage());
+        logger.warn("When run constant call in VM, have Runtime Exception: " + e.getMessage());
       } catch (Exception e) {
         retBuilder.setResult(false).setCode(response_code.OTHER_ERROR)
             .setMessage(ByteString.copyFromUtf8(e.getClass() + " : " + e.getMessage()));

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

@@ -2,8 +2,8 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.7.0.1-75-g36fc5063e9";
-  public static final String VERSION_CODE = "17673";
+  public static final String VERSION_NAME = "GreatVoyage-v4.7.1-11-ge5e347de7";
+  public static final String VERSION_CODE = "17686";
   private static final String VERSION = "4.7.2";
 
   public static String getVersion() {