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().getProposalExpireTime();
       long round = (now3 - currentMaintenanceTime) / maintenanceTimeInterval;
       long expirationTime =
           currentMaintenanceTime + (round + 1) * maintenanceTimeInterval;

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

@@ -4,8 +4,8 @@
 import static org.tron.core.Constant.CREATE_ACCOUNT_TRANSACTION_MIN_BYTE_SIZE;
 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_VOTING_WINDOW;
-import static org.tron.core.Constant.MIN_PROPOSAL_VOTING_WINDOW;
+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;
@@ -841,17 +841,17 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
-      case PROPOSAL_VOTING_WINDOW: {
+      case PROPOSAL_EXPIRE_TIME: {
         if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
           throw new ContractValidateException(
-              "Bad chain parameter id [PROPOSAL_VOTING_WINDOW]");
+              "Bad chain parameter id [PROPOSAL_EXPIRE_TIME]");
         }
-        if (value <= MIN_PROPOSAL_VOTING_WINDOW
-            || value > MAX_PROPOSAL_VOTING_WINDOW) {
+        if (value <= MIN_PROPOSAL_EXPIRE_TIME
+            || value >= MAX_PROPOSAL_EXPIRE_TIME) {
           throw new ContractValidateException(
-              "This value[PROPOSAL_VOTING_WINDOW] is only allowed to be greater than "
-                  + MIN_PROPOSAL_VOTING_WINDOW + " and less than or equal to "
-                  + MAX_PROPOSAL_VOTING_WINDOW + "!");
+              "This value[PROPOSAL_EXPIRE_TIME] is only allowed to be greater than "
+                  + MIN_PROPOSAL_EXPIRE_TIME + " and less than "
+                  + MAX_PROPOSAL_EXPIRE_TIME + "!");
         }
         break;
       }
@@ -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_EXPIRE_TIME(92); // (0, 31536000000)
 
     private long code;
 

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

@@ -1,6 +1,8 @@
 package org.tron.core.store;
 
 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;
 
@@ -231,7 +233,7 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] ALLOW_TVM_CANCUN = "ALLOW_TVM_CANCUN".getBytes();
 
   private static final byte[] ALLOW_TVM_BLOB = "ALLOW_TVM_BLOB".getBytes();
-  private static final byte[] PROPOSAL_VOTING_WINDOW = "PROPOSAL_VOTING_WINDOW".getBytes();
+  private static final byte[] PROPOSAL_EXPIRE_TIME = "PROPOSAL_EXPIRE_TIME".getBytes();
 
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
@@ -2947,15 +2949,16 @@ public long getAllowTvmBlob() {
         .orElse(CommonParameter.getInstance().getAllowTvmBlob());
   }
 
-  public void saveProposalVotingWindow(long proposalVotingWindow) {
-    this.put(PROPOSAL_VOTING_WINDOW, new BytesCapsule(ByteArray.fromLong(proposalVotingWindow)));
+  public void saveProposalExpireTime(long proposalExpireTime) {
+    this.put(PROPOSAL_EXPIRE_TIME, new BytesCapsule(ByteArray.fromLong(proposalExpireTime)));
   }
 
-  public long getProposalVotingWindow() {
-    return Optional.ofNullable(getUnchecked(PROPOSAL_VOTING_WINDOW))
+  public long getProposalExpireTime() {
+    return Optional.ofNullable(getUnchecked(PROPOSAL_EXPIRE_TIME))
         .map(BytesCapsule::getData)
         .map(ByteArray::toLong)
-        .orElse(CommonParameter.getInstance().getProposalVotingWindow());
+        .filter(time -> time > MIN_PROPOSAL_EXPIRE_TIME && time < MAX_PROPOSAL_EXPIRE_TIME)
+        .orElse(CommonParameter.getInstance().getProposalExpireTime());
   }
 
   private static class DynamicResourceProperties {

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

@@ -724,14 +724,6 @@ public class CommonParameter {
   @Setter
   public long allowTvmBlob;
 
-  /**
-   * Committee parameter.
-   * Indicate the number of blocks after which the proposal approval window will take effect.
-   */
-  @Getter
-  @Setter
-  public long proposalVotingWindow;
-
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
     return 5.0;

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

@@ -39,12 +39,9 @@ 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
-  /**
-   * default number of blocks to 3 days
-   */
-  public static final long DEFAULT_PROPOSAL_VOTING_WINDOW = 86400L;
+  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
 
 
   // Numbers
@@ -411,5 +408,5 @@ public class Constant {
   public static final String COMMITTEE_ALLOW_TVM_CANCUN = "committee.allowTvmCancun";
 
   public static final String COMMITTEE_ALLOW_TVM_BLOB = "committee.allowTvmBlob";
-  public static final String COMMITTEE_PROPOSAL_VOTING_WINDOW = "committee.proposalVotingWindow";
+  public static final String COMMITTEE_PROPOSAL_EXPIRE_TIME = "committee.proposalExpireTime";
 }

framework/src/main/java/org/tron/core/Wallet.java

@@ -1388,8 +1388,8 @@ public Protocol.ChainParameters getChainParameters() {
         .build());
 
     builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
-        .setKey("getProposalVotingWindow")
-        .setValue(dbManager.getDynamicPropertiesStore().getProposalVotingWindow())
+        .setKey("getProposalExpireTime")
+        .setValue(dbManager.getDynamicPropertiesStore().getProposalExpireTime())
         .build());
 
     return builder.build();

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

@@ -4,9 +4,11 @@
 import static org.tron.common.math.Maths.max;
 import static org.tron.common.math.Maths.min;
 import static org.tron.core.Constant.ADD_PRE_FIX_BYTE_MAINNET;
-import static org.tron.core.Constant.DEFAULT_PROPOSAL_VOTING_WINDOW;
+import static org.tron.core.Constant.DEFAULT_PROPOSAL_EXPIRE_TIME;
 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;
 
@@ -248,7 +250,6 @@ public static void clearParam() {
     PARAMETER.consensusLogicOptimization = 0;
     PARAMETER.allowTvmCancun = 0;
     PARAMETER.allowTvmBlob = 0;
-    PARAMETER.proposalVotingWindow = DEFAULT_PROPOSAL_VOTING_WINDOW;
   }
 
   /**
@@ -817,9 +818,7 @@ public static void setParam(final Config config) {
         config.hasPath(Constant.BLOCK_MAINTENANCE_TIME_INTERVAL) ? config
             .getInt(Constant.BLOCK_MAINTENANCE_TIME_INTERVAL) : 21600000L;
 
-    PARAMETER.proposalExpireTime =
-        config.hasPath(Constant.BLOCK_PROPOSAL_EXPIRE_TIME) ? config
-            .getInt(Constant.BLOCK_PROPOSAL_EXPIRE_TIME) : 259200000L;
+    PARAMETER.proposalExpireTime = getProposalExpirationTime(config);
 
     PARAMETER.checkFrozenTime =
         config.hasPath(Constant.BLOCK_CHECK_FROZEN_TIME) ? config
@@ -1299,13 +1298,29 @@ 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;
-
     logConfig();
   }
 
+  private static long getProposalExpirationTime(final Config config) {
+    if (config.hasPath(Constant.COMMITTEE_PROPOSAL_EXPIRE_TIME)) {
+      throw new IllegalArgumentException("It is not allowed to configure "
+          + "commit.proposalExpireTime in config.conf, please set the value in "
+          + "block.proposalExpireTime.");
+    }
+    if (config.hasPath(Constant.BLOCK_PROPOSAL_EXPIRE_TIME)) {
+      long proposalExpireTime = config.getLong(Constant.BLOCK_PROPOSAL_EXPIRE_TIME);
+      if (proposalExpireTime <= MIN_PROPOSAL_EXPIRE_TIME
+          || 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 "
+            + MAX_PROPOSAL_EXPIRE_TIME + "!");
+      }
+      return proposalExpireTime;
+    } else {
+      return DEFAULT_PROPOSAL_EXPIRE_TIME;
+    }
+  }
+
   private static List<Witness> getWitnessesFromConfig(final com.typesafe.config.Config config) {
     return config.getObjectList(Constant.GENESIS_BLOCK_WITNESSES).stream()
         .map(Args::createWitness)

framework/src/main/java/org/tron/core/consensus/ProposalService.java

@@ -384,8 +384,8 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
           manager.getDynamicPropertiesStore().saveAllowTvmBlob(entry.getValue());
           break;
         }
-        case PROPOSAL_VOTING_WINDOW: {
-          manager.getDynamicPropertiesStore().saveProposalVotingWindow(entry.getValue());
+        case PROPOSAL_EXPIRE_TIME: {
+          manager.getDynamicPropertiesStore().saveProposalExpireTime(entry.getValue());
           break;
         }
         default:

framework/src/test/java/org/tron/common/ParameterTest.java

@@ -316,7 +316,5 @@ public void testCommonParameter() {
     assertEquals(1, parameter.getAllowEnergyAdjustment());
     parameter.setMaxCreateAccountTxSize(1000);
     assertEquals(1000, parameter.getMaxCreateAccountTxSize());
-    parameter.setProposalVotingWindow(86400L);
-    assertEquals(86400L, parameter.getProposalVotingWindow());
   }
 }

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

@@ -1,9 +1,9 @@
 package org.tron.core.services;
 
-import static org.tron.core.Constant.MAX_PROPOSAL_VOTING_WINDOW;
+import static org.tron.core.Constant.MAX_PROPOSAL_EXPIRE_TIME;
 import static org.tron.core.utils.ProposalUtil.ProposalType.CONSENSUS_LOGIC_OPTIMIZATION;
 import static org.tron.core.utils.ProposalUtil.ProposalType.ENERGY_FEE;
-import static org.tron.core.utils.ProposalUtil.ProposalType.PROPOSAL_VOTING_WINDOW;
+import static org.tron.core.utils.ProposalUtil.ProposalType.PROPOSAL_EXPIRE_TIME;
 import static org.tron.core.utils.ProposalUtil.ProposalType.TRANSACTION_FEE;
 import static org.tron.core.utils.ProposalUtil.ProposalType.WITNESS_127_PAY_PER_BLOCK;
 
@@ -135,20 +135,20 @@ public void testUpdateConsensusLogicOptimization() {
   }
 
   @Test
-  public void testProposalVotingWindow() {
-    long defaultWindow = dbManager.getDynamicPropertiesStore().getProposalVotingWindow();
+  public void testProposalExpireTime() {
+    long defaultWindow = dbManager.getDynamicPropertiesStore().getProposalExpireTime();
     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();
+    Proposal proposal = Proposal.newBuilder().putParameters(PROPOSAL_EXPIRE_TIME.getCode(),
+        31536000000L).build();
     ProposalCapsule proposalCapsule = new ProposalCapsule(proposal);
     proposalCapsule.setExpirationTime(1627279200000L);
     boolean result = ProposalService.process(dbManager, proposalCapsule);
     Assert.assertTrue(result);
 
-    long window = dbManager.getDynamicPropertiesStore().getProposalVotingWindow();
-    Assert.assertEquals(MAX_PROPOSAL_VOTING_WINDOW, window);
+    long window = dbManager.getDynamicPropertiesStore().getProposalExpireTime();
+    Assert.assertEquals(MAX_PROPOSAL_EXPIRE_TIME - 3000, window);
   }
 
 }