Merge branch 'master' of https://github.com/tronprotocol/java-tron

Author: nanfengpo

src/main/java/org/tron/common/utils/ForkController.java

@@ -17,18 +17,22 @@
 import org.apache.commons.lang3.StringUtils;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.BlockCapsule;
-import org.tron.core.config.Parameter;
 import org.tron.core.config.Parameter.ForkBlockVersionConsts;
 import org.tron.core.db.Manager;
 
 @Slf4j
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ForkController {
 
+  private static final byte VERSION_UPGRADE = (byte) 1;
+  private static final byte HARD_FORK_EFFECTIVE = (byte) 2;
   private static final byte[] check;
+  private static final byte[] check2;
   static {
     check = new byte[1024];
-    Arrays.fill(check, (byte) 1);
+    Arrays.fill(check, VERSION_UPGRADE);
+    check2 = new byte[1024];
+    Arrays.fill(check2, HARD_FORK_EFFECTIVE);
   }
 
   @Getter
@@ -42,7 +46,7 @@ public void init(Manager manager) {
   }
 
   public synchronized boolean pass(int version) {
-    if (!check(version)) {
+    if (!checkEnergy(version)) {
       return false;
     }
 
@@ -51,14 +55,23 @@ public synchronized boolean pass(int version) {
     }
 
     byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
-    boolean pass = check(stats);
+    boolean pass;
+    if (version == ForkBlockVersionConsts.ENERGY_LIMIT) {
+      pass = check(stats);
+    } else {
+      pass = check2(stats);
+    }
+
     if (pass) {
       passSet.add(version);
     }
     return pass;
   }
 
-  private boolean check(int version) {
+  // when block.version = 5,
+  // it make block use new energy to handle transaction when block number >= 4727890L.
+  // version !=5, skip this.
+  private boolean checkEnergy(int version) {
     if (version != ForkBlockVersionConsts.ENERGY_LIMIT) {
       return true;
     }
@@ -68,6 +81,14 @@ private boolean check(int version) {
   }
 
   private boolean check(byte[] stats) {
+    return check(check, stats);
+  }
+
+  private boolean check2(byte[] stats) {
+    return check(check2, stats);
+  }
+
+  private boolean check(byte[] check, byte[] stats) {
     if (stats == null || stats.length == 0) {
       return false;
     }
@@ -95,16 +116,15 @@ public synchronized void update(BlockCapsule blockCapsule) {
     }
 
     byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
-    if (check(stats)) {
-      passSet.add(version);
+    if (check(stats) || check2(stats)) {
       return;
     }
 
     if (stats == null) {
       stats = new byte[witnesses.size()];
     }
 
-    stats[slot] = (byte) 1;
+    stats[slot] = VERSION_UPGRADE;
     manager.getDynamicPropertiesStore().statsByVersion(version, stats);
     logger.info(
         "*******update hard fork:{}, witness size:{}, solt:{}, witness:{}, version:{}",
@@ -118,15 +138,32 @@ public synchronized void update(BlockCapsule blockCapsule) {
         version);
   }
 
+  public synchronized void updateWhenMaintenance(BlockCapsule blockCapsule) {
+    int version = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
+    if (version < ForkBlockVersionConsts.VERSION_3_2_2 || passSet.contains(version)) {
+      return;
+    }
+
+    byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
+    if (check2(stats)) {
+      return;
+    }
+
+    if (check(stats)) {
+      Arrays.fill(stats, HARD_FORK_EFFECTIVE);
+      manager.getDynamicPropertiesStore().statsByVersion(version, stats);
+      logger.info("*******hard fork is effective in the maintenance, version is {}", version);
+    }
+  }
+
   public synchronized void reset(BlockCapsule blockCapsule) {
     int version = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
     if (version < ForkBlockVersionConsts.ENERGY_LIMIT || passSet.contains(version)) {
       return;
     }
 
     byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
-    if (check(stats)) {
-      passSet.add(version);
+    if (check(stats) || check2(stats)) {
       return;
     }
 

src/main/java/org/tron/core/config/Parameter.java

@@ -107,6 +107,7 @@ interface ForkBlockVersionConsts {
 
     int START_NEW_TRANSACTION = 4;
     int ENERGY_LIMIT = 5;
+    int VERSION_3_2_2 = 6;
   }
 
 }

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

@@ -594,8 +594,7 @@ void validateCommon(TransactionCapsule transactionCapsule)
   }
 
   void validateDup(TransactionCapsule transactionCapsule) throws DupTransactionException {
-    if (getTransactionStore().getUnchecked(transactionCapsule.getTransactionId().getBytes())
-        != null) {
+    if (getTransactionStore().has(transactionCapsule.getTransactionId().getBytes())) {
       logger.debug(ByteArray.toHexString(transactionCapsule.getTransactionId().getBytes()));
       throw new DupTransactionException("dup trans");
     }
@@ -1406,6 +1405,7 @@ private void processMaintenance(BlockCapsule block) {
     proposalController.processProposals();
     witnessController.updateWitness();
     this.dynamicPropertiesStore.updateNextMaintenanceTime(block.getTimeStamp());
+    forkController.updateWhenMaintenance(block);
     forkController.reset(block);
   }
 

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

@@ -86,6 +86,15 @@ public TransactionCapsule get(byte[] key) throws BadItemException {
     return transactionCapsule == null ? new TransactionCapsule(value) : transactionCapsule;
   }
 
+  @Override
+  public TransactionCapsule getUnchecked(byte[] key) {
+    try {
+      return get(key);
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
   /**
    * get total transaction.
    */

src/main/java/org/tron/program/SolidityNode.java

@@ -257,6 +257,9 @@ private void processTrx() {
             logger.warn("Failed to get trx: {}, reason: {}", trx.getTransactionId(), ex.getMessage());
             continue;
           }
+          if (ret == null) {
+            continue;
+          }
           ret.setBlockNumber(blockCapsule.getNum());
           ret.setBlockTimeStamp(blockCapsule.getTimeStamp());
           dbManager.getTransactionHistoryStore().put(trx.getTransactionId().getBytes(), ret);