Feature/triggerConstantContract & clearContractABI

src/main/java/org/tron/common/runtime/Runtime.java

@@ -10,8 +10,6 @@
 
 public interface Runtime {
 
-  boolean isCallConstant() throws ContractValidateException;
-
   void execute() throws ContractValidateException, ContractExeException, VMIllegalException;
 
   void go();

src/main/java/org/tron/common/runtime/RuntimeImpl.java

@@ -56,7 +56,6 @@
 import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Block;
 import org.tron.protos.Protocol.SmartContract;
-import org.tron.protos.Protocol.SmartContract.ABI;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.contractResult;
@@ -86,7 +85,10 @@ public class RuntimeImpl implements Runtime {
 
   //tx trace
   private TransactionTrace trace;
-  private boolean isStaticCall;
+
+  @Getter
+  @Setter
+  private boolean isStaticCall = false;
 
   @Setter
   private boolean enableEventLinstener;
@@ -447,7 +449,6 @@ private void create()
           this.blockCap);
       byte[] txId = new TransactionCapsule(trx).getTransactionId().getBytes();
       this.program.setRootTransactionId(txId);
-      this.program.setRootCallConstant(isCallConstant());
       if (enableEventLinstener &&
           (EventPluginLoader.getInstance().isContractEventTriggerEnable()
               || EventPluginLoader.getInstance().isContractLogTriggerEnable())
@@ -467,8 +468,9 @@ && isCheckTransaction()) {
 
     deposit.createContract(contractAddress, new ContractCapsule(newSmartContract));
     byte[] code = newSmartContract.getBytecode().toByteArray();
-    deposit.saveCode(contractAddress, ProgramPrecompile.getCode(code));
-
+    if (!VMConfig.allowTvmConstantinople()) {
+      deposit.saveCode(contractAddress, ProgramPrecompile.getCode(code));
+    }
     // transfer from callerAddress to contractAddress according to callValue
     if (callValue > 0) {
       transfer(this.deposit, callerAddress, contractAddress, callValue);
@@ -542,14 +544,14 @@ private void call()
       }
       AccountCapsule caller = this.deposit.getAccount(callerAddress);
       long energyLimit;
-      if (isCallConstant(contractAddress)) {
-        isStaticCall = true;
+      if (isStaticCall) {
         energyLimit = Constant.ENERGY_LIMIT_IN_CONSTANT_TX;
       } else {
         AccountCapsule creator = this.deposit
             .getAccount(deployedContract.getInstance().getOriginAddress().toByteArray());
         energyLimit = getTotalEnergyLimit(creator, caller, contract, feeLimit, callValue);
       }
+
       long maxCpuTimeOfOneTx = deposit.getDbManager().getDynamicPropertiesStore()
           .getMaxCpuTimeOfOneTx() * Constant.ONE_THOUSAND;
       long thisTxCPULimitInUs =
@@ -569,7 +571,6 @@ private void call()
           this.blockCap);
       byte[] txId = new TransactionCapsule(trx).getTransactionId().getBytes();
       this.program.setRootTransactionId(txId);
-      this.program.setRootCallConstant(isCallConstant());
 
       if (enableEventLinstener &&
           (EventPluginLoader.getInstance().isContractEventTriggerEnable()
@@ -613,7 +614,7 @@ public void go() {
         vm.play(program);
         result = program.getResult();
 
-        if (isCallConstant()) {
+        if (isStaticCall) {
           long callValue = TransactionCapsule.getCallValue(trx.getRawData().getContract(0));
           long callTokenValue = TransactionCapsule
               .getCallTokenValue(trx.getRawData().getContract(0));
@@ -636,6 +637,9 @@ public void go() {
             }
           } else {
             result.spendEnergy(saveCodeEnergy);
+            if (VMConfig.allowTvmConstantinople()) {
+              deposit.saveCode(program.getContractAddress().getNoLeadZeroesData(), code);
+            }
           }
         }
 
@@ -679,8 +683,6 @@ public void go() {
       result.rejectInternalTransactions();
       runtimeError = result.getException().getMessage();
       logger.info("timeout: {}", result.getException().getMessage());
-    } catch (ContractValidateException e) {
-      logger.info("when check constant, {}", e.getMessage());
     } catch (Throwable e) {
       program.spendAllEnergy();
       result = program.getResult();
@@ -706,40 +708,6 @@ private static long getEnergyFee(long callerEnergyUsage, long callerEnergyFrozen
         .divide(BigInteger.valueOf(callerEnergyTotal)).longValueExact();
   }
 
-  public boolean isCallConstant() throws ContractValidateException {
-
-    TriggerSmartContract triggerContractFromTransaction = ContractCapsule
-        .getTriggerContractFromTransaction(trx);
-    if (TrxType.TRX_CONTRACT_CALL_TYPE == trxType) {
-
-      ContractCapsule contract = deposit
-          .getContract(triggerContractFromTransaction.getContractAddress().toByteArray());
-      if (contract == null) {
-        logger.info("contract: {} is not in contract store", Wallet
-            .encode58Check(triggerContractFromTransaction.getContractAddress().toByteArray()));
-        throw new ContractValidateException("contract: " + Wallet
-            .encode58Check(triggerContractFromTransaction.getContractAddress().toByteArray())
-            + " is not in contract store");
-      }
-      ABI abi = contract.getInstance().getAbi();
-      if (Wallet.isConstant(abi, triggerContractFromTransaction)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean isCallConstant(byte[] address) throws ContractValidateException {
-
-    if (TrxType.TRX_CONTRACT_CALL_TYPE == trxType) {
-      ABI abi = deposit.getContract(address).getInstance().getAbi();
-      if (Wallet.isConstant(abi, ContractCapsule.getTriggerContractFromTransaction(trx))) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   public void finalization() {
     if (StringUtils.isEmpty(runtimeError)) {
       for (DataWord contract : result.getDeleteAccounts()) {

src/main/java/org/tron/common/runtime/config/VMConfig.java

@@ -17,13 +17,10 @@
  */
 package org.tron.common.runtime.config;
 
-import lombok.Getter;
 import lombok.Setter;
 import org.tron.common.utils.ForkController;
 import org.tron.core.config.Parameter.ForkBlockVersionConsts;
-import org.tron.core.config.Parameter.ForkBlockVersionEnum;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.Manager;
 
 /**
  * For developer only
@@ -48,6 +45,9 @@ public class VMConfig {
   @Setter
   private static boolean ALLOW_TVM_TRANSFER_TRC10 = false;
 
+  @Setter
+  private static boolean ALLOW_TVM_CONSTANTINOPLE = false;
+
   @Setter
   private static boolean ALLOW_MULTI_SIGN = false;
 
@@ -84,6 +84,10 @@ public static void initAllowTvmTransferTrc10(long allow) {
     ALLOW_TVM_TRANSFER_TRC10 = allow == 1;
   }
 
+  public static void initAllowTvmConstantinople(long allow) {
+    ALLOW_TVM_CONSTANTINOPLE = allow == 1;
+  }
+
   public static boolean getEnergyLimitHardFork() {
     return ENERGY_LIMIT_HARD_FORK;
   }
@@ -92,6 +96,10 @@ public static boolean allowTvmTransferTrc10() {
     return ALLOW_TVM_TRANSFER_TRC10;
   }
 
+  public static boolean allowTvmConstantinople() {
+    return ALLOW_TVM_CONSTANTINOPLE;
+  }
+
   public static boolean allowMultiSign() {
     return ALLOW_MULTI_SIGN;
   }