fix: Improve gentx validation & error messages

x/genutil/collect.go

@@ -111,8 +111,8 @@ func CollectTxs(cdc codec.JSONCodec, txJSONDecoder sdk.TxDecoder, moniker, genTx
 			return appGenTxs, persistentPeers, err
 		}
 
-		var genTx sdk.Tx
-		if genTx, err = txJSONDecoder(jsonRawTx); err != nil {
+		genTx, err := types.ValidateAndGetGenTx(jsonRawTx, txJSONDecoder)
+		if err != nil {
 			return appGenTxs, persistentPeers, err
 		}
 

x/genutil/gentx.go

@@ -100,17 +100,17 @@ func DeliverGenTxs(
 	for _, genTx := range genTxs {
 		tx, err := txEncodingConfig.TxJSONDecoder()(genTx)
 		if err != nil {
-			panic(err)
+			panic(fmt.Sprintf("failed to decode gentx: %s error: %s", genTx, err))
 		}
 
 		bz, err := txEncodingConfig.TxEncoder()(tx)
 		if err != nil {
-			panic(err)
+			panic(fmt.Sprintf("failed to encode gentx: %s error: %s", genTx, err))
 		}
 
 		res := deliverTx(abci.RequestDeliverTx{Tx: bz})
 		if !res.IsOK() {
-			panic(res.Log)
+			panic(fmt.Sprintf("failed to deliverTx: %s error: %s", genTx, res.Log))
 		}
 	}
 

x/genutil/types/genesis_state.go

@@ -2,7 +2,6 @@ package types
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	tmos "github.com/tendermint/tendermint/libs/os"
@@ -96,24 +95,36 @@ func GenesisStateFromGenFile(genFile string) (genesisState map[string]json.RawMe
 
 // ValidateGenesis validates GenTx transactions
 func ValidateGenesis(genesisState *GenesisState, txJSONDecoder sdk.TxDecoder) error {
-	for i, genTx := range genesisState.GenTxs {
-		var tx sdk.Tx
-		tx, err := txJSONDecoder(genTx)
+	for _, genTx := range genesisState.GenTxs {
+		_, err := ValidateAndGetGenTx(genTx, txJSONDecoder)
 		if err != nil {
 			return err
 		}
+	}
+	return nil
+}
 
-		msgs := tx.GetMsgs()
-		if len(msgs) != 1 {
-			return errors.New(
-				"must provide genesis Tx with exactly 1 CreateValidator message")
-		}
+func ValidateAndGetGenTx(genTx json.RawMessage, txJSONDecoder sdk.TxDecoder) (sdk.Tx, error) {
+	tx, err := txJSONDecoder(genTx)
+	if err != nil {
+		return tx, fmt.Errorf("failed to decode gentx: %s, error: %s", genTx, err)
+	}
 
-		// TODO: abstract back to staking
-		if _, ok := msgs[0].(*stakingtypes.MsgCreateValidator); !ok {
-			return fmt.Errorf(
-				"genesis transaction %v does not contain a MsgCreateValidator", i)
-		}
+	msgs := tx.GetMsgs()
+	if len(msgs) != 1 {
+		return tx, fmt.Errorf(
+			"must provide genesis Tx with exactly 1 CreateValidator message, got more in gentx %v", tx)
 	}
-	return nil
+
+	// TODO: abstract back to staking
+	if _, ok := msgs[0].(*stakingtypes.MsgCreateValidator); !ok {
+		return tx, fmt.Errorf(
+			"genesis transaction %v does not contain a MsgCreateValidator", tx)
+	}
+
+	if err := msgs[0].ValidateBasic(); err != nil {
+		return tx, fmt.Errorf("invalid gentx: %s, error:%s", msgs[0], err)
+	}
+
+	return tx, nil
 }