From c7f6a3e8c60822280b7c2109a0d5926d9ef5cb4b Mon Sep 17 00:00:00 2001
From: "Samuel E. Moelius" <35515885+smoelius@users.noreply.github.com>
Date: Mon, 4 Mar 2019 07:28:18 -0500
Subject: [PATCH] Merge PR #3797: Have MsgCreateValidator.UnmarshalJSON return
 an error rather than panic.

---
 x/staking/types/msg.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/x/staking/types/msg.go b/x/staking/types/msg.go
index 5e7d43c017..620ea1e9f7 100644
--- a/x/staking/types/msg.go
+++ b/x/staking/types/msg.go
@@ -107,7 +107,11 @@ func (msg *MsgCreateValidator) UnmarshalJSON(bz []byte) error {
 	msg.Commission = msgCreateValJSON.Commission
 	msg.DelegatorAddress = msgCreateValJSON.DelegatorAddress
 	msg.ValidatorAddress = msgCreateValJSON.ValidatorAddress
-	msg.PubKey = sdk.MustGetConsPubKeyBech32(msgCreateValJSON.PubKey)
+	var err error
+	msg.PubKey, err = sdk.GetConsPubKeyBech32(msgCreateValJSON.PubKey)
+	if err != nil {
+		return err
+	}
 	msg.Value = msgCreateValJSON.Value
 	msg.MinSelfDelegation = msgCreateValJSON.MinSelfDelegation