Merge pull request #534 from chaosuper12321/release_v4.7.0

fix some parameter verification problems

Author: zhang0125

README.md

@@ -1385,7 +1385,7 @@ wallet> getDelegatedResourceAccountIndexV2 TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh
 }
 ```
 
-    > getcandelegatedmaxsize [ownerAddress] type
+    > getcandelegatedmaxsize ownerAddress type
 > get the max size that the ownerAddress can delegate use delegateResource
 
 ownerAddress
@@ -1396,27 +1396,27 @@ type
 
 Example:
 ```console
-wallet> getCanDelegatedMaxSize 0
+wallet> getCanDelegatedMaxSize TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 0
 {
 	"max_size": 999999978708334
 }
 ```
 
-    > getavailableunfreezecount [ownerAddress] 
+    > getavailableunfreezecount ownerAddress
 > get the available unfreeze count that the ownerAddress can call unfreezeBalanceV2
 
 ownerAddress
 > The address of the account that initiated the transaction, optional, default is the address of the login account.
 
 Example:
 ```console
-wallet> getAvailableUnfreezeCount
+wallet> getAvailableUnfreezeCount TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh
 {
 	"count": 31
 }
 ```
 
-    > getcanwithdrawunfreezeamount [ownerAddress] timestamp
+    > getcanwithdrawunfreezeamount ownerAddress timestamp
 > get the withdraw unfreeze amount that the ownerAddress can get by  withdrawexpireunfreeze 
 
 ownerAddress
@@ -1428,7 +1428,7 @@ timestamp
 
 Example:
 ```console
-wallet> getCanWithdrawUnfreezeAmount 1671100335000
+wallet> getCanWithdrawUnfreezeAmount TJAVcszse667FmSNCwU2fm6DmfM5D4AyDh 1671100335000
 {
 	"amount": 9000000
 }

src/main/java/org/tron/walletcli/Client.java

@@ -1444,9 +1444,12 @@ private void delegateResource(String[] parameters)
             "delegateResource receiverAddress is invalid");
         return;
       }
-      lock = Boolean.parseBoolean(parameters[index++]);
-    }
 
+      if (parameters.length == 5 ||
+          (ownerAddress == null && parameters.length == 4)) {
+        lock = Boolean.parseBoolean(parameters[index++]);
+      }
+    }
 
     boolean result = walletApiWrapper.delegateresource(
         ownerAddress, balance, resourceCode, receiverAddress, lock);
@@ -1708,28 +1711,54 @@ private void getDelegatedResourceAccountIndexV2(String[] parameters) {
     }
   }
 
+  private void outputGetCanWithdrawUnfreezeAmountTip() {
+    System.out.println("Using getCanWithdrawUnfreezeAmount command needs 2 parameters like: ");
+    System.out.println("getcanwithdrawunfreezeamount ownerAddress timestamp");
+  }
+
   private void getCanWithdrawUnfreezeAmount(String[] parameters) throws CipherException, IOException, CancelException {
     if (parameters == null || !(parameters.length == 1 || parameters.length == 2)) {
-      System.out.println("Using getCanWithdrawUnfreezeAmount command needs 2 parameters like: ");
-      System.out.println("getcanwithdrawunfreezeamount [ownerAddress] timestamp");
+      this.outputGetCanWithdrawUnfreezeAmountTip();
       return;
     }
     int index = 0;
     long timestamp = 0;
-    byte[] ownerAddress = getAddressBytes(parameters[index]);
-    if (ownerAddress != null) {
-      index++;
-      if (parameters.length != 2) {
-        System.out.println("Using getCanWithdrawUnfreezeAmount command needs 2 parameters like: ");
-        System.out.println("getcanwithdrawunfreezeamount [ownerAddress] timestamp");
+    byte[] ownerAddress = null;
+
+    if (parameters.length == 1) {
+      try {
+        timestamp = Long.parseLong(parameters[index]);
+        if (timestamp < 0) {
+          System.out.println("Invalid param, timestamp >= 0");
+          return;
+        }
+      } catch (NumberFormatException nfe) {
+        this.outputGetCanWithdrawUnfreezeAmountTip();
         return;
       }
-    }
 
-    timestamp = Long.parseLong(parameters[index++]);
-    if (timestamp < 0) {
-      System.out.println("Invalid param, timestamp >= 0");
-      return;
+      ownerAddress = this.getLoginAddreess();
+      if (ownerAddress == null) {
+        System.out.println("getcanwithdrawunfreezeamount ownerAddress is invalid");
+        return ;
+      }
+    } else if (parameters.length == 2) {
+      ownerAddress = getAddressBytes(parameters[index++]);
+      if (ownerAddress == null) {
+        this.outputGetCanWithdrawUnfreezeAmountTip();
+        return;
+      }
+
+      try {
+        timestamp = Long.parseLong(parameters[index]);
+        if (timestamp < 0) {
+          System.out.println("Invalid param, timestamp >= 0");
+          return;
+        }
+      } catch (NumberFormatException nfe) {
+        this.outputGetCanWithdrawUnfreezeAmountTip();
+        return;
+      }
     }
 
     Optional<CanWithdrawUnfreezeAmountResponseMessage> result = WalletApi.getCanWithdrawUnfreezeAmount(
@@ -1742,29 +1771,55 @@ private void getCanWithdrawUnfreezeAmount(String[] parameters) throws CipherExce
     }
   }
 
+
+  private void outputGetCanDelegatedMaxSizeTip() {
+    System.out.println("Using getcandelegatedmaxsize command needs 2 parameters like: ");
+    System.out.println("getcandelegatedmaxsize ownerAddress type");
+  }
+
   private void getCanDelegatedMaxSize(String[] parameters) throws CipherException, IOException, CancelException {
     if (parameters == null || !(parameters.length == 1 || parameters.length == 2)) {
-      System.out.println("Using getcandelegatedmaxsize command needs 2 parameters like: ");
-      System.out.println("getcandelegatedmaxsize [ownerAddress] type");
+      this.outputGetCanDelegatedMaxSizeTip();
       return;
     }
     int index = 0;
     int type = 0;
-    byte[] ownerAddress = getAddressBytes(parameters[index]);
-    if (ownerAddress != null) {
-      index++;
-      if (parameters.length < 2) {
-        System.out.println("Using getcandelegatedmaxsize command needs 2 parameters like: ");
-        System.out.println("getcandelegatedmaxsize [ownerAddress] type");
-        return ;
+    byte[] ownerAddress = null;
+
+    if (parameters.length == 1) {
+      try {
+        type = Integer.parseInt(parameters[index]);
+        if (ResourceCode.BANDWIDTH.ordinal() != type && ResourceCode.ENERGY.ordinal() != type) {
+          System.out.println("getcandelegatedmaxsize type must be: 0 or 1");
+          return;
+        }
+      } catch (NumberFormatException nfe) {
+        this.outputGetCanDelegatedMaxSizeTip();
+        return;
       }
-    }
 
-    type = Integer.parseInt(parameters[index++]);
+      ownerAddress = this.getLoginAddreess();
+      if (ownerAddress == null) {
+        System.out.println("getcandelegatedmaxsize ownerAddress is invalid");
+        return ;
+      }
+    } else if (parameters.length == 2) {
+      ownerAddress = getAddressBytes(parameters[index++]);
+      if (ownerAddress == null) {
+        this.outputGetCanDelegatedMaxSizeTip();
+        return ;
+      }
 
-    if (ResourceCode.BANDWIDTH.ordinal() != type && ResourceCode.ENERGY.ordinal() != type) {
-      System.out.println("getcandelegatedmaxsize param type must be: 0 or 1");
-      return;
+      try {
+        type = Integer.parseInt(parameters[index]);
+        if (ResourceCode.BANDWIDTH.ordinal() != type && ResourceCode.ENERGY.ordinal() != type) {
+          System.out.println("getcandelegatedmaxsize type must be: 0 or 1");
+          return;
+        }
+      } catch (NumberFormatException nfe) {
+        this.outputGetCanDelegatedMaxSizeTip();
+        return;
+      }
     }
 
     Optional<CanDelegatedMaxSizeResponseMessage> result = WalletApi.getCanDelegatedMaxSize(ownerAddress, type);
@@ -1776,21 +1831,30 @@ private void getCanDelegatedMaxSize(String[] parameters) throws CipherException,
     }
   }
 
+  private void outputGetAvailableUnfreezeCountTip() {
+    System.out.println("Using getavailableunfreezecount command needs 1 parameters like: ");
+    System.out.println("getavailableunfreezecount owner_address ");
+  }
+
   private void getAvailableUnfreezeCount(String[] parameters) throws CipherException, IOException, CancelException {
     if (parameters == null || !(parameters.length == 0 || parameters.length == 1)) {
-      System.out.println("Using getavailableunfreezecount command needs 1 parameters like: ");
-      System.out.println("getavailableunfreezecount [owner_address] ");
+      this.outputGetAvailableUnfreezeCountTip();
       return;
     }
     int index = 0;
     byte[] ownerAddress = null;
     if (parameters.length == 1) {
         ownerAddress = getAddressBytes(parameters[index]);
         if (ownerAddress == null) {
-          System.out.println("Using getavailableunfreezecount command needs 1 parameters like: ");
-          System.out.println("getavailableunfreezecount [owner_address] ");
-          return ;
+          this.outputGetAvailableUnfreezeCountTip();
+          return;
         }
+    } else {
+      ownerAddress = this.getLoginAddreess();
+      if (ownerAddress == null) {
+        this.outputGetAvailableUnfreezeCountTip();
+        return;
+      }
     }
 
     Optional<GetAvailableUnfreezeCountResponseMessage> result = WalletApi.getAvailableUnfreezeCount(ownerAddress);
@@ -4818,6 +4882,14 @@ private void getChainParameters() {
     }
   }
 
+  private byte[] getLoginAddreess() {
+    if (walletApiWrapper.isLoginState()) {
+      String ownerAddressStr = walletApiWrapper.getAddress();
+      return WalletApi.decodeFromBase58Check(ownerAddressStr);
+    }
+    return null;
+  }
+
   private void getBlockByIdOrNum(String[] parameters) {
     String idOrNum = null;
     boolean detail = false;