From 869d85fba5aa47c93765a14915ba9af2f6d39fdf Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Sun, 7 Oct 2018 21:08:20 -0700
Subject: [PATCH] Merge PR #2453: Update to tm version v0.25.0

---
 Gopkg.lock       | 10 +++++-----
 Gopkg.toml       |  2 +-
 PENDING.md       | 10 ++++++++++
 types/context.go |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index c3b08bd5c7..169893877a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -164,13 +164,12 @@
   version = "v1.2.0"
 
 [[projects]]
-  digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10"
+  digest = "1:ea40c24cdbacd054a6ae9de03e62c5f252479b96c716375aace5c120d68647c8"
   name = "github.com/hashicorp/hcl"
   packages = [
     ".",
     "hcl/ast",
     "hcl/parser",
-    "hcl/printer",
     "hcl/scanner",
     "hcl/strconv",
     "hcl/token",
@@ -447,7 +446,7 @@
   version = "v0.11.0"
 
 [[projects]]
-  digest = "1:f4fcc1a4dbe079b200556ca26c1ff1dacf23712125b9c265d8f02c0dbc318f39"
+  digest = "1:a69eebd15b05045ffdb10a984e001fadc5666f74383de3d2a9ee5862ee99cfdc"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -478,6 +477,7 @@
     "libs/clist",
     "libs/common",
     "libs/db",
+    "libs/errors",
     "libs/events",
     "libs/flowrate",
     "libs/log",
@@ -512,8 +512,8 @@
     "version",
   ]
   pruneopts = "UT"
-  revision = "d419fffe18531317c28c29a292ad7d253f6cafdf"
-  version = "v0.24.0"
+  revision = "0c9c3292c918617624f6f3fbcd95eceade18bcd5"
+  version = "v0.25.0"
 
 [[projects]]
   digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666"
diff --git a/Gopkg.toml b/Gopkg.toml
index 45ffc8317e..b63234f460 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -57,7 +57,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "=0.24.0"
+  version = "=0.25.0"
 
 [[constraint]]
   name = "github.com/bartekn/go-bip39"
diff --git a/PENDING.md b/PENDING.md
index 9c1ab1c028..d76a816bb6 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -68,6 +68,16 @@ BREAKING CHANGES
     * [x/stake] \#2394 Split up UpdateValidator into distinct state transitions applied only in EndBlock
 
 * Tendermint
+  * Update tendermint version from v0.23.0 to v0.25.0, notable changes
+    * Mempool now won't build too large blocks, or too computationally expensive blocks
+    * Maximum tx sizes and gas are now removed, and are implicitly the blocks maximums
+    * ABCI validators no longer send the pubkey. The pubkey is only sent in validator updates
+    * Validator set changes are now delayed by one block 
+    * Block header now includes the next validator sets hash
+    * BFT time is implemented
+    * Secp256k1 signature format has changed
+    * There is now a threshold multisig format
+    * See the [tendermint changelog](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md) for other changes.
 
 FEATURES
 
diff --git a/types/context.go b/types/context.go
index fd2e076881..417fc0158c 100644
--- a/types/context.go
+++ b/types/context.go
@@ -190,7 +190,7 @@ func (c Context) WithConsensusParams(params *abci.ConsensusParams) Context {
 		return c
 	}
 	return c.withValue(contextKeyConsensusParams, params).
-		WithGasMeter(NewGasMeter(params.TxSize.MaxGas))
+		WithGasMeter(NewGasMeter(params.BlockSize.MaxGas))
 }
 
 func (c Context) WithChainID(chainID string) Context { return c.withValue(contextKeyChainID, chainID) }