Merge pull request #5268 from chengtx01/hard_fork

feat(hard_fork):remove local version checking logic

Author: jwrct

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

@@ -38,6 +38,17 @@ public class ForkController {
 
   public void init(ChainBaseManager manager) {
     this.manager = manager;
+    DynamicPropertiesStore store = manager.getDynamicPropertiesStore();
+    int latestVersion = store.getLatestVersion();
+    if (latestVersion == 0) {
+      for (ForkBlockVersionEnum version : ForkBlockVersionEnum.values()) {
+        int v = version.getValue();
+        if (pass(v) && latestVersion < v) {
+          latestVersion = v;
+        }
+      }
+      store.saveLatestVersion(latestVersion);
+    }
   }
 
   public boolean pass(ForkBlockVersionEnum forkBlockVersionEnum) {
@@ -218,32 +229,4 @@ private ForkController getInstance() {
     }
   }
 
-  public void checkLocalVersion() {
-    DynamicPropertiesStore store = manager.getDynamicPropertiesStore();
-    int latestVersion = store.getLatestVersion();
-    if (latestVersion == 0) {
-      for (ForkBlockVersionEnum version : ForkBlockVersionEnum.values()) {
-        int v = version.getValue();
-        if (pass(v) && latestVersion < v) {
-          latestVersion = v;
-        }
-      }
-      store.saveLatestVersion(latestVersion);
-      return;
-    }
-
-    if (!CommonParameter.getInstance().isVersionCheckEnable()) {
-      return;
-    }
-
-    int systemVersion = 0;
-    for (ForkBlockVersionEnum version : ForkBlockVersionEnum.values()) {
-      if (version.getValue() > systemVersion) {
-        systemVersion = version.getValue();
-      }
-    }
-    if (latestVersion > systemVersion) {
-      throw new RuntimeException("Version check failed, please upgrade to the latest version");
-    }
-  }
 }

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -395,9 +395,6 @@ public class CommonParameter {
   public boolean version;
   @Getter
   @Setter
-  public boolean versionCheckEnable;
-  @Getter
-  @Setter
   public String zenTokenId;
   @Getter
   @Setter

common/src/main/java/org/tron/core/Constant.java

@@ -372,7 +372,5 @@ public class Constant {
   public static final String DYNAMIC_CONFIG_ENABLE = "node.dynamicConfig.enable";
   public static final String DYNAMIC_CONFIG_CHECK_INTERVAL = "node.dynamicConfig.checkInterval";
 
-  public static final String NODE_VERSION_CHECK_ENABLE = "node.versionCheckEnable";
-
   public static final String COMMITTEE_ALLOW_TVM_SHANGHAI = "committee.allowTvmShangHai";
 }

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -233,7 +233,6 @@ public static void clearParam() {
     PARAMETER.p2pDisable = false;
     PARAMETER.dynamicConfigEnable = false;
     PARAMETER.dynamicConfigCheckInterval = 600;
-    PARAMETER.versionCheckEnable = true;
     PARAMETER.allowTvmShangHai = 0;
   }
 
@@ -1180,9 +1179,6 @@ public static void setParam(final String[] args, final String confFileName) {
       PARAMETER.dynamicConfigCheckInterval = 600;
     }
 
-    PARAMETER.versionCheckEnable = !config.hasPath(Constant.NODE_VERSION_CHECK_ENABLE)
-        || config.getBoolean(Constant.NODE_VERSION_CHECK_ENABLE);
-
     PARAMETER.allowTvmShangHai =
         config.hasPath(Constant.COMMITTEE_ALLOW_TVM_SHANGHAI) ? config
             .getInt(Constant.COMMITTEE_ALLOW_TVM_SHANGHAI) : 0;

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

@@ -487,12 +487,6 @@ public void init() {
       System.exit(1);
     }
     getChainBaseManager().getForkController().init(this.chainBaseManager);
-    try {
-      getChainBaseManager().getForkController().checkLocalVersion();
-    } catch (RuntimeException r) {
-      logger.error("{}", r.getMessage());
-      System.exit(1);
-    }
 
     if (Args.getInstance().isNeedToUpdateAsset() && needToUpdateAsset()) {
       new AssetUpdateHelper(chainBaseManager).doWork();

framework/src/test/java/org/tron/core/ForkControllerTest.java

@@ -222,39 +222,6 @@ public void testUpdate() {
     Assert.assertEquals(getSum(bytes), 4);
   }
 
-  @Test
-  public void testCheck() {
-    byte[] stats1 = {0, 0, 0, 0, 0};
-    byte[] stats2 = {1, 1, 1, 1, 1};
-
-    for (Parameter.ForkBlockVersionEnum version : Parameter.ForkBlockVersionEnum.values()) {
-      dynamicPropertiesStore.statsByVersion(version.getValue(), stats1);
-    }
-
-    dynamicPropertiesStore
-        .statsByVersion(Parameter.ForkBlockVersionEnum.VERSION_3_5.getValue(), stats2);
-
-    forkController.checkLocalVersion();
-
-    Assert.assertEquals(dynamicPropertiesStore.getLatestVersion(),
-        Parameter.ForkBlockVersionEnum.VERSION_3_5.getValue());
-
-
-    Args.getInstance().setVersionCheckEnable(false);
-    dynamicPropertiesStore.saveLatestVersion(Integer.MAX_VALUE);
-
-    forkController.checkLocalVersion();
-
-    Args.getInstance().setVersionCheckEnable(true);
-
-    try {
-      forkController.checkLocalVersion();
-      Assert.fail();
-    } catch (Exception e) {
-      Assert.assertTrue(e instanceof  RuntimeException);
-    }
-  }
-
   private BlockCapsule getBlock(int i, Parameter.ForkBlockVersionEnum versionEnum) {
     org.tron.protos.Protocol.BlockHeader.raw rawData =
         org.tron.protos.Protocol.BlockHeader.raw.newBuilder()