working through compile errors

cmd/gaia/cmd/gaiad/main.go

@@ -19,7 +19,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	genutil "github.com/cosmos/cosmos-sdk/x/genutil"
+	genutil "github.com/cosmos/cosmos-sdk/x/genutil/server/cli"
 )
 
 // gaiad custom flags
@@ -48,7 +48,7 @@ func main() {
 	rootCmd.AddCommand(genutil.CollectGenTxsCmd(ctx, cdc))
 	rootCmd.AddCommand(genutil.TestnetFilesCmd(ctx, cdc))
 	rootCmd.AddCommand(genutil.GenTxCmd(ctx, cdc))
-	rootCmd.AddCommand(genutil.AddGenesisAccountCmd(ctx, cdc))
+	rootCmd.AddCommand(genutil.AddGenesisAccountCmd(ctx, cdc)) // XXX pass in the mbm validate function
 	rootCmd.AddCommand(genutil.ValidateGenesisCmd(ctx, cdc))
 	rootCmd.AddCommand(client.NewCompletionCmd(rootCmd, true))
 

types/module.go

@@ -20,7 +20,7 @@ type AppModuleBasic interface {
 	Name() string
 	RegisterCodec(*codec.Codec)
 	DefaultGenesis() json.RawMessage
-	ValidateGenesis(json.RawMessage) error
+	ValidateGenesis(*codec.Codec, json.RawMessage) error
 }
 
 // collections of AppModuleBasic
@@ -47,9 +47,9 @@ func (mbm ModuleBasicManager) DefaultGenesis() map[string]json.RawMessage {
 }
 
 // Provided default genesis information for all modules
-func (mbm ModuleBasicManager) ValidateGenesis(genesis map[string]json.RawMessage) error {
+func (mbm ModuleBasicManager) ValidateGenesis(cdc *codec.Codec, genesis map[string]json.RawMessage) error {
 	for _, mb := range mbm {
-		if err := mb.ValidateGenesis(genesis[mb.Name()]); err != nil {
+		if err := mb.ValidateGenesis(cdc, genesis[mb.Name()]); err != nil {
 			return err
 		}
 	}

x/auth/module.go

@@ -32,7 +32,7 @@ func (AppModuleBasic) DefaultGenesis() json.RawMessage {
 }
 
 // module validate genesis
-func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error {
+func (AppModuleBasic) ValidateGenesis(_ *codec.Codec, bz json.RawMessage) error {
 	var data GenesisState
 	err := moduleCdc.UnmarshalJSON(bz, &data)
 	if err != nil {

x/bank/module.go

@@ -33,7 +33,7 @@ func (AppModuleBasic) DefaultGenesis() json.RawMessage {
 }
 
 // module validate genesis
-func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error {
+func (AppModuleBasic) ValidateGenesis(_ *codec.Codec, bz json.RawMessage) error {
 	var data GenesisState
 	err := moduleCdc.UnmarshalJSON(bz, &data)
 	if err != nil {

x/crisis/module.go

@@ -34,7 +34,7 @@ func (AppModuleBasic) DefaultGenesis() json.RawMessage {
 }
 
 // module validate genesis
-func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error {
+func (AppModuleBasic) ValidateGenesis(_ *codec.Codec, bz json.RawMessage) error {
 	var data GenesisState
 	err := moduleCdc.UnmarshalJSON(bz, &data)
 	if err != nil {

x/distribution/module.go

@@ -29,7 +29,7 @@ func (AppModuleBasic) DefaultGenesis() json.RawMessage {
 }
 
 // module validate genesis
-func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error {
+func (AppModuleBasic) ValidateGenesis(_ *codec.Codec, bz json.RawMessage) error {
 	var data GenesisState
 	err := ModuleCdc.UnmarshalJSON(bz, &data)
 	if err != nil {

x/genutil/collect.go

@@ -16,11 +16,10 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	"github.com/cosmos/cosmos-sdk/cmd/gaia/app" // XXX XXX
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/cosmos/cosmos-sdk/x/staking" // XXX XXX
+	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
 const flagGenTxDir = "gentx-dir"
@@ -73,12 +72,34 @@ func genAppStateFromConfig(cdc *codec.Codec, config *cfg.Config,
 	}
 
 	// create the app state
-	genesisState, err := GenesisStateFromGenDoc(cdc, genDoc)
+	appGenesisState, err := GenesisStateFromGenDoc(cdc, genDoc)
+	if err != nil {
+		return appState, err
+	}
+	var genesisState GenesisState
+	cdc.UnmarshalJSON(appGenesisState[moduleName], &genesisState)
+
+	// convert all the GenTxs to JSON
+	var appGenTxsBz []json.RawMessage
+	for _, genTx := range appGenTxs {
+		txBz, err := cdc.MarshalJSON(genTx)
+		if err != nil {
+			return appState, err
+		}
+		appGenTxsBz = append(appGenTxsBz, txBz)
+	}
+
+	genesisState.GenTxs = appGenTxsBz
+	genesisStateBz, err := cdc.MarshalJSON(genesisState)
+	if err != nil {
+		return appState, err
+	}
+
+	appGenesisState[moduleName] = genesisStateBz
+	appState, err = codec.MarshalJSONIndent(cdc, appGenesisState)
 	if err != nil {
 		return appState, err
 	}
-	genesisState.Module[moduleName] = appGenTxs // XXXXXXXXXXXXX XXX fix up
-	appState = codec.MarshalJSONIndent(cdc, genesisState)
 
 	genDoc.AppState = appState
 	err = ExportGenesisFile(&genDoc, config.GenesisFile())
@@ -98,14 +119,18 @@ func CollectStdTxs(cdc *codec.Codec, moniker string, genTxsDir string, genDoc tm
 
 	// prepare a map of all accounts in genesis state to then validate
 	// against the validators addresses
-	var appState app.GenesisState
+	var appState ExpectedAppGenesisState
 	if err := cdc.UnmarshalJSON(genDoc.AppState, &appState); err != nil {
 		return appGenTxs, persistentPeers, err
 	}
+	var genesisState GenesisState
+	if err := cdc.UnmarshalJSON(appState[moduleName], &genesisState); err != nil {
+		return appGenTxs, persistentPeers, err
+	}
 
-	addrMap := make(map[string]app.GenesisAccount, len(appState.Accounts))
-	for i := 0; i < len(appState.Accounts); i++ {
-		acc := appState.Accounts[i]
+	addrMap := make(map[string]GenesisAccount, len(genesisState.Accounts))
+	for i := 0; i < len(genesisState.Accounts); i++ {
+		acc := genesisState.Accounts[i]
 		addrMap[acc.Address.String()] = acc
 	}
 
@@ -145,6 +170,7 @@ func CollectStdTxs(cdc *codec.Codec, moniker string, genTxsDir string, genDoc tm
 				"each genesis transaction must provide a single genesis message")
 		}
 
+		// TODO abstract out staking reference here through the expected staking keeper
 		msg := msgs[0].(staking.MsgCreateValidator)
 		// validate delegator and validator addresses and funds against the accounts in the state
 		delAddr := msg.DelegatorAddress.String()

x/genutil/expected_keepers.go

@@ -1,6 +1,8 @@
 package genutil
 
 import (
+	"encoding/json"
+
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -12,8 +14,17 @@ type StakingKeeper interface {
 	ApplyAndReturnValidatorSetUpdates(sdk.Context) (updates []abci.ValidatorUpdate)
 }
 
+// expected account keeper
 type AccountKeeper interface {
 	NewAccount(sdk.Context, auth.Account)
 	SetAccount(sdk.Context, auth.Account)
-	IterateAccounts(ctx sdk.Context, process func(Account) (stop bool))
+	IterateAccounts(ctx sdk.Context, process func(auth.Account) (stop bool))
+}
+
+// The expected format of app genesis state
+type ExpectedAppGenesisState map[string]json.RawMessage
+
+// expected cosmos app
+type CosmosApp interface {
+	NewDefaultGenesisState() ExpectedAppGenesisState
 }

x/genutil/export.go

@@ -1,23 +1,27 @@
 package genutil
 
 import (
-	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 )
 
-func ExportGenesis(accountKeeper AccountKeeper) GenesisState {
+// export genesis for all accounts
+func ExportGenesis(ctx sdk.Context, accountKeeper AccountKeeper) GenesisState {
 
 	// iterate to get the accounts
 	accounts := []GenesisAccount{}
-	app.accountKeeper.IterateAccounts(ctx,
+	accountKeeper.IterateAccounts(ctx,
 		func(acc auth.Account) (stop bool) {
-			account := NewGenesisAccountI(acc)
+			account, err := NewGenesisAccountI(acc)
+			if err != nil {
+				panic(err)
+			}
 			accounts = append(accounts, account)
 			return false
 		},
 	)
 
 	var genesisState GenesisState
-	genesisState.GenesisAccounts = accounts
+	genesisState.Accounts = accounts
 	return genesisState
 }

x/genutil/genesis_account.go

@@ -70,13 +70,12 @@ func NewGenesisAccountI(acc auth.Account) (GenesisAccount, error) {
 		Sequence:      acc.GetSequence(),
 	}
 
+	if err := gacc.Validate(); err != nil {
+		return gacc, err
+	}
+
 	vacc, ok := acc.(auth.VestingAccount)
 	if ok {
-		err := ValidateVestingAccount(vacc)
-		if err != nil {
-			return err
-		}
-
 		gacc.OriginalVesting = vacc.GetOriginalVesting()
 		gacc.DelegatedFree = vacc.GetDelegatedFree()
 		gacc.DelegatedVesting = vacc.GetDelegatedVesting()
@@ -115,6 +114,7 @@ func (ga *GenesisAccount) ToAccount() auth.Account {
 //___________________________________
 type GenesisAccounts []GenesisAccount
 
+// genesis accounts contain an address
 func (gaccs GenesisAccounts) Contains(acc sdk.AccAddress) bool {
 	for _, gacc := range gaccs {
 		if gacc.Address.Equals(acc) {

x/genutil/genesis_state.go

@@ -7,8 +7,9 @@ import (
 	"sort"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/cosmos/cosmos-sdk/x/staking" // XXX XXX
+	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
 // State to Unmarshal
@@ -29,14 +30,11 @@ func (gs GenesisState) Sanitize() {
 }
 
 // validate genesis information
-func ValidateGenesis(genesisState GenesisState) error {
+func ValidateGenesis(cdc *codec.Codec, genesisState GenesisState) error {
 	if err := validateGenesisStateAccounts(genesisState.Accounts); err != nil {
 		return err
 	}
-	if err := validateGenTxs(genesisState.GenTxs); err != nil {
-		return err
-	}
-	return nil
+	return validateGenTxs(cdc, genesisState.GenTxs)
 }
 
 // validateGenesisStateAccounts performs validation of genesis accounts. It
@@ -74,21 +72,21 @@ func validateGenesisStateAccounts(accs []GenesisAccount) error {
 }
 
 // validate GenTx transactions
-func validateGenTxs(genTxs []json.RawMessage) error {
+func validateGenTxs(cdc *codec.Codec, genTxs []json.RawMessage) error {
 	for i, genTx := range genTxs {
 		var tx auth.StdTx
 		if err := cdc.UnmarshalJSON(genTx, &tx); err != nil {
-			return genesisState, err
+			return err
 		}
 
 		msgs := tx.GetMsgs()
 		if len(msgs) != 1 {
-			return genesisState, errors.New(
+			return errors.New(
 				"must provide genesis StdTx with exactly 1 CreateValidator message")
 		}
 
 		if _, ok := msgs[0].(staking.MsgCreateValidator); !ok {
-			return genesisState, fmt.Errorf(
+			return fmt.Errorf(
 				"Genesis transaction %v does not contain a MsgCreateValidator", i)
 		}
 	}

x/genutil/gentx.go

@@ -13,7 +13,6 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/common"
 
-	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -29,15 +28,19 @@ var (
 	defaultMinSelfDelegation       = "1"
 )
 
-func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins sdk.Coins, cdc *codec.Codec) error {
+func validateAccountInGenesis(appGenesisState ExpectedGenesisState, key sdk.AccAddress, coins sdk.Coins, cdc *codec.Codec) error {
 	accountIsInGenesis := false
 
 	// TODO refactor out bond denom to common state area
-	stakingDataBz := genesisState.Modules[staking.ModuleName]
+	stakingDataBz := appGenesisState[staking.ModuleName]
 	var stakingData staking.GenesisState
 	cdc.MustUnmarshalJSON(stakingDataBz, &stakingData)
 	bondDenom := stakingData.Params.BondDenom
 
+	genUtilDataBz := appGenesisState[staking.ModuleName]
+	var genesisState GenesisState
+	cdc.MustUnmarshalJSON(genUtilDataBz, &genesisState)
+
 	// Check if the account is in genesis
 	for _, acc := range genesisState.Accounts {
 		// Ensure that account is in genesis
@@ -55,11 +58,11 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s
 		}
 	}
 
-	if accountIsInGenesis {
-		return nil
+	if !accountIsInGenesis {
+		return fmt.Errorf("account %s in not in the app_state.accounts array of genesis.json", key)
 	}
 
-	return fmt.Errorf("account %s in not in the app_state.accounts array of genesis.json", key)
+	return nil
 }
 
 func makeOutputFilepath(rootDir, nodeID string) (string, error) {

x/genutil/module.go

@@ -8,7 +8,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 )
 
-const ModuleName = "genutil"
+const moduleName = "genutil"
 
 // app module basics object
 type AppModuleBasic struct{}
@@ -27,13 +27,13 @@ func (AppModuleBasic) RegisterCodec(cdc *codec.Codec) {}
 func (AppModuleBasic) DefaultGenesis() json.RawMessage { return nil }
 
 // module validate genesis
-func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error {
+func (AppModuleBasic) ValidateGenesis(cdc *codec.Codec, bz json.RawMessage) error {
 	var data GenesisState
 	err := ModuleCdc.UnmarshalJSON(bz, &data)
 	if err != nil {
 		return err
 	}
-	return ValidateGenesis(data)
+	return ValidateGenesis(cdc, data)
 }
 
 //___________________________

x/genutil/server/cli/collect.go

@@ -13,6 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
+	"github.com/cosmos/cosmos-sdk/x/genutil"
 )
 
 const flagGenTxDir = "gentx-dir"
@@ -26,7 +27,7 @@ func CollectGenTxsCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 			config := ctx.Config
 			config.SetRoot(viper.GetString(cli.HomeFlag))
 			name := viper.GetString(client.FlagName)
-			nodeID, valPubKey, err := InitializeNodeValidatorFiles(config)
+			nodeID, valPubKey, err := genutil.InitializeNodeValidatorFiles(config)
 			if err != nil {
 				return err
 			}