Merge pull request #1499 from tronprotocol/develop

master

Author: zhaohong

.travis.yml

@@ -14,15 +14,11 @@ cache:
 script:
 - sh tron.sh
 - "./gradlew build"
+- sh deploy.sh
 
 skip_build:
 - README.md：
 - LICENSE
-deploy:
-  provider: script
-  script: bash deploy.sh
-  on:
-    branch: develop
 
 
 

deploy.sh

@@ -1,3 +1,23 @@
 #!/bin/bash
-#ssh [email protected] -p 22008 sh /home/tron/workspace/deploy_all.sh
-#./gradlew stest
+
+echo "$TRAVIS_BRANCH"
+
+if [ "$TRAVIS_BRANCH" = "develop" ];then
+  echo "init env"
+  ssh [email protected] -p 22008 sh /home/tron/workspace/deploy_all.sh
+  echo "stest start"
+  ./gradlew stest | tee stest.log
+  echo "stest end"
+
+  echo $?
+  ret=$(cat stest.log | grep "stest FAILED" | wc -l)
+
+  if [ $ret != 0 ];then
+    echo $ret
+    exit 1
+  fi
+
+fi
+echo "bye bye"
+
+exit 0

src/main/java/org/tron/common/net/udp/handler/PacketDecoder.java

@@ -46,7 +46,7 @@ public void decode(ChannelHandlerContext ctx, DatagramPacket packet, List<Object
       out.add(event);
     } catch (Exception e) {
       logger.error("Parse msg failed, type {}, len {}, address {}", encoded[0], encoded.length,
-          ctx.channel().remoteAddress());
+          packet.sender());
     }
   }
 }

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

@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -88,6 +90,8 @@ public class Runtime {
   private VM vm = null;
   private Program program = null;
 
+  @Getter
+  @Setter
   private InternalTransaction.TrxType trxType = TRX_UNKNOWN_TYPE;
   private ExecutorType executorType = ET_UNKNOWN_TYPE;
 
@@ -132,6 +136,13 @@ public Runtime(TransactionTrace trace, BlockCapsule block, Deposit deposit,
   /**
    * For constant trx with latest blockCap.
    */
+  private boolean isStaticCall = false;
+  public Runtime(Transaction tx, BlockCapsule block, DepositImpl deposit,
+                 ProgramInvokeFactory programInvokeFactory, boolean isStaticCall) {
+    this(tx, block, deposit, programInvokeFactory);
+    this.isStaticCall = isStaticCall;
+  }
+
   public Runtime(Transaction tx, BlockCapsule block, DepositImpl deposit,
       ProgramInvokeFactory programInvokeFactory) {
     this.trx = tx;
@@ -177,32 +188,26 @@ public BigInteger getBlockCPULeftInUs() {
                 .getTimestamp())); // us
     BigInteger curBlockCPULimitInUs = BigInteger.valueOf((long)
         (1000 * ChainConstant.BLOCK_PRODUCED_INTERVAL * 0.5
-            * ChainConstant.BLOCK_PRODUCED_TIME_OUT
+            * Args.getInstance().getBlockProducedTimeOut()
             / 100)); // us
 
     return curBlockCPULimitInUs.subtract(curBlockHaveElapsedCPUInUs);
 
   }
 
   public void execute() throws ContractValidateException, ContractExeException {
-    try {
-      switch (trxType) {
-        case TRX_PRECOMPILED_TYPE:
-          precompiled();
-          break;
-        case TRX_CONTRACT_CREATION_TYPE:
-          create();
-          break;
-        case TRX_CONTRACT_CALL_TYPE:
-          call();
-          break;
-        default:
-          throw new ContractValidateException("Unknown contract type");
-      }
-    } catch (ContractExeException | ContractValidateException e) {
-      throw e;
-    } catch (Exception e) {
-      throw new ContractValidateException("Unknown contract error");
+    switch (trxType) {
+      case TRX_PRECOMPILED_TYPE:
+        precompiled();
+        break;
+      case TRX_CONTRACT_CREATION_TYPE:
+        create();
+        break;
+      case TRX_CONTRACT_CALL_TYPE:
+        call();
+        break;
+      default:
+        throw new ContractValidateException("Unknown contract type");
     }
   }
 
@@ -255,18 +260,15 @@ private long getEnergyLimit(AccountCapsule creator, AccountCapsule caller,
     // creatorEnergyFromFreeze
     long creatorEnergyLimit = energyProcessor.getAccountLeftEnergyFromFreeze(creator);
 
+
     SmartContract smartContract = this.deposit
         .getContract(contract.getContractAddress().toByteArray()).getInstance();
     long consumeUserResourcePercent = smartContract.getConsumeUserResourcePercent();
 
     consumeUserResourcePercent = max(0, min(consumeUserResourcePercent, 100));
 
-    if (consumeUserResourcePercent <= 0) {
-      return creatorEnergyLimit;
-    }
-
     if (creatorEnergyLimit * consumeUserResourcePercent
-        >= (100 - consumeUserResourcePercent) * callerEnergyLimit) {
+        > (100 - consumeUserResourcePercent) * callerEnergyLimit) {
       return Math.floorDiv(callerEnergyLimit * 100, consumeUserResourcePercent);
     } else {
       return Math.addExact(callerEnergyLimit, creatorEnergyLimit);
@@ -309,6 +311,9 @@ private void create()
     }
 
     CreateSmartContract contract = ContractCapsule.getSmartContractFromTransaction(trx);
+    if (contract == null) {
+      throw new ContractValidateException("Cannot get CreateSmartContract from transaction");
+    }
     SmartContract newSmartContract = contract.getNewContract();
     if (!contract.getOwnerAddress().equals(newSmartContract.getOriginAddress())) {
       logger.error("OwnerAddress not equals OriginAddress");
@@ -317,6 +322,12 @@ private void create()
     byte[] code = newSmartContract.getBytecode().toByteArray();
     byte[] contractAddress = Wallet.generateContractAddress(trx);
     byte[] ownerAddress = contract.getOwnerAddress().toByteArray();
+    byte[] contractName = newSmartContract.getName().getBytes();
+
+    if (contractName.length > 32) {
+      logger.error("contractName's length mustn't be greater than 32");
+      throw new ContractValidateException("contractName's length mustn't be greater than 32");
+    }
 
     long percent = contract.getNewContract().getConsumeUserResourcePercent();
     if (percent < 0 || percent > 100) {
@@ -374,7 +385,6 @@ private void create()
       this.vm = new VM(config);
       this.program = new Program(ops, programInvoke, internalTransaction, config, this.blockCap);
       this.program.setRootTransactionId(new TransactionCapsule(trx).getTransactionId().getBytes());
-      this.program.resetNonce();
       this.program.setRootCallConstant(isCallConstant());
     } catch (Exception e) {
       logger.error(e.getMessage());
@@ -415,7 +425,17 @@ private void call()
       return;
     }
 
+    if(contract.getContractAddress() == null){
+      throw new ContractValidateException("Cannot get contract address from TriggerContract");
+    }
+
     byte[] contractAddress = contract.getContractAddress().toByteArray();
+
+    ContractCapsule deployedContract = this.deposit.getContract(contractAddress);
+    if (null == deployedContract) {
+      logger.error("No contract or not a smart contract");
+      throw new ContractValidateException("No contract or not a smart contract");
+    }
     byte[] code = this.deposit.getCode(contractAddress);
     long callValue = contract.getCallValue();
     if (isEmpty(code)) {
@@ -424,7 +444,7 @@ private void call()
 
       AccountCapsule caller = this.deposit.getAccount(contract.getOwnerAddress().toByteArray());
       AccountCapsule creator = this.deposit.getAccount(
-          this.deposit.getContract(contractAddress).getInstance()
+          deployedContract.getInstance()
               .getOriginAddress().toByteArray());
 
       long MAX_CPU_TIME_OF_ONE_TX = deposit.getDbManager().getDynamicPropertiesStore()
@@ -443,6 +463,7 @@ private void call()
       }
       long energyLimit;
       if (isCallConstant(contractAddress)) {
+        isStaticCall = true;
         energyLimit = Constant.MAX_ENERGY_IN_TX;
       } else {
         energyLimit = getEnergyLimit(creator, caller, contract, feeLimit, callValue);
@@ -451,12 +472,14 @@ private void call()
       ProgramInvoke programInvoke = programInvokeFactory
           .createProgramInvoke(TRX_CONTRACT_CALL_TYPE, executorType, trx,
               blockCap.getInstance(), deposit, vmStartInUs, vmShouldEndInUs, energyLimit);
+      if (isStaticCall) {
+        programInvoke.setStaticCall();
+      }
       this.vm = new VM(config);
       InternalTransaction internalTransaction = new InternalTransaction(trx);
       this.program = new Program(null, code, programInvoke, internalTransaction, config,
           this.blockCap);
       this.program.setRootTransactionId(new TransactionCapsule(trx).getTransactionId().getBytes());
-      this.program.resetNonce();
       this.program.setRootCallConstant(isCallConstant());
     }
 
@@ -473,7 +496,8 @@ public void go() {
     try {
 
       TransactionCapsule trxCap = new TransactionCapsule(trx);
-      if (null != trxCap.getContractRet() && contractResult.OUT_OF_TIME
+      if (null != blockCap && blockCap.generatedByMyself && null != trxCap.getContractRet()
+          && contractResult.OUT_OF_TIME
           .equals(trxCap.getContractRet())) {
         result = program.getResult();
         program.spendAllEnergy();
@@ -485,7 +509,6 @@ public void go() {
       if (vm != null) {
         vm.play(program);
 
-        program.getResult().setRet(result.getRet());
         result = program.getResult();
 
         if (isCallConstant()) {
@@ -533,16 +556,19 @@ public void go() {
       }
     } catch (JVMStackOverFlowException e) {
       program.spendAllEnergy();
+      result = program.getResult();
       result.setException(e);
       runtimeError = result.getException().getMessage();
       logger.error("runtime error is :{}", result.getException().getMessage());
     } catch (OutOfResourceException e) {
       program.spendAllEnergy();
+      result = program.getResult();
       result.setException(e);
       runtimeError = result.getException().getMessage();
       logger.error("runtime error is :{}", result.getException().getMessage());
     } catch (Throwable e) {
       program.spendAllEnergy();
+      result = program.getResult();
       if (Objects.isNull(result.getException())) {
         logger.error(e.getMessage(), e);
         result.setException(new RuntimeException("Unknown Throwable"));

src/main/java/org/tron/common/runtime/vm/VM.java

@@ -1209,7 +1209,6 @@ public void step(Program program) {
           program.stackPop(); // use adjustedCallEnergy instead of requested
           DataWord codeAddress = program.stackPop();
 
-          // todo: check the callvalue >= 0
           DataWord value = op.callHasValue() ?
               program.stackPop() : DataWord.ZERO;