Merge pull request #1130 from tronprotocol/doc

address format

Author: zhaohong

src/main/java/org/tron/core/services/http/CreateAddressServlet.java

@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI.BytesMessage;
+import org.tron.common.utils.ByteArray;
 import org.tron.core.Wallet;
 import org.tron.core.services.http.JsonFormat.ParseException;
 
@@ -30,9 +31,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       BytesMessage.Builder build = BytesMessage.newBuilder();
       JsonFormat.merge(jsonObject.toJSONString(), build);
       byte[] address = wallet.createAdresss(build.getValue().toByteArray());
-      BytesMessage.Builder builder = BytesMessage.newBuilder();
-      builder.setValue(ByteString.copyFrom(address));
-      response.getWriter().println(JsonFormat.printToString(builder.build()));
+      String base58check = Wallet.encode58Check(address);
+      String hexString = ByteArray.toHexString(address);
+      JSONObject jsonAddress = new JSONObject();
+      jsonAddress.put("base58checkAddress", base58check);
+      jsonAddress.put("value", hexString);
+      response.getWriter().println(jsonAddress.toJSONString());
     } catch (Exception e) {
       logger.debug("Exception: {}", e.getMessage());
       try {
@@ -50,9 +54,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       BytesMessage.Builder build = BytesMessage.newBuilder();
       JsonFormat.merge(input, build);
       byte[] address = wallet.createAdresss(build.getValue().toByteArray());
-      BytesMessage.Builder builder = BytesMessage.newBuilder();
-      builder.setValue(ByteString.copyFrom(address));
-      response.getWriter().println(JsonFormat.printToString(builder.build()));
+      String base58check = Wallet.encode58Check(address);
+      String hexString = ByteArray.toHexString(address);
+      JSONObject jsonAddress = new JSONObject();
+      jsonAddress.put("base58checkAddress", base58check);
+      jsonAddress.put("value", hexString);
+      response.getWriter().println(jsonAddress.toJSONString());
     } catch (Exception e) {
       logger.debug("Exception: {}", e.getMessage());
       try {

src/main/java/org/tron/core/services/http/GenerateAddressServlet.java

@@ -1,5 +1,6 @@
 package org.tron.core.services.http;
 
+import com.alibaba.fastjson.JSONObject;
 import java.io.IOException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -9,6 +10,7 @@
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI.AddressPrKeyPairMessage;
 import org.tron.common.crypto.ECKey;
+import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Utils;
 import org.tron.core.Wallet;
 import org.tron.core.services.http.JsonFormat.ParseException;
@@ -23,12 +25,14 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       ECKey ecKey = new ECKey(Utils.getRandom());
       byte[] priKey = ecKey.getPrivKeyBytes();
       byte[] address = ecKey.getAddress();
-      String addressStr = Wallet.encode58Check(address);
       String priKeyStr = Hex.encodeHexString(priKey);
-      AddressPrKeyPairMessage.Builder builder = AddressPrKeyPairMessage.newBuilder();
-      builder.setAddress(addressStr);
-      builder.setPrivateKey(priKeyStr);
-      response.getWriter().println(JsonFormat.printToString(builder.build()));
+      String base58check = Wallet.encode58Check(address);
+      String hexString = ByteArray.toHexString(address);
+      JSONObject jsonAddress = new JSONObject();
+      jsonAddress.put("address", base58check);
+      jsonAddress.put("hexAddress", hexString);
+      jsonAddress.put("privateKey", priKeyStr);
+      response.getWriter().println(jsonAddress.toJSONString());
     } catch (Exception e) {
       logger.debug("Exception: {}", e.getMessage());
       try {