certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rollback changes which break gen-tx

This commit is contained in:
rigelrozanski 2018-07-25 16:57:33 -04:00
parent d6cd0d4acc
commit ee47b3b1ca
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/init.go
View File

@ -48,9 +48,10 @@ var (
// genesis piece structure for creating combined genesis // genesis piece structure for creating combined genesis
type GenesisTx struct { type GenesisTx struct {
NodeID string `json:"node_id"` NodeID string `json:"node_id"`
IP string `json:"ip"` IP string `json:"ip"`
AppGenTx json.RawMessage `json:"app_gen_tx"` Validator tmtypes.GenesisValidator `json:"validator"`
AppGenTx json.RawMessage `json:"app_gen_tx"`
} }
// Storage for init command input parameters // Storage for init command input parameters
@ -120,15 +121,16 @@ func gentxWithConfig(cdc *wire.Codec, appInit AppInit, config *cfg.Config, genTx
nodeID := string(nodeKey.ID()) nodeID := string(nodeKey.ID())
pubKey := readOrCreatePrivValidator(config) pubKey := readOrCreatePrivValidator(config)
appGenTx, cliPrint, _, err := appInit.AppGenTx(cdc, pubKey, genTxConfig) appGenTx, cliPrint, validator, err := appInit.AppGenTx(cdc, pubKey, genTxConfig)
if err != nil { if err != nil {
return return
} }
tx := GenesisTx{ tx := GenesisTx{
NodeID: nodeID, NodeID: nodeID,
IP: genTxConfig.IP, IP: genTxConfig.IP,
AppGenTx: appGenTx, Validator: validator,
AppGenTx: appGenTx,
} }
bz, err := wire.MarshalJSONIndent(cdc, tx) bz, err := wire.MarshalJSONIndent(cdc, tx)
if err != nil { if err != nil {
@ -310,6 +312,7 @@ func processGenTxs(genTxsDir string, cdc *wire.Codec) (
genTx := genTxs[nodeID] genTx := genTxs[nodeID]
// combine some stuff // combine some stuff
validators = append(validators, genTx.Validator)
appGenTxs = append(appGenTxs, genTx.AppGenTx) appGenTxs = append(appGenTxs, genTx.AppGenTx)
// Add a persistent peer // Add a persistent peer