feat(freezeV2): optimize some code logic

Tron protobuf protocol document.md

@@ -627,7 +627,7 @@ Transaction and transaction-related messages.
           WithdrawExpireUnfreezeContract = 56;
           DelegateResourceContract = 57;
           UnDelegateResourceContract = 58;
-          CancelUnfreezeV2Contract = 59;
+          CancelAllUnfreezeV2Contract = 59;
         }
         ContractType type = 1;
         google.protobuf.Any parameter = 2;
@@ -888,7 +888,7 @@ Contract and contract-related messages.
       WithdrawExpireUnfreezeContract = 56;
       DelegateResourceContract = 57;
       UnDelegateResourceContract = 58;
-      CancelUnfreezeV2Contract = 59;
+      CancelAllUnfreezeV2Contract = 59;
     }
     ContractType type = 1;
     google.protobuf.Any parameter = 2;

actuator/src/main/java/org/tron/core/actuator/CancelUnfreezeV2Actuator.java → actuator/src/main/java/org/tron/core/actuator/CancelAllUnfreezeV2Actuator.java

@@ -8,14 +8,10 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Triple;
 import org.tron.common.utils.DecodeUtil;
 import org.tron.common.utils.StringUtil;
@@ -28,13 +24,13 @@
 import org.tron.protos.Protocol.Account.UnFreezeV2;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
-import org.tron.protos.contract.BalanceContract.CancelUnfreezeV2Contract;
+import org.tron.protos.contract.BalanceContract.CancelAllUnfreezeV2Contract;
 
 @Slf4j(topic = "actuator")
-public class CancelUnfreezeV2Actuator extends AbstractActuator {
+public class CancelAllUnfreezeV2Actuator extends AbstractActuator {
 
-  public CancelUnfreezeV2Actuator() {
-    super(ContractType.CancelUnfreezeV2Contract, CancelUnfreezeV2Contract.class);
+  public CancelAllUnfreezeV2Actuator() {
+    super(ContractType.CancelAllUnfreezeV2Contract, CancelAllUnfreezeV2Contract.class);
   }
 
   @Override
@@ -46,42 +42,26 @@ public boolean execute(Object result) throws ContractExeException {
     long fee = calcFee();
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
-    final CancelUnfreezeV2Contract cancelUnfreezeV2Contract;
     byte[] ownerAddress;
     try {
-      cancelUnfreezeV2Contract = getCancelUnfreezeV2Contract();
       ownerAddress = getOwnerAddress().toByteArray();
     } catch (InvalidProtocolBufferException e) {
       logger.debug(e.getMessage(), e);
       ret.setStatus(fee, code.FAILED);
       throw new ContractExeException(e.getMessage());
     }
-    List<Integer> indexList = cancelUnfreezeV2Contract.getIndexList()
-        .stream().sorted().collect(Collectors.toList());
     AccountCapsule ownerCapsule = accountStore.get(ownerAddress);
     List<UnFreezeV2> unfrozenV2List = ownerCapsule.getUnfrozenV2List();
     long now = dynamicStore.getLatestBlockHeaderTimestamp();
     AtomicLong atomicWithdrawExpireBalance = new AtomicLong(0L);
     AtomicLong atomicCancelBalance = new AtomicLong(0L);
     Triple<AtomicLong, AtomicLong, AtomicLong> triple =
         Triple.of(new AtomicLong(0L), new AtomicLong(0L), new AtomicLong(0L));
-    List<UnFreezeV2> newUnFreezeV2List = null;
-    if (indexList.isEmpty()) {
-      for (UnFreezeV2 unFreezeV2 : unfrozenV2List) {
-        updateAndCalculate(triple, ownerCapsule, now, atomicWithdrawExpireBalance,
-            atomicCancelBalance, unFreezeV2);
-      }
-    } else {
-      indexList.forEach(index -> {
-        UnFreezeV2 unFreezeV2 = unfrozenV2List.get(index);
-        updateAndCalculate(triple, ownerCapsule, now, atomicWithdrawExpireBalance,
-            atomicCancelBalance, unFreezeV2);
-      });
-      newUnFreezeV2List = unfrozenV2List.stream()
-          .filter(o -> !indexList.contains(unfrozenV2List.indexOf(o))).collect(Collectors.toList());
+    for (UnFreezeV2 unFreezeV2 : unfrozenV2List) {
+      updateAndCalculate(triple, ownerCapsule, now, atomicWithdrawExpireBalance,
+          atomicCancelBalance, unFreezeV2);
     }
     ownerCapsule.clearUnfrozenV2();
-    ownerCapsule.addAllUnfrozenV2(newUnFreezeV2List);
     addTotalResourceWeight(dynamicStore, triple);
 
     long withdrawExpireBalance = atomicWithdrawExpireBalance.get();
@@ -91,7 +71,7 @@ public boolean execute(Object result) throws ContractExeException {
 
     accountStore.put(ownerCapsule.createDbKey(), ownerCapsule);
     ret.setWithdrawExpireAmount(withdrawExpireBalance);
-    ret.setCancelUnfreezeV2Amount(atomicCancelBalance.get());
+    ret.setCancelAllUnfreezeV2Amount(atomicCancelBalance.get());
     ret.setStatus(fee, code.SUCESS);
     return true;
   }
@@ -127,20 +107,18 @@ public boolean validate() throws ContractValidateException {
     AccountStore accountStore = chainBaseManager.getAccountStore();
     DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
 
-    if (!this.any.is(CancelUnfreezeV2Contract.class)) {
+    if (!this.any.is(CancelAllUnfreezeV2Contract.class)) {
       throw new ContractValidateException("contract type error, expected type " +
-          "[CancelUnfreezeV2Contract], real type[" + any.getClass() + "]");
+          "[CancelAllUnfreezeV2Contract], real type[" + any.getClass() + "]");
     }
 
-    if (!dynamicStore.supportAllowCancelUnfreezeV2()) {
-      throw new ContractValidateException("Not support CancelUnfreezeV2 transaction,"
+    if (!dynamicStore.supportAllowCancelAllUnfreezeV2()) {
+      throw new ContractValidateException("Not support CancelAllUnfreezeV2 transaction,"
           + " need to be opened by the committee");
     }
 
-    final CancelUnfreezeV2Contract cancelUnfreezeV2Contract;
     byte[] ownerAddress;
     try {
-      cancelUnfreezeV2Contract = getCancelUnfreezeV2Contract();
       ownerAddress = getOwnerAddress().toByteArray();
     } catch (InvalidProtocolBufferException e) {
       logger.debug(e.getMessage(), e);
@@ -162,37 +140,17 @@ public boolean validate() throws ContractValidateException {
       throw new ContractValidateException("No unfreezeV2 list to cancel");
     }
 
-    List<Integer> indexList = cancelUnfreezeV2Contract.getIndexList();
-    if (indexList.size() > unfrozenV2List.size()) {
-      throw new ContractValidateException(
-          "The size[" + indexList.size() + "] of the index cannot exceed the size["
-              + unfrozenV2List.size() + "] of unfreezeV2!");
-    }
-
-    for (Integer i : indexList) {
-      int maxIndex = unfrozenV2List.size() - 1;
-      if (i < 0 || i > maxIndex) {
-        throw new ContractValidateException(
-            "The input index[" + i + "] cannot be less than 0 and cannot be "
-                + "greater than the maximum index[" + maxIndex + "] of unfreezeV2!");
-      }
-    }
-    Set<Integer> set = new HashSet<>();
-    List<Integer> dps = indexList.stream().filter(n -> !set.add(n)).collect(Collectors.toList());
-    if (CollectionUtils.isNotEmpty(dps)) {
-      throw new ContractValidateException("The element" + dps + " in the index list is duplicated");
-    }
     return true;
   }
 
   @Override
   public ByteString getOwnerAddress() throws InvalidProtocolBufferException {
-    return getCancelUnfreezeV2Contract().getOwnerAddress();
+    return getCancelAllUnfreezeV2Contract().getOwnerAddress();
   }
 
-  private CancelUnfreezeV2Contract getCancelUnfreezeV2Contract()
+  private CancelAllUnfreezeV2Contract getCancelAllUnfreezeV2Contract()
       throws InvalidProtocolBufferException {
-    return any.unpack(CancelUnfreezeV2Contract.class);
+    return any.unpack(CancelAllUnfreezeV2Contract.class);
   }
 
   @Override

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

@@ -2,7 +2,6 @@
 
 import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
 import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_PERIOD;
-import static org.tron.core.config.Parameter.ChainConstant.MAX_BLOCK_NUM_DELEGATE_PERIOD;
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 import static org.tron.protos.contract.Common.ResourceCode;
 import static org.tron.protos.contract.Common.ResourceCode.BANDWIDTH;
@@ -65,7 +64,8 @@ public boolean execute(Object result) throws ContractExeException {
 
     long delegateBalance = delegateResourceContract.getBalance();
     boolean lock = delegateResourceContract.getLock();
-    long lockPeriod = delegateResourceContract.getLockPeriod();
+    boolean support = chainBaseManager.getDynamicPropertiesStore().supportMaxNumberOfLockPeriod();
+    long lockPeriod = support ? delegateResourceContract.getLockPeriod() : 0;
     byte[] receiverAddress = delegateResourceContract.getReceiverAddress().toByteArray();
 
     // delegate resource to receiver
@@ -219,11 +219,13 @@ public boolean validate() throws ContractValidateException {
     }
 
     boolean lock = delegateResourceContract.getLock();
-    if (lock && dynamicStore.supportAllowOptimizeLockDelegateResource()) {
+    if (lock && dynamicStore.supportMaxNumberOfLockPeriod()) {
       long lockPeriod = delegateResourceContract.getLockPeriod();
-      if (lockPeriod < 0 || lockPeriod > MAX_BLOCK_NUM_DELEGATE_PERIOD) {
+      long maxNumberOfLockPeriod = dynamicStore.getMaxNumberOfLockPeriod();
+      if (lockPeriod < 0 || lockPeriod > maxNumberOfLockPeriod) {
         throw new ContractValidateException(
-            "The lock period of delegate resource cannot be less than 0 and cannot exceed 1 year!");
+            "The lock period of delegate resource cannot be less than 0 and cannot exceed "
+                + maxNumberOfLockPeriod + "!");
       }
 
       byte[] key = DelegatedResourceCapsule.createDbKeyV2(ownerAddress, receiverAddress, true);
@@ -262,7 +264,7 @@ private void validRemainTime(ResourceCode resourceCode, long lockPeriod, long ex
     if (lockPeriod * 3 * 1000 < remainTime) {
       throw new ContractValidateException(
           "The lock period for " + resourceCode.name() + " this time cannot be less than the "
-              + "remaining time[" + remainTime + "s] of the last lock period for "
+              + "remaining time[" + remainTime + "ms] of the last lock period for "
               + resourceCode.name() + "!");
     }
   }
@@ -292,7 +294,7 @@ private void delegateResource(byte[] ownerAddress, byte[] receiverAddress, boole
     //modify DelegatedResourceStore
     long expireTime = 0;
     if (lock) {
-      if (dynamicPropertiesStore.supportAllowOptimizeLockDelegateResource()) {
+      if (dynamicPropertiesStore.supportMaxNumberOfLockPeriod()) {
         expireTime = now + (lockPeriod == 0 ? DELEGATE_PERIOD : lockPeriod * 3 * 1000);
       } else {
         expireTime = now + DELEGATE_PERIOD;

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

@@ -692,35 +692,36 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
-      case ALLOW_CANCEL_UNFREEZE_V2: {
+      case ALLOW_CANCEL_ALL_UNFREEZE_V2: {
         if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_7_2)) {
           throw new ContractValidateException(
-              "Bad chain parameter id [ALLOW_CANCEL_UNFREEZE_V2]");
+              "Bad chain parameter id [ALLOW_CANCEL_ALL_UNFREEZE_V2]");
         }
         if (value != 1) {
           throw new ContractValidateException(
-              "This value[ALLOW_CANCEL_UNFREEZE_V2] is only allowed to be 1");
+              "This value[ALLOW_CANCEL_ALL_UNFREEZE_V2] is only allowed to be 1");
         }
         if (dynamicPropertiesStore.getUnfreezeDelayDays() == 0) {
           throw new ContractValidateException(
               "[UNFREEZE_DELAY_DAYS] proposal must be approved "
-                  + "before [ALLOW_CANCEL_UNFREEZE_V2] can be proposed");
+                  + "before [ALLOW_CANCEL_ALL_UNFREEZE_V2] can be proposed");
         }
         break;
       }
-      case ALLOW_OPTIMIZE_LOCK_DELEGATE_RESOURCE: {
+      case MAX_NUMBER_OF_LOCK_PERIOD: {
         if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_7_2)) {
           throw new ContractValidateException(
-              "Bad chain parameter id [ALLOW_OPTIMIZE_LOCK_DELEGATE_RESOURCE]");
+              "Bad chain parameter id [MAX_NUMBER_OF_LOCK_PERIOD]");
         }
-        if (value != 1) {
+        if (value < 1) {
           throw new ContractValidateException(
-              "This value[ALLOW_OPTIMIZE_LOCK_DELEGATE_RESOURCE] is only allowed to be 1");
+              "This value[MAX_NUMBER_OF_LOCK_PERIOD] is only allowed to be "
+                  + "greater than or equal to 1");
         }
         if (dynamicPropertiesStore.getUnfreezeDelayDays() == 0) {
           throw new ContractValidateException(
               "[UNFREEZE_DELAY_DAYS] proposal must be approved "
-                  + "before [ALLOW_OPTIMIZE_LOCK_DELEGATE_RESOURCE] can be proposed");
+                  + "before [MAX_NUMBER_OF_LOCK_PERIOD] can be proposed");
         }
         break;
       }
@@ -798,8 +799,8 @@ public enum ProposalType {         // current value, value range
     DYNAMIC_ENERGY_INCREASE_FACTOR(74), // 0, [0, 10_000]
     DYNAMIC_ENERGY_MAX_FACTOR(75), // 0, [0, 100_000]
     ALLOW_TVM_SHANGHAI(76), // 0, 1
-    ALLOW_CANCEL_UNFREEZE_V2(77), // 0, 1
-    ALLOW_OPTIMIZE_LOCK_DELEGATE_RESOURCE(78); // 0, 1
+    ALLOW_CANCEL_ALL_UNFREEZE_V2(77), // 0, 1
+    MAX_NUMBER_OF_LOCK_PERIOD(78); // 0, 1
 
     private long code;
 

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

@@ -17,7 +17,6 @@
 
 import static org.tron.common.crypto.Hash.sha3omit12;
 import static org.tron.core.config.Parameter.ChainConstant.DELEGATE_COST_BASE_SIZE;
-import static org.tron.core.config.Parameter.ChainConstant.MAX_BLOCK_NUM_DELEGATE_PERIOD;
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 
 import com.google.common.base.CaseFormat;
@@ -279,13 +278,19 @@ public static long consumeBandWidthSize(
     return bytesSize;
   }
 
-
   public static long estimateConsumeBandWidthSize(final AccountCapsule ownerCapsule,
       ChainBaseManager chainBaseManager) {
-    DelegateResourceContract.Builder builder = DelegateResourceContract.newBuilder()
-                    .setLock(true)
-                    .setLockPeriod(MAX_BLOCK_NUM_DELEGATE_PERIOD)
-                    .setBalance(ownerCapsule.getFrozenV2BalanceForBandwidth());
+    DelegateResourceContract.Builder builder;
+    if (chainBaseManager.getDynamicPropertiesStore().supportMaxNumberOfLockPeriod()) {
+      builder = DelegateResourceContract.newBuilder()
+          .setLock(true)
+          .setLockPeriod(chainBaseManager.getDynamicPropertiesStore().getMaxNumberOfLockPeriod())
+          .setBalance(ownerCapsule.getFrozenV2BalanceForBandwidth());
+    } else {
+      builder = DelegateResourceContract.newBuilder()
+          .setLock(true)
+          .setBalance(ownerCapsule.getFrozenV2BalanceForBandwidth());
+    }
     TransactionCapsule fakeTransactionCapsule = new TransactionCapsule(builder.build()
             , ContractType.DelegateResourceContract);
     long size1 = consumeBandWidthSize(fakeTransactionCapsule, chainBaseManager);

chainbase/src/main/java/org/tron/core/capsule/TransactionResultCapsule.java

@@ -89,13 +89,13 @@ public void setWithdrawExpireAmount(long amount) {
             .setWithdrawExpireAmount(amount).build();
   }
 
-  public long getCancelUnfreezeV2Amount() {
-    return transactionResult.getCancelUnfreezeV2Amount();
+  public long getCancelAllUnfreezeV2Amount() {
+    return transactionResult.getCancelAllUnfreezeV2Amount();
   }
 
-  public void setCancelUnfreezeV2Amount(long amount) {
+  public void setCancelAllUnfreezeV2Amount(long amount) {
     this.transactionResult = this.transactionResult.toBuilder()
-        .setCancelUnfreezeV2Amount(amount).build();
+        .setCancelAllUnfreezeV2Amount(amount).build();
   }
 
   public long getExchangeReceivedAmount() {

chainbase/src/main/java/org/tron/core/capsule/utils/TransactionUtil.java

@@ -100,7 +100,7 @@ public static TransactionInfoCapsule buildTransactionInfoInstance(TransactionCap
     builder.setExchangeId(programResult.getRet().getExchangeId());
     builder.setWithdrawAmount(programResult.getRet().getWithdrawAmount());
     builder.setWithdrawExpireAmount(programResult.getRet().getWithdrawExpireAmount());
-    builder.setCancelUnfreezeV2Amount(programResult.getRet().getCancelUnfreezeV2Amount());
+    builder.setCancelAllUnfreezeV2Amount(programResult.getRet().getCancelAllUnfreezeV2Amount());
     builder.setExchangeReceivedAmount(programResult.getRet().getExchangeReceivedAmount());
     builder.setExchangeInjectAnotherAmount(programResult.getRet().getExchangeInjectAnotherAmount());
     builder.setExchangeWithdrawAnotherAmount(