hard fork in mantenance

Author: Yrp

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

@@ -18,16 +18,19 @@
 import org.tron.core.Wallet;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.config.Parameter.ForkBlockVersionConsts;
+import org.tron.core.config.Parameter.ForkBlockVersionEnum;
 import org.tron.core.db.Manager;
 
 @Slf4j
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 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);
@@ -45,6 +48,10 @@ public void init(Manager manager) {
     passSet.clear();
   }
 
+  public boolean pass(ForkBlockVersionEnum forkBlockVersionEnum) {
+    return pass(forkBlockVersionEnum.getValue());
+  }
+
   public synchronized boolean pass(int version) {
     if (!checkEnergy(version)) {
       return false;
@@ -102,6 +109,18 @@ private boolean check(byte[] check, byte[] stats) {
     return true;
   }
 
+  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) {
+          stats[slot] = VERSION_DOWNGRADE;
+          manager.getDynamicPropertiesStore().statsByVersion(versionEnum.getValue(), stats);
+        }
+      }
+    }
+  }
+
   public synchronized void update(BlockCapsule blockCapsule) {
     List<ByteString> witnesses = manager.getWitnessController().getActiveWitnesses();
     ByteString witness = blockCapsule.getWitnessAddress();
@@ -115,6 +134,8 @@ public synchronized void update(BlockCapsule blockCapsule) {
       return;
     }
 
+    downgrade(version, slot);
+
     byte[] stats = manager.getDynamicPropertiesStore().statsByVersion(version);
     if (check(stats) || check2(stats)) {
       return;
@@ -138,9 +159,13 @@ public synchronized void update(BlockCapsule blockCapsule) {
         version);
   }
 
+  private void setSolidNumWithVersion5BeEffective() {
+
+  }
+
   public synchronized void updateWhenMaintenance(BlockCapsule blockCapsule) {
     int version = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
-    if (version < ForkBlockVersionConsts.VERSION_3_2_2 || passSet.contains(version)) {
+    if (version < ForkBlockVersionEnum.VERSION_3_2_2.getValue() || passSet.contains(version)) {
       return;
     }
 
@@ -152,7 +177,10 @@ public synchronized void updateWhenMaintenance(BlockCapsule blockCapsule) {
     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);
+      logger.info(
+          "*******hard fork is effective in the maintenance:{}, version:{}",
+          ArrayUtils.toObject(stats),
+          version);
     }
   }
 

src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

@@ -16,6 +16,7 @@
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.config.Parameter.ChainParameters;
 import org.tron.core.config.Parameter.ForkBlockVersionConsts;
+import org.tron.core.config.Parameter.ForkBlockVersionEnum;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
@@ -219,7 +220,7 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
         if (!dbManager.getForkController().pass(ForkBlockVersionConsts.ENERGY_LIMIT)) {
           throw new ContractValidateException("Bad chain parameter id");
         }
-        if (dbManager.getForkController().pass(ForkBlockVersionConsts.VERSION_3_2_2)) {
+        if (dbManager.getForkController().pass(ForkBlockVersionEnum.VERSION_3_2_2)) {
           throw new ContractValidateException("Bad chain parameter id");
         }
         if (entry.getValue() < 0 || entry.getValue() > 100_000_000_000_000_000L) {
@@ -243,7 +244,7 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
         break;
       }
       case (19): {
-        if (!dbManager.getForkController().pass(ForkBlockVersionConsts.VERSION_3_2_2)) {
+        if (!dbManager.getForkController().pass(ForkBlockVersionEnum.VERSION_3_2_2)) {
           throw new ContractValidateException("Bad chain parameter id");
         }
         if (entry.getValue() < 0 || entry.getValue() > 100_000_000_000_000_000L) {

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

@@ -1,5 +1,7 @@
 package org.tron.core.config;
 
+import lombok.Getter;
+
 public interface Parameter {
 
   interface ChainConstant {
@@ -104,11 +106,22 @@ enum ChainParameters {
 //    EXCHANGE_BALANCE_LIMIT,
   }
 
+  @Deprecated
   interface ForkBlockVersionConsts {
 
     int START_NEW_TRANSACTION = 4;
     int ENERGY_LIMIT = 5;
-    int VERSION_3_2_2 = 6;
+  }
+
+  enum ForkBlockVersionEnum {
+    VERSION_3_2_2(6);
+
+    @Getter
+    int value;
+
+    ForkBlockVersionEnum(int value) {
+      this.value = value;
+    }
   }
 
 }