Merge remote-tracking branch 'origin/develop' into release_v4.7.2

# Conflicts:
#	src/main/java/org/tron/walletcli/Client.java
#	src/main/protos/api/api.proto

Author: lxcmyf

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

@@ -25,7 +25,10 @@
 import org.jline.terminal.TerminalBuilder;
 import org.tron.api.GrpcAPI.*;
 import org.tron.common.crypto.Hash;
+import org.tron.common.crypto.SignInterface;
+import org.tron.common.crypto.SignUtils;
 import org.tron.common.utils.AbiUtil;
+import org.tron.common.utils.Base58;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.ByteUtil;
 import org.tron.common.utils.Utils;
@@ -99,6 +102,7 @@ public class Client {
       "ExchangeWithdraw",
       "FreezeBalance",
       "FreezeBalanceV2",
+      "GenerateAddress",
       // "GenerateShieldedAddress",
       "GenerateShieldedTRC20Address",
       "GetAccount",
@@ -241,6 +245,7 @@ public class Client {
       "ExchangeWithdraw",
       "FreezeBalance",
       "FreezeBalanceV2",
+      "GenerateAddress",
       // "GenerateShieldedAddress",
       "GenerateShieldedTRC20Address",
       "GetAccount",
@@ -2857,6 +2862,24 @@ private void getContractInfo(String[] parameters) {
     }
   }
 
+  private void generateAddress(String[] parameters) {
+    try {
+      boolean isECKey  = parameters == null || parameters.length == 0
+         ||  Boolean.parseBoolean(parameters[0]);
+      SignInterface cryptoEngine = SignUtils.getGeneratedRandomSign(Utils.getRandom(), isECKey);
+      byte[] priKey = cryptoEngine.getPrivateKey();
+      byte[] address = cryptoEngine.getAddress();
+      String addressStr = WalletApi.encode58Check(address);
+      String priKeyStr = ByteArray.toHexString(priKey);
+      AddressPrKeyPairMessage.Builder builder = AddressPrKeyPairMessage.newBuilder();
+      builder.setAddress(addressStr);
+      builder.setPrivateKey(priKeyStr);
+      System.out.println(Utils.formatMessageString(builder.build()));
+    } catch (Exception e) {
+      System.out.println("GenerateAddress failed !!!");
+    }
+  }
+
   private void updateAccountPermission(String[] parameters)
       throws CipherException, IOException, CancelException {
     if (parameters == null || parameters.length != 2) {
@@ -4745,6 +4768,10 @@ private void run() {
               getContractInfo(parameters);
               break;
             }
+            case "generateaddress": {
+              generateAddress(parameters);
+              break;
+            }
             case "updateaccountpermission": {
               updateAccountPermission(parameters);
               break;

src/main/protos/api/api.proto

@@ -1091,6 +1091,7 @@ message GetAvailableUnfreezeCountResponseMessage {
   int64 count = 1;
 }
 
+//GetCanDelegatedMaxSize
 message CanDelegatedMaxSizeRequestMessage {
   int32 type = 1;
   bytes owner_address = 2;
@@ -1099,6 +1100,7 @@ message CanDelegatedMaxSizeResponseMessage {
   int64 max_size = 1;
 }
 
+//GetCanWithdrawUnfreezeAmount
 message CanWithdrawUnfreezeAmountRequestMessage {
   bytes owner_address = 1;
   int64 timestamp = 2;
@@ -1194,6 +1196,11 @@ message PaginatedMessage {
   int64 offset = 1;
   int64 limit = 2;
 }
+// for only wallet-cli, do not delete
+message AddressPrKeyPairMessage {
+  string address = 1;
+  string privateKey = 2;
+}
 
 message TransactionExtention {
   Transaction transaction = 1;