From 068ca5e3e6318e109248bd797892ef8320bab7a8 Mon Sep 17 00:00:00 2001 From: rigelrozanski Date: Wed, 11 Apr 2018 11:58:11 -0400 Subject: [PATCH] fix gaia init genesis creation int int --- cmd/gaia/app/app.go | 22 ++++++++++++++++++++++ cmd/gaia/cmd/gaiad/main.go | 12 ++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go index 0fa4f41815..792a6bbd99 100644 --- a/cmd/gaia/app/app.go +++ b/cmd/gaia/app/app.go @@ -179,3 +179,25 @@ func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount) { Coins: ga.Coins.Sort(), } } + +// DefaultGenAppState expects two args: an account address +// and a coin denomination, and gives lots of coins to that address. +func DefaultGenAppState(args []string, addr sdk.Address, coinDenom string) (json.RawMessage, error) { + + accAuth := auth.NewBaseAccountWithAddress(addr) + accAuth.Coins = sdk.Coins{{"fermion", 100000}} + acc := NewGenesisAccount(&accAuth) + genaccs := []GenesisAccount{acc} + + genesisState := GenesisState{ + Accounts: genaccs, + StakeData: stake.GetGenesisJSON(), + } + + stateBytes, err := json.MarshalIndent(genesisState, "", "\t") + if err != nil { + return nil, err + } + + return stateBytes, nil +} diff --git a/cmd/gaia/cmd/gaiad/main.go b/cmd/gaia/cmd/gaiad/main.go index f966c446ab..b84a4e20dc 100644 --- a/cmd/gaia/cmd/gaiad/main.go +++ b/cmd/gaia/cmd/gaiad/main.go @@ -40,22 +40,22 @@ func generateApp(rootDir string, logger log.Logger) (abci.Application, error) { //if err != nil { //return nil, err //} - //dbStaking, err := dbm.NewGoLevelDB("gaia-staking", dataDir) + //dbStake, err := dbm.NewGoLevelDB("gaia-stake", dataDir) //if err != nil { //return nil, err //} //dbs := map[string]dbm.DB{ - //"main": dbMain, - //"acc": dbAcc, - //"ibc": dbIBC, - //"staking": dbStaking, + //"main": dbMain, + //"acc": dbAcc, + //"ibc": dbIBC, + //"stake": dbStake, //} //bapp := app.NewGaiaApp(logger, dbs) return bapp, nil } func main() { - server.AddCommands(rootCmd, server.DefaultGenAppState, generateApp, context) + server.AddCommands(rootCmd, app.DefaultGenAppState, generateApp, context) // prepare and add flags rootDir := os.ExpandEnv("$HOME/.gaiad")