Merge pull request #432 from kyonRay/release-3.1.0

<fix>(codec): rm bytes base64 encode decode.

Author: kyonRay

sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/datatypes/DynamicArray.java

@@ -53,7 +53,7 @@ public int bytes32PaddedLength() {
     @Override
     public String getTypeAsString() {
         String type;
-        if (StructType.class.isAssignableFrom(value.get(0).getClass())) {
+        if (!value.isEmpty() && StructType.class.isAssignableFrom(value.get(0).getClass())) {
             type = value.get(0).getTypeAsString();
         } else {
             type = AbiTypes.getTypeAString(getComponentType());

sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/wrapper/ABICodecJsonWrapper.java

@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Iterator;
 import java.util.List;
 import org.fisco.bcos.sdk.codec.datatypes.*;
@@ -21,7 +20,6 @@
 import org.slf4j.LoggerFactory;
 
 public class ABICodecJsonWrapper {
-    public static final String Base64EncodedDataPrefix = "base64://";
     public static final String HexEncodedDataPrefix = "hex://";
 
     private static final Logger logger = LoggerFactory.getLogger(ABICodecJsonWrapper.class);
@@ -280,10 +278,7 @@ private ABIObject encodeNode(String path, ABIObject template, JsonNode node) {
     }
 
     public static byte[] tryDecodeInputData(String inputData) {
-        if (inputData.startsWith(Base64EncodedDataPrefix)) {
-            return Base64.getDecoder()
-                    .decode(inputData.substring(Base64EncodedDataPrefix.length()));
-        } else if (inputData.startsWith(HexEncodedDataPrefix)) {
+        if (inputData.startsWith(HexEncodedDataPrefix)) {
             String hexString = inputData.substring(HexEncodedDataPrefix.length());
             if (hexString.startsWith("0x")) {
                 return Hex.decode(hexString.substring(2));
@@ -340,7 +335,7 @@ public ABIObject encode(ABIObject template, List<String> inputs) throws IOExcept
                                     }
                                 case BYTES:
                                     {
-                                        // Binary data requires base64 encoding
+                                        // Binary data hex encoding
                                         byte[] bytesValue = tryDecodeInputData(value);
                                         if (bytesValue == null) {
                                             bytesValue = value.getBytes();
@@ -360,7 +355,7 @@ public ABIObject encode(ABIObject template, List<String> inputs) throws IOExcept
                                     }
                                 case DBYTES:
                                     {
-                                        // Binary data requires base64 encoding
+                                        // Binary data requires hex encoding
                                         byte[] bytesValue = tryDecodeInputData(value);
                                         if (bytesValue == null) {
                                             bytesValue = value.getBytes();
@@ -432,13 +427,14 @@ public JsonNode decode(ABIObject abiObject) {
                             }
                         case BYTES:
                             {
-                                return jsonNodeFactory.binaryNode(
-                                        abiObject.getBytesValue().getValue());
+                                return jsonNodeFactory.textNode(
+                                        Hex.toHexString(abiObject.getBytesValue().getValue()));
                             }
                         case DBYTES:
                             {
-                                return jsonNodeFactory.binaryNode(
-                                        abiObject.getDynamicBytesValue().getValue());
+                                return jsonNodeFactory.textNode(
+                                        Hex.toHexString(
+                                                abiObject.getDynamicBytesValue().getValue()));
                             }
                         case STRING:
                             {
@@ -511,19 +507,15 @@ public List<String> decode(ABIObject template, byte[] buffer) {
                             case BYTES:
                                 {
                                     byte[] value = ABICodecObject.formatBytesN(argObject);
-                                    byte[] base64Bytes = Base64.getEncoder().encode(value);
-                                    result.add(Base64EncodedDataPrefix + new String(base64Bytes));
+                                    byte[] hexBytes = Hex.encode(value);
+                                    result.add(HexEncodedDataPrefix + new String(hexBytes));
                                     break;
                                 }
                             case DBYTES:
                                 {
-                                    byte[] base64Bytes =
-                                            Base64.getEncoder()
-                                                    .encode(
-                                                            argObject
-                                                                    .getDynamicBytesValue()
-                                                                    .getValue());
-                                    result.add(Base64EncodedDataPrefix + new String(base64Bytes));
+                                    byte[] hexBytes =
+                                            Hex.encode(argObject.getDynamicBytesValue().getValue());
+                                    result.add(HexEncodedDataPrefix + new String(hexBytes));
                                     break;
                                 }
                             case STRING:
@@ -545,7 +537,7 @@ public List<String> decode(ABIObject template, byte[] buffer) {
                     {
                         // Note: when the argNode is text data, toPrettyString output the text data
                         //       if the argNode is binary data, toPrettyString output the
-                        // base64-encoded data
+                        // hex-encoded data
                         result.add(argNode.toPrettyString());
                         break;
                     }

sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/wrapper/ABIDefinition.java

@@ -98,7 +98,7 @@ public String getMethodSignatureAsString() {
         result.append("(");
         String params =
                 this.getInputs().stream()
-                        .map(abi -> abi.getTypeAsString())
+                        .map(NamedType::getTypeAsString)
                         .collect(Collectors.joining(","));
         result.append(params);
         result.append(")");