query api not need check login

Author: chaozhu

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

@@ -90,6 +90,7 @@ public class Client {
       "CreateAccount",
       "CreateProposal",
       "CreateWitness",
+      "DelegateResource",
       "DeleteProposal",
       "DeployContract contractName ABI byteCode constructor params isHex fee_limit consume_user_resource_percent origin_energy_limit value token_value token_id <library:address,library:address,...> <lib_compiler_version(e.g:v5)>",
       "ExchangeCreate",
@@ -198,6 +199,7 @@ public class Client {
       "TransferAsset",
       "TriggerConstantContract contractAddress method args isHex",
       "TriggerContract contractAddress method args isHex fee_limit value",
+      "UnDelegateResource",
       "UnfreezeAsset",
       "UnfreezeBalance",
       "UnfreezeBalanceV2",
@@ -211,8 +213,6 @@ public class Client {
       "VoteWitness",
       "WithdrawBalance",
       "WithdrawExpireUnfreeze",
-      "DelegateResource",
-      "UnDelegateResource",
   };
 
   // note: this is sorted by alpha
@@ -231,13 +231,15 @@ public class Client {
       "CreateAccount",
       "CreateProposal",
       "CreateWitness",
+      "DelegateResource",
       "DeleteProposal",
       "DeployContract",
       "ExchangeCreate",
       "ExchangeInject",
       "ExchangeTransaction",
       "ExchangeWithdraw",
       "FreezeBalance",
+      "FreezeBalanceV2",
       "GenerateAddress",
       // "GenerateShieldedAddress",
       "GenerateShieldedTRC20Address",
@@ -338,8 +340,10 @@ public class Client {
       "TransferAsset",
       "TriggerConstantContract",
       "TriggerContract",
+      "UnDelegateResource",
       "UnfreezeAsset",
       "UnfreezeBalance",
+      "UnfreezeBalanceV2",
       "UpdateAccount",
       "UpdateAccountPermission",
       "UpdateAsset",
@@ -349,6 +353,7 @@ public class Client {
       "UpdateWitness",
       "VoteWitness",
       "WithdrawBalance",
+      "WithdrawExpireUnfreeze",
   };
 
   private byte[] inputPrivateKey() throws IOException {
@@ -1727,8 +1732,8 @@ private void getCanWithdrawUnfreezeAmount(String[] parameters) throws CipherExce
       return;
     }
 
-    Optional<CanWithdrawUnfreezeAmountResponseMessage> result = walletApiWrapper.
-            getCanWithdrawUnfreezeAmount(ownerAddress, timestamp);
+    Optional<CanWithdrawUnfreezeAmountResponseMessage> result = WalletApi.getCanWithdrawUnfreezeAmount(
+        ownerAddress, timestamp);
     if (result.isPresent()) {
       CanWithdrawUnfreezeAmountResponseMessage canWithdrawUnfreezeAmountResponseMessage = result.get();
       System.out.println(Utils.formatMessageString(canWithdrawUnfreezeAmountResponseMessage));
@@ -1762,7 +1767,7 @@ private void getCanDelegatedMaxSize(String[] parameters) throws CipherException,
       return;
     }
 
-    Optional<CanDelegatedMaxSizeResponseMessage> result = walletApiWrapper.getCanDelegatedMaxSize(ownerAddress, type);
+    Optional<CanDelegatedMaxSizeResponseMessage> result = WalletApi.getCanDelegatedMaxSize(ownerAddress, type);
     if (result.isPresent()) {
       CanDelegatedMaxSizeResponseMessage canDelegatedMaxSizeResponseMessage = result.get();
       System.out.println(Utils.formatMessageString(canDelegatedMaxSizeResponseMessage));
@@ -1782,11 +1787,13 @@ private void getAvailableUnfreezeCount(String[] parameters) throws CipherExcepti
     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 ;
         }
     }
 
-    Optional<GetAvailableUnfreezeCountResponseMessage> result = walletApiWrapper.getAvailableUnfreezeCount(ownerAddress);
+    Optional<GetAvailableUnfreezeCountResponseMessage> result = WalletApi.getAvailableUnfreezeCount(ownerAddress);
     if (result.isPresent()) {
       GetAvailableUnfreezeCountResponseMessage getAvailableUnfreezeCountResponseMessage = result.get();
       System.out.println(Utils.formatMessageString(getAvailableUnfreezeCountResponseMessage));

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

@@ -577,37 +577,6 @@ public boolean undelegateresource(byte[] ownerAddress, long balance
 
     return wallet.unDelegateResource(ownerAddress, balance, resourceCode, receiverAddress);
   }
-  
-  public Optional<GrpcAPI.CanWithdrawUnfreezeAmountResponseMessage> getCanWithdrawUnfreezeAmount(
-          byte[] ownerAddress, long timestamp)
-          throws CipherException, IOException, CancelException {
-    if (wallet == null || !wallet.isLoginState()) {
-      System.out.println("Warning: getCanWithdrawUnfreezeAmount failed, Please login first !!");
-      return Optional.empty();
-    }
-
-    return wallet.getCanWithdrawUnfreezeAmount(ownerAddress, timestamp);
-  }
-
-  public Optional<GrpcAPI.CanDelegatedMaxSizeResponseMessage> getCanDelegatedMaxSize(byte[] ownerAddress, int type)
-          throws CipherException, IOException, CancelException {
-    if (wallet == null || !wallet.isLoginState()) {
-      System.out.println("Warning: getCanDelegatedMaxSize failed, Please login first !!");
-      return Optional.empty();
-    }
-
-    return wallet.getCanDelegatedMaxSize(ownerAddress, type);
-  }
-
-  public Optional<GrpcAPI.GetAvailableUnfreezeCountResponseMessage> getAvailableUnfreezeCount(byte[] ownerAddress)
-          throws CipherException, IOException, CancelException {
-    if (wallet == null || !wallet.isLoginState()) {
-      System.out.println("Warning: getAvailableUnfreezeCount failed, Please login first !!");
-      return Optional.empty();
-    }
-
-    return wallet.getAvailableUnfreezeCount(ownerAddress);
-  }
 
   public boolean unfreezeAsset(byte[] ownerAddress)
       throws CipherException, IOException, CancelException {

src/main/java/org/tron/walletserver/WalletApi.java

@@ -1657,27 +1657,18 @@ public static Optional<Protocol.DelegatedResourceAccountIndex> getDelegatedResou
     return rpcCli.getDelegatedResourceAccountIndexV2(ownerAddress);
   }
 
-  public Optional<GrpcAPI.CanWithdrawUnfreezeAmountResponseMessage> getCanWithdrawUnfreezeAmount(
+  public static Optional<GrpcAPI.CanWithdrawUnfreezeAmountResponseMessage> getCanWithdrawUnfreezeAmount(
           byte[] ownerAddress, long timestamp) {
-    if (ownerAddress == null) {
-      ownerAddress = this.getAddress();
-    }
     return rpcCli.getCanWithdrawUnfreezeAmount(ownerAddress, timestamp);
   }
 
-  public  Optional<GrpcAPI.CanDelegatedMaxSizeResponseMessage> getCanDelegatedMaxSize(
+  public static Optional<GrpcAPI.CanDelegatedMaxSizeResponseMessage> getCanDelegatedMaxSize(
           byte[] ownerAddress, int type) {
-    if (ownerAddress == null) {
-      ownerAddress = this.getAddress();
-    }
     return rpcCli.getCanDelegatedMaxSize(ownerAddress, type);
   }
 
-  public Optional<GrpcAPI.GetAvailableUnfreezeCountResponseMessage> getAvailableUnfreezeCount(
+  public static Optional<GrpcAPI.GetAvailableUnfreezeCountResponseMessage> getAvailableUnfreezeCount(
           byte[] ownerAddress) {
-    if (ownerAddress == null) {
-      ownerAddress = this.getAddress();
-    }
     return rpcCli.getAvailableUnfreezeCount(ownerAddress);
   }