modify the hard fork

Author: lvs007

actuator/src/main/java/org/tron/core/utils/ProposalUtil.java

@@ -302,7 +302,7 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore, Fork
         break;
       }
       case ALLOW_SHIELDED_TRC20_TRANSACTION: {
-        if (!forkUtils.pass(ForkBlockVersionEnum.VERSION_4_0)) {
+        if (!forkUtils.pass(ForkBlockVersionEnum.VERSION_4_0_1)) {
           throw new ContractValidateException(
               "Bad chain parameter id [ALLOW_SHIELDED_TRC20_TRANSACTION]");
         }

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

@@ -66,10 +66,6 @@ private boolean passNew(int version) {
     if (latestBlockTime < hardForkTime) {
       return false;
     }
-    Boolean hardForkResult = dynamicPropertiesStore.getForked(version);
-    if (hardForkResult != null) {
-      return hardForkResult;
-    }
     byte[] stats = dynamicPropertiesStore.statsByVersion(version);
     if (stats == null || stats.length == 0) {
       return false;
@@ -80,11 +76,7 @@ private boolean passNew(int version) {
         ++count;
       }
     }
-    hardForkResult = count >= versionEnum.getHardForkCount();
-    dynamicPropertiesStore.forked(version, hardForkResult);
-    logger.info("******** update block version {} hard fork result:{} ********", version,
-        hardForkResult);
-    return hardForkResult;
+    return count >= versionEnum.getHardForkCount();
   }
 
   // when block.version = 5,

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

@@ -18,7 +18,7 @@ public class ChainConstant {
     public static final int SINGLE_REPEAT = 1;
     public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
     public static final int MAX_FROZEN_NUMBER = 1;
-    public static final int BLOCK_VERSION = 16;
+    public static final int BLOCK_VERSION = 17;
   }
 
   public class NodeConstant {

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

@@ -11,7 +11,8 @@ public enum ForkBlockVersionEnum {
     VERSION_3_6(8, 0L, 0),
     VERSION_3_6_5(9, 0L, 0),
     VERSION_3_6_6(10, 0L, 0),
-    VERSION_4_0(16, 0L, 0);
+    VERSION_4_0(16, 0L, 0),
+    VERSION_4_0_1(17, 1L, 22);
 
     @Getter
     private int value;