hard fork in mantenance

Author: Yrp

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

@@ -159,8 +159,16 @@ public synchronized void update(BlockCapsule blockCapsule) {
         version);
   }
 
-  private void setSolidNumWithVersion5BeEffective() {
+  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) {

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

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.ByteUtil;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BytesCapsule;
 import org.tron.core.config.Parameter;
@@ -119,6 +120,7 @@ private static class DynamicResourceProperties {
 
   private static final byte[] FORK_CONTROLLER = "FORK_CONTROLLER".getBytes();
   private static final String FORK_PREFIX = "FORK_VERSION_";
+  private static final byte[] SOLID_NUM_WITH_VERSION_5 = "SOLID_NUM_WITH_VERSION_5".getBytes();
 
   //This value is only allowed to be 0, 1, -1
   private static final byte[] REMOVE_THE_POWER_OF_THE_GR = "REMOVE_THE_POWER_OF_THE_GR".getBytes();
@@ -1411,6 +1413,18 @@ public byte[] statsByVersion(int version) {
     return revokingDB.getUnchecked(statsKey.getBytes());
   }
 
+  public void setSolidNumWithVersion5(long blockNum) {
+    byte[] longBytes = ByteArray.fromLong(blockNum);
+    put(SOLID_NUM_WITH_VERSION_5, new BytesCapsule(longBytes));
+  }
+
+  public long getSolidNumWithVersion5() {
+    return Optional.ofNullable(getUnchecked(SOLID_NUM_WITH_VERSION_5))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElse(-1L);
+  }
+
   public boolean getForked() {
     byte[] value = revokingDB.getUnchecked(FORK_CONTROLLER);
     return value == null ? Boolean.FALSE : Boolean.valueOf(new String(value));