diff --git a/CHANGELOG.md b/CHANGELOG.md index ebc769ee0..fd805eb87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.15.2 + +IMPROVEMENT + +- [cmd] `--show_validator` flag now returns hex public key of a validator +- [tendermint] Update to [v0.31.1](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0311) + ## 0.15.1 IMPROVEMENT diff --git a/Gopkg.lock b/Gopkg.lock index 5c56e5161..858de8056 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -383,7 +383,7 @@ version = "v0.14.1" [[projects]] - digest = "1:76fbe1f3b51f6bd7014bbf9c6c4427180be62b1715278993e9235d7d4552629f" + digest = "1:c9856690720d5c24530ab1e2768dd4c80f6f21e34d16464f6906a70921a40254" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -439,8 +439,8 @@ "version", ] pruneopts = "UT" - revision = "0d985ede28bd6937fa9d3613618e42cab6fc871c" - version = "v0.31.0" + revision = "a0234affb6959a0aec285eebf3a3963251d2d186" + version = "v0.31.1" [[projects]] digest = "1:b6621a5e9003d7d809993d49217a841d27ef85b4bc0459115d3fd1f8c1518999" diff --git a/Gopkg.toml b/Gopkg.toml index d3d1a0438..628fe9051 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -16,7 +16,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.31.0" + version = "0.31.1" [[constraint]] name = "github.com/MinterTeam/go-amino" diff --git a/cmd/minter/main.go b/cmd/minter/main.go index 9e886657d..8ca836fbe 100644 --- a/cmd/minter/main.go +++ b/cmd/minter/main.go @@ -9,7 +9,6 @@ import ( "github.com/MinterTeam/minter-go-node/genesis" "github.com/MinterTeam/minter-go-node/gui" "github.com/MinterTeam/minter-go-node/log" - "github.com/pkg/errors" "github.com/tendermint/go-amino" "github.com/tendermint/tendermint/abci/types" bc "github.com/tendermint/tendermint/blockchain" @@ -166,10 +165,5 @@ func showValidator() { } pv := privval.LoadFilePV(keyFilePath, cfg.PrivValidatorStateFile()) - bz, err := cdc.MarshalJSON(pv.GetPubKey()) - if err != nil { - panic(errors.Wrap(err, "failed to marshal private validator pubkey")) - } - - fmt.Println(string(bz)) + fmt.Printf("Mp%x", pv.GetPubKey().Bytes()[5:]) } diff --git a/version/version.go b/version/version.go index c0d2ed927..1d4d12c3a 100755 --- a/version/version.go +++ b/version/version.go @@ -4,14 +4,14 @@ package version const ( Maj = "0" Min = "15" - Fix = "1" + Fix = "2" AppVer = 2 ) var ( // Must be a string because scripts like dist.sh read this file. - Version = "0.15.1" + Version = "0.15.2" // GitCommit is the current HEAD set using ldflags. GitCommit string