Merge pull request #227 from MinterTeam/dev

v0.15.2

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

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"

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:])
 }

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