hard fork in mantenance

Author: Yrp

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

@@ -4,9 +4,8 @@
 import com.google.common.collect.Streams;
 import com.google.protobuf.ByteString;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.AccessLevel;
@@ -27,75 +26,42 @@ public class ForkController {
 
   private static final byte VERSION_DOWNGRADE = (byte) 0;
   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, VERSION_UPGRADE);
-    check2 = new byte[1024];
-    Arrays.fill(check2, HARD_FORK_EFFECTIVE);
   }
 
   @Getter
   private Manager manager;
 
-  private Set<Integer> passSet = new HashSet<>();
-
   public void init(Manager manager) {
     this.manager = manager;
-    passSet.clear();
   }
 
   public boolean pass(ForkBlockVersionEnum forkBlockVersionEnum) {
     return pass(forkBlockVersionEnum.getValue());
   }
 
   public synchronized boolean pass(int version) {
-    if (!checkEnergy(version)) {
-      return false;
-    }
-
-    if (passSet.contains(version)) {
-      return true;
-    }
-
-    byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
-    boolean pass;
     if (version == ForkBlockVersionConsts.ENERGY_LIMIT) {
-      pass = check(stats);
-    } else {
-      pass = check2(stats);
+      return checkForEnergyLimit();
     }
 
-    if (pass) {
-      passSet.add(version);
-    }
-    return pass;
+    byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
+    return check(stats);
   }
 
   // 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;
-    }
-
+  private boolean checkForEnergyLimit() {
     long blockNum = manager.getDynamicPropertiesStore().getLatestBlockHeaderNumber();
     return blockNum >= 4727890L;
   }
 
   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;
     }
@@ -113,7 +79,7 @@ private void downgrade(int version, int slot) {
     for (ForkBlockVersionEnum versionEnum : ForkBlockVersionEnum.values()) {
       if (versionEnum.getValue() > version) {
         byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(versionEnum.getValue());
-        if (!check2(stats) && stats != null) {
+        if (!check(stats) && Objects.nonNull(stats)) {
           stats[slot] = VERSION_DOWNGRADE;
           manager.getDynamicPropertiesStore().statsByVersion(versionEnum.getValue(), stats);
         }
@@ -130,14 +96,12 @@ public synchronized void update(BlockCapsule blockCapsule) {
     }
 
     int version = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
-    if (version < ForkBlockVersionConsts.ENERGY_LIMIT || passSet.contains(version)) {
+    if (version < ForkBlockVersionEnum.VERSION_3_2_2.getValue()) {
       return;
     }
 
-    downgrade(version, slot);
-
     byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
-    if (check(stats) || check2(stats)) {
+    if (check(stats)) {
       return;
     }
 
@@ -147,6 +111,7 @@ public synchronized void update(BlockCapsule blockCapsule) {
 
     stats[slot] = VERSION_UPGRADE;
     manager.getDynamicPropertiesStore().statsByVersion(version, stats);
+    downgrade(version, slot);
     logger.info(
         "*******update hard fork:{}, witness size:{}, solt:{}, witness:{}, version:{}",
         Streams.zip(witnesses.stream(), Stream.of(ArrayUtils.toObject(stats)), Maps::immutableEntry)
@@ -159,53 +124,13 @@ public synchronized void update(BlockCapsule blockCapsule) {
         version);
   }
 
-  private void setSolidNumWithVersion5BeEffective(int version, int witnessSize) {
-    if (version != ForkBlockVersionConsts.ENERGY_LIMIT) {
-      return;
-    }
-
-    long num = manager.getDynamicPropertiesStore().getSolidNumWithVersion5();
-    if (num == -1) {
-      long blockNum = manager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
-      manager.getDynamicPropertiesStore().setSolidNumWithVersion5(blockNum + witnessSize * 2 / 3);
-    }
-  }
-
-  public synchronized void updateWhenMaintenance(BlockCapsule blockCapsule) {
-    int version = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
-    if (version < ForkBlockVersionEnum.VERSION_3_2_2.getValue() || 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:{}",
-          ArrayUtils.toObject(stats),
-          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) || check2(stats)) {
-      return;
-    }
-
-    if (stats != null) {
-      Arrays.fill(stats, (byte) 0);
-      manager.getDynamicPropertiesStore().statsByVersion(version, stats);
+  public synchronized void reset() {
+    for (ForkBlockVersionEnum versionEnum : ForkBlockVersionEnum.values()) {
+      byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(versionEnum.getValue());
+      if (!check(stats) && Objects.nonNull(stats)) {
+        Arrays.fill(stats, VERSION_DOWNGRADE);
+        manager.getDynamicPropertiesStore().statsByVersion(versionEnum.getValue(), stats);
+      }
     }
   }
 

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

@@ -678,7 +678,7 @@ private void applyBlock(BlockCapsule block) throws ContractValidateException,
     processBlock(block);
     this.blockStore.put(block.getBlockId().getBytes(), block);
     this.blockIndexStore.put(block.getBlockId());
-    updateFork();
+    updateFork(block);
     if (System.currentTimeMillis() - block.getTimeStamp() >= 60_000) {
       revokingStore.setMaxFlushCount(SnapshotManager.DEFAULT_MAX_FLUSH_COUNT);
     } else {
@@ -1363,14 +1363,8 @@ public void updateLatestSolidifiedBlock() {
     logger.info("update solid block, num = {}", latestSolidifiedBlockNum);
   }
 
-  public void updateFork() {
-    try {
-      long latestSolidifiedBlockNum = dynamicPropertiesStore.getLatestSolidifiedBlockNum();
-      BlockCapsule solidifiedBlock = getBlockByNum(latestSolidifiedBlockNum);
-      forkController.update(solidifiedBlock);
-    } catch (ItemNotFoundException | BadItemException e) {
-      logger.error("solidified block not found");
-    }
+  public void updateFork(BlockCapsule block) {
+    forkController.update(block);
   }
 
   public long getSyncBeginNumber() {
@@ -1405,8 +1399,7 @@ private void processMaintenance(BlockCapsule block) {
     proposalController.processProposals();
     witnessController.updateWitness();
     this.dynamicPropertiesStore.updateNextMaintenanceTime(block.getTimeStamp());
-    forkController.updateWhenMaintenance(block);
-    forkController.reset(block);
+    forkController.reset();
   }
 
   /**