Merge pull request #3866 from tronprotocol/release_4.3

release 4.2.2

Author: zhang0125

actuator/src/main/java/org/tron/core/vm/LogInfoTriggerParser.java

@@ -11,6 +11,7 @@
 import org.tron.common.logsfilter.trigger.ContractTrigger;
 import org.tron.common.runtime.vm.LogInfo;
 import org.tron.common.utils.StringUtil;
+import org.tron.core.capsule.AbiCapsule;
 import org.tron.core.capsule.ContractCapsule;
 import org.tron.core.db.TransactionTrace;
 import org.tron.core.store.StoreFactory;
@@ -75,8 +76,14 @@ public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Repository de
         abiMap.put(strContractAddr, ABI.getDefaultInstance());
         continue;
       }
-      ABI abi = StoreFactory.getInstance().getChainBaseManager()
-          .getAbiStore().get(contractAddress).getInstance();
+      AbiCapsule abiCapsule = StoreFactory.getInstance().getChainBaseManager()
+          .getAbiStore().get(contractAddress);
+      ABI abi;
+      if (abiCapsule == null || abiCapsule.getInstance() == null) {
+        abi = ABI.getDefaultInstance();
+      } else {
+        abi = abiCapsule.getInstance();
+      }
       String creatorAddr = StringUtil.encode58Check(
           TransactionTrace
               .convertToTronAddress(contract.getInstance().getOriginAddress().toByteArray()));

framework/src/main/java/org/tron/core/Wallet.java

@@ -2471,15 +2471,20 @@ public Transaction triggerContract(TriggerSmartContract
       Return.Builder retBuilder)
       throws ContractValidateException, ContractExeException, HeaderNotFound, VMIllegalException {
 
-    AbiStore abiStore = chainBaseManager.getAbiStore();
     byte[] contractAddress = triggerSmartContract.getContractAddress()
         .toByteArray();
-    AbiCapsule abiCapsule = abiStore.get(contractAddress);
-    if (abiCapsule == null) {
+    ContractCapsule contractCapsule = chainBaseManager.getContractStore().get(contractAddress);
+    if (contractCapsule == null) {
       throw new ContractValidateException(
           "No contract or not a valid smart contract");
     }
-    SmartContract.ABI abi = abiCapsule.getInstance();
+    AbiCapsule abiCapsule = chainBaseManager.getAbiStore().get(contractAddress);
+    SmartContract.ABI abi;
+    if (abiCapsule == null || abiCapsule.getData() == null) {
+      abi = SmartContract.ABI.getDefaultInstance();
+    } else {
+      abi = abiCapsule.getInstance();
+    }
 
     byte[] selector = WalletUtil.getSelector(
         triggerSmartContract.getData().toByteArray());
@@ -2580,7 +2585,7 @@ public SmartContract getContract(GrpcAPI.BytesMessage bytesMessage) {
     ContractCapsule contractCapsule = chainBaseManager.getContractStore().get(address);
     if (Objects.nonNull(contractCapsule)) {
       AbiCapsule abiCapsule = chainBaseManager.getAbiStore().get(address);
-      if (Objects.nonNull(abiCapsule)) {
+      if (abiCapsule != null && abiCapsule.getInstance() != null) {
         contractCapsule = new ContractCapsule(
             contractCapsule.getInstance().toBuilder().setAbi(abiCapsule.getInstance()).build());
       }
@@ -2609,7 +2614,7 @@ public SmartContractDataWrapper getContractInfo(GrpcAPI.BytesMessage bytesMessag
     ContractCapsule contractCapsule = chainBaseManager.getContractStore().get(address);
     if (Objects.nonNull(contractCapsule)) {
       AbiCapsule abiCapsule = chainBaseManager.getAbiStore().get(address);
-      if (Objects.nonNull(abiCapsule)) {
+      if (abiCapsule != null && abiCapsule.getInstance() != null) {
         contractCapsule = new ContractCapsule(
             contractCapsule.getInstance().toBuilder().setAbi(abiCapsule.getInstance()).build());
       }