Merge pull request #2843 from tronprotocol/Hotfix/add_blockCap_hasWitnessSignature

add hasWitnessSignature for BlockCapsule

Author: BlueHoopor

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

@@ -338,7 +338,7 @@ private double getCpuLimitInUsRatio() {
     if (ExecutorType.ET_NORMAL_TYPE == executorType) {
       // self witness generates block
       if (this.blockCap != null && blockCap.generatedByMyself &&
-          this.blockCap.getInstance().getBlockHeader().getWitnessSignature().isEmpty()) {
+          !this.blockCap.hasWitnessSignature()) {
         cpuLimitRatio = 1.0;
       } else {
         // self witness or other witness or fullnode verifies block
@@ -602,7 +602,8 @@ public void go() {
     try {
       if (vm != null) {
         TransactionCapsule trxCap = new TransactionCapsule(trx);
-        if (null != blockCap && blockCap.generatedByMyself && null != trxCap.getContractRet()
+        if (null != blockCap && blockCap.generatedByMyself
+            && blockCap.hasWitnessSignature() && null != trxCap.getContractRet()
             && contractResult.OUT_OF_TIME == trxCap.getContractRet()) {
           result = program.getResult();
           program.spendAllEnergy();

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

@@ -344,6 +344,10 @@ public long getTimeStamp() {
     return this.block.getBlockHeader().getRawData().getTimestamp();
   }
 
+  public boolean hasWitnessSignature() {
+    return !getInstance().getBlockHeader().getWitnessSignature().isEmpty();
+  }
+
   private StringBuffer toStringBuff = new StringBuffer();
 
   @Override

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

@@ -1252,7 +1252,7 @@ public TransactionInfo processTransaction(final TransactionCapsule trxCap, Block
 
     if (Objects.nonNull(blockCap)) {
       trace.setResult();
-      if (!blockCap.getInstance().getBlockHeader().getWitnessSignature().isEmpty()) {
+      if (blockCap.hasWitnessSignature()) {
         if (trace.checkNeedRetry()) {
           String txId = Hex.toHexString(trxCap.getTransactionId().getBytes());
           logger.info("Retry for tx id: {}", txId);
@@ -1682,7 +1682,7 @@ private void processMaintenance(BlockCapsule block) {
 
   /**
    * @param block the block update signed witness. set witness who signed block the 1. the latest
-   * block num 2. pay the trx to witness. 3. the latest slot num.
+   *              block num 2. pay the trx to witness. 3. the latest slot num.
    */
   public void updateSignedWitness(BlockCapsule block) {
     // TODO: add verification

src/test/java/org/tron/core/capsule/BlockCapsuleTest.java

@@ -119,6 +119,15 @@ public void testGetInsHash() {
         Sha256Hash.wrap(blockCapsule0.getParentHashStr()));
   }
 
+  @Test
+  public void testHasWitnessSignature() {
+
+    Assert.assertFalse(blockCapsule0.hasWitnessSignature());
+    blockCapsule0
+        .sign(ByteArray.fromHexString(Args.getInstance().getLocalWitnesses().getPrivateKey()));
+    Assert.assertTrue(blockCapsule0.hasWitnessSignature());
+  }
+
   @Test
   public void testGetTimeStamp() {
     Assert.assertEquals(1234L, blockCapsule0.getTimeStamp());