rm creating account fee from packingFee

Author: sean-liu55

chainbase/src/main/java/org/tron/core/capsule/utils/TransactionUtil.java

@@ -32,7 +32,6 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.core.capsule.TransactionInfoCapsule;
 import org.tron.core.db.TransactionTrace;
-import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.Transaction.Contract;
@@ -80,7 +79,10 @@ public static TransactionInfoCapsule buildTransactionInfoInstance(TransactionCap
     boolean supportTransactionFeePool = trace.getTransactionContext().getStoreFactory()
         .getChainBaseManager().getDynamicPropertiesStore().supportTransactionFeePool();
     if (supportTransactionFeePool) {
-      long packingFee = traceReceipt.getNetFee();
+      long packingFee = 0L;
+      if (trace.isNetFeeForBandwidth()) {
+        packingFee += traceReceipt.getNetFee();
+      }
       if (!traceReceipt.getResult().equals(Transaction.Result.contractResult.OUT_OF_TIME)) {
         packingFee += traceReceipt.getEnergyFee();
       }

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

@@ -73,6 +73,9 @@ public class TransactionTrace {
   @Getter
   @Setter
   private TimeResultType timeResultType = TimeResultType.NORMAL;
+  @Getter
+  @Setter
+  private boolean netFeeForBandwidth = true;
 
   public TransactionTrace(TransactionCapsule trx, StoreFactory storeFactory,
       Runtime runtime) {
@@ -162,6 +165,12 @@ public void setNetBill(long netUsage, long netFee) {
     receipt.setNetFee(netFee);
   }
 
+  public void setNetBillForCreateNewAccount(long netUsage, long netFee) {
+    receipt.setNetUsage(netUsage);
+    receipt.setNetFee(netFee);
+    setNetFeeForBandwidth(false);
+  }
+
   public void addNetBill(long netFee) {
     receipt.addNetFee(netFee);
   }

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

@@ -182,7 +182,7 @@ public boolean consumeFeeForCreateNewAccount(AccountCapsule accountCapsule,
       TransactionTrace trace) {
     long fee = chainBaseManager.getDynamicPropertiesStore().getCreateAccountFee();
     if (consumeFeeForNewAccount(accountCapsule, fee)) {
-      trace.setNetBill(0, fee);
+      trace.setNetBillForCreateNewAccount(0, fee);
       chainBaseManager.getDynamicPropertiesStore().addTotalCreateAccountCost(fee);
       return true;
     } else {