feat(freezeV2): optimize proposal validation

Author: lxcmyf

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

@@ -713,10 +713,11 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
           throw new ContractValidateException(
               "Bad chain parameter id [MAX_DELEGATE_LOCK_PERIOD]");
         }
-        if (value <= 0) {
+        long maxDelegateLockPeriod = dynamicPropertiesStore.getMaxDelegateLockPeriod();
+        if (value <= maxDelegateLockPeriod || value > 10512000L) {
           throw new ContractValidateException(
-              "This value[MAX_DELEGATE_LOCK_PERIOD] is only allowed to be "
-                  + "greater than 0");
+              "This value[MAX_DELEGATE_LOCK_PERIOD] is only allowed to be greater than "
+                  + maxDelegateLockPeriod + "and less than or equal to 10512000 !");
         }
         if (dynamicPropertiesStore.getUnfreezeDelayDays() == 0) {
           throw new ContractValidateException(
@@ -800,7 +801,7 @@ public enum ProposalType {         // current value, value range
     DYNAMIC_ENERGY_MAX_FACTOR(75), // 0, [0, 100_000]
     ALLOW_TVM_SHANGHAI(76), // 0, 1
     ALLOW_CANCEL_ALL_UNFREEZE_V2(77), // 0, 1
-    MAX_DELEGATE_LOCK_PERIOD(78); // 0, 1
+    MAX_DELEGATE_LOCK_PERIOD(78); // (86400, 10512000]
 
     private long code;
 

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

@@ -1,5 +1,7 @@
 package org.tron.core.store;
 
+import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
+
 import com.google.protobuf.ByteString;
 import java.util.Arrays;
 import java.util.Optional;
@@ -2808,11 +2810,11 @@ public long getMaxDelegateLockPeriod() {
     return Optional.ofNullable(getUnchecked(MAX_DELEGATE_LOCK_PERIOD))
         .map(BytesCapsule::getData)
         .map(ByteArray::toLong)
-        .orElse(CommonParameter.getInstance().getMaxDelegateLockPeriod());
+        .orElse(DELEGATE_PERIOD / 3000);
   }
 
   public boolean supportMaxDelegateLockPeriod() {
-    return getMaxDelegateLockPeriod() > 0 && getUnfreezeDelayDays() > 0;
+    return (getMaxDelegateLockPeriod() > DELEGATE_PERIOD / 3000) && getUnfreezeDelayDays() > 0;
   }
 
   private static class DynamicResourceProperties {

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

@@ -655,10 +655,6 @@ public class CommonParameter {
   @Setter
   public long allowCancelAllUnfreezeV2;
 
-  @Getter
-  @Setter
-  public long maxDelegateLockPeriod;
-
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
     return 5.0;

framework/src/test/java/org/tron/core/WalletTest.java

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 import static org.tron.protos.contract.Common.ResourceCode.BANDWIDTH;
 import static org.tron.protos.contract.Common.ResourceCode.ENERGY;
@@ -792,19 +793,19 @@ public void testGetCanDelegatedMaxSizeBandWidth() {
         ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
         BANDWIDTH.getNumber());
     Assert.assertEquals(initBalance - 280L, message.getMaxSize());
-    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
   @Test
   public void testGetCanDelegatedMaxSizeBandWidth2() {
     chainBaseManager.getDynamicPropertiesStore().saveUnfreezeDelayDays(14);
-    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(1);
+    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(86401);
     freezeBandwidthForOwner();
     GrpcAPI.CanDelegatedMaxSizeResponseMessage message = wallet.getCanDelegatedMaxSize(
         ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
         BANDWIDTH.getNumber());
-    Assert.assertEquals(initBalance - 282L, message.getMaxSize());
-    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    Assert.assertEquals(initBalance - 284L, message.getMaxSize());
+    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
   @Test

framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 import static org.tron.protos.contract.Common.ResourceCode.BANDWIDTH;
 import static org.tron.protos.contract.Common.ResourceCode.ENERGY;
@@ -435,7 +436,7 @@ public void testLockedDelegateResourceForBandwidth() {
 
   @Test
   public void testMaxDelegateLockPeriodForBandwidthWrongLockPeriod1() {
-    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(1);
+    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(86401);
     freezeBandwidthForOwner();
     long delegateBalance = 1_000_000_000L;
     DelegateResourceActuator actuator = new DelegateResourceActuator();
@@ -444,7 +445,7 @@ public void testMaxDelegateLockPeriodForBandwidthWrongLockPeriod1() {
             delegateBalance, 370 * 24 * 3600));
     assertThrows("The lock period of delegate resources cannot exceed 1 year!",
         ContractValidateException.class, actuator::validate);
-    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
   @Test
@@ -473,7 +474,7 @@ public void testMaxDelegateLockPeriodForBandwidthWrongLockPeriod2() {
     assertThrows("The lock period for bandwidth this time cannot be less than the remaining"
             + " time[60000s] of the last lock period for bandwidth!",
         ContractValidateException.class, actuator1::validate);
-    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    dbManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
   @Test

framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
+import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
 import static org.tron.core.utils.TransactionUtil.validAccountId;
 import static org.tron.core.utils.TransactionUtil.validAccountName;
 import static org.tron.core.utils.TransactionUtil.validAssetName;
@@ -149,7 +150,7 @@ public void testEstimateConsumeBandWidthSize() {
     long estimateConsumeBandWidthSize = TransactionUtil.estimateConsumeBandWidthSize(ownerCapsule,
         dbManager.getChainBaseManager());
     assertEquals(275L, estimateConsumeBandWidthSize);
-    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
   @Test
@@ -161,7 +162,7 @@ public void testEstimateConsumeBandWidthSize2() {
     long estimateConsumeBandWidthSize = TransactionUtil.estimateConsumeBandWidthSize(ownerCapsule,
         dbManager.getChainBaseManager());
     assertEquals(277L, estimateConsumeBandWidthSize);
-    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(0);
+    chainBaseManager.getDynamicPropertiesStore().saveMaxDelegateLockPeriod(DELEGATE_PERIOD / 3000);
   }
 
 }