From d542d2c3945116697f60451e6a407082c41c3cc9 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Thu, 26 Jul 2018 18:08:09 -0700
Subject: [PATCH] Fix 0.22.7, bump to 0.22.8

---
 CHANGELOG.md            | 8 ++++++++
 blockchain/wire.go      | 4 +---
 consensus/types/wire.go | 4 +---
 consensus/wire.go       | 4 ++--
 lite/files/wire.go      | 4 ++--
 rpc/core/types/wire.go  | 4 +---
 types/wire.go           | 4 ++++
 version/version.go      | 4 ++--
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0dca0af..0c744678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.22.8
+
+*July 26th, 2018*
+
+BUG FIXES
+
+- [consensus, blockchain] Fix 0.22.7 below.
+
 ## 0.22.7
 
 *July 26th, 2018*
diff --git a/blockchain/wire.go b/blockchain/wire.go
index cfd261ab..91156fa8 100644
--- a/blockchain/wire.go
+++ b/blockchain/wire.go
@@ -2,7 +2,6 @@ package blockchain
 
 import (
 	"github.com/tendermint/go-amino"
-	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/types"
 )
 
@@ -10,6 +9,5 @@ var cdc = amino.NewCodec()
 
 func init() {
 	RegisterBlockchainMessages(cdc)
-	cryptoAmino.RegisterAmino(cdc)
-	types.RegisterEvidences(cdc)
+	types.RegisterBlockAmino(cdc)
 }
diff --git a/consensus/types/wire.go b/consensus/types/wire.go
index c0b858dd..db674816 100644
--- a/consensus/types/wire.go
+++ b/consensus/types/wire.go
@@ -2,13 +2,11 @@ package types
 
 import (
 	"github.com/tendermint/go-amino"
-	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
 
 func init() {
-	cryptoAmino.RegisterAmino(cdc)
-	types.RegisterEvidences(cdc)
+	types.RegisterBlockAmino(cdc)
 }
diff --git a/consensus/wire.go b/consensus/wire.go
index cc172bea..567e6095 100644
--- a/consensus/wire.go
+++ b/consensus/wire.go
@@ -2,7 +2,7 @@ package consensus
 
 import (
 	"github.com/tendermint/go-amino"
-	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
@@ -10,5 +10,5 @@ var cdc = amino.NewCodec()
 func init() {
 	RegisterConsensusMessages(cdc)
 	RegisterWALMessages(cdc)
-	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterBlockAmino(cdc)
 }
diff --git a/lite/files/wire.go b/lite/files/wire.go
index f45e4c63..e7864831 100644
--- a/lite/files/wire.go
+++ b/lite/files/wire.go
@@ -2,11 +2,11 @@ package files
 
 import (
 	"github.com/tendermint/go-amino"
-	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
 
 func init() {
-	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterBlockAmino(cdc)
 }
diff --git a/rpc/core/types/wire.go b/rpc/core/types/wire.go
index d49b977e..ef1fa800 100644
--- a/rpc/core/types/wire.go
+++ b/rpc/core/types/wire.go
@@ -2,12 +2,10 @@ package core_types
 
 import (
 	"github.com/tendermint/go-amino"
-	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/types"
 )
 
 func RegisterAmino(cdc *amino.Codec) {
 	types.RegisterEventDatas(cdc)
-	types.RegisterEvidences(cdc)
-	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterBlockAmino(cdc)
 }
diff --git a/types/wire.go b/types/wire.go
index 569ea321..c5608998 100644
--- a/types/wire.go
+++ b/types/wire.go
@@ -8,6 +8,10 @@ import (
 var cdc = amino.NewCodec()
 
 func init() {
+	RegisterBlockAmino(cdc)
+}
+
+func RegisterBlockAmino(cdc *amino.Codec) {
 	cryptoAmino.RegisterAmino(cdc)
 	RegisterEvidences(cdc)
 }
diff --git a/version/version.go b/version/version.go
index 474c43a3..85b1f191 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "22"
-	Fix = "7"
+	Fix = "8"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.22.7"
+	Version = "0.22.8"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string