modify valid bytes

Author: gossens

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

@@ -23,6 +23,7 @@
 import com.google.protobuf.ByteString;
 import java.security.SignatureException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
@@ -34,6 +35,7 @@
 import org.tron.api.GrpcAPI.TransactionSignWeight;
 import org.tron.api.GrpcAPI.TransactionSignWeight.Result;
 import org.tron.common.parameter.CommonParameter;
+import org.tron.common.crypto.Hash;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.AccountCapsule;
@@ -47,22 +49,23 @@
 import org.tron.protos.Protocol.Transaction.Result.contractResult;
 import org.tron.protos.Protocol.TransactionSign;
 import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI.Entry.StateMutabilityType;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 
 @Slf4j(topic = "capsule")
 @Component
 public class TransactionUtil {
 
-  @Autowired
-  private ChainBaseManager chainBaseManager;
-
   private static final int maxAccountNameLen = 200;
   private static final int maxAccountIdLen = 32;
   private static final int minAccountIdLen = 8;
   private static final int maxAssetNameLen = 32;
   private static final int maxTokenAbbrName = 5;
-  private static final int maxAssetDescription = 200;
-  private static final int maxUrlLen = 256;
+
+  @Autowired
+  private ChainBaseManager chainBaseManager;
 
   public static boolean validAccountId(byte[] accountId) {
     return validReadableBytes(accountId, maxAccountIdLen) && accountId.length < minAccountIdLen;
@@ -93,22 +96,25 @@ private static boolean validReadableBytes(byte[] bytes, int maxLength) {
   }
 
   public static boolean validAccountName(byte[] accountName) {
-    return validBytes(accountName, maxAccountNameLen, true);
+    if (ArrayUtils.isEmpty(accountName)) {
+      return true;   //account name can be empty
+    }
+    return accountName.length <= maxAccountNameLen;
   }
 
   public static boolean validAssetDescription(byte[] description) {
-    return validBytes(description, maxAssetDescription, true);
-  }
+    if (ArrayUtils.isEmpty(description)) {
+      return true;   //description can empty
+    }
 
-  public static boolean validUrl(byte[] url) {
-    return validBytes(url, maxUrlLen, false);
+    return description.length <= 200;
   }
 
-  private static boolean validBytes(byte[] bytes, int maxLength, boolean allowEmpty) {
-    if (ArrayUtils.isEmpty(bytes)) {
-      return allowEmpty;
+  public static boolean validUrl(byte[] url) {
+    if (ArrayUtils.isEmpty(url)) {
+      return false;
     }
-    return bytes.length <= maxLength;
+    return url.length <= 256;
   }
 
   public static boolean isNumber(byte[] id) {