Merge pull request #5267 from lxcmyf/release_v4.7.2

feat(freezeV2): optimize msg format

Author: halibobo1205

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

@@ -61,10 +61,10 @@ public boolean execute(Object result) throws ContractExeException {
 
     AccountCapsule ownerCapsule = accountStore
         .get(delegateResourceContract.getOwnerAddress().toByteArray());
-
+    DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
     long delegateBalance = delegateResourceContract.getBalance();
     boolean lock = delegateResourceContract.getLock();
-    long lockPeriod = delegateResourceContract.getLockPeriod();
+    long lockPeriod = getLockPeriod(dynamicStore, delegateResourceContract);
     byte[] receiverAddress = delegateResourceContract.getReceiverAddress().toByteArray();
 
     // delegate resource to receiver
@@ -219,7 +219,7 @@ public boolean validate() throws ContractValidateException {
 
     boolean lock = delegateResourceContract.getLock();
     if (lock && dynamicStore.supportMaxDelegateLockPeriod()) {
-      long lockPeriod = delegateResourceContract.getLockPeriod();
+      long lockPeriod = getLockPeriod(dynamicStore, delegateResourceContract);
       long maxDelegateLockPeriod = dynamicStore.getMaxDelegateLockPeriod();
       if (lockPeriod < 0 || lockPeriod > maxDelegateLockPeriod) {
         throw new ContractValidateException(
@@ -257,6 +257,16 @@ public boolean validate() throws ContractValidateException {
     return true;
   }
 
+  private long getLockPeriod(DynamicPropertiesStore dynamicStore,
+      DelegateResourceContract delegateResourceContract) {
+    long lockPeriod = delegateResourceContract.getLockPeriod();
+    if (dynamicStore.supportMaxDelegateLockPeriod()) {
+      return lockPeriod == 0 ? DELEGATE_PERIOD / 3000 : lockPeriod;
+    } else {
+      return 0;
+    }
+  }
+
   private void validRemainTime(ResourceCode resourceCode, long lockPeriod, long expireTime,
       long now) throws ContractValidateException {
     long remainTime = expireTime - now;
@@ -294,7 +304,7 @@ private void delegateResource(byte[] ownerAddress, byte[] receiverAddress, boole
     long expireTime = 0;
     if (lock) {
       if (dynamicPropertiesStore.supportMaxDelegateLockPeriod()) {
-        expireTime = now + (lockPeriod == 0 ? DELEGATE_PERIOD : lockPeriod * 3 * 1000);
+        expireTime = now + lockPeriod * 3 * 1000;
       } else {
         expireTime = now + DELEGATE_PERIOD;
       }

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

@@ -717,7 +717,7 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         if (value <= maxDelegateLockPeriod || value > 10512000L) {
           throw new ContractValidateException(
               "This value[MAX_DELEGATE_LOCK_PERIOD] is only allowed to be greater than "
-                  + maxDelegateLockPeriod + "and less than or equal to 10512000 !");
+                  + maxDelegateLockPeriod + " and less than or equal to 10512000 !");
         }
         if (dynamicPropertiesStore.getUnfreezeDelayDays() == 0) {
           throw new ContractValidateException(