chore(tm2): crypto.Address json Marshal

tm2/pkg/crypto/bech32_test.go

@@ -1,6 +1,7 @@
 package crypto_test
 
 import (
+	"encoding/json"
 	"math/rand"
 	"testing"
 
@@ -59,6 +60,7 @@ func TestRandBech32AddrConsistency(t *testing.T) {
 		addr := crypto.AddressFromBytes(pub.Address().Bytes())
 		testMarshal(t, addr, amino.Marshal, amino.Unmarshal)
 		testMarshal(t, addr, amino.MarshalJSON, amino.UnmarshalJSON)
+		testMarshal(t, addr, json.Marshal, json.Unmarshal)
 
 		str := addr.String()
 		res, err := crypto.AddressFromBech32(str)

tm2/pkg/crypto/crypto.go

@@ -2,6 +2,7 @@
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 
 	"github.com/gnolang/gno/tm2/pkg/bech32"
@@ -53,11 +54,25 @@
 	return
 }
 
+func (addr Address) MarshalJSON() ([]byte, error) {
+	b := AddressToBech32(addr)
+	return []byte(`"` + b + `"`), nil
+}
+
+func (addr *Address) UnmarshalJSON(b []byte) error {
+	var s string
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+	return addr.UnmarshalAmino(s)
+}
+
 func (addr Address) MarshalAmino() (string, error) {
 	return AddressToBech32(addr), nil
 }
 
 func (addr *Address) UnmarshalAmino(b32str string) (err error) {
+	// NOTE: also used to unmarshal normal JSON, through UnmarshalJSON.
 	if b32str == "" {
 		return nil // leave addr as zero.
 	}