Merge PR #5497: ensure non-nil gentxs

CHANGELOG.md

@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * (x/genutil) [\#5499](https://github.com/cosmos/cosmos-sdk/pull/) Ensure `DefaultGenesis` returns valid and non-nil default genesis state.
+* (genesis) [\#5086](https://github.com/cosmos/cosmos-sdk/issues/5086) Ensure `gentxs` are always an empty array instead of `nil`.
 
 ## [v0.37.7] - 2020-02-10
 

x/genutil/types/genesis_state.go

@@ -20,6 +20,10 @@ type GenesisState struct {
 
 // NewGenesisState creates a new GenesisState object
 func NewGenesisState(genTxs []json.RawMessage) GenesisState {
+	// Ensure genTxs is never nil, https://github.com/cosmos/cosmos-sdk/issues/5086
+	if len(genTxs) == 0 {
+		genTxs = make([]json.RawMessage, 0)
+	}
 	return GenesisState{
 		GenTxs: genTxs,
 	}

x/genutil/types/genesis_state_test.go

@@ -1,8 +1,10 @@
 package types
 
 import (
+	"encoding/json"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
@@ -16,6 +18,18 @@ var (
 	pk2 = ed25519.GenPrivKey().PubKey()
 )
 
+func TestNetGenesisState(t *testing.T) {
+	gen := NewGenesisState(nil)
+	assert.NotNil(t, gen.GenTxs) // https://github.com/cosmos/cosmos-sdk/issues/5086
+
+	gen = NewGenesisState(
+		[]json.RawMessage{
+			[]byte(`{"foo":"bar"}`),
+		},
+	)
+	assert.Equal(t, string(gen.GenTxs[0]), `{"foo":"bar"}`)
+}
+
 func TestValidateGenesisMultipleMessages(t *testing.T) {
 
 	desc := stakingtypes.NewDescription("testname", "", "", "")