From b737e7f7f96fdaf65f9774902cb01181a7c6e5d1 Mon Sep 17 00:00:00 2001
From: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Date: Wed, 22 Apr 2020 10:01:20 -0400
Subject: [PATCH] Remove JSON marshaler for base account (#6054)

* Remove JSON marshaler for base account

* Add changelog entries
---
 CHANGELOG.md            |  1 +
 x/auth/types/account.go | 45 -----------------------------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecf90c762ebb..46d26ea26b05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Client Breaking
 
+* (x/auth) [\#6054](https://github.com/cosmos/cosmos-sdk/pull/6054) Remove custom JSON marshaling for base accounts as multsigs cannot be bech32 decoded.
 * (modules) [\#5572](https://github.com/cosmos/cosmos-sdk/pull/5572) The `/bank/balances/{address}` endpoint now returns all account
 balances or a single balance by denom when the `denom` query parameter is present.
 * (client) [\#5640](https://github.com/cosmos/cosmos-sdk/pull/5640) The rest server endpoint `/swagger-ui/` is replaced by ´/´.
diff --git a/x/auth/types/account.go b/x/auth/types/account.go
index 35202f30a65b..a6f3c54483b2 100644
--- a/x/auth/types/account.go
+++ b/x/auth/types/account.go
@@ -150,51 +150,6 @@ func (acc BaseAccount) MarshalYAML() (interface{}, error) {
 	return string(bz), err
 }
 
-// MarshalJSON returns the JSON representation of a BaseAccount.
-func (acc BaseAccount) MarshalJSON() ([]byte, error) {
-	alias := baseAccountPretty{
-		Address:       acc.Address,
-		AccountNumber: acc.AccountNumber,
-		Sequence:      acc.Sequence,
-	}
-
-	if acc.PubKey != nil {
-		pks, err := sdk.Bech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, acc.GetPubKey())
-		if err != nil {
-			return nil, err
-		}
-
-		alias.PubKey = pks
-	}
-
-	return json.Marshal(alias)
-}
-
-// UnmarshalJSON unmarshals raw JSON bytes into a BaseAccount.
-func (acc *BaseAccount) UnmarshalJSON(bz []byte) error {
-	var alias baseAccountPretty
-	if err := json.Unmarshal(bz, &alias); err != nil {
-		return err
-	}
-
-	// NOTE: This will not work for multisig-based accounts as their Bech32
-	// encoding is too long.
-	if alias.PubKey != "" {
-		pk, err := sdk.GetPubKeyFromBech32(sdk.Bech32PubKeyTypeAccPub, alias.PubKey)
-		if err != nil {
-			return err
-		}
-
-		acc.PubKey = pk.Bytes()
-	}
-
-	acc.Address = alias.Address
-	acc.AccountNumber = alias.AccountNumber
-	acc.Sequence = alias.Sequence
-
-	return nil
-}
-
 // NewModuleAddress creates an AccAddress from the hash of the module's name
 func NewModuleAddress(name string) sdk.AccAddress {
 	return sdk.AccAddress(crypto.AddressHash([]byte(name)))