Merge pull request #1352 from tronprotocol/createaccount_add_fee_to_blackhole

Include AccountCreateContract fees in the black hole account

Author: sean-liu55

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

@@ -28,12 +28,14 @@ public boolean execute(TransactionResultCapsule ret)
     long fee = calcFee();
     try {
       AccountCreateContract accountCreateContract = contract.unpack(AccountCreateContract.class);
-      AccountCapsule accountCapsule = new AccountCapsule(accountCreateContract,
-          dbManager.getHeadBlockTimeStamp());
-      dbManager.getAccountStore()
-          .put(accountCreateContract.getAccountAddress().toByteArray(), accountCapsule);
+      AccountCapsule accountCapsule = new AccountCapsule(accountCreateContract, dbManager.getHeadBlockTimeStamp());
+
+      dbManager.getAccountStore().put(accountCreateContract.getAccountAddress().toByteArray(), accountCapsule);
 
       dbManager.adjustBalance(accountCreateContract.getOwnerAddress().toByteArray(), -fee);
+      // Add to blackhole address
+      dbManager.adjustBalance(dbManager.getAccountStore().getBlackhole().createDbKey(), fee);
+
       ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException e) {
       logger.debug(e.getMessage(), e);

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

@@ -11,6 +11,7 @@
 import org.tron.core.capsule.ExchangeCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.db.Manager;
+import org.tron.core.exception.BalanceInsufficientException;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.protos.Contract.ExchangeCreateContract;
@@ -37,7 +38,7 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       long firstTokenBalance = exchangeCreateContract.getFirstTokenBalance();
       long secondTokenBalance = exchangeCreateContract.getSecondTokenBalance();
 
-      long newBalance = accountCapsule.getBalance() - calcFee();
+      long newBalance = accountCapsule.getBalance() - fee;
 
       accountCapsule.setBalance(newBalance);
 
@@ -70,7 +71,13 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       dbManager.getExchangeStore().put(exchangeCapsule.createDbKey(), exchangeCapsule);
       dbManager.getDynamicPropertiesStore().saveLatestExchangeNum(id);
 
+      dbManager.adjustBalance(dbManager.getAccountStore().getBlackhole().createDbKey(), fee);
+
       ret.setStatus(fee, code.SUCESS);
+    } catch (BalanceInsufficientException e) {
+      logger.debug(e.getMessage(), e);
+      ret.setStatus(fee, code.FAILED);
+      throw new ContractExeException(e.getMessage());
     } catch (InvalidProtocolBufferException e) {
       logger.debug(e.getMessage(), e);
       ret.setStatus(fee, code.FAILED);

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

@@ -44,6 +44,7 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
         fee = fee + dbManager.getDynamicPropertiesStore().getCreateNewAccountFeeInSystemContract();
       }
       dbManager.adjustBalance(ownerAddress, -fee);
+      dbManager.adjustBalance(dbManager.getAccountStore().getBlackhole().createDbKey(), fee);
       ret.setStatus(fee, code.SUCESS);
       dbManager.adjustBalance(ownerAddress, -amount);
       dbManager.adjustBalance(toAddress, amount);

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

@@ -62,6 +62,7 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
       long amount = transferAssetContract.getAmount();
 
       dbManager.adjustBalance(ownerAddress, -fee);
+      dbManager.adjustBalance(dbManager.getAccountStore().getBlackhole().createDbKey(), fee);
 
       AccountCapsule ownerAccountCapsule = accountStore.get(ownerAddress);
       if (!ownerAccountCapsule.reduceAssetAmount(assetName.toByteArray(), amount)) {