- release 2.0.3: fix hardfork proposal

uniworld-io · Oct 24, 2021 · 499978c · 499978c
1 parent ce4ddad
commit 499978c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 group 'org.unichain'
-version '2.0.2'
+version '2.0.3'
 
 apply plugin: 'java'
 apply plugin: 'com.google.protobuf'

diff --git a/src/main/java/org/unichain/core/config/Parameter.java b/src/main/java/org/unichain/core/config/Parameter.java
@@ -51,7 +51,7 @@ public class ChainConstant {
     public static final long MAX_FUTURE_TRANSFER_UNW_TIME_RANGE_UPPER_BOUND = 30*31536000000L;//30 years
 
     public static final long MAX_FUTURE_TRANSFER_TIME_RANGE_TOKEN = 10*31536000000L;//10 years
-    public static final long MAX_FUTURE_TRANSFER_TIME_RANGE_TOKEN_UPPER_BOUND = 30*31536000000L;//10 years
+    public static final long MAX_FUTURE_TRANSFER_TIME_RANGE_TOKEN_UPPER_BOUND = 30*31536000000L;//30 years
 
     public static final long MAX_TOKEN_AGE = 50*31536000000L;//50 years
     public static final long DEFAULT_TOKEN_AGE = 20*31536000000L;//20 years

diff --git a/src/main/java/org/unichain/core/net/UnichainNetDelegate.java b/src/main/java/org/unichain/core/net/UnichainNetDelegate.java
@@ -219,7 +219,6 @@ public boolean validBlock(BlockCapsule block) throws P2pException {
     }
   }
 
-  //@todo review: is it solid or snapshot version ?
   public int getRunningBlockVersion(){
     return dbManager.getDynamicPropertiesStore().getHardForkVersion();
   }

diff --git a/src/main/java/org/unichain/core/services/ProposalService.java b/src/main/java/org/unichain/core/services/ProposalService.java
@@ -270,9 +270,10 @@ public static void validator(Manager manager, long code, long value) throws Cont
 
       case HARD_FORK: {
         logger.info("validating hardfork proposal --> {}", value);
-        Assert.isTrue(value >= 2 && value <= Integer.MAX_VALUE, "hardfork version should greater than version 1 and not greater than MAX_INTEGER :" + Integer.MAX_VALUE);
-        Assert.isTrue(Parameter.BLOCK_VERSION_SUPPORTED.contains(value), "hardfork version not supported by software :" + value);
-        Assert.isTrue(value > manager.getDynamicPropertiesStore().getHardForkVersion(), "hardfork version must be greater than current version");
+        int valueInt = Long.valueOf(value).intValue();
+        Assert.isTrue(valueInt >= 2 && valueInt <= Integer.MAX_VALUE, "hardfork version should greater than version 1 and not greater than MAX_INTEGER :" + Integer.MAX_VALUE);
+        Assert.isTrue(Parameter.BLOCK_VERSION_SUPPORTED.contains(valueInt), "hardfork version not supported by software :" + valueInt);
+        Assert.isTrue(valueInt > manager.getDynamicPropertiesStore().getHardForkVersion(), "hardfork version must be greater than current version: " + manager.getDynamicPropertiesStore().getHardForkVersion());
         break;
       }
       case MAX_FUTURE_TRANSFER_TIME_RANGE_UNW: {
@@ -452,6 +453,11 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
           manager.getDynamicPropertiesStore().saveWitness55PayPerBlock(entry.getValue());
           break;
         }
+        /**
+         * @note:
+         * - if some hard fork proposals created/approved in the same maintain time, they will be processed sequentially
+         * - the last proposal will win.
+         */
         case HARD_FORK: {
           logger.info("saving hardfork proposal --> {}", entry.getValue());
           manager.getDynamicPropertiesStore().saveHardForkVersion(entry.getValue());