From df567616a9d2391c5929da2c138ba39c860b1fae Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 11 Jan 2019 17:19:01 +0000 Subject: [PATCH] Upgrade tendermint to 0.28.0-dev0 (#3279) --- Gopkg.lock | 5 ++-- Gopkg.toml | 2 +- PENDING.md | 2 +- client/lcd/test_helpers.go | 6 ++-- cmd/gaia/init/utils.go | 30 ++++++++++---------- docs/examples/basecoin/cmd/basecoind/main.go | 7 +++-- docs/examples/democoin/cmd/democoind/main.go | 4 ++- server/export.go | 2 +- server/start.go | 3 +- server/tm_cmds.go | 15 ++++++---- server/util.go | 11 +++++++ x/auth/ante_test.go | 18 ++++++------ x/auth/stdtx.go | 2 +- 13 files changed, 65 insertions(+), 42 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d7952983d..1f46f7fd0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -452,11 +452,12 @@ version = "v0.12.0" [[projects]] - digest = "1:fbf8a69c035430a7f06fe0b725ef9ef1ea02366a35d35a0f4c2c2c77b5d1d9cb" + digest = "1:cf5ca19b425df58000f12801db22c1c50840be194640d7b612312e4beffb0ff7" name = "github.com/tendermint/tendermint" packages = [ "abci/client", "abci/example/code", + "abci/example/counter", "abci/example/kvstore", "abci/server", "abci/types", @@ -517,7 +518,7 @@ "version", ] pruneopts = "UT" - revision = "v0.27.4" + revision = "v0.28.0-dev0" [[projects]] digest = "1:a7485b2a69f996923f9d3406a9a853fd8eb31818515e985a830d71f88f6a925b" diff --git a/Gopkg.toml b/Gopkg.toml index 207bbab96..2b57eea07 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -40,7 +40,7 @@ [[override]] name = "github.com/tendermint/tendermint" - revision = "v0.27.4" + revision = "v0.28.0-dev0" [[constraint]] name = "github.com/zondax/ledger-cosmos-go" diff --git a/PENDING.md b/PENDING.md index 2c3243a71..2653e20ce 100644 --- a/PENDING.md +++ b/PENDING.md @@ -29,7 +29,7 @@ BREAKING CHANGES meter utilization during aborted ante handler executions. * Tendermint - * [\#3278](https://github.com/cosmos/cosmos-sdk/pull/3278) Upgrade to 0.27.4 release + * \#3279 Upgrade to Tendermint 0.28.0-dev0 FEATURES diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go index 436b9d680..d5af08824 100644 --- a/client/lcd/test_helpers.go +++ b/client/lcd/test_helpers.go @@ -227,8 +227,8 @@ func InitializeTestLCD( logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) logger = log.NewFilter(logger, log.AllowError()) - privValidatorFile := config.PrivValidatorFile() - privVal := pvm.LoadOrGenFilePV(privValidatorFile) + privVal := pvm.LoadOrGenFilePV(config.PrivValidatorKeyFile(), + config.PrivValidatorStateFile()) privVal.Reset() db := dbm.NewMemDB() @@ -247,7 +247,7 @@ func InitializeTestLCD( for i := 0; i < nValidators; i++ { operPrivKey := secp256k1.GenPrivKey() operAddr := operPrivKey.PubKey().Address() - pubKey := privVal.PubKey + pubKey := privVal.GetPubKey() delegation := 100 if i > 0 { pubKey = ed25519.GenPrivKey().PubKey() diff --git a/cmd/gaia/init/utils.go b/cmd/gaia/init/utils.go index 14c625d7f..149b4d10e 100644 --- a/cmd/gaia/init/utils.go +++ b/cmd/gaia/init/utils.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "io/ioutil" + "path/filepath" "time" amino "github.com/tendermint/go-amino" @@ -16,6 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/cmd/gaia/app" "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/server" ) // ExportGenesisFile creates and writes the genesis configuration to disk. An @@ -58,20 +60,6 @@ func ExportGenesisFileWithTime( return genDoc.SaveAs(genFile) } -// read of create the private key file for this config -func ReadOrCreatePrivValidator(privValFile string) crypto.PubKey { - var privValidator *privval.FilePV - - if common.FileExists(privValFile) { - privValidator = privval.LoadFilePV(privValFile) - } else { - privValidator = privval.GenFilePV(privValFile) - privValidator.Save() - } - - return privValidator.GetPubKey() -} - // InitializeNodeValidatorFiles creates private validator and p2p configuration files. func InitializeNodeValidatorFiles( config *cfg.Config) (nodeID string, valPubKey crypto.PubKey, err error, @@ -83,7 +71,19 @@ func InitializeNodeValidatorFiles( } nodeID = string(nodeKey.ID()) - valPubKey = ReadOrCreatePrivValidator(config.PrivValidatorFile()) + server.UpgradeOldPrivValFile(config) + + pvKeyFile := config.PrivValidatorKeyFile() + if err := common.EnsureDir(filepath.Dir(pvKeyFile), 0777); err != nil { + return nodeID, valPubKey, nil + } + + pvStateFile := config.PrivValidatorStateFile() + if err := common.EnsureDir(filepath.Dir(pvStateFile), 0777); err != nil { + return nodeID, valPubKey, nil + } + + valPubKey = privval.LoadOrGenFilePV(pvKeyFile, pvStateFile).GetPubKey() return nodeID, valPubKey, nil } diff --git a/docs/examples/basecoin/cmd/basecoind/main.go b/docs/examples/basecoin/cmd/basecoind/main.go index 8b5351da7..cca6b2e42 100644 --- a/docs/examples/basecoin/cmd/basecoind/main.go +++ b/docs/examples/basecoin/cmd/basecoind/main.go @@ -3,11 +3,13 @@ package main import ( "encoding/json" "fmt" - "github.com/cosmos/cosmos-sdk/store" "io" "os" + "github.com/cosmos/cosmos-sdk/store" + "github.com/tendermint/tendermint/p2p" + "github.com/tendermint/tendermint/privval" "github.com/cosmos/cosmos-sdk/baseapp" gaiaInit "github.com/cosmos/cosmos-sdk/cmd/gaia/init" @@ -78,7 +80,8 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command { } nodeID := string(nodeKey.ID()) - pk := gaiaInit.ReadOrCreatePrivValidator(config.PrivValidatorFile()) + pk := privval.LoadOrGenFilePV(config.PrivValidatorKeyFile(), + config.PrivValidatorStateFile()).GetPubKey() genTx, appMessage, validator, err := server.SimpleAppGenTx(cdc, pk) if err != nil { return err diff --git a/docs/examples/democoin/cmd/democoind/main.go b/docs/examples/democoin/cmd/democoind/main.go index f0553ee5d..8ac1b8cf4 100644 --- a/docs/examples/democoin/cmd/democoind/main.go +++ b/docs/examples/democoin/cmd/democoind/main.go @@ -9,6 +9,7 @@ import ( "github.com/spf13/viper" "github.com/tendermint/tendermint/libs/common" "github.com/tendermint/tendermint/p2p" + "github.com/tendermint/tendermint/privval" "github.com/cosmos/cosmos-sdk/client" @@ -81,7 +82,8 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command { } nodeID := string(nodeKey.ID()) - pk := gaiaInit.ReadOrCreatePrivValidator(config.PrivValidatorFile()) + pk := privval.LoadOrGenFilePV(config.PrivValidatorKeyFile(), + config.PrivValidatorStateFile()).GetPubKey() genTx, appMessage, validator, err := server.SimpleAppGenTx(cdc, pk) if err != nil { return err diff --git a/server/export.go b/server/export.go index aa30597da..16187fa66 100644 --- a/server/export.go +++ b/server/export.go @@ -33,7 +33,7 @@ func ExportCmd(ctx *Context, cdc *codec.Codec, appExporter AppExporter) *cobra.C return err } - if emptyState { + if emptyState || appExporter == nil { fmt.Println("WARNING: State is not initialized. Returning genesis file.") genesisFile := path.Join(home, "config", "genesis.json") genesis, err := ioutil.ReadFile(genesisFile) diff --git a/server/start.go b/server/start.go index cf39ff71b..2b94bb934 100644 --- a/server/start.go +++ b/server/start.go @@ -114,10 +114,11 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) { return nil, err } + UpgradeOldPrivValFile(cfg) // create & start tendermint node tmNode, err := node.NewNode( cfg, - pvm.LoadOrGenFilePV(cfg.PrivValidatorFile()), + pvm.LoadOrGenFilePV(cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()), nodeKey, proxy.NewLocalClientCreator(app), node.DefaultGenesisDocProviderFunc(cfg), diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 33994b0cb..9d8351711 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -41,8 +41,10 @@ func ShowValidatorCmd(ctx *Context) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { cfg := ctx.Config - privValidator := pvm.LoadOrGenFilePV(cfg.PrivValidatorFile()) - valPubKey := privValidator.PubKey + UpgradeOldPrivValFile(cfg) + privValidator := pvm.LoadOrGenFilePV( + cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) + valPubKey := privValidator.GetPubKey() if viper.GetBool(client.FlagJson) { return printlnJSON(valPubKey) @@ -67,9 +69,12 @@ func ShowAddressCmd(ctx *Context) *cobra.Command { Use: "show-address", Short: "Shows this node's tendermint validator consensus address", RunE: func(cmd *cobra.Command, args []string) error { + cfg := ctx.Config - privValidator := pvm.LoadOrGenFilePV(cfg.PrivValidatorFile()) - valConsAddr := (sdk.ConsAddress)(privValidator.Address) + UpgradeOldPrivValFile(cfg) + privValidator := pvm.LoadOrGenFilePV( + cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) + valConsAddr := (sdk.ConsAddress)(privValidator.GetAddress()) if viper.GetBool(client.FlagJson) { return printlnJSON(valConsAddr) @@ -102,7 +107,7 @@ func UnsafeResetAllCmd(ctx *Context) *cobra.Command { Short: "Resets the blockchain database, removes address book files, and resets priv_validator.json to the genesis state", RunE: func(cmd *cobra.Command, args []string) error { cfg := ctx.Config - tcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorFile(), ctx.Logger) + tcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile(), ctx.Logger) return nil }, } diff --git a/server/util.go b/server/util.go index 4e834ce10..dec3a6d4a 100644 --- a/server/util.go +++ b/server/util.go @@ -18,6 +18,7 @@ import ( "github.com/tendermint/tendermint/libs/cli" tmflags "github.com/tendermint/tendermint/libs/cli/flags" "github.com/tendermint/tendermint/libs/log" + pvm "github.com/tendermint/tendermint/privval" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -221,6 +222,16 @@ func TrapSignal(cleanupFunc func()) { }() } +// UpgradeOldPrivValFile converts old priv_validator.json file (prior to Tendermint 0.28) +// to the new priv_validator_key.json and priv_validator_state.json files. +func UpgradeOldPrivValFile(config *cfg.Config) { + if _, err := os.Stat(config.OldPrivValidatorFile()); !os.IsNotExist(err) { + if oldFilePV, err := pvm.LoadOldFilePV(config.OldPrivValidatorFile()); err == nil { + oldFilePV.Upgrade(config.PrivValidatorKeyFile(), config.PrivValidatorStateFile()) + } + } +} + func skipInterface(iface net.Interface) bool { if iface.Flags&net.FlagUp == 0 { return true // interface down diff --git a/x/auth/ante_test.go b/x/auth/ante_test.go index f92e61274..9511798a5 100644 --- a/x/auth/ante_test.go +++ b/x/auth/ante_test.go @@ -620,23 +620,23 @@ func TestCountSubkeys(t *testing.T) { } return ret } - genMultiKey := func(n, k int, keysGen func(n int) []crypto.PubKey) crypto.PubKey { - return multisig.NewPubKeyMultisigThreshold(k, keysGen(n)) - } + singleKey := secp256k1.GenPrivKey().PubKey() + singleLevelMultiKey := multisig.NewPubKeyMultisigThreshold(4, genPubKeys(5)) + multiLevelSubKey1 := multisig.NewPubKeyMultisigThreshold(4, genPubKeys(5)) + multiLevelSubKey2 := multisig.NewPubKeyMultisigThreshold(4, genPubKeys(5)) + multiLevelMultiKey := multisig.NewPubKeyMultisigThreshold(2, []crypto.PubKey{ + multiLevelSubKey1, multiLevelSubKey2, secp256k1.GenPrivKey().PubKey()}) type args struct { pub crypto.PubKey } - mkey := genMultiKey(5, 4, genPubKeys) - mkeyType := mkey.(*multisig.PubKeyMultisigThreshold) - mkeyType.PubKeys = append(mkeyType.PubKeys, genMultiKey(6, 5, genPubKeys)) tests := []struct { name string args args want int }{ - {"single key", args{secp256k1.GenPrivKey().PubKey()}, 1}, - {"multi sig key", args{genMultiKey(5, 4, genPubKeys)}, 5}, - {"multi multi sig", args{mkey}, 11}, + {"single key", args{singleKey}, 1}, + {"single level multikey", args{singleLevelMultiKey}, 5}, + {"multi level multikey", args{multiLevelMultiKey}, 11}, } for _, tt := range tests { t.Run(tt.name, func(T *testing.T) { diff --git a/x/auth/stdtx.go b/x/auth/stdtx.go index 07469f81b..f13e77457 100644 --- a/x/auth/stdtx.go +++ b/x/auth/stdtx.go @@ -71,7 +71,7 @@ func (tx StdTx) ValidateBasic() sdk.Error { // countSubKeys counts the total number of keys for a multi-sig public key. func countSubKeys(pub crypto.PubKey) int { - v, ok := pub.(*multisig.PubKeyMultisigThreshold) + v, ok := pub.(multisig.PubKeyMultisigThreshold) if !ok { return 1 }