fix(proposalExpireTime): optimize the minimum value of proposal expiration time

Author: lxcmyf

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

@@ -5,7 +5,6 @@
 import static org.tron.core.Constant.DYNAMIC_ENERGY_INCREASE_FACTOR_RANGE;
 import static org.tron.core.Constant.DYNAMIC_ENERGY_MAX_FACTOR_RANGE;
 import static org.tron.core.Constant.MAX_PROPOSAL_EXPIRE_TIME;
-import static org.tron.core.Constant.MIN_PROPOSAL_EXPIRE_TIME;
 import static org.tron.core.config.Parameter.ChainConstant.ONE_YEAR_BLOCK_NUMBERS;
 
 import org.tron.common.utils.ForkController;
@@ -846,11 +845,12 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
           throw new ContractValidateException(
               "Bad chain parameter id [PROPOSAL_EXPIRE_TIME]");
         }
-        if (value <= MIN_PROPOSAL_EXPIRE_TIME
+        long minProposalExpireTime = dynamicPropertiesStore.getMaintenanceTimeInterval();
+        if (value <= minProposalExpireTime
             || value >= MAX_PROPOSAL_EXPIRE_TIME) {
           throw new ContractValidateException(
               "This value[PROPOSAL_EXPIRE_TIME] is only allowed to be greater than "
-                  + MIN_PROPOSAL_EXPIRE_TIME + " and less than "
+                  + minProposalExpireTime + " and less than "
                   + MAX_PROPOSAL_EXPIRE_TIME + "!");
         }
         break;

chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java

@@ -2,7 +2,6 @@
 
 import static org.tron.common.math.Maths.max;
 import static org.tron.core.Constant.MAX_PROPOSAL_EXPIRE_TIME;
-import static org.tron.core.Constant.MIN_PROPOSAL_EXPIRE_TIME;
 import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
 import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
 
@@ -2957,7 +2956,7 @@ public long getProposalExpireTime() {
     return Optional.ofNullable(getUnchecked(PROPOSAL_EXPIRE_TIME))
         .map(BytesCapsule::getData)
         .map(ByteArray::toLong)
-        .filter(time -> time > MIN_PROPOSAL_EXPIRE_TIME && time < MAX_PROPOSAL_EXPIRE_TIME)
+        .filter(time -> time > getMaintenanceTimeInterval() && time < MAX_PROPOSAL_EXPIRE_TIME)
         .orElse(CommonParameter.getInstance().getProposalExpireTime());
   }
 

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

@@ -39,7 +39,7 @@ public class Constant {
   public static final long MAX_CONTRACT_RESULT_SIZE = 2L;
   public static final long PB_DEFAULT_ENERGY_LIMIT = 0L;
   public static final long CREATOR_DEFAULT_ENERGY_LIMIT = 1000 * 10_000L;
-  public static final long MIN_PROPOSAL_EXPIRE_TIME = 0L; // 0 ms
+//  public static final long MIN_PROPOSAL_EXPIRE_TIME = 0L; // 0 ms
   public static final long MAX_PROPOSAL_EXPIRE_TIME = 31536003000L; // ms of 365 days + 3000 ms
   public static final long DEFAULT_PROPOSAL_EXPIRE_TIME = 259200000L; // ms of 3 days
 

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

@@ -8,7 +8,6 @@
 import static org.tron.core.Constant.DYNAMIC_ENERGY_INCREASE_FACTOR_RANGE;
 import static org.tron.core.Constant.DYNAMIC_ENERGY_MAX_FACTOR_RANGE;
 import static org.tron.core.Constant.MAX_PROPOSAL_EXPIRE_TIME;
-import static org.tron.core.Constant.MIN_PROPOSAL_EXPIRE_TIME;
 import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCE_TIMEOUT_PERCENT;
 import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
 
@@ -1309,10 +1308,11 @@ private static long getProposalExpirationTime(final Config config) {
     }
     if (config.hasPath(Constant.BLOCK_PROPOSAL_EXPIRE_TIME)) {
       long proposalExpireTime = config.getLong(Constant.BLOCK_PROPOSAL_EXPIRE_TIME);
-      if (proposalExpireTime <= MIN_PROPOSAL_EXPIRE_TIME
+      long minProposalExpireTime = PARAMETER.maintenanceTimeInterval;
+      if (proposalExpireTime <= minProposalExpireTime
           || proposalExpireTime >= MAX_PROPOSAL_EXPIRE_TIME) {
         throw new IllegalArgumentException("The value[block.proposalExpireTime] is only allowed to "
-            + "be greater than " + MIN_PROPOSAL_EXPIRE_TIME + " and less than "
+            + "be greater than " + minProposalExpireTime + " and less than "
             + MAX_PROPOSAL_EXPIRE_TIME + "!");
       }
       return proposalExpireTime;