feat(DynamicEnergy): optimize dynamic energy penalty in receipts

Author: daniel-cao-byte

chainbase/src/main/java/org/tron/common/runtime/ProgramResult.java

@@ -16,7 +16,6 @@
 import org.tron.common.logsfilter.trigger.ContractTrigger;
 import org.tron.common.runtime.vm.DataWord;
 import org.tron.common.runtime.vm.LogInfo;
-import org.tron.common.utils.ByteArraySet;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.protos.Protocol.Transaction.Result.contractResult;
 
@@ -29,7 +28,7 @@ public class ProgramResult {
   private long energyPenalty = 0;
 
   @Getter
-  private long energyOrigin = 0;
+  private long energyPenaltyTotal = 0;
 
   private byte[] hReturn = EMPTY_BYTE_ARRAY;
   private byte[] contractAddress = EMPTY_BYTE_ARRAY;
@@ -68,12 +67,11 @@ public static ProgramResult createEmpty() {
 
   public void spendEnergy(long energy) {
     energyUsed += energy;
-    energyOrigin += energy;
   }
 
   public void spendEnergyWithPenalty(long origin, long penalty) {
-    energyOrigin += origin;
     energyPenalty += penalty;
+    energyPenaltyTotal += penalty;
     energyUsed += origin + penalty;
   }
 
@@ -89,6 +87,10 @@ public void refundEnergy(long energy) {
     energyUsed -= energy;
   }
 
+  public void addTotalPenalty(long penalty) {
+    energyPenaltyTotal += penalty;
+  }
+
   public byte[] getContractAddress() {
     return Arrays.copyOf(contractAddress, contractAddress.length);
   }
@@ -243,6 +245,7 @@ public void merge(ProgramResult another) {
     if (another.getException() == null && !another.isRevert()) {
       addDeleteAccounts(another.getDeleteAccounts());
       addLogInfos(another.getLogInfoList());
+      addTotalPenalty(another.getEnergyPenaltyTotal());
       //addFutureRefund(another.getFutureRefund());
       //addTouchAccounts(another.getTouchedAccounts());
     }

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

@@ -129,6 +129,14 @@ public void setEnergyUsageTotal(long energyUsage) {
     this.receipt = this.receipt.toBuilder().setEnergyUsageTotal(energyUsage).build();
   }
 
+  public long getEnergyPenaltyTotal() {
+    return this.receipt.getEnergyPenaltyTotal();
+  }
+
+  public void setEnergyPenaltyTotal(long penalty) {
+    this.receipt = this.receipt.toBuilder().setEnergyPenaltyTotal(penalty).build();
+  }
+
   public long getNetUsage() {
     return this.receipt.getNetUsage();
   }

chainbase/src/main/java/org/tron/core/db/TransactionTrace.java

@@ -158,6 +158,13 @@ public void setBill(long energyUsage) {
     receipt.setEnergyUsageTotal(energyUsage);
   }
 
+  public void setPenalty(long energyPenalty) {
+    if (energyPenalty < 0) {
+      energyPenalty = 0L;
+    }
+    receipt.setEnergyPenaltyTotal(energyPenalty);
+  }
+
   //set net bill
   public void setNetBill(long netUsage, long netFee) {
     receipt.setNetUsage(netUsage);
@@ -179,6 +186,7 @@ public void exec()
     /*  VM execute  */
     runtime.execute(transactionContext);
     setBill(transactionContext.getProgramResult().getEnergyUsed());
+    setPenalty(transactionContext.getProgramResult().getEnergyPenaltyTotal());
 
 //    if (TrxType.TRX_PRECOMPILED_TYPE != trxType) {
 //      if (contractResult.OUT_OF_TIME

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

@@ -2960,8 +2960,7 @@ public Transaction callConstantContract(TransactionCapsule trxCap,
 
     TransactionResultCapsule ret = new TransactionResultCapsule();
     builder.setEnergyUsed(result.getEnergyUsed());
-    builder.setEnergyOrigin(result.getEnergyOrigin());
-    builder.setEnergyPenalty(result.getEnergyPenalty());
+    builder.setEnergyPenalty(result.getEnergyPenaltyTotal());
     builder.addConstantResult(ByteString.copyFrom(result.getHReturn()));
     result.getLogInfoList().forEach(logInfo ->
         builder.addLogs(LogInfo.buildLog(logInfo)));

protocol/src/main/protos/api/api.proto

@@ -1311,8 +1311,7 @@ message TransactionExtention {
   int64 energy_used = 5;
   repeated TransactionInfo.Log logs = 6;
   repeated InternalTransaction internal_transactions = 7;
-  int64 energy_origin = 8;
-  int64 energy_penalty = 9;
+  int64 energy_penalty = 8;
 }
 
 message EstimateEnergyMessage {

protocol/src/main/protos/core/Tron.proto

@@ -321,6 +321,7 @@ message ResourceReceipt {
   int64 net_usage = 5;
   int64 net_fee = 6;
   Transaction.Result.contractResult result = 7;
+  int64 energy_penalty_total = 8;
 }
 
 message MarketOrderDetail {