add 0x prefix to solidity address (#431)

Author: ywy2090

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
     id 'java-library'
     id 'java'
-    id 'org.ajoberstar.grgit' version '4.1.0'
+    id 'org.ajoberstar.grgit' version '4.1.1'
     id 'com.github.sherter.google-java-format' version '0.9'
 }
 println("Notice: current gradle version is " + gradle.gradleVersion)

sdk-core/src/main/java/org/fisco/bcos/sdk/model/TransactionReceipt.java

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import java.util.Objects;
+import org.fisco.bcos.sdk.utils.AddressUtils;
 
 public class TransactionReceipt {
     private String version;
@@ -177,7 +178,7 @@ public void setFrom(String from) {
     }
 
     public String getTo() {
-        return this.to;
+        return AddressUtils.addHexPrefixToAddress(this.to);
     }
 
     public void setTo(String to) {
@@ -193,11 +194,7 @@ public void setGasUsed(String gasUsed) {
     }
 
     public String getContractAddress() {
-        if (!isWasm() && Objects.nonNull(contractAddress) && !contractAddress.isEmpty()) {
-            return "0x" + contractAddress;
-        }
-
-        return contractAddress;
+        return AddressUtils.addHexPrefixToAddress(contractAddress);
     }
 
     public void setContractAddress(String contractAddress) {
@@ -244,14 +241,6 @@ public void setTransactionProof(List<MerkleProofUnit> transactionProof) {
         this.transactionProof = transactionProof;
     }
 
-    public boolean isWasm() {
-        return wasm;
-    }
-
-    public void setWasm(boolean wasm) {
-        this.wasm = wasm;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -306,7 +295,7 @@ public String toString() {
                 + this.from
                 + '\''
                 + ", to='"
-                + this.to
+                + this.getTo()
                 + '\''
                 + ", gasUsed='"
                 + this.gasUsed

sdk-core/src/main/java/org/fisco/bcos/sdk/utils/AddressUtils.java

@@ -15,6 +15,8 @@
 
 package org.fisco.bcos.sdk.utils;
 
+import java.util.Objects;
+
 public class AddressUtils {
     public static final int ADDRESS_SIZE = 160;
     public static final int ADDRESS_LENGTH_IN_HEX = ADDRESS_SIZE >> 2;
@@ -23,4 +25,14 @@ public static boolean isValidAddress(String address) {
         String addressNoPrefix = Numeric.cleanHexPrefix(address);
         return addressNoPrefix.length() == ADDRESS_LENGTH_IN_HEX;
     }
+
+    public static String addHexPrefixToAddress(String address) {
+        if (!Objects.isNull(address)
+                && !(address.startsWith("0x") || address.startsWith("0X"))
+                && isValidAddress(address)) {
+            return Hex.addPrefix(address);
+        }
+
+        return address;
+    }
 }

sdk-core/src/main/java/org/fisco/bcos/sdk/utils/Hex.java

@@ -24,6 +24,14 @@
 public class Hex {
     private static final HexEncoder encoder = new HexEncoder();
 
+    public static boolean hasHexPrefix(String data) {
+        if ((data != null) && (data.startsWith("0x") || data.startsWith("0X"))) {
+            return true;
+        }
+
+        return false;
+    }
+
     public static String addPrefix(String data) {
         if (Objects.isNull(data)) {
             return data;

sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java

@@ -204,9 +204,6 @@ public BcosTransactionReceipt sendTransaction(
                                 Arrays.asList(
                                         this.groupID, node, signedTransactionData, withProof)),
                         BcosTransactionReceipt.class);
-        if (bcosTransactionReceipt.getResult() != null) {
-            bcosTransactionReceipt.getResult().setWasm(isWASM());
-        }
         return bcosTransactionReceipt;
     }
 
@@ -233,9 +230,6 @@ public void sendTransactionAsync(
                 new RespCallback<BcosTransactionReceipt>() {
                     @Override
                     public void onResponse(BcosTransactionReceipt transactionReceiptWithProof) {
-                        if (transactionReceiptWithProof.getResult() != null) {
-                            transactionReceiptWithProof.getResult().setWasm(isWASM());
-                        }
                         callback.onResponse(transactionReceiptWithProof.getTransactionReceipt());
                     }
 

sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/JsonTransactionResponse.java

@@ -22,6 +22,7 @@
 import org.fisco.bcos.sdk.client.protocol.model.tars.TransactionData;
 import org.fisco.bcos.sdk.crypto.CryptoSuite;
 import org.fisco.bcos.sdk.model.MerkleProofUnit;
+import org.fisco.bcos.sdk.utils.AddressUtils;
 import org.fisco.bcos.sdk.utils.Hex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,7 +95,7 @@ public void setNonce(String nonce) {
     }
 
     public String getTo() {
-        return this.to;
+        return AddressUtils.addHexPrefixToAddress(this.to);
     }
 
     public void setTo(String to) {
@@ -213,7 +214,7 @@ public String toString() {
                 + this.nonce
                 + '\''
                 + ", to='"
-                + this.to
+                + this.getTo()
                 + '\''
                 + ", blockLimit='"
                 + this.blockLimit

sdk-service/src/test/java/org/fisco/bcos/sdk/test/client/ResponseTest.java

@@ -744,7 +744,7 @@ public void testTransactionReceipt() throws JsonProcessingException {
                         + "        \"output\": \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n"
                         + "        \"root\":\"0x38723a2e5e8a17aa7950dc008209944e898f69a7bd10a23c839d341e935fd5ca\",\n"
                         + "        \"status\": \"12\",\n"
-                        + "        \"to\": \"0x15538acd403ac1b2ff09083c70d04856b8c0bdfd\",\n"
+                        + "        \"to\": \"15538acd403ac1b2ff09083c70d04856b8c0bdfd\",\n"
                         + "        \"transactionHash\": \"0x708b5781b62166bd86e543217be6cd954fd815fd192b9a124ee9327580df8f3f\",\n"
                         + "        \"transactionIndex\": \"0x10\"\n"
                         + "    }\n"