Merge pull request #2631 from tronprotocol/develop

merge develop code

Author: xxo1shine

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

@@ -5,6 +5,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.tron.common.utils.Commons;
@@ -31,7 +32,12 @@ public AccountPermissionUpdateActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule result) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule result = (TransactionResultCapsule)object;
+    if (Objects.isNull(result)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     AccountStore accountStore = chainBaseManager.getAccountStore();
     long fee = calcFee();
     final AccountPermissionUpdateContract accountPermissionUpdateContract;

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

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.core.capsule.AccountCapsule;
@@ -47,7 +48,12 @@ public AssetIssueActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
     AssetIssueStore assetIssueStore = chainBaseManager.getAssetIssueStore();

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

@@ -3,6 +3,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.StringUtil;
@@ -26,7 +27,12 @@ public ClearABIContractActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     ContractStore contractStore = chainBaseManager.getContractStore();
     try {

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

@@ -2,6 +2,7 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.StringUtil;
@@ -24,8 +25,13 @@ public CreateAccountActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret)
+  public boolean execute(Object result)
       throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
     AccountStore accountStore = chainBaseManager.getAccountStore();

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

@@ -3,6 +3,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.StringUtil;
@@ -30,7 +31,12 @@ public ExchangeCreateActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -4,6 +4,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -32,7 +33,12 @@ public ExchangeInjectActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -3,6 +3,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -31,7 +32,12 @@ public ExchangeTransactionActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -5,6 +5,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -33,7 +34,12 @@ public ExchangeWithdrawActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -4,6 +4,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.tron.common.utils.Commons;
@@ -32,7 +33,12 @@ public FreezeBalanceActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     final FreezeBalanceContract freezeBalanceContract;
     AccountStore accountStore = chainBaseManager.getAccountStore();

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

@@ -18,6 +18,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -43,7 +44,12 @@ public ParticipateAssetIssueActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -7,6 +7,7 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -33,7 +34,12 @@ public ProposalApproveActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     ProposalStore proposalStore = chainBaseManager.getProposalStore();
     try {

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

@@ -7,6 +7,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Map;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.DBConfig;
@@ -28,7 +29,12 @@ public ProposalCreateActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
 
     try {

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

@@ -6,6 +6,7 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -31,7 +32,12 @@ public ProposalDeleteActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     ProposalStore proposalStore = chainBaseManager.getProposalStore();
     try {

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

@@ -2,6 +2,7 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.core.capsule.AccountCapsule;
@@ -23,7 +24,12 @@ public SetAccountIdActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     final SetAccountIdContract setAccountIdContract;
     final long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();

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

@@ -8,6 +8,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.tron.common.utils.Commons;
@@ -53,8 +54,13 @@ public ShieldedTransferActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret)
+  public boolean execute(Object result)
       throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = 0;
     long shieldedTransactionFee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();

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

@@ -5,6 +5,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.core.capsule.AccountCapsule;
@@ -27,7 +28,12 @@ public TransferActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -19,6 +19,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Commons;
@@ -44,7 +45,12 @@ public TransferAssetActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object result) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)result;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();

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

@@ -5,6 +5,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.StringUtil;
@@ -28,7 +29,12 @@ public UnfreezeAssetActuator() {
   }
 
   @Override
-  public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
+  public boolean execute(Object object) throws ContractExeException {
+    TransactionResultCapsule ret = (TransactionResultCapsule)object;
+    if (Objects.isNull(ret)){
+      throw new RuntimeException("TransactionResultCapsule is null");
+    }
+
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     AssetIssueStore assetIssueStore = chainBaseManager.getAssetIssueStore();