refactor!: make ExportGenesis return proto.Message

baseapp/block_gas_test.go

@@ -1,6 +1,7 @@
 package baseapp_test
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"testing"
@@ -109,8 +110,19 @@ func TestBaseApp_BlockGas(t *testing.T) {
 				&testdata.TestMsg{},
 			)
 			genState := GenesisStateWithSingleValidator(t, cdc, appBuilder)
-			stateBytes, err := tmjson.MarshalIndent(genState, "", " ")
+
+			genStateJson := map[string]json.RawMessage{}
+			for k, v := range genState {
+				if v != nil {
+					genStateJson[k] = cdc.MustMarshalJSON(v)
+				} else {
+					genStateJson[k] = []byte("{}")
+				}
+			}
+
+			stateBytes, err := tmjson.MarshalIndent(genStateJson, "", "  ")
 			require.NoError(t, err)
+
 			bapp.InitChain(abci.RequestInitChain{
 				Validators:      []abci.ValidatorUpdate{},
 				ConsensusParams: simtestutil.DefaultConsensusParams,

baseapp/util_test.go

@@ -2,9 +2,9 @@ package baseapp_test
 
 import (
 	"context"
-	"encoding/json"
 	"testing"
 
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	tmtypes "github.com/tendermint/tendermint/types"
 
@@ -38,7 +38,7 @@ import (
 
 // GenesisStateWithSingleValidator initializes GenesisState with a single validator and genesis accounts
 // that also act as delegators.
-func GenesisStateWithSingleValidator(t *testing.T, codec codec.Codec, builder *runtime.AppBuilder) map[string]json.RawMessage {
+func GenesisStateWithSingleValidator(t *testing.T, codec codec.Codec, builder *runtime.AppBuilder) map[string]proto.Message {
 	t.Helper()
 
 	privVal := mock.NewPV()

client/grpc_query_test.go

@@ -2,6 +2,7 @@ package client_test
 
 import (
 	"context"
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -73,7 +74,16 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	genesisState, err := sims.GenesisStateWithValSet(cdc, appBuilder.DefaultGenesis(), valSet, []authtypes.GenesisAccount{acc}, balance)
 	s.NoError(err)
 
-	stateBytes, err := tmjson.MarshalIndent(genesisState, "", " ")
+	genStateJson := map[string]json.RawMessage{}
+	for k, v := range genesisState {
+		if v != nil {
+			genStateJson[k] = cdc.MustMarshalJSON(v)
+		} else {
+			genStateJson[k] = []byte("{}")
+		}
+	}
+
+	stateBytes, err := tmjson.MarshalIndent(genStateJson, "", "  ")
 	s.NoError(err)
 
 	// init chain will set the validator set and initialize the genesis accounts

runtime/app.go

@@ -125,6 +125,7 @@ func (a *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.Respo
 	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
+
 	return a.ModuleManager.InitGenesis(ctx, a.cdc, genesisState)
 }
 

runtime/builder.go

@@ -1,9 +1,9 @@
 package runtime
 
 import (
-	"encoding/json"
 	"io"
 
+	"github.com/gogo/protobuf/proto"
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
@@ -20,8 +20,8 @@ type AppBuilder struct {
 
 // DefaultGenesis returns a default genesis from the registered
 // AppModuleBasic's.
-func (a *AppBuilder) DefaultGenesis() map[string]json.RawMessage {
-	return a.app.basicManager.DefaultGenesis(a.app.cdc)
+func (a *AppBuilder) DefaultGenesis() map[string]proto.Message {
+	return a.app.basicManager.DefaultGenesis()
 }
 
 // Build builds an *App instance.

simapp/app_legacy.go

@@ -525,7 +525,7 @@ func (a *SimApp) Configurator() module.Configurator {
 
 // InitChainer application update at chain initialization
 func (app *SimApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
-	var genesisState GenesisState
+	var genesisState map[string]json.RawMessage
 	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}

simapp/app_test.go

@@ -1,7 +1,6 @@
 package simapp
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -14,6 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/tests/mocks"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -60,7 +60,8 @@ func TestSimAppExportAndBlockedAddrs(t *testing.T) {
 	logger2, _ := log.NewDefaultLogger("plain", "info", false)
 	// Making a new app object with the db, so that initchain hasn't been called
 	app2 := NewSimApp(logger2, db, nil, true, encCfg, simtestutil.NewAppOptionsWithFlagHome(DefaultNodeHome))
-	_, err := app2.ExportAppStateAndValidators(false, []string{})
+	exportedApp, err := app2.ExportAppStateAndValidators(false, []string{})
+	println(string(exportedApp.AppState))
 	require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
 }
 
@@ -214,9 +215,10 @@ func TestInitGenesisOnMigration(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	t.Cleanup(mockCtrl.Finish)
 	mockModule := mocks.NewMockAppModule(mockCtrl)
-	mockDefaultGenesis := json.RawMessage(`{"key": "value"}`)
-	mockModule.EXPECT().DefaultGenesis(gomock.Eq(app.appCodec)).Times(1).Return(mockDefaultGenesis)
-	mockModule.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(app.appCodec), gomock.Eq(mockDefaultGenesis)).Times(1).Return(nil)
+	mockDefaultGenesis := &testdata.AnyWithExtra{B: 111}
+
+	mockModule.EXPECT().DefaultGenesis().Times(1).Return(mockDefaultGenesis)
+	mockModule.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(mockDefaultGenesis)).Times(1).Return(nil)
 	mockModule.EXPECT().ConsensusVersion().Times(1).Return(uint64(0))
 
 	app.ModuleManager.Modules["mock"] = mockModule

simapp/export.go

@@ -30,8 +30,18 @@ func (app *SimApp) ExportAppStateAndValidators(
 		app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}
 
-	genState := app.ModuleManager.ExportGenesis(ctx, app.appCodec)
-	appState, err := json.MarshalIndent(genState, "", "  ")
+	genState := app.ModuleManager.ExportGenesis(ctx)
+
+	genStateJson := map[string]json.RawMessage{}
+	for k, v := range genState {
+		if v != nil {
+			genStateJson[k] = app.appCodec.MustMarshalJSON(v)
+		} else {
+			genStateJson[k] = []byte("{}")
+		}
+	}
+
+	appState, err := json.MarshalIndent(genStateJson, "", "  ")
 	if err != nil {
 		return servertypes.ExportedApp{}, err
 	}

simapp/genesis.go

@@ -1,9 +1,8 @@
 package simapp
 
 import (
-	"encoding/json"
-
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/gogo/protobuf/proto"
 )
 
 // GenesisState of the blockchain is represented here as a map of raw json
@@ -13,9 +12,9 @@ import (
 // Within this application default genesis information is retrieved from
 // the ModuleBasicManager which populates json from each BasicModule
 // object provided to it during init.
-type GenesisState map[string]json.RawMessage
+type GenesisState map[string]proto.Message
 
 // NewDefaultGenesisState generates the default state for the application.
 func NewDefaultGenesisState(cdc codec.JSONCodec) GenesisState {
-	return ModuleBasics.DefaultGenesis(cdc)
+	return ModuleBasics.DefaultGenesis()
 }

simapp/integration/server/export_test.go

@@ -3,6 +3,7 @@ package server_test
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -132,7 +133,17 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *t
 	app := simapp.NewSimApp(logger, db, nil, true, encCfg, simtestutil.NewAppOptionsWithFlagHome(tempDir))
 
 	genesisState := simapp.GenesisStateWithSingleValidator(t, app)
-	stateBytes, err := tmjson.MarshalIndent(genesisState, "", " ")
+
+	genStateJson := map[string]json.RawMessage{}
+	for k, v := range genesisState {
+		if v != nil {
+			genStateJson[k] = encCfg.Codec.MustMarshalJSON(v)
+		} else {
+			genStateJson[k] = []byte("{}")
+		}
+	}
+
+	stateBytes, err := tmjson.MarshalIndent(genStateJson, "", "  ")
 	require.NoError(t, err)
 
 	serverCtx := server.NewDefaultContext()

simapp/sim_test.go

@@ -162,7 +162,8 @@ func TestAppImportExport(t *testing.T) {
 	newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, MakeTestEncodingConfig(), appOptions, fauxMerkleModeOpt)
 	require.Equal(t, "SimApp", newApp.Name())
 
-	var genesisState GenesisState
+	// var genesisState GenesisState
+	var genesisState map[string]json.RawMessage
 	err = json.Unmarshal(exported.AppState, &genesisState)
 	require.NoError(t, err)
 

simapp/simd/cmd/testnet.go

@@ -354,35 +354,39 @@ func initGenFiles(
 	genAccounts []authtypes.GenesisAccount, genBalances []banktypes.Balance,
 	genFiles []string, numValidators int,
 ) error {
-	appGenState := mbm.DefaultGenesis(clientCtx.Codec)
+	appGenState := mbm.DefaultGenesis()
 
 	// set the accounts in the genesis state
-	var authGenState authtypes.GenesisState
-	clientCtx.Codec.MustUnmarshalJSON(appGenState[authtypes.ModuleName], &authGenState)
+	authGenState := appGenState[authtypes.ModuleName].(*authtypes.GenesisState)
 
 	accounts, err := authtypes.PackAccounts(genAccounts)
 	if err != nil {
 		return err
 	}
 
 	authGenState.Accounts = accounts
-	appGenState[authtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&authGenState)
+	appGenState[authtypes.ModuleName] = authGenState
 
 	// set the balances in the genesis state
-	var bankGenState banktypes.GenesisState
-	clientCtx.Codec.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState)
+	bankGenState := appGenState[banktypes.ModuleName].(*banktypes.GenesisState)
 
 	bankGenState.Balances = banktypes.SanitizeGenesisBalances(genBalances)
 	for _, bal := range bankGenState.Balances {
 		bankGenState.Supply = bankGenState.Supply.Add(bal.Coins...)
 	}
-	appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState)
-
-	appGenStateJSON, err := json.MarshalIndent(appGenState, "", "  ")
-	if err != nil {
-		return err
+	appGenState[banktypes.ModuleName] = bankGenState
+
+	genStateJson := map[string]json.RawMessage{}
+	for k, v := range appGenState {
+		if v != nil {
+			genStateJson[k] = clientCtx.Codec.MustMarshalJSON(v)
+		} else {
+			genStateJson[k] = []byte("{}")
+		}
 	}
 
+	appGenStateJSON, err := json.MarshalIndent(genStateJson, "", "  ")
+
 	genDoc := types.GenesisDoc{
 		ChainID:    chainID,
 		AppState:   appGenStateJSON,

simapp/state.go

@@ -215,9 +215,9 @@ func AppStateFromGenesisFileFn(r io.Reader, cdc codec.JSONCodec, genesisFile str
 		panic(err)
 	}
 
-	var authGenesis authtypes.GenesisState
+	var authGenesis *authtypes.GenesisState
 	if appState[authtypes.ModuleName] != nil {
-		cdc.MustUnmarshalJSON(appState[authtypes.ModuleName], &authGenesis)
+		authGenesis = appState[authtypes.ModuleName].(*authtypes.GenesisState)
 	}
 
 	newAccs := make([]simtypes.Account, len(authGenesis.Accounts))

simapp/test_helpers.go

@@ -87,7 +87,16 @@ func NewSimappWithCustomOptions(t *testing.T, isCheckTx bool, options SetupOptio
 
 	if !isCheckTx {
 		// init chain must be called to stop deliverState from being nil
-		stateBytes, err := tmjson.MarshalIndent(genesisState, "", " ")
+		genStateJson := map[string]json.RawMessage{}
+		for k, v := range genesisState {
+			if v != nil {
+				genStateJson[k] = app.appCodec.MustMarshalJSON(v)
+			} else {
+				genStateJson[k] = []byte("{}")
+			}
+		}
+
+		stateBytes, err := tmjson.MarshalIndent(genStateJson, "", "  ")
 		require.NoError(t, err)
 
 		// Initialize the chain
@@ -139,7 +148,16 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 	genesisState, err := simtestutil.GenesisStateWithValSet(app.AppCodec(), genesisState, valSet, genAccs, balances...)
 	require.NoError(t, err)
 
-	stateBytes, err := json.MarshalIndent(genesisState, "", " ")
+	genStateJson := map[string]json.RawMessage{}
+	for k, v := range genesisState {
+		if v != nil {
+			genStateJson[k] = app.appCodec.MustMarshalJSON(v)
+		} else {
+			genStateJson[k] = []byte("{}")
+		}
+	}
+
+	stateBytes, err := tmjson.MarshalIndent(genStateJson, "", "  ")
 	require.NoError(t, err)
 
 	// init chain will set the validator set and initialize the genesis accounts
@@ -378,7 +396,7 @@ func NewTestNetworkFixture() network.TestFixture {
 
 	return network.TestFixture{
 		AppConstructor: appCtr,
-		GenesisState:   ModuleBasics.DefaultGenesis(cfg.Codec),
+		GenesisState:   ModuleBasics.DefaultGenesis(),
 		EncodingConfig: cfg,
 	}
 }