Merge pull request #3858 from tronprotocol/release_4.3

merge Release 4.3 to master

Author: lvs007

actuator/build.gradle

@@ -72,11 +72,11 @@ jacocoTestReport {
         xml.enabled = true
         html.enabled = true
     }
-    executionData = files('../framework/build/jacoco/jacocoTest.exec')
+    executionData.from = '../framework/build/jacoco/jacocoTest.exec'
     afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
+        classDirectories.from = classDirectories.files.collect {
             fileTree(dir: it,)
-        })
+        }
     }
 }
 

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

@@ -7,16 +7,19 @@
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.DecodeUtil;
 import org.tron.common.utils.StringUtil;
+import org.tron.core.capsule.AbiCapsule;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.ContractCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
+import org.tron.core.store.AbiStore;
 import org.tron.core.store.AccountStore;
 import org.tron.core.store.ContractStore;
 import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
 import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract;
 
 import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
@@ -36,15 +39,12 @@ public boolean execute(Object result) throws ContractExeException {
     }
 
     long fee = calcFee();
-    ContractStore contractStore = chainBaseManager.getContractStore();
+    AbiStore abiStore = chainBaseManager.getAbiStore();
     try {
       ClearABIContract usContract = any.unpack(ClearABIContract.class);
 
       byte[] contractAddress = usContract.getContractAddress().toByteArray();
-      ContractCapsule deployedContract = contractStore.get(contractAddress);
-
-      deployedContract.clearABI();
-      contractStore.put(contractAddress, deployedContract);
+      abiStore.put(contractAddress, new AbiCapsule(ABI.getDefaultInstance()));
 
       ret.setStatus(fee, code.SUCESS);
     } catch (InvalidProtocolBufferException e) {

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

@@ -13,6 +13,7 @@
 import org.tron.common.utils.StringUtil;
 import org.tron.core.capsule.ContractCapsule;
 import org.tron.core.db.TransactionTrace;
+import org.tron.core.store.StoreFactory;
 import org.tron.core.vm.repository.Repository;
 import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
 
@@ -74,7 +75,8 @@ public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Repository de
         abiMap.put(strContractAddr, ABI.getDefaultInstance());
         continue;
       }
-      ABI abi = contract.getInstance().getAbi();
+      ABI abi = StoreFactory.getInstance().getChainBaseManager()
+          .getAbiStore().get(contractAddress).getInstance();
       String creatorAddr = StringUtil.encode58Check(
           TransactionTrace
               .convertToTronAddress(contract.getInstance().getOriginAddress().toByteArray()));

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

@@ -834,7 +834,7 @@ public static class BatchValidateSign extends PrecompiledContract {
     private static final int MAX_SIZE = 16;
 
     static {
-      workers = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() / 2);
+      workers = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() / 2 + 1);
     }
 
     @Override

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

@@ -99,8 +99,9 @@ public void step(Program program) {
           || (!VMConfig.allowTvmConstantinople()
               && (op == SHL || op == SHR || op == SAR || op == CREATE2 || op == EXTCODEHASH))
           || (!VMConfig.allowTvmSolidity059() && op == ISCONTRACT)
-          || (!VMConfig.allowTvmIstanbul() && (op == SELFBALANCE || op == CHAINID)
-          || (!VMConfig.allowTvmFreeze() && (op == FREEZE || op == UNFREEZE || op == FREEZEEXPIRETIME)))
+          || (!VMConfig.allowTvmIstanbul() && (op == SELFBALANCE || op == CHAINID))
+          || (!VMConfig.allowTvmFreeze()
+              && (op == FREEZE || op == UNFREEZE || op == FREEZEEXPIRETIME))
           ) {
         throw Program.Exception.invalidOpCode(program.getCurrentOp());
       }

actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java

@@ -63,6 +63,8 @@ public class RepositoryImpl implements Repository {
   @Getter
   private AssetIssueV2Store assetIssueV2Store;
   @Getter
+  private AbiStore abiStore;
+  @Getter
   private CodeStore codeStore;
   @Getter
   private ContractStore contractStore;
@@ -112,6 +114,7 @@ protected void init(StoreFactory storeFactory, RepositoryImpl parent) {
       ChainBaseManager manager = storeFactory.getChainBaseManager();
       dynamicPropertiesStore = manager.getDynamicPropertiesStore();
       accountStore = manager.getAccountStore();
+      abiStore = manager.getAbiStore();
       codeStore = manager.getCodeStore();
       contractStore = manager.getContractStore();
       assetIssueStore = manager.getAssetIssueStore();
@@ -784,7 +787,11 @@ private void commitContractCache(Repository deposit) {
         if (deposit != null) {
           deposit.putContract(key, value);
         } else {
-          getContractStore().put(key.getData(), value.getContract());
+          ContractCapsule contractCapsule = value.getContract();
+          if (!abiStore.has(key.getData())) {
+            abiStore.put(key.getData(), new AbiCapsule(contractCapsule));
+          }
+          getContractStore().put(key.getData(), contractCapsule);
         }
       }
     }));
@@ -945,4 +952,5 @@ public long getTotalEnergyWeight() {
         .orElseThrow(
             () -> new IllegalArgumentException("not found TOTAL_ENERGY_WEIGHT"));
   }
+
 }

chainbase/build.gradle

@@ -102,11 +102,11 @@ jacocoTestReport {
         xml.enabled = true
         html.enabled = true
     }
-    executionData = files('../framework/build/jacoco/jacocoTest.exec')
+    executionData.from = '../framework/build/jacoco/jacocoTest.exec'
     afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
+        classDirectories.from = classDirectories.files.collect {
             fileTree(dir: it,)
-        })
+        }
     }
 }
 

chainbase/src/main/java/org/tron/core/ChainBaseManager.java

@@ -30,6 +30,7 @@
 import org.tron.core.exception.HeaderNotFound;
 import org.tron.core.exception.ItemNotFoundException;
 import org.tron.core.service.MortgageService;
+import org.tron.core.store.AbiStore;
 import org.tron.core.store.AccountIdIndexStore;
 import org.tron.core.store.AccountIndexStore;
 import org.tron.core.store.AccountStore;
@@ -122,6 +123,9 @@ public class ChainBaseManager {
   private MarketPairToPriceStore marketPairToPriceStore;
   @Autowired
   @Getter
+  private AbiStore abiStore;
+  @Autowired
+  @Getter
   private CodeStore codeStore;
   @Autowired
   @Getter
@@ -231,6 +235,7 @@ public void closeAllStore() {
     closeOneStore(witnessScheduleStore);
     closeOneStore(assetIssueStore);
     closeOneStore(dynamicPropertiesStore);
+    closeOneStore(abiStore);
     closeOneStore(codeStore);
     closeOneStore(contractStore);
     closeOneStore(storageRowStore);

chainbase/src/main/java/org/tron/core/capsule/AbiCapsule.java

@@ -0,0 +1,43 @@
+package org.tron.core.capsule;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import lombok.extern.slf4j.Slf4j;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
+
+
+@Slf4j(topic = "capsule")
+public class AbiCapsule implements ProtoCapsule<ABI> {
+
+  private ABI abi;
+
+  public AbiCapsule(byte[] data) {
+    try {
+      this.abi = ABI.parseFrom(data);
+    } catch (InvalidProtocolBufferException e) {
+      logger.debug(e.getMessage());
+    }
+  }
+
+  public AbiCapsule(ContractCapsule contract) {
+    this.abi = contract.getInstance().getAbi().toBuilder().build();
+  }
+
+  public AbiCapsule(ABI abi) {
+    this.abi = abi.toBuilder().build();
+  }
+
+  @Override
+  public byte[] getData() {
+    return this.abi.toByteArray();
+  }
+
+  @Override
+  public ABI getInstance() {
+    return this.abi;
+  }
+
+  @Override
+  public String toString() {
+    return this.abi.toString();
+  }
+}

chainbase/src/main/java/org/tron/core/db/TransactionTrace.java

@@ -54,6 +54,8 @@ public class TransactionTrace {
 
   private CodeStore codeStore;
 
+  private AbiStore abiStore;
+
   private EnergyProcessor energyProcessor;
 
   private TrxType trxType;
@@ -92,6 +94,7 @@ public TransactionTrace(TransactionCapsule trx, StoreFactory storeFactory,
     this.dynamicPropertiesStore = storeFactory.getChainBaseManager().getDynamicPropertiesStore();
     this.contractStore = storeFactory.getChainBaseManager().getContractStore();
     this.codeStore = storeFactory.getChainBaseManager().getCodeStore();
+    this.abiStore = storeFactory.getChainBaseManager().getAbiStore();
     this.accountStore = storeFactory.getChainBaseManager().getAccountStore();
 
     this.receipt = new ReceiptCapsule(Sha256Hash.ZERO_HASH);
@@ -297,6 +300,7 @@ public Runtime getRuntime() {
   }
 
   public void deleteContract(byte[] address) {
+    abiStore.delete(address);
     codeStore.delete(address);
     accountStore.delete(address);
     contractStore.delete(address);