Merge pull request #1393 from tronprotocol/set_out_of_time

Set out of time

Author: huzhenyuan

src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -76,6 +76,7 @@
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result;
 import org.tron.protos.Protocol.Transaction.Result.contractResult;
+import org.tron.protos.Protocol.Transaction.raw;
 
 @Slf4j
 public class TransactionCapsule implements ProtoCapsule<Transaction> {
@@ -159,6 +160,11 @@ public TransactionCapsule(ParticipateAssetIssueContract participateAssetIssueCon
     createTransaction(participateAssetIssueContract, ContractType.ParticipateAssetIssueContract);
   }
 
+  public TransactionCapsule(raw rawData, List<ByteString> signatureList) {
+    this.transaction = Transaction.newBuilder().setRawData(rawData).addAllSignature(signatureList)
+        .build();
+  }
+
   public void resetResult() {
     if (this.getInstance().getRetCount() > 0) {
       this.transaction = this.getInstance().toBuilder().clearRet().build();
@@ -601,10 +607,9 @@ private void setResultCode(contractResult code) {
   }
 
   public contractResult getContractRet() {
-    Result ret = this.transaction.getRet(0);
-    if (Objects.isNull(ret)) {
+    if (this.transaction.getRetCount() <= 0) {
       return null;
     }
-    return ret.getContractRet();
+    return this.transaction.getRet(0).getContractRet();
   }
 }

src/main/java/org/tron/core/capsule/TransactionResultCapsule.java

@@ -1,11 +1,11 @@
 package org.tron.core.capsule;
 
-import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.core.exception.BadItemException;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.Transaction.Result;
+import org.tron.protos.Protocol.Transaction.Result.contractResult;
 
 @Slf4j
 public class TransactionResultCapsule implements ProtoCapsule<Transaction.Result> {
@@ -31,6 +31,10 @@ public TransactionResultCapsule() {
     this.transactionResult = Transaction.Result.newBuilder().build();
   }
 
+  public TransactionResultCapsule(contractResult code) {
+    this.transactionResult = Transaction.Result.newBuilder().setContractRet(code).build();
+  }
+
   public TransactionResultCapsule(Transaction.Result.code code, long fee) {
     this.transactionResult = Transaction.Result.newBuilder().setRet(code).setFee(fee).build();
   }

src/main/java/org/tron/core/db/BandwidthProcessor.java

@@ -53,9 +53,10 @@ public void consume(TransactionCapsule trx, TransactionResultCapsule ret,
       throws ContractValidateException, AccountResourceInsufficientException {
     List<Contract> contracts =
         trx.getInstance().getRawData().getContractList();
-
+    TransactionCapsule transactionCapsule = new TransactionCapsule(trx.getInstance().getRawData(),
+        trx.getInstance().getSignatureList());
     for (Contract contract : contracts) {
-      long bytes = trx.getSerializedSize();
+      long bytes = transactionCapsule.getSerializedSize();
       logger.debug("trxId {},bandwidth cost :{}", trx.getTransactionId(), bytes);
       trace.setNetBill(bytes, 0);
       byte[] address = TransactionCapsule.getOwner(contract);

src/main/java/org/tron/core/db/Manager.java

@@ -39,6 +39,7 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.discover.node.Node;
 import org.tron.common.runtime.Runtime;
+import org.tron.common.runtime.config.SystemProperties;
 import org.tron.common.runtime.vm.program.invoke.ProgramInvokeFactoryImpl;
 import org.tron.common.storage.DepositImpl;
 import org.tron.common.utils.ByteArray;
@@ -1039,6 +1040,12 @@ public boolean processTransaction(final TransactionCapsule trxCap, BlockCapsule
       // Fixme Wrong exception
       throw new UnsupportVMException("cannot call constant method ");
     }
+    // if (SystemProperties.getInstance().vmOn()) {
+    //   if(trxCap.getInstance().getRetCount()<=0){
+    //     trxCap.setResult(new TransactionResultCapsule(contractResult.UNKNOWN));
+    //   }
+    // }
+
     consumeBandwidth(trxCap, runtime.getResult().getRet(), trace);
 
     trace.init();
@@ -1053,15 +1060,18 @@ public boolean processTransaction(final TransactionCapsule trxCap, BlockCapsule
     trace.exec(runtime);
 
     if (Objects.nonNull(blockCap)) {
-      trace.setResult(runtime); 
+      trace.setResult(runtime);
       if (!blockCap.generatedByMyself) {
         trace.check();
       }
     }
 
     trace.finalization(runtime);
-
-    trxCap.setResult(runtime);
+    if (Objects.nonNull(blockCap)) {
+      if (SystemProperties.getInstance().vmOn()) {
+        trxCap.setResult(runtime);
+      }
+    }
     transactionStore.put(trxCap.getTransactionId().getBytes(), trxCap);
 
     ReceiptCapsule traceReceipt = trace.getReceipt();

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

@@ -89,8 +89,8 @@ public void init() throws TransactionTraceException {
   }
 
   //set bill
-  public void setBill(long energyUseage) {
-    receipt.setEnergyUsageTotal(energyUseage);
+  public void setBill(long energyUsage) {
+    receipt.setEnergyUsageTotal(energyUsage);
   }
 
   //set net bill
@@ -100,7 +100,7 @@ public void setNetBill(long netUsage, long netFee) {
   }
 
   public void exec(Runtime runtime)
-      throws ContractExeException, ContractValidateException, ReceiptCheckErrException {
+      throws ContractExeException, ContractValidateException {
     /**  VM execute  **/
     runtime.execute();
     runtime.go();
@@ -167,6 +167,9 @@ public ReceiptCapsule getReceipt() {
   }
 
   public void setResult(Runtime runtime) {
+    if (!needVM()) {
+      return;
+    }
     RuntimeException exception = runtime.getResult().getException();
     if (Objects.isNull(exception) && StringUtils
         .isEmpty(runtime.getRuntimeError()) && !runtime.getResult().isRevert()) {

src/test/java/org/tron/core/db/TransactionTraceTest.java

@@ -42,7 +42,6 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
-import org.tron.core.exception.ReceiptCheckErrException;
 import org.tron.protos.Contract.CreateSmartContract;
 import org.tron.protos.Contract.TriggerSmartContract;
 import org.tron.protos.Protocol.Account;
@@ -162,8 +161,6 @@ public void testUseFee() throws InvalidProtocolBufferException {
       e.printStackTrace();
     } catch (ContractValidateException e) {
       e.printStackTrace();
-    } catch (ReceiptCheckErrException e) {
-      e.printStackTrace();
     }
   }
 
@@ -197,8 +194,6 @@ public void testUseUsage() throws InvalidProtocolBufferException {
       e.printStackTrace();
     } catch (ContractValidateException e) {
       e.printStackTrace();
-    } catch (ReceiptCheckErrException e) {
-      e.printStackTrace();
     }
   }