feat(conf): make compatible with old configurations

Author: lxcmyf

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

@@ -3,7 +3,6 @@
 import static org.tron.core.actuator.ActuatorConstant.ACCOUNT_EXCEPTION_STR;
 import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
 import static org.tron.core.actuator.ActuatorConstant.WITNESS_EXCEPTION_STR;
-import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -53,8 +52,7 @@ public boolean execute(Object result) throws ContractExeException {
 
       long currentMaintenanceTime =
           chainBaseManager.getDynamicPropertiesStore().getNextMaintenanceTime();
-      long now3 = now + chainBaseManager.getDynamicPropertiesStore().getProposalVotingWindow()
-          * BLOCK_PRODUCED_INTERVAL;
+      long now3 = now + chainBaseManager.getDynamicPropertiesStore().getProposalVotingWindow();
       long round = (now3 - currentMaintenanceTime) / maintenanceTimeInterval;
       long expirationTime =
           currentMaintenanceTime + (round + 1) * maintenanceTimeInterval;

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

@@ -938,7 +938,7 @@ public enum ProposalType {         // current value, value range
     ALLOW_STRICT_MATH(87), // 0, 1
     CONSENSUS_LOGIC_OPTIMIZATION(88), // 0, 1
     ALLOW_TVM_BLOB(89), // 0, 1
-    PROPOSAL_VOTING_WINDOW(92); // (0, 10512000]
+    PROPOSAL_VOTING_WINDOW(92); // (0, 31536000000]
 
     private long code;
 

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

@@ -39,12 +39,12 @@ 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_VOTING_WINDOW = 0L; // Number of blocks to 0 day
-  public static final long MAX_PROPOSAL_VOTING_WINDOW = 10512000L; // Number of blocks to 365 days
+  public static final long MIN_PROPOSAL_VOTING_WINDOW = 0L; // 0 ms
+  public static final long MAX_PROPOSAL_VOTING_WINDOW = 31536000000L; // ms of 365 days
   /**
    * default number of blocks to 3 days
    */
-  public static final long DEFAULT_PROPOSAL_VOTING_WINDOW = 86400L;
+  public static final long DEFAULT_PROPOSAL_VOTING_WINDOW = 259200000L;
 
 
   // Numbers

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

@@ -1299,9 +1299,18 @@ public static void setParam(final Config config) {
         config.hasPath(Constant.COMMITTEE_ALLOW_TVM_BLOB) ? config
             .getInt(Constant.COMMITTEE_ALLOW_TVM_BLOB) : 0;
 
-    PARAMETER.proposalVotingWindow =
-        config.hasPath(Constant.COMMITTEE_PROPOSAL_VOTING_WINDOW) ? config
-            .getInt(Constant.COMMITTEE_PROPOSAL_VOTING_WINDOW) : DEFAULT_PROPOSAL_VOTING_WINDOW;
+    if (config.hasPath(Constant.COMMITTEE_PROPOSAL_VOTING_WINDOW)) {
+      // Highest priority: As long as COMMITTEE_PROPOSAL_VOTING_WINDOW is configured, it will be
+      // taken
+      PARAMETER.proposalVotingWindow = config.getInt(Constant.COMMITTEE_PROPOSAL_VOTING_WINDOW);
+    } else if (config.hasPath(Constant.BLOCK_PROPOSAL_EXPIRE_TIME)) {
+      // Secondary priority: If the former is not configured but the latter is configured,
+      // choose the latter
+      PARAMETER.proposalVotingWindow = config.getInt(Constant.BLOCK_PROPOSAL_EXPIRE_TIME);
+    } else {
+      // Lowest priority: Neither is configured, use default values
+      PARAMETER.proposalVotingWindow = DEFAULT_PROPOSAL_VOTING_WINDOW;
+    }
 
     logConfig();
   }

framework/src/test/java/org/tron/core/services/ProposalServiceTest.java

@@ -138,7 +138,7 @@ public void testUpdateConsensusLogicOptimization() {
   public void testProposalVotingWindow() {
     long defaultWindow = dbManager.getDynamicPropertiesStore().getProposalVotingWindow();
     long proposalExpireTime = CommonParameter.getInstance().getProposalExpireTime();
-    Assert.assertEquals(proposalExpireTime, defaultWindow * 3000);
+    Assert.assertEquals(proposalExpireTime, defaultWindow);
 
     Proposal proposal = Proposal.newBuilder().putParameters(PROPOSAL_VOTING_WINDOW.getCode(),
         MAX_PROPOSAL_VOTING_WINDOW).build();