Revise extradata encode (tronprotocol#3104)

* remove unnecessary base64 encode on extra_data field

* fix checkStyle error

Author: mattopolitan

framework/src/main/java/org/tron/core/services/http/Util.java

@@ -22,7 +22,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.util.StringUtil;
-import org.spongycastle.util.encoders.Base64;
 import org.spongycastle.util.encoders.Hex;
 import org.tron.api.GrpcAPI.BlockList;
 import org.tron.api.GrpcAPI.EasyTransferResponse;
@@ -353,7 +352,11 @@ public static Transaction setTransactionExtraData(JSONObject jsonObject,
       String data = jsonObject.getString(EXTRA_DATA);
       if (data.length() > 0) {
         Transaction.raw.Builder raw = transaction.getRawData().toBuilder();
-        raw.setData(ByteString.copyFrom(Base64.decode(data)));
+        if (getVisibleOnlyForSign(jsonObject)) {
+          raw.setData(ByteString.copyFrom(data.getBytes()));
+        } else {
+          raw.setData(ByteString.copyFrom(ByteArray.fromHexString(data)));
+        }
         return transaction.toBuilder().setRawData(raw).build();
       }
     }

framework/src/test/java/stest/tron/wallet/common/client/utils/HttpMethed.java

@@ -24,7 +24,6 @@
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.util.EntityUtils;
 import org.junit.Assert;
-import org.spongycastle.util.encoders.Base64;
 import org.testng.collections.Lists;
 import org.tron.api.GrpcAPI;
 import org.tron.common.utils.ByteArray;
@@ -296,7 +295,7 @@ public static String sendCoin(String httpNode, byte[] fromAddress, byte[] toAddr
       userBaseObj2.addProperty("to_address", ByteArray.toHexString(toAddress));
       userBaseObj2.addProperty("owner_address", ByteArray.toHexString(fromAddress));
       userBaseObj2.addProperty("amount", amount);
-      userBaseObj2.addProperty("extra_data", Base64.toBase64String(notes.getBytes()));
+      userBaseObj2.addProperty("extra_data", ByteArray.toHexString(notes.getBytes()));
       response = createConnect(requestUrl, userBaseObj2);
       transactionString = EntityUtils.toString(response.getEntity());
       transactionSignString = gettransactionsign(httpNode, transactionString, fromKey);