Skip to content

Commit 074b755

Browse files
committed
rm addTransactionFeeAmount() method
1 parent d1ee0fc commit 074b755

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,8 @@ private void createWitness(final WitnessCreateContract witnessCreateContract)
143143
Commons
144144
.adjustBalance(accountStore, witnessCreateContract.getOwnerAddress().toByteArray(), -cost);
145145
if (dynamicStore.supportTransactionFeePool()) {
146-
dynamicStore.addTransactionFeeAmount(cost);
147146
dynamicStore.addTransactionFeePool(cost);
148147
} else if (dynamicStore.supportRemoveBlackHole()) {
149-
dynamicStore.addTransactionFeeAmount(cost);
150148
dynamicStore.burnTrx(cost);
151149
} else {
152150
Commons.adjustBalance(accountStore, accountStore.getBlackhole(), +cost);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,8 @@ private void payEnergyBill(
196196

197197
if (dynamicPropertiesStore.supportTransactionFeePool() &&
198198
!contractResult.equals(contractResult.OUT_OF_TIME)) {
199-
dynamicPropertiesStore.addTransactionFeeAmount(energyFee);
200199
dynamicPropertiesStore.addTransactionFeePool(energyFee);
201200
} else if (dynamicPropertiesStore.supportRemoveBlackHole()) {
202-
dynamicPropertiesStore.addTransactionFeeAmount(energyFee);
203201
dynamicPropertiesStore.burnTrx(energyFee);
204202
} else {
205203
//send to blackHole

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,8 @@ public void consumeMultiSignFee(TransactionCapsule trx, TransactionTrace trace)
723723
adjustBalance(getAccountStore(), accountCapsule, -fee);
724724

725725
if (getDynamicPropertiesStore().supportTransactionFeePool()) {
726-
getDynamicPropertiesStore().addTransactionFeeAmount(fee);
727726
getDynamicPropertiesStore().addTransactionFeePool(fee);
728727
} else if (getDynamicPropertiesStore().supportRemoveBlackHole()) {
729-
getDynamicPropertiesStore().addTransactionFeeAmount(fee);
730728
getDynamicPropertiesStore().burnTrx(fee);
731729
} else {
732730
adjustBalance(getAccountStore(), this.getAccountStore().getBlackhole(), +fee);
@@ -1176,12 +1174,6 @@ public TransactionInfo processTransaction(final TransactionCapsule trxCap, Block
11761174
TransactionInfoCapsule transactionInfo = TransactionUtil
11771175
.buildTransactionInfoInstance(trxCap, blockCap, trace);
11781176

1179-
if (getDynamicPropertiesStore().supportTransactionFeePool() ||
1180-
getDynamicPropertiesStore().supportRemoveBlackHole()) {
1181-
transactionInfo.setFee(getDynamicPropertiesStore().getTransactionFeeAmount());
1182-
getDynamicPropertiesStore().saveTransactionFeeAmount(0L);
1183-
}
1184-
11851177
// if event subscribe is enabled, post contract triggers to queue
11861178
postContractTrigger(trace, false);
11871179
Contract contract = trxCap.getInstance().getRawData().getContract(0);

0 commit comments

Comments
 (0)