Merge pull request #3613 from tronprotocol/remove-blackhole-account

sean-liu55 · web-flow · commit 2d4a7f9c0812 · 2021-01-12T14:20:59.000+08:00
add packing fee
diff --git a/actuator/src/main/java/org/tron/core/actuator/AccountPermissionUpdateActuator.java b/actuator/src/main/java/org/tron/core/actuator/AccountPermissionUpdateActuator.java
@@ -53,9 +53,7 @@ public boolean execute(Object object) throws ContractExeException {
       accountStore.put(ownerAddress, account);
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      if (chainBaseManager.getDynamicPropertiesStore().supportTransactionFeePool()) {
-        chainBaseManager.getDynamicPropertiesStore().addTransactionFeePool(fee);
-      } else if (chainBaseManager.getDynamicPropertiesStore().supportOptimizeBlackHole()) {
+      if (chainBaseManager.getDynamicPropertiesStore().supportOptimizeBlackHole()) {
         chainBaseManager.getDynamicPropertiesStore().burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/AssetIssueActuator.java b/actuator/src/main/java/org/tron/core/actuator/AssetIssueActuator.java
@@ -85,9 +85,7 @@ public boolean execute(Object result) throws ContractExeException {
       }
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);//send to blackhole
diff --git a/actuator/src/main/java/org/tron/core/actuator/CreateAccountActuator.java b/actuator/src/main/java/org/tron/core/actuator/CreateAccountActuator.java
@@ -51,9 +51,7 @@ public boolean execute(Object result)
       Commons
           .adjustBalance(accountStore, accountCreateContract.getOwnerAddress().toByteArray(), -fee);
       // Add to blackhole address
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java
@@ -118,9 +118,7 @@ public boolean execute(Object object) throws ContractExeException {
 
       accountStore.put(accountCapsule.createDbKey(), accountCapsule);
       dynamicStore.saveLatestExchangeNum(id);
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java
@@ -97,9 +97,7 @@ public boolean execute(Object object) throws ContractExeException {
 
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java
@@ -126,9 +126,7 @@ public boolean execute(Object object) throws ContractExeException {
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
       // add to blackhole address
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/TransferActuator.java b/actuator/src/main/java/org/tron/core/actuator/TransferActuator.java
@@ -57,9 +57,7 @@ public boolean execute(Object object) throws ContractExeException {
       }
 
       Commons.adjustBalance(accountStore, ownerAddress, -(Math.addExact(fee, amount)));
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/TransferAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/TransferAssetActuator.java
@@ -85,9 +85,7 @@ public boolean execute(Object result) throws ContractExeException {
       accountStore.put(toAddress, toAccountCapsule);
 
       Commons.adjustBalance(accountStore, ownerAccountCapsule, -fee);
-      if (dynamicStore.supportTransactionFeePool()) {
-        dynamicStore.addTransactionFeePool(fee);
-      } else  if (dynamicStore.supportOptimizeBlackHole()) {
+      if (dynamicStore.supportOptimizeBlackHole()) {
         dynamicStore.burnTrx(fee);
       } else {
         Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
diff --git a/actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java
@@ -142,9 +142,7 @@ private void createWitness(final WitnessCreateContract witnessCreateContract)
     long cost = dynamicStore.getAccountUpgradeCost();
     Commons
         .adjustBalance(accountStore, witnessCreateContract.getOwnerAddress().toByteArray(), -cost);
-    if (dynamicStore.supportTransactionFeePool()) {
-      dynamicStore.addTransactionFeePool(cost);
-    } else if (dynamicStore.supportOptimizeBlackHole()) {
+    if (dynamicStore.supportOptimizeBlackHole()) {
       dynamicStore.burnTrx(cost);
     } else {
       Commons.adjustBalance(accountStore, accountStore.getBlackhole(), +cost);
diff --git a/chainbase/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/TransactionInfoCapsule.java
@@ -34,8 +34,8 @@ public TransactionInfoCapsule() {
   }
 
 
-  public long getPunishment() {
-    return transactionInfo.getPunishment();
+  public long getPackingFee() {
+    return transactionInfo.getPackingFee();
   }
 
   public long getFee() {
diff --git a/chainbase/src/main/java/org/tron/core/capsule/utils/TransactionUtil.java b/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;
@@ -77,16 +76,17 @@ public static TransactionInfoCapsule buildTransactionInfoInstance(TransactionCap
         programResult.getRet().getFee() + traceReceipt.getEnergyFee()
             + traceReceipt.getNetFee() + traceReceipt.getMultiSignFee();
 
-    boolean supportPunishmentAmount = trace.getTransactionContext().getStoreFactory()
-        .getChainBaseManager().getDynamicPropertiesStore().supportPunishmentAmount();
-    if (supportPunishmentAmount) {
-      long punishment = 0L;
-      if (traceReceipt.getResult().equals(Transaction.Result.contractResult.OUT_OF_TIME)) {
-        fee = programResult.getRet().getFee() + traceReceipt.getNetFee() +
-            traceReceipt.getMultiSignFee();
-        punishment += traceReceipt.getEnergyFee();
+    boolean supportTransactionFeePool = trace.getTransactionContext().getStoreFactory()
+        .getChainBaseManager().getDynamicPropertiesStore().supportTransactionFeePool();
+    if (supportTransactionFeePool) {
+      long packingFee = 0L;
+      if (trace.isNetFeeForBandwidth()) {
+        packingFee += traceReceipt.getNetFee();
       }
-      builder.setPunishment(punishment);
+      if (!traceReceipt.getResult().equals(Transaction.Result.contractResult.OUT_OF_TIME)) {
+        packingFee += traceReceipt.getEnergyFee();
+      }
+      builder.setPackingFee(packingFee);
     }
 
     ByteString contractResult = ByteString.copyFrom(programResult.getHReturn());
diff --git a/chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java b/chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java
@@ -67,7 +67,7 @@ private long getUsage(long usage, long windowSize) {
     return usage * windowSize / precision;
   }
 
-  protected boolean consumeFee(AccountCapsule accountCapsule, long fee) {
+  protected boolean consumeFeeForBandwidth(AccountCapsule accountCapsule, long fee) {
     try {
       long latestOperationTime = dynamicPropertiesStore.getLatestBlockHeaderTimestamp();
       accountCapsule.setLatestOperationTime(latestOperationTime);
@@ -85,4 +85,22 @@ protected boolean consumeFee(AccountCapsule accountCapsule, long fee) {
       return false;
     }
   }
+
+
+  protected boolean consumeFeeForNewAccount(AccountCapsule accountCapsule, long fee) {
+    try {
+      long latestOperationTime = dynamicPropertiesStore.getLatestBlockHeaderTimestamp();
+      accountCapsule.setLatestOperationTime(latestOperationTime);
+      Commons.adjustBalance(accountStore, accountCapsule, -fee);
+      if (dynamicPropertiesStore.supportOptimizeBlackHole()) {
+        dynamicPropertiesStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), +fee);
+      }
+
+      return true;
+    } catch (BalanceInsufficientException e) {
+      return false;
+    }
+  }
 }
diff --git a/chainbase/src/main/java/org/tron/core/db/TransactionTrace.java b/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);
   }
diff --git a/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java b/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java
@@ -2151,10 +2151,6 @@ private void saveBurnTrx(long amount) {
     this.put(BURN_TRX_AMOUNT, new BytesCapsule(ByteArray.fromLong(amount)));
   }
 
-  public boolean supportPunishmentAmount() {
-    return supportOptimizeBlackHole() || supportTransactionFeePool();
-  }
-
   public boolean supportOptimizeBlackHole() {
     return getAllowOptimizeBlackHole() == 1L;
   }
diff --git a/framework/src/main/java/org/tron/core/db/BandwidthProcessor.java b/framework/src/main/java/org/tron/core/db/BandwidthProcessor.java
@@ -130,7 +130,7 @@ public void consume(TransactionCapsule trx, TransactionTrace trace)
   private boolean useTransactionFee(AccountCapsule accountCapsule, long bytes,
       TransactionTrace trace) {
     long fee = chainBaseManager.getDynamicPropertiesStore().getTransactionFee() * bytes;
-    if (consumeFee(accountCapsule, fee)) {
+    if (consumeFeeForBandwidth(accountCapsule, fee)) {
       trace.setNetBill(0, fee);
       chainBaseManager.getDynamicPropertiesStore().addTotalTransactionCost(fee);
       return true;
@@ -181,8 +181,8 @@ public boolean consumeBandwidthForCreateNewAccount(AccountCapsule accountCapsule
   public boolean consumeFeeForCreateNewAccount(AccountCapsule accountCapsule,
       TransactionTrace trace) {
     long fee = chainBaseManager.getDynamicPropertiesStore().getCreateAccountFee();
-    if (consumeFee(accountCapsule, fee)) {
-      trace.setNetBill(0, fee);
+    if (consumeFeeForNewAccount(accountCapsule, fee)) {
+      trace.setNetBillForCreateNewAccount(0, fee);
       chainBaseManager.getDynamicPropertiesStore().addTotalCreateAccountCost(fee);
       return true;
     } else {
diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -719,9 +719,7 @@ public void consumeMultiSignFee(TransactionCapsule trx, TransactionTrace trace)
           if (accountCapsule != null) {
             adjustBalance(getAccountStore(), accountCapsule, -fee);
 
-            if (getDynamicPropertiesStore().supportTransactionFeePool()) {
-              getDynamicPropertiesStore().addTransactionFeePool(fee);
-            } else if (getDynamicPropertiesStore().supportOptimizeBlackHole()) {
+            if (getDynamicPropertiesStore().supportOptimizeBlackHole()) {
               getDynamicPropertiesStore().burnTrx(fee);
             } else {
               adjustBalance(getAccountStore(), this.getAccountStore().getBlackhole(), +fee);
diff --git a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java
@@ -395,22 +395,31 @@ public void timeOutFeeTest()
     TransactionTrace traceSuccess = TvmTestUtils
         .processTransactionAndReturnTrace(trx1, deposit, null);
 
-    traceSuccess.getReceipt().setResult(contractResult.OUT_OF_TIME);
     Assert.assertEquals(traceSuccess.getReceipt().getEnergyFee(), 12705900L);
 
     TransactionInfoCapsule trxInfoCapsule =
         buildTransactionInfoInstance(new TransactionCapsule(trx1), null, traceSuccess);
     Assert.assertEquals(trxInfoCapsule.getFee(), 12705900L);
-    Assert.assertEquals(trxInfoCapsule.getPunishment(), 0L);
+    Assert.assertEquals(trxInfoCapsule.getPackingFee(), 0L);
 
     DynamicPropertiesStore dynamicPropertiesStore = traceSuccess.getTransactionContext()
         .getStoreFactory().getChainBaseManager().getDynamicPropertiesStore();
-    dynamicPropertiesStore.saveAllowOptimizeBlackHole(1L);
+    dynamicPropertiesStore.saveAllowTransactionFeePool(1L);
 
     trxInfoCapsule =
         buildTransactionInfoInstance(new TransactionCapsule(trx1), null, traceSuccess);
-    Assert.assertEquals(trxInfoCapsule.getFee(), 0L);
-    Assert.assertEquals(trxInfoCapsule.getPunishment(), 12705900L);
+    Assert.assertEquals(trxInfoCapsule.getFee(), 12705900L);
+    Assert.assertEquals(trxInfoCapsule.getPackingFee(), 12705900L);
+
+
+    traceSuccess.getReceipt().setResult(contractResult.OUT_OF_TIME);
+
+    trxInfoCapsule =
+        buildTransactionInfoInstance(new TransactionCapsule(trx1), null, traceSuccess);
+    Assert.assertEquals(trxInfoCapsule.getFee(), 12705900L);
+    Assert.assertEquals(trxInfoCapsule.getPackingFee(), 0L);
+
+
   }
 
   private byte[] deployC(String contractName)
diff --git a/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java b/framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java
diff --git a/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java b/framework/src/test/java/stest/tron/wallet/dailybuild/account/TransactionFee001.java
diff --git a/protocol/src/main/protos/core/Tron.proto b/protocol/src/main/protos/core/Tron.proto

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public TransactionInfoCapsule() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
`37`		`- public long getPunishment() {`
`38`		`- return transactionInfo.getPunishment();`
	`37`	`+ public long getPackingFee() {`
	`38`	`+ return transactionInfo.getPackingFee();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public long getFee() {`