#215 Fix gentx commands.

app/app.go

@@ -240,7 +240,7 @@ func (app *CyberdApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) ab
 	// load the accounts
 	for _, gacc := range genesisState.Accounts {
 		acc := gacc.ToAccount()
-		acc.AccountNumber = app.accountKeeper.GetNextAccountNumber(ctx)
+		app.accountKeeper.GetNextAccountNumber(ctx) //increment for future accs being started from right number
 		app.accountKeeper.SetAccount(ctx, acc)
 		app.stakingIndex.UpdateStake(types.AccNumber(acc.AccountNumber), acc.Coins.AmountOf(coin.CYB).Int64())
 	}

app/export.go

@@ -24,7 +24,7 @@ func (app *CyberdApp) ExportAppStateAndValidators() (appState json.RawMessage, v
 	// iterate to get the accounts
 	var accounts []GenesisAccount
 	appendAccount := func(acc auth.Account) (stop bool) {
-		account := NewGenesisAccountI(acc)
+		account := NewGenesisAccount(acc)
 		accounts = append(accounts, account)
 		return false
 	}

app/genesis.go

@@ -54,29 +54,25 @@ func NewGenesisState(
 }
 
 type GenesisAccount struct {
-	Address sdk.AccAddress `json:"addr"`
-	Amount  int64          `json:"amt"`
+	Address   sdk.AccAddress `json:"addr"`
+	Amount    int64          `json:"amt"`
+	AccNumber uint64         `json:"nmb"`
 }
 
-func NewGenesisAccount(acc *auth.BaseAccount) GenesisAccount {
+func NewGenesisAccount(acc auth.Account) GenesisAccount {
 	return GenesisAccount{
-		Address: acc.Address,
-		Amount:  acc.Coins.AmountOf(coin.CYB).Int64(),
-	}
-}
-
-func NewGenesisAccountI(acc auth.Account) GenesisAccount {
-	return GenesisAccount{
-		Address: acc.GetAddress(),
-		Amount:  acc.GetCoins().AmountOf(coin.CYB).Int64(),
+		Address:   acc.GetAddress(),
+		Amount:    acc.GetCoins().AmountOf(coin.CYB).Int64(),
+		AccNumber: acc.GetAccountNumber(),
 	}
 }
 
 // convert GenesisAccount to auth.BaseAccount
 func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount) {
 	return &auth.BaseAccount{
-		Address: ga.Address,
-		Coins:   sdk.Coins{sdk.NewInt64Coin(coin.CYB, ga.Amount)},
+		Address:       ga.Address,
+		Coins:         sdk.Coins{sdk.NewInt64Coin(coin.CYB, ga.Amount)},
+		AccountNumber: ga.AccNumber,
 	}
 }
 
@@ -111,7 +107,7 @@ func NewDefaultGenesisState() GenesisState {
 		},
 		SlashingData: slashing.DefaultGenesisState(),
 		DistrData:    distr.DefaultGenesisState(),
-		GenTxs:       nil,
+		GenTxs:       []json.RawMessage{},
 	}
 }
 
@@ -154,7 +150,7 @@ func CyberdAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []
 	return genesisState, nil
 }
 
-// CyberdAppGenState but with JSON
+//todo should be here?
 func CyberdAppGenStateJSON(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) (
 	appState json.RawMessage, err error) {
 	// create the final app state