Release 4.1.2

Tron protobuf protocol document.md

@@ -1537,6 +1537,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
               Function = 2;
               Event = 3;
               Fallback = 4;
+              Receive = 5;
           }
           ```
 
@@ -1617,6 +1618,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
                      Function = 2;
                      Event = 3;
                      Fallback = 4;
+                     Receive = 5;
                 }
                 message Param {
                     bool indexed = 1;

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

@@ -53,7 +53,11 @@ public boolean execute(Object object) throws ContractExeException {
       accountStore.put(ownerAddress, account);
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      if (chainBaseManager.getDynamicPropertiesStore().supportBlackHoleOptimization()) {
+        chainBaseManager.getDynamicPropertiesStore().burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
 
       result.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | InvalidProtocolBufferException e) {

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

@@ -85,9 +85,11 @@ public boolean execute(Object result) throws ContractExeException {
       }
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().getAddress().toByteArray(),
-          fee);//send to blackhole
-
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);//send to blackhole
+      }
       AccountCapsule accountCapsule = accountStore.get(ownerAddress);
       List<FrozenSupply> frozenSupplyList = assetIssueContract.getFrozenSupplyList();
       Iterator<FrozenSupply> iterator = frozenSupplyList.iterator();

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

@@ -19,6 +19,8 @@
 import org.tron.protos.Protocol.Transaction.Result.code;
 import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
+
 @Slf4j(topic = "actuator")
 public class ClearABIContractActuator extends AbstractActuator {
 
@@ -90,7 +92,7 @@ public boolean validate() throws ContractValidateException {
     if (accountCapsule == null) {
       throw new ContractValidateException(
           ActuatorConstant.ACCOUNT_EXCEPTION_STR
-              + readableOwnerAddress + "] not exists");
+              + readableOwnerAddress + NOT_EXIST_STR);
     }
 
     byte[] contractAddress = contract.getContractAddress().toByteArray();

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

@@ -1,5 +1,7 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
+
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Objects;
@@ -49,8 +51,11 @@ public boolean execute(Object result)
       Commons
           .adjustBalance(accountStore, accountCreateContract.getOwnerAddress().toByteArray(), -fee);
       // Add to blackhole address
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | InvalidProtocolBufferException e) {
       logger.debug(e.getMessage(), e);
@@ -95,7 +100,7 @@ public boolean validate() throws ContractValidateException {
       String readableOwnerAddress = StringUtil.createReadableString(ownerAddress);
       throw new ContractValidateException(
           ActuatorConstant.ACCOUNT_EXCEPTION_STR
-              + readableOwnerAddress + "] not exists");
+              + readableOwnerAddress + NOT_EXIST_STR);
     }
 
     final long fee = calcFee();

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

@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
 import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
@@ -22,7 +23,6 @@
 import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.core.store.ExchangeStore;
 import org.tron.core.store.ExchangeV2Store;
-import org.tron.core.utils.TransactionUtil;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
 import org.tron.protos.contract.ExchangeContract.ExchangeCreateContract;
@@ -118,9 +118,11 @@ public boolean execute(Object object) throws ContractExeException {
 
       accountStore.put(accountCapsule.createDbKey(), accountCapsule);
       dynamicStore.saveLatestExchangeNum(id);
-
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       ret.setExchangeId(id);
       ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | InvalidProtocolBufferException e) {
@@ -161,7 +163,7 @@ public boolean validate() throws ContractValidateException {
     }
 
     if (!accountStore.has(ownerAddress)) {
-      throw new ContractValidateException("account[" + readableOwnerAddress + "] not exists");
+      throw new ContractValidateException("account[" + readableOwnerAddress + NOT_EXIST_STR);
     }
 
     AccountCapsule accountCapsule = accountStore.get(ownerAddress);

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

@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
 import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
@@ -137,7 +138,7 @@ public boolean validate() throws ContractValidateException {
     }
 
     if (!accountStore.has(ownerAddress)) {
-      throw new ContractValidateException("account[" + readableOwnerAddress + "] not exists");
+      throw new ContractValidateException("account[" + readableOwnerAddress + NOT_EXIST_STR);
     }
 
     AccountCapsule accountCapsule = accountStore.get(ownerAddress);

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

@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
 import static org.tron.core.config.Parameter.ChainConstant.FROZEN_PERIOD;
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 
@@ -142,7 +143,7 @@ public boolean validate() throws ContractValidateException {
     if (accountCapsule == null) {
       String readableOwnerAddress = StringUtil.createReadableString(ownerAddress);
       throw new ContractValidateException(
-          ActuatorConstant.ACCOUNT_EXCEPTION_STR + readableOwnerAddress + "] not exists");
+          ActuatorConstant.ACCOUNT_EXCEPTION_STR + readableOwnerAddress + NOT_EXIST_STR);
     }
 
     long frozenBalance = freezeBalanceContract.getFrozenBalance();
@@ -207,7 +208,7 @@ public boolean validate() throws ContractValidateException {
         String readableOwnerAddress = StringUtil.createReadableString(receiverAddress);
         throw new ContractValidateException(
             ActuatorConstant.ACCOUNT_EXCEPTION_STR
-                + readableOwnerAddress + "] not exists");
+                + readableOwnerAddress + NOT_EXIST_STR);
       }
 
       if (dynamicStore.getAllowTvmConstantinople() == 1

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

@@ -15,6 +15,10 @@
 
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.CONTRACT_NOT_EXIST;
+import static org.tron.core.actuator.ActuatorConstant.STORE_NOT_EXIST;
+import static org.tron.core.actuator.ActuatorConstant.TX_RESULT_NULL;
+
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Objects;
@@ -77,7 +81,7 @@ public boolean execute(Object object) throws ContractExeException {
 
     TransactionResultCapsule ret = (TransactionResultCapsule) object;
     if (Objects.isNull(ret)) {
-      throw new RuntimeException("TransactionResultCapsule is null");
+      throw new RuntimeException(TX_RESULT_NULL);
     }
     long fee = calcFee();
 
@@ -93,10 +97,14 @@ public boolean execute(Object object) throws ContractExeException {
 
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       // 1. return balance and token
-      MarketUtils.returnSellTokenRemain(orderCapsule, accountCapsule, dynamicStore, assetIssueStore);
+      MarketUtils
+          .returnSellTokenRemain(orderCapsule, accountCapsule, dynamicStore, assetIssueStore);
 
       MarketUtils.updateOrderState(orderCapsule, State.CANCELED, marketAccountStore);
       accountStore.put(orderCapsule.getOwnerAddress().toByteArray(), accountCapsule);
@@ -145,10 +153,10 @@ public boolean execute(Object object) throws ContractExeException {
   @Override
   public boolean validate() throws ContractValidateException {
     if (this.any == null) {
-      throw new ContractValidateException("No contract!");
+      throw new ContractValidateException(CONTRACT_NOT_EXIST);
     }
     if (chainBaseManager == null) {
-      throw new ContractValidateException("No account store or dynamic store!");
+      throw new ContractValidateException(STORE_NOT_EXIST);
     }
 
     initStores();

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

@@ -15,6 +15,9 @@
 
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.CONTRACT_NOT_EXIST;
+import static org.tron.core.actuator.ActuatorConstant.STORE_NOT_EXIST;
+import static org.tron.core.actuator.ActuatorConstant.TX_RESULT_NULL;
 import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 
 import com.google.protobuf.ByteString;
@@ -46,7 +49,6 @@
 import org.tron.core.store.MarketOrderStore;
 import org.tron.core.store.MarketPairPriceToOrderStore;
 import org.tron.core.store.MarketPairToPriceStore;
-import org.tron.core.utils.TransactionUtil;
 import org.tron.protos.Protocol.MarketOrder.State;
 import org.tron.protos.Protocol.MarketOrderDetail;
 import org.tron.protos.Protocol.MarketPrice;
@@ -101,7 +103,7 @@ public boolean execute(Object object) throws ContractExeException {
 
     TransactionResultCapsule ret = (TransactionResultCapsule) object;
     if (Objects.isNull(ret)) {
-      throw new RuntimeException("TransactionResultCapsule is null");
+      throw new RuntimeException(TX_RESULT_NULL);
     }
 
     long fee = calcFee();
@@ -124,8 +126,11 @@ public boolean execute(Object object) throws ContractExeException {
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
       // add to blackhole address
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       // 1. transfer of balance
       transferBalanceOrToken(accountCapsule);
 
@@ -160,10 +165,10 @@ public boolean execute(Object object) throws ContractExeException {
   @Override
   public boolean validate() throws ContractValidateException {
     if (this.any == null) {
-      throw new ContractValidateException("No contract!");
+      throw new ContractValidateException(CONTRACT_NOT_EXIST);
     }
     if (chainBaseManager == null) {
-      throw new ContractValidateException("No account store or dynamic store!");
+      throw new ContractValidateException(STORE_NOT_EXIST);
     }
 
     initStores();
@@ -288,7 +293,7 @@ public long calcFee() {
 
   /**
    * return marketPrice if matched, otherwise null
-   * */
+   */
   private MarketPrice hasMatch(List<byte[]> priceKeysList, MarketPrice takerPrice) {
     if (priceKeysList.isEmpty()) {
       return null;
@@ -310,7 +315,6 @@ private void matchOrder(MarketOrderCapsule takerCapsule, MarketPrice takerPrice,
 
     // makerPair not exists
     long makerPriceNumber = pairToPriceStore.getPriceNum(makerPair);
-
     if (makerPriceNumber == 0) {
       return;
     }
@@ -319,7 +323,7 @@ private void matchOrder(MarketOrderCapsule takerCapsule, MarketPrice takerPrice,
     // get maker price list
     List<byte[]> priceKeysList = pairPriceToOrderStore
         .getPriceKeysList(MarketUtils.getPairPriceHeadKey(makerSellTokenID, makerBuyTokenID),
-            (long)(MAX_MATCH_NUM + 1), makerPriceNumber, true);
+            (long) (MAX_MATCH_NUM + 1), makerPriceNumber, true);
 
     int matchOrderCount = 0;
     // match different price

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

@@ -76,7 +76,7 @@ public boolean execute(Object result)
         executeTransparentFrom(shieldedTransferContract.getTransparentFromAddress().toByteArray(),
             shieldedTransferContract.getFromAmount(), ret, fee);
       }
-      Commons.adjustAssetBalanceV2(accountStore.getBlackhole().createDbKey(),
+      Commons.adjustAssetBalanceV2(accountStore.getBlackhole(),
           CommonParameter.getInstance().getZenTokenId(), fee,
           accountStore, assetIssueStore, dynamicStore);
     } catch (BalanceInsufficientException e) {

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

@@ -55,11 +55,15 @@ public boolean execute(Object object) throws ContractExeException {
 
         fee = fee + dynamicStore.getCreateNewAccountFeeInSystemContract();
       }
-      Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-      ret.setStatus(fee, code.SUCESS);
-      Commons.adjustBalance(accountStore, ownerAddress, -amount);
+
+      Commons.adjustBalance(accountStore, ownerAddress, -(Math.addExact(fee, amount)));
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       Commons.adjustBalance(accountStore, toAddress, amount);
+      ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | ArithmeticException | InvalidProtocolBufferException e) {
       logger.debug(e.getMessage(), e);
       ret.setStatus(fee, code.FAILED);

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

@@ -73,9 +73,6 @@ public boolean execute(Object result) throws ContractExeException {
       ByteString assetName = transferAssetContract.getAssetName();
       long amount = transferAssetContract.getAmount();
 
-      Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
-
       AccountCapsule ownerAccountCapsule = accountStore.get(ownerAddress);
       if (!ownerAccountCapsule
           .reduceAssetAmountV2(assetName.toByteArray(), amount, dynamicStore, assetIssueStore)) {
@@ -87,6 +84,12 @@ public boolean execute(Object result) throws ContractExeException {
           .addAssetAmountV2(assetName.toByteArray(), amount, dynamicStore, assetIssueStore);
       accountStore.put(toAddress, toAccountCapsule);
 
+      Commons.adjustBalance(accountStore, ownerAccountCapsule, -fee);
+      if (dynamicStore.supportBlackHoleOptimization()) {
+        dynamicStore.burnTrx(fee);
+      } else {
+        Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
+      }
       ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException e) {
       logger.debug(e.getMessage(), e);

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

@@ -1,5 +1,7 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.ACCOUNT_EXCEPTION_STR;
+
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -112,7 +114,7 @@ public boolean validate() throws ContractValidateException {
     if (accountCapsule == null) {
       String readableOwnerAddress = StringUtil.createReadableString(ownerAddress);
       throw new ContractValidateException(
-          "Account[" + readableOwnerAddress + "] does not exist");
+          ACCOUNT_EXCEPTION_STR + readableOwnerAddress + "] does not exist");
     }
 
     if (accountCapsule.getFrozenSupplyCount() <= 0) {