Merge pull request #899 from tronprotocol/feature/fix_transaction_fee

fix transaction fee bug

Author: nanfengpo

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

@@ -124,10 +124,9 @@ public void consumeBandwidth(TransactionCapsule trx)
 
   private boolean consumeFee(AccountCapsule accountCapsule, long fee) {
     try {
-      dbManager.adjustBalance(accountCapsule.getAddress().toByteArray(), -fee);
       long latestOperationTime = dbManager.getHeadBlockTimeStamp();
       accountCapsule.setLatestOperationTime(latestOperationTime);
-      dbManager.getAccountStore().put(accountCapsule.createDbKey(), accountCapsule);
+      dbManager.adjustBalance(accountCapsule.createDbKey(), -fee);
       return true;
     } catch (BalanceInsufficientException e) {
       return false;

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

@@ -380,24 +380,31 @@ public AccountStore getAccountStore() {
     return this.accountStore;
   }
 
+  public void adjustBalance(byte[] accountAddress, long amount)
+      throws BalanceInsufficientException {
+    AccountCapsule account = getAccountStore().get(accountAddress);
+    adjustBalance(account, amount);
+  }
+
   /**
    * judge balance.
    */
-  public void adjustBalance(byte[] accountAddress, long amount)
+  public void adjustBalance(AccountCapsule account, long amount)
       throws BalanceInsufficientException {
-    AccountCapsule account = getAccountStore().get(accountAddress);
+
     long balance = account.getBalance();
     if (amount == 0) {
       return;
     }
 
     if (amount < 0 && balance < -amount) {
-      throw new BalanceInsufficientException(accountAddress + " Insufficient");
+      throw new BalanceInsufficientException(account.createDbKey() + " Insufficient");
     }
     account.setBalance(Math.addExact(balance, amount));
     this.getAccountStore().put(account.getAddress().toByteArray(), account);
   }
 
+
   public void adjustAllowance(byte[] accountAddress, long amount)
       throws BalanceInsufficientException {
     AccountCapsule account = getAccountStore().get(accountAddress);