Merge pull request #178 from MinterTeam/dev

v0.8.3
MinterTeam · Dec 10, 2018 · 2f3f40e · 2f3f40e
2 parents 0ab909b + e7695ff
commit 2f3f40e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.8.3
+*Dec 10th, 2018*
+
+BUG FIXES
+
+- [events] Fix pub key formatting in API
+
 ## 0.8.2
 *Dec 10th, 2018*
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   minter:
-    image: minterteam/minter:0.8.2
+    image: minterteam/minter:0.8.3
     volumes:
       - ~/.minter:/minter
     ports:

diff --git a/eventsdb/events.go b/eventsdb/events.go
@@ -62,15 +62,15 @@ type RewardEvent struct {
 
 func (e RewardEvent) MarshalJSON() ([]byte, error) {
 	return json.Marshal(struct {
-		Role            string `json:"role"`
-		Address         string `json:"address"`
-		Amount          string `json:"amount"`
-		ValidatorPubKey string `json:"validator_pub_key"`
+		Role            string       `json:"role"`
+		Address         string       `json:"address"`
+		Amount          string       `json:"amount"`
+		ValidatorPubKey types.Pubkey `json:"validator_pub_key"`
 	}{
 		Role:            string(e.Role),
 		Address:         e.Address.String(),
 		Amount:          big.NewInt(0).SetBytes(e.Amount).String(),
-		ValidatorPubKey: fmt.Sprintf("Mp%x", e.ValidatorPubKey),
+		ValidatorPubKey: e.ValidatorPubKey,
 	})
 }
 
@@ -83,15 +83,15 @@ type SlashEvent struct {
 
 func (e SlashEvent) MarshalJSON() ([]byte, error) {
 	return json.Marshal(struct {
-		Address         string `json:"address"`
-		Amount          string `json:"amount"`
-		Coin            string `json:"coin"`
-		ValidatorPubKey string `json:"validator_pub_key"`
+		Address         string       `json:"address"`
+		Amount          string       `json:"amount"`
+		Coin            string       `json:"coin"`
+		ValidatorPubKey types.Pubkey `json:"validator_pub_key"`
 	}{
 		Address:         e.Address.String(),
 		Amount:          big.NewInt(0).SetBytes(e.Amount).String(),
 		Coin:            e.Coin.String(),
-		ValidatorPubKey: fmt.Sprintf("Mp%x", e.ValidatorPubKey),
+		ValidatorPubKey: e.ValidatorPubKey,
 	})
 }
 
@@ -104,14 +104,14 @@ type UnbondEvent struct {
 
 func (e UnbondEvent) MarshalJSON() ([]byte, error) {
 	return json.Marshal(struct {
-		Address         string `json:"address"`
-		Amount          string `json:"amount"`
-		Coin            string `json:"coin"`
-		ValidatorPubKey string `json:"validator_pub_key"`
+		Address         string       `json:"address"`
+		Amount          string       `json:"amount"`
+		Coin            string       `json:"coin"`
+		ValidatorPubKey types.Pubkey `json:"validator_pub_key"`
 	}{
 		Address:         e.Address.String(),
 		Amount:          big.NewInt(0).SetBytes(e.Amount).String(),
 		Coin:            e.Coin.String(),
-		ValidatorPubKey: fmt.Sprintf("Mp%x", e.ValidatorPubKey),
+		ValidatorPubKey: e.ValidatorPubKey,
 	})
 }
diff --git a/version/version.go b/version/version.go
@@ -4,12 +4,12 @@ package version
 const (
 	Maj = "0"
 	Min = "8"
-	Fix = "2"
+	Fix = "3"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.8.2"
+	Version = "0.8.3"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string