Update testnet to use canonical genesis time (#2692)

* Update testnet to use canonical genesis time * Fix linting in genesis test
cosmos · Nov 7, 2018 · 4f46a4c · 4f46a4c
1 parent 2a3d1f1
commit 4f46a4c
Show file tree

Hide file tree

Showing 7 changed files with 267 additions and 131 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/PENDING.md b/PENDING.md
@@ -64,7 +64,8 @@ BUG FIXES
 * Gaia CLI  (`gaiacli`)
 
 * Gaia
- - \#2670 [x/stake] fixed incorrent `IterateBondedValidators` and split into two functions: `IterateBondedValidators` and `IterateLastBlockConsValidators`
+ - \#2670 [x/stake] fixed incorrect `IterateBondedValidators` and split into two functions: `IterateBondedValidators` and `IterateLastBlockConsValidators`
+ - \#2691 Fix local testnet creation by using a single canonical genesis time
 
 * SDK
  - \#2625 [x/gov] fix AppendTag function usage error

diff --git a/cmd/gaia/app/genesis_test.go b/cmd/gaia/app/genesis_test.go
@@ -2,9 +2,10 @@ package app
 
 import (
 	"encoding/json"
+	"testing"
+
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	tmtypes "github.com/tendermint/tendermint/types"
-	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -91,8 +92,10 @@ func TestGaiaAppGenState(t *testing.T) {
 func makeMsg(name string, pk crypto.PubKey) auth.StdTx {
 	desc := stake.NewDescription(name, "", "", "")
 	comm := stakeTypes.CommissionMsg{}
-	msg := stake.NewMsgCreateValidator(sdk.ValAddress(pk.Address()), pk, sdk.NewInt64Coin(bondDenom,
-		50),	desc, comm)
+	msg := stake.NewMsgCreateValidator(
+		sdk.ValAddress(pk.Address()), pk,
+		sdk.NewInt64Coin(bondDenom, 50), desc, comm,
+	)
 	return auth.NewStdTx([]sdk.Msg{msg}, auth.StdFee{}, nil, "")
 }
 

diff --git a/cmd/gaia/init/collect.go b/cmd/gaia/init/collect.go
@@ -2,7 +2,6 @@ package init
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"path/filepath"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -12,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/tendermint/go-amino"
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/libs/cli"
@@ -35,12 +33,13 @@ func CollectGenTxsCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 		RunE: func(_ *cobra.Command, _ []string) error {
 			config := ctx.Config
 			config.SetRoot(viper.GetString(cli.HomeFlag))
-
 			name := viper.GetString(client.FlagName)
+
 			nodeID, valPubKey, err := InitializeNodeValidatorFiles(config)
 			if err != nil {
 				return err
 			}
+
 			genDoc, err := loadGenesisDoc(cdc, config.GenesisFile())
 			if err != nil {
 				return err
@@ -59,12 +58,14 @@ func CollectGenTxsCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 				NodeID:    nodeID,
 				ValPubKey: valPubKey,
 			}
+
 			appMessage, err := genAppStateFromConfig(cdc, config, initCfg, genDoc)
 			if err != nil {
 				return err
 			}
 
 			toPrint.AppMessage = appMessage
+
 			// print out some key information
 			return displayInfo(cdc, toPrint)
 		},
@@ -74,23 +75,29 @@ func CollectGenTxsCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	return cmd
 }
 
-func genAppStateFromConfig(cdc *codec.Codec, config *cfg.Config, initCfg initConfig,
-	genDoc types.GenesisDoc) (appState json.RawMessage, err error) {
+func genAppStateFromConfig(
+	cdc *codec.Codec, config *cfg.Config, initCfg initConfig, genDoc types.GenesisDoc,
+) (appState json.RawMessage, err error) {
 
 	genFile := config.GenesisFile()
-	// process genesis transactions, else create default genesis.json
-	var appGenTxs []auth.StdTx
-	var persistentPeers string
-	var genTxs []json.RawMessage
-	var jsonRawTx json.RawMessage
+	var (
+		appGenTxs       []auth.StdTx
+		persistentPeers string
+		genTxs          []json.RawMessage
+		jsonRawTx       json.RawMessage
+	)
 
+	// process genesis transactions, else create default genesis.json
 	appGenTxs, persistentPeers, err = app.CollectStdTxs(
-		cdc, config.Moniker, initCfg.GenTxsDir, genDoc)
+		cdc, config.Moniker, initCfg.GenTxsDir, genDoc,
+	)
 	if err != nil {
 		return
 	}
+
 	genTxs = make([]json.RawMessage, len(appGenTxs))
 	config.P2P.PersistentPeers = persistentPeers
+
 	for i, stdTx := range appGenTxs {
 		jsonRawTx, err = cdc.MarshalJSON(stdTx)
 		if err != nil {
@@ -100,6 +107,7 @@ func genAppStateFromConfig(cdc *codec.Codec, config *cfg.Config, initCfg initCon
 	}
 
 	cfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config)
+
 	appState, err = app.GaiaAppGenStateJSON(cdc, genDoc, genTxs)
 	if err != nil {
 		return
@@ -108,12 +116,3 @@ func genAppStateFromConfig(cdc *codec.Codec, config *cfg.Config, initCfg initCon
 	err = WriteGenesisFile(genFile, initCfg.ChainID, nil, appState)
 	return
 }
-
-func loadGenesisDoc(cdc *amino.Codec, genFile string) (genDoc types.GenesisDoc, err error) {
-	genContents, err := ioutil.ReadFile(genFile)
-	if err != nil {
-		return
-	}
-	err = cdc.UnmarshalJSON(genContents, &genDoc)
-	return
-}
diff --git a/cmd/gaia/init/init.go b/cmd/gaia/init/init.go
@@ -3,7 +3,6 @@ package init
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tendermint/tendermint/privval"
 	"os"
 	"path/filepath"
 
@@ -14,11 +13,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/common"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
 )
 
 const (
@@ -97,54 +93,3 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec, appInit server.AppInit) *cob
 	cmd.Flags().String(flagMoniker, "", "set the validator's moniker")
 	return cmd
 }
-
-// InitializeNodeValidatorFiles creates private validator and p2p configuration files.
-func InitializeNodeValidatorFiles(config *cfg.Config) (nodeID string, valPubKey crypto.PubKey, err error) {
-	nodeKey, err := p2p.LoadOrGenNodeKey(config.NodeKeyFile())
-	if err != nil {
-		return
-	}
-	nodeID = string(nodeKey.ID())
-	valPubKey = ReadOrCreatePrivValidator(config.PrivValidatorFile())
-	return
-}
-
-// WriteGenesisFile creates and writes the genesis configuration to disk. An
-// error is returned if building or writing the configuration to file fails.
-// nolint: unparam
-func WriteGenesisFile(genesisFile, chainID string, validators []types.GenesisValidator, appState json.RawMessage) error {
-	genDoc := types.GenesisDoc{
-		ChainID:    chainID,
-		Validators: validators,
-		AppState:   appState,
-	}
-
-	if err := genDoc.ValidateAndComplete(); err != nil {
-		return err
-	}
-
-	return genDoc.SaveAs(genesisFile)
-}
-
-// read of create the private key file for this config
-func ReadOrCreatePrivValidator(privValFile string) crypto.PubKey {
-	// private validator
-	var privValidator *privval.FilePV
-	if common.FileExists(privValFile) {
-		privValidator = privval.LoadFilePV(privValFile)
-	} else {
-		privValidator = privval.GenFilePV(privValFile)
-		privValidator.Save()
-	}
-	return privValidator.GetPubKey()
-}
-
-func initializeEmptyGenesis(cdc *codec.Codec, genFile string, chainID string,
-	overwrite bool) (appState json.RawMessage, err error) {
-	if !overwrite && common.FileExists(genFile) {
-		err = fmt.Errorf("genesis.json file already exists: %v", genFile)
-		return
-	}
-
-	return codec.MarshalJSONIndent(cdc, app.NewDefaultGenesisState())
-}