fix Marshal/Unmarshal address

Author: Goren G

common/types/address.go

@@ -60,15 +60,16 @@ func BytesToAddress(b []byte) (Address, error) {
 
 // HexToAddress convert hex address string to Address
 func HexToAddress(hexStr string) (Address, error) {
-	if len(hexStr) != hexAddressLength {
+	s := util.TrimQuotes(hexStr)
+	if len(s) != hexAddressLength {
 		return Address{}, errAddressLen
 	}
 
-	if !strings.HasPrefix(hexStr, AddressPrefix) {
+	if !strings.HasPrefix(s, AddressPrefix) {
 		return Address{}, errAddressPrefix
 	}
 
-	addr := hexStr[addressPrefixLen:]
+	addr := s[addressPrefixLen:]
 
 	key, err := AddressEncoding.DecodeString("1111" + addr[0:52])
 	if err != nil {
@@ -218,5 +219,19 @@ func (addr *Address) UnmarshalBinary(text []byte) error {
 
 //MarshalJSON implements json.Marshaler interface
 func (addr *Address) MarshalJSON() ([]byte, error) {
-	return []byte(addr.String()), nil
+	//buffer := bytes.NewBufferString(`"`)
+	//buffer.WriteString(addr.String())
+	//buffer.WriteString(`"`)
+	//return buffer.Bytes(), nil
+	return []byte("\"" + addr.String() + "\""), nil
+}
+
+//UnmarshalJSON implements json.UnmarshalJSON interface
+func (addr *Address) UnmarshalJSON(b []byte) error {
+	tmp, err := HexToAddress(string(b))
+	if err != nil {
+		return err
+	}
+	copy((*addr)[:], tmp[:])
+	return nil
 }

common/types/address_test.go

@@ -2,6 +2,8 @@ package types
 
 import (
 	"encoding/hex"
+	"encoding/json"
+	"fmt"
 	"testing"
 )
 
@@ -71,3 +73,18 @@ func BenchmarkGenerateAddress(b *testing.B) {
 		PubToAddress(pub.Bytes())
 	}
 }
+
+func TestAddressMarshalJSON(t *testing.T) {
+	addr, _ := HexToAddress("qlc_3t6k35gi95xu6tergt6p69ck76ogmitsa8mnijtpxm9fkcm736xtoncuohr3")
+	bytes, err := json.Marshal(&addr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println(string(bytes))
+	addr2 := Address{}
+	err = json.Unmarshal(bytes, &addr2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println(addr2)
+}

common/types/internal/util/util.go

@@ -57,3 +57,13 @@ func Hash(size int, data ...[]byte) []byte {
 	}
 	return d.Sum(nil)
 }
+
+// TrimQuotes trim quotes of string if quotes exist
+func TrimQuotes(s string) string {
+	if len(s) >= 2 {
+		if s[0] == '"' && s[len(s)-1] == '"' {
+			return s[1 : len(s)-1]
+		}
+	}
+	return s
+}