From aa72e72ce4bf8dcd3a9897f32010c4dae9a376f7 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@pluranimity.org>
Date: Wed, 28 Nov 2018 23:29:55 +0100
Subject: [PATCH] Merge #2932: Update to Tendermint v0.27.0-dev0

* Update upstream Tendermint version
* Update PENDING.md
* Fix for accum -> proposer priority
---
 Gopkg.lock               |  8 +++-----
 Gopkg.toml               |  2 +-
 PENDING.md               |  1 +
 client/rpc/validators.go | 16 ++++++++--------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index f8d29e5905c..fb27145205d 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -314,7 +314,7 @@
     "xfs",
   ]
   pruneopts = "UT"
-  revision = "185b4288413d2a0dd0806f78c90dde719829e5ae"
+  revision = "619930b0b4713cc1280189bf0a4c54b3fb506f60"
 
 [[projects]]
   digest = "1:ea0700160aca4ef099f4e06686a665a87691f4248dddd40796925eda2e46bd64"
@@ -437,7 +437,6 @@
   version = "v0.14.1"
 
 [[projects]]
-  branch = "jae/reverseiterator"
   digest = "1:c42b83333367f9c701d2373c2ce11177382c41bfce3b105aa632eaf0e5654ccb"
   name = "github.com/tendermint/iavl"
   packages = ["."]
@@ -445,8 +444,7 @@
   revision = "d8d0eef715649bcc21682990ac635566119f070c"
 
 [[projects]]
-  branch = "jae/reverseiterator"
-  digest = "1:db22ebc8142359cc3f8b6fc3954177be59358699af699794302cf60168dcf343"
+  digest = "1:86eea4d2e0992aecae63ead1e1d00373d6d56288af625d0ad080cf647ebd141f"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -511,7 +509,7 @@
     "version",
   ]
   pruneopts = "UT"
-  revision = "70a7cae58c8f880aede3b19101e54fb9a7b08c0b"
+  revision = "v0.27.0-dev0"
 
 [[projects]]
   digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666"
diff --git a/Gopkg.toml b/Gopkg.toml
index a43d7ff40b5..a996488a4c2 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -36,7 +36,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  revision = "70a7cae58c8f880aede3b19101e54fb9a7b08c0b"
+  revision = "v0.27.0-dev0"
 
 ## deps without releases:
 
diff --git a/PENDING.md b/PENDING.md
index b3ed20c611e..4f6364ebb87 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -25,6 +25,7 @@ BREAKING CHANGES
   * [\#2798](https://github.com/cosmos/cosmos-sdk/issues/2798) Governance API has miss-spelled English word in JSON response ('depositer' -> 'depositor')
 
 * Tendermint
+  - Update to Tendermint 0.27.0
 
 
 FEATURES
diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index 330966bf874..6ec7ba615d5 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -38,10 +38,10 @@ func ValidatorCommand() *cobra.Command {
 
 // Validator output in bech32 format
 type ValidatorOutput struct {
-	Address     sdk.ValAddress `json:"address"` // in bech32
-	PubKey      string         `json:"pub_key"` // in bech32
-	Accum       int64          `json:"accum"`
-	VotingPower int64          `json:"voting_power"`
+	Address          sdk.ValAddress `json:"address"` // in bech32
+	PubKey           string         `json:"pub_key"` // in bech32
+	ProposerPriority int64          `json:"proposer_priority"`
+	VotingPower      int64          `json:"voting_power"`
 }
 
 // Validators at a certain height output in bech32 format
@@ -57,10 +57,10 @@ func bech32ValidatorOutput(validator *tmtypes.Validator) (ValidatorOutput, error
 	}
 
 	return ValidatorOutput{
-		Address:     sdk.ValAddress(validator.Address),
-		PubKey:      bechValPubkey,
-		Accum:       validator.Accum,
-		VotingPower: validator.VotingPower,
+		Address:          sdk.ValAddress(validator.Address),
+		PubKey:           bechValPubkey,
+		ProposerPriority: validator.ProposerPriority,
+		VotingPower:      validator.VotingPower,
 	}, nil
 }