From a3b31c7a6b0c0a85ea8ea7612e087d2105e85a0d Mon Sep 17 00:00:00 2001
From: gamarin2 <gautier@tendermint.com>
Date: Tue, 2 Oct 2018 13:58:58 +0200
Subject: [PATCH 1/5] Merge PR #2427: Fix typo val faq

---
 docs/validators/validator-faq.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/validators/validator-faq.md b/docs/validators/validator-faq.md
index 14644daf26..454bb21a14 100644
--- a/docs/validators/validator-faq.md
+++ b/docs/validators/validator-faq.md
@@ -216,12 +216,12 @@ We have to solve this simple equation to find the reward R for each validator:
 * For the proposer validator:
   * The pool obtains `R + R * 5%`: 105 Atoms
   * Commission: `105 * 80% * 1%` = 0.84 Atoms
-  * Validator's reward: `100 * 20% + Commission` = 21.84 Atoms
+  * Validator's reward: `105 * 20% + Commission` = 21.84 Atoms
   * Delegators' rewards: `105 * 80% - Commission` = 83.16 Atoms (each delegator will be able to claim its portion of these rewards in proportion to their stake)
 * For each non-proposer validator:
   * The pool obtains R: 100 Atoms
   * Commission: `100 * 80% * 1%` = 0.8 Atoms
-  * Validator's reward: `105 * 20% + Commission` = 20.8 Atoms
+  * Validator's reward: `100 * 20% + Commission` = 20.8 Atoms
   * Delegators' rewards: `100 * 80% - Commission` = 79.2 Atoms (each delegator will be able to claim its portion of these rewards in proportion to their stake)
 
 ### What are the slashing conditions?

From 9410b6287c8890a9ce21b011d72347c9a669b70c Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Tue, 2 Oct 2018 05:01:18 -0700
Subject: [PATCH 2/5] Merge PR #2425: simulation: Make bank testing auth
 configurable

---
 PENDING.md                    |   1 +
 cmd/gaia/app/sim_test.go      |   2 +-
 x/bank/simulation/msgs.go     | 124 ++++++++++++++++++++++------------
 x/bank/simulation/sim_test.go |   5 +-
 4 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index 7458a110aa..f36d4fd3ea 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -138,6 +138,7 @@ IMPROVEMENTS
     * [simulation] Make logs not just pure strings, speeding it up by a large factor at greater block heights \#2282
     * [simulation] Add a concept of weighting the operations \#2303
     * [simulation] Logs get written to file if large, and also get printed on panics \#2285
+    * [simulation] Bank simulations now makes testing auth configurable \#2425
     * [gaiad] \#1992 Add optional flag to `gaiad testnet` to make config directory of daemon (default `gaiad`) and cli (default `gaiacli`) configurable
     * [x/stake] Add stake `Queriers` for Gaia-lite endpoints. This increases the staking endpoints performance by reusing the staking `keeper` logic for queries. [#2249](https://github.com/cosmos/cosmos-sdk/pull/2149)
     * [store] [\#2017](https://github.com/cosmos/cosmos-sdk/issues/2017) Refactor
diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go
index 6097b5a08c..db08d872f0 100644
--- a/cmd/gaia/app/sim_test.go
+++ b/cmd/gaia/app/sim_test.go
@@ -90,7 +90,7 @@ func appStateFn(r *rand.Rand, accs []simulation.Account) json.RawMessage {
 
 func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation {
 	return []simulation.WeightedOperation{
-		{100, banksim.SimulateSingleInputMsgSend(app.accountMapper)},
+		{100, banksim.SingleInputSendMsg(app.accountMapper, app.bankKeeper)},
 		{5, govsim.SimulateSubmittingVotingAndSlashingForProposal(app.govKeeper, app.stakeKeeper)},
 		{100, govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper)},
 		{100, stakesim.SimulateMsgCreateValidator(app.accountMapper, app.stakeKeeper)},
diff --git a/x/bank/simulation/msgs.go b/x/bank/simulation/msgs.go
index 0b8ec3026f..0a253235e1 100644
--- a/x/bank/simulation/msgs.go
+++ b/x/bank/simulation/msgs.go
@@ -15,47 +15,36 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 )
 
-// SimulateSingleInputMsgSend tests and runs a single msg send, with one input and one output, where both
+// SingleInputSendTx tests and runs a single msg send w/ auth, with one input and one output, where both
 // accounts already exist.
-func SimulateSingleInputMsgSend(mapper auth.AccountMapper) simulation.Operation {
+func SingleInputSendTx(mapper auth.AccountMapper) simulation.Operation {
 	return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
-		fromAcc := simulation.RandomAcc(r, accs)
-		toAcc := simulation.RandomAcc(r, accs)
-		// Disallow sending money to yourself
-		for {
-			if !fromAcc.PubKey.Equals(toAcc.PubKey) {
-				break
-			}
-			toAcc = simulation.RandomAcc(r, accs)
+		fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
+		if abort {
+			return action, nil, nil
 		}
-		toAddr := toAcc.Address
-		initFromCoins := mapper.GetAccount(ctx, fromAcc.Address).GetCoins()
-
-		if len(initFromCoins) == 0 {
-			return "skipping, no coins at all", nil, nil
+		err = sendAndVerifyMsgSend(app, mapper, msg, ctx, []crypto.PrivKey{fromAcc.PrivKey}, nil)
+		if err != nil {
+			return "", nil, err
 		}
+		event("bank/sendAndVerifyTxSend/ok")
 
-		denomIndex := r.Intn(len(initFromCoins))
-		amt, goErr := randPositiveInt(r, initFromCoins[denomIndex].Amount)
-		if goErr != nil {
-			return "skipping bank send due to account having no coins of denomination " + initFromCoins[denomIndex].Denom, nil, nil
+		return action, nil, nil
+	}
+}
+
+// SingleInputSendMsg tests and runs a single msg send, with one input and one output, where both
+// accounts already exist.
+func SingleInputSendMsg(mapper auth.AccountMapper, bk bank.Keeper) simulation.Operation {
+	handler := bank.NewHandler(bk)
+	return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
+		fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
+		if abort {
+			return action, nil, nil
 		}
-
-		action = fmt.Sprintf("%s is sending %s %s to %s",
-			fromAcc.Address.String(),
-			amt.String(),
-			initFromCoins[denomIndex].Denom,
-			toAddr.String(),
-		)
-
-		coins := sdk.Coins{{initFromCoins[denomIndex].Denom, amt}}
-		var msg = bank.MsgSend{
-			Inputs:  []bank.Input{bank.NewInput(fromAcc.Address, coins)},
-			Outputs: []bank.Output{bank.NewOutput(toAddr, coins)},
-		}
-		goErr = sendAndVerifyMsgSend(app, mapper, msg, ctx, []crypto.PrivKey{fromAcc.PrivKey})
-		if goErr != nil {
-			return "", nil, goErr
+		err = sendAndVerifyMsgSend(app, mapper, msg, ctx, []crypto.PrivKey{fromAcc.PrivKey}, handler)
+		if err != nil {
+			return "", nil, err
 		}
 		event("bank/sendAndVerifyMsgSend/ok")
 
@@ -63,8 +52,47 @@ func SimulateSingleInputMsgSend(mapper auth.AccountMapper) simulation.Operation
 	}
 }
 
+func createSingleInputSendMsg(r *rand.Rand, ctx sdk.Context, accs []simulation.Account, mapper auth.AccountMapper) (fromAcc simulation.Account, action string, msg bank.MsgSend, abort bool) {
+	fromAcc = simulation.RandomAcc(r, accs)
+	toAcc := simulation.RandomAcc(r, accs)
+	// Disallow sending money to yourself
+	for {
+		if !fromAcc.PubKey.Equals(toAcc.PubKey) {
+			break
+		}
+		toAcc = simulation.RandomAcc(r, accs)
+	}
+	toAddr := toAcc.Address
+	initFromCoins := mapper.GetAccount(ctx, fromAcc.Address).GetCoins()
+
+	if len(initFromCoins) == 0 {
+		return fromAcc, "skipping, no coins at all", msg, true
+	}
+
+	denomIndex := r.Intn(len(initFromCoins))
+	amt, goErr := randPositiveInt(r, initFromCoins[denomIndex].Amount)
+	if goErr != nil {
+		return fromAcc, "skipping bank send due to account having no coins of denomination " + initFromCoins[denomIndex].Denom, msg, true
+	}
+
+	action = fmt.Sprintf("%s is sending %s %s to %s",
+		fromAcc.Address.String(),
+		amt.String(),
+		initFromCoins[denomIndex].Denom,
+		toAddr.String(),
+	)
+
+	coins := sdk.Coins{{initFromCoins[denomIndex].Denom, amt}}
+	msg = bank.MsgSend{
+		Inputs:  []bank.Input{bank.NewInput(fromAcc.Address, coins)},
+		Outputs: []bank.Output{bank.NewOutput(toAddr, coins)},
+	}
+	return
+}
+
 // Sends and verifies the transition of a msg send. This fails if there are repeated inputs or outputs
-func sendAndVerifyMsgSend(app *baseapp.BaseApp, mapper auth.AccountMapper, msg bank.MsgSend, ctx sdk.Context, privkeys []crypto.PrivKey) error {
+// pass in handler as nil to handle txs, otherwise handle msgs
+func sendAndVerifyMsgSend(app *baseapp.BaseApp, mapper auth.AccountMapper, msg bank.MsgSend, ctx sdk.Context, privkeys []crypto.PrivKey, handler sdk.Handler) error {
 	initialInputAddrCoins := make([]sdk.Coins, len(msg.Inputs))
 	initialOutputAddrCoins := make([]sdk.Coins, len(msg.Outputs))
 	AccountNumbers := make([]int64, len(msg.Inputs))
@@ -80,14 +108,22 @@ func sendAndVerifyMsgSend(app *baseapp.BaseApp, mapper auth.AccountMapper, msg b
 		acc := mapper.GetAccount(ctx, msg.Outputs[i].Address)
 		initialOutputAddrCoins[i] = acc.GetCoins()
 	}
-	tx := mock.GenTx([]sdk.Msg{msg},
-		AccountNumbers,
-		SequenceNumbers,
-		privkeys...)
-	res := app.Deliver(tx)
-	if !res.IsOK() {
-		// TODO: Do this in a more 'canonical' way
-		return fmt.Errorf("Deliver failed %v", res)
+	if handler != nil {
+		res := handler(ctx, msg)
+		if !res.IsOK() {
+			// TODO: Do this in a more 'canonical' way
+			return fmt.Errorf("handling msg failed %v", res)
+		}
+	} else {
+		tx := mock.GenTx([]sdk.Msg{msg},
+			AccountNumbers,
+			SequenceNumbers,
+			privkeys...)
+		res := app.Deliver(tx)
+		if !res.IsOK() {
+			// TODO: Do this in a more 'canonical' way
+			return fmt.Errorf("Deliver failed %v", res)
+		}
 	}
 
 	for i := 0; i < len(msg.Inputs); i++ {
diff --git a/x/bank/simulation/sim_test.go b/x/bank/simulation/sim_test.go
index 819289845d..ce3877a620 100644
--- a/x/bank/simulation/sim_test.go
+++ b/x/bank/simulation/sim_test.go
@@ -32,14 +32,15 @@ func TestBankWithRandomMessages(t *testing.T) {
 	simulation.Simulate(
 		t, mapp.BaseApp, appStateFn,
 		[]simulation.WeightedOperation{
-			{1, SimulateSingleInputMsgSend(mapper)},
+			{1, SingleInputSendTx(mapper)},
+			{1, SingleInputSendMsg(mapper, bankKeeper)},
 		},
 		[]simulation.RandSetup{},
 		[]simulation.Invariant{
 			NonnegativeBalanceInvariant(mapper),
 			TotalCoinsInvariant(mapper, func() sdk.Coins { return mapp.TotalCoinsSupply }),
 		},
-		30, 30,
+		30, 60,
 		false,
 	)
 }

From 6cbac799125414d225530241cc8ee44be36a76f7 Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Tue, 2 Oct 2018 05:02:22 -0700
Subject: [PATCH 3/5] Merge PR #2419: Add quick start section to the docs
 readme

---
 docs/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 48b8c69d5c..2edcebe8db 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,6 +8,12 @@ The first blockchain in the Cosmos Network is the Cosmos Hub, whose native token
 
 Cosmos can interoperate with multiple other applications and cryptocurrencies. By creating a new zone, you can plug any blockchain system into the Cosmos hub and pass tokens back and forth between those zones, without the need for an intermediary.
 
+## Quick Start
+
+- [Getting started with the SDK](./sdk/core/intro.html)
+- [SDK Examples](../examples)
+- [Join the testnet](./getting-started/full-node.html#run-a-full-node)
+
 ## Edit the Documentation
 
 See [this file](./DOCS_README.md) for details of the build process and

From 482a22da900f485340c229adf5853c95b6a39093 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@pluranimity.org>
Date: Wed, 3 Oct 2018 17:27:59 +0200
Subject: [PATCH 4/5] Merge PR #2428: Update priorities file

---
 docs/PRIORITIES.md | 61 ++++++++++++----------------------------------
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/docs/PRIORITIES.md b/docs/PRIORITIES.md
index d5e4257764..20eb20e1a3 100644
--- a/docs/PRIORITIES.md
+++ b/docs/PRIORITIES.md
@@ -1,75 +1,44 @@
-# High priority
-
-## Fees
-
-- Collection
-  - Simple flat fee set in-config by validators & full nodes - ref [#1921](https://github.com/cosmos/cosmos-sdk/issues/1921)
-  - @sunnya97 working on implementation
-  - _*BLOCKER:*_ Blocked on [tendermint/tendermint#2275](https://github.com/tendermint/tendermint/issues/2275) @ValarDragon
-- Distribution
-  - "Piggy bank" fee distribution - ref [#1944](https://github.com/cosmos/cosmos-sdk/pull/1944) (spec)
-  - @rigelrozanski working on implementation
-- EST TIMELINE:
-  - Work on fees should be completed in the `v0.25.0` release
+# Post-0.25/GoS Pre-Release
 
 ## Staking/Slashing/Stability
 
-- Unbonding state for validators (WIP) [#2163](https://github.com/cosmos/cosmos-sdk/pull/2163) @rigelrozanski
-  - Needs :eyes: from @chris
-  - Should be in `v0.25.0` release
-- Slashing period PR - ref [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122)
-  - Needs :eyes: from @cwgoes and @jaekwon
-  - Should be in `v0.25.0` release
 - Other slashing issues blocking for launch - [#1256](https://github.com/cosmos/cosmos-sdk/issues/1256)
-- Update staking/slashing for NextValSet change
-  - @cwgoes to start next
 - Miscellaneous minor staking issues
   - [List here](https://github.com/cosmos/cosmos-sdk/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Astaking+label%3Aprelaunch)
   - Need to figure out scope of work here to estimate time
   - @rigelrozanski to start next
-
-## Vesting
-
-- Single `VestingAccount` allowing delegation/voting but no withdrawals
-- Ref [#1875](https://github.com/cosmos/cosmos-sdk/pull/1875) (spec)
-- @AdityaSripal working on this.
-  - Should be in `v0.25.0` release
+- Consider "tombstone" / "prison" - double-sign and you can never validate again - https://github.com/cosmos/cosmos-sdk/issues/2363
 
 ## Multisig
 
-- Already implemented on TM side, need simple CLI interface
-- @alessio working on the SDK side of things here
-- Need to schedule some time with @alessio, @ebuchman and @ValarDragon this week to finalize feature set/implementation plan
+- Need to test changes in https://github.com/cosmos/cosmos-sdk/pull/2165
+- Spam prevention - https://github.com/cosmos/cosmos-sdk/issues/2019
 
 ## ABCI Changes
 
-- Need to update for new ABCI changes - error string, tags are list of lists, proposer in header (Tendermint 0.24?)
-- @cwgoes has done some work here. Should be on `develop` in tendermint w/in next week.
-- Include in tendermint `v0.24.0` release?
+- Need to update for new ABCI changes when/if they land - error string, tags are list of lists
+- Need to verify correct proposer reward semantics
+- CheckEvidence/DeliverEvidence, CheckTx/DeliverTx ordering semantics
 
 ## Gas
 
-- Simple transaction benchmarking work by @jlandrews to inform additional work here
-- Integrate @alessio's simulation work into CLI and LCD
-- Sanity Checks
+- Charge for transaction size
+- Decide what "one gas" corresponds to (standard hardware benchmarks?)
+- More benchmarking
+- Consider charging based on maximum depth of IAVL tree iteration
+- Test out gas estimation in CLI and LCD and ensure the UX works
 
 ## LCD
 
-- Bianje working on implementation ([#2147](https://github.com/cosmos/cosmos-sdk/pull/2147))
-  - ICS 0,ICS 1, ICS 20 and ICS 21 implemented in this PR :point_up:
-  - @fedekunze, @jackzampolin and @alexanderbez to review
+- Bianje working on implementation of ICS standards
 - Additional PR incoming for ICS 22 and ICS 23
-- Include [#382](https://github.com/cosmos/cosmos-sdk/issues/382)
+- Decide what ought to be ICS-standardized and what ought not to
 
 # Lower priority
 
 ## Governance v2
 
-- Simple software upgrade proposals
-  - Implementation described in [#1079](https://github.com/cosmos/cosmos-sdk/issues/1079)
-  - Agree upon a block height to switch to new version
-- Another Governance proposal from @jaekwon [#2116](https://github.com/cosmos/cosmos-sdk/pull/2116)
-- Circuit breaker
+- Circuit breaker - https://github.com/cosmos/cosmos-sdk/issues/926
 - Parameter change proposals (roughly the same implementation as circuit breaker)
 
 ## Documentation

From 17983460b8f217b95220e8d261bda266ca7471dc Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@pluranimity.org>
Date: Wed, 3 Oct 2018 17:48:23 +0200
Subject: [PATCH 5/5] Merge PR #2219: Update to Tendermint 0.24 (except
 NextValSet offsets)

---
 Gopkg.lock                                  |  72 +++++++------
 Gopkg.toml                                  |   4 +-
 Makefile                                    |   2 +-
 PENDING.md                                  |   4 +
 baseapp/baseapp.go                          |  12 +--
 client/config.go                            |  14 +--
 client/context/context.go                   |  32 ++++--
 client/context/query.go                     |  18 ++--
 client/lcd/certificates.go                  |   2 +-
 client/lcd/test_helpers.go                  |   9 +-
 client/rpc/block.go                         |   2 +-
 client/rpc/status.go                        |   2 +-
 client/rpc/validators.go                    |   6 +-
 client/tx/query.go                          |   4 +-
 cmd/gaia/app/app_test.go                    |   2 +-
 cmd/gaia/app/benchmarks/txsize_test.go      |   2 +-
 cmd/gaia/cli_test/cli_test.go               |   2 +-
 cmd/gaia/cmd/gaiacli/main.go                |   6 +-
 crypto/encode_test.go                       |   1 +
 crypto/keys/keybase.go                      |   2 +-
 crypto/keys/keybase_test.go                 |   4 +-
 examples/basecoin/app/app_test.go           |   4 +-
 examples/democoin/app/app_test.go           |   2 +-
 server/start.go                             |   7 ++
 store/cachekvstore_test.go                  |   5 +-
 store/firstlast.go                          |   6 +-
 store/iavlstore.go                          |   4 +-
 store/iavlstore_test.go                     |   8 +-
 tools/gometalinter.json                     |   5 +-
 types/address_test.go                       |   2 +-
 types/coin_test.go                          |   4 +-
 types/context.go                            |  12 +--
 types/context_test.go                       |   8 +-
 types/errors.go                             |  15 +--
 types/stake.go                              |   2 -
 types/utils.go                              |   2 +-
 x/mock/simulation/random_simulate_blocks.go |  37 ++++---
 x/mock/simulation/types.go                  |   2 +-
 x/slashing/keeper.go                        |   2 +-
 x/slashing/tick.go                          |   5 +-
 x/slashing/tick_test.go                     |   6 +-
 x/stake/genesis.go                          |   6 +-
 x/stake/genesis_test.go                     |   8 +-
 x/stake/handler.go                          |   4 +-
 x/stake/keeper/validator.go                 |  22 ++--
 x/stake/keeper/validator_test.go            | 114 ++++++++++----------
 x/stake/types/validator.go                  |  25 +++--
 x/stake/types/validator_test.go             |   8 +-
 48 files changed, 286 insertions(+), 241 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 00eafa4ade..5160d752e9 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -34,11 +34,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:2c00f064ba355903866cbfbf3f7f4c0fe64af6638cc7d1b8bdcf3181bc67f1d8"
+  digest = "1:c0decf632843204d2b8781de7b26e7038584e2dcccc7e2f401e88ae85b1df2b7"
   name = "github.com/btcsuite/btcd"
   packages = ["btcec"]
   pruneopts = "UT"
-  revision = "d81d8877b8f327112e94e814937143a71d1692a7"
+  revision = "2a560b2036bee5e3679ec2133eb6520b2f195213"
 
 [[projects]]
   digest = "1:386de157f7d19259a7f9c81f26ce011223ce0f090353c1152ffdf730d7d10ac2"
@@ -95,12 +95,12 @@
   version = "v0.3.0"
 
 [[projects]]
-  digest = "1:c4a2528ccbcabf90f9f3c464a5fc9e302d592861bbfd0b7135a7de8a943d0406"
+  digest = "1:586ea76dbd0374d6fb649a91d70d652b7fe0ccffb8910a77468e7702e7901f3d"
   name = "github.com/go-stack/stack"
   packages = ["."]
   pruneopts = "UT"
-  revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
-  version = "v1.7.0"
+  revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"
+  version = "v1.8.0"
 
 [[projects]]
   digest = "1:35621fe20f140f05a0c4ef662c26c0ab4ee50bca78aa30fe87d33120bd28165e"
@@ -164,13 +164,13 @@
   version = "v1.2.0"
 
 [[projects]]
-  branch = "master"
-  digest = "1:12247a2e99a060cc692f6680e5272c8adf0b8f572e6bce0d7095e624c958a240"
+  digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10"
   name = "github.com/hashicorp/hcl"
   packages = [
     ".",
     "hcl/ast",
     "hcl/parser",
+    "hcl/printer",
     "hcl/scanner",
     "hcl/strconv",
     "hcl/token",
@@ -179,7 +179,8 @@
     "json/token",
   ]
   pruneopts = "UT"
-  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+  revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241"
+  version = "v1.0.0"
 
 [[projects]]
   digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
@@ -214,12 +215,12 @@
   version = "v1.8.0"
 
 [[projects]]
-  digest = "1:d4d17353dbd05cb52a2a52b7fe1771883b682806f68db442b436294926bbfafb"
+  digest = "1:0981502f9816113c9c8c4ac301583841855c8cf4da8c72f696b3ebedf6d0e4e5"
   name = "github.com/mattn/go-isatty"
   packages = ["."]
   pruneopts = "UT"
-  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-  version = "v0.0.3"
+  revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+  version = "v0.0.4"
 
 [[projects]]
   digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc"
@@ -301,7 +302,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:8c49953a1414305f2ff5465147ee576dd705487c35b15918fcd4efdc0cb7a290"
+  digest = "1:ef1dd9945e58ee9b635273d28c0ef3fa3742a7dedc038ebe207fd63e6ce000ef"
   name = "github.com/prometheus/procfs"
   packages = [
     ".",
@@ -310,7 +311,7 @@
     "xfs",
   ]
   pruneopts = "UT"
-  revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92"
+  revision = "418d78d0b9a7b7de3a6bbc8a23def624cc977bb2"
 
 [[projects]]
   digest = "1:c4556a44e350b50a490544d9b06e9fba9c286c21d6c0e47f54f3a9214597298c"
@@ -320,15 +321,15 @@
   revision = "e2704e165165ec55d062f5919b4b29494e9fa790"
 
 [[projects]]
-  digest = "1:bd1ae00087d17c5a748660b8e89e1043e1e5479d0fea743352cda2f8dd8c4f84"
+  digest = "1:6a4a11ba764a56d2758899ec6f3848d24698d48442ebce85ee7a3f63284526cd"
   name = "github.com/spf13/afero"
   packages = [
     ".",
     "mem",
   ]
   pruneopts = "UT"
-  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
-  version = "v1.1.1"
+  revision = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd"
+  version = "v1.1.2"
 
 [[projects]]
   digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f"
@@ -347,12 +348,12 @@
   version = "v0.0.1"
 
 [[projects]]
-  branch = "master"
-  digest = "1:8a020f916b23ff574845789daee6818daf8d25a4852419aae3f0b12378ba432a"
+  digest = "1:68ea4e23713989dc20b1bded5d9da2c5f9be14ff9885beef481848edd18c26cb"
   name = "github.com/spf13/jwalterweatherman"
   packages = ["."]
   pruneopts = "UT"
-  revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"
+  revision = "4a4406e478ca629068e7768fc33f3f044173c0a6"
+  version = "v1.0.0"
 
 [[projects]]
   digest = "1:dab83a1bbc7ad3d7a6ba1a1cc1760f25ac38cdf7d96a5cdd55cd915a4f5ceaf9"
@@ -402,6 +403,13 @@
   pruneopts = "UT"
   revision = "ae2bd5eed72d46b28834ec3f60db3a3ebedd8dbd"
 
+[[projects]]
+  digest = "1:605b6546f3f43745695298ec2d342d3e952b6d91cdf9f349bea9315f677d759f"
+  name = "github.com/tendermint/btcd"
+  packages = ["btcec"]
+  pruneopts = "UT"
+  revision = "e5840949ff4fff0c56f9b6a541e22b63581ea9df"
+
 [[projects]]
   branch = "master"
   digest = "1:087aaa7920e5d0bf79586feb57ce01c35c830396ab4392798112e8aae8c47722"
@@ -415,12 +423,12 @@
   revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057"
 
 [[projects]]
-  digest = "1:e0a2a4be1e20c305badc2b0a7a9ab7fef6da500763bec23ab81df3b5f9eec9ee"
+  digest = "1:2c971a45c89ca2ccc735af50919cdee05fbdc54d4bf50625073693300e31ead8"
   name = "github.com/tendermint/go-amino"
   packages = ["."]
   pruneopts = "UT"
-  revision = "a8328986c1608950fa5d3d1c0472cccc4f8fc02c"
-  version = "v0.12.0-rc0"
+  revision = "faa6e731944e2b7b6a46ad202902851e8ce85bee"
+  version = "v0.12.0"
 
 [[projects]]
   digest = "1:53397098d6acb7613358683cc84ae59281a60c6033f0bff62fa8d3f279c6c430"
@@ -431,7 +439,7 @@
   version = "v0.11.0"
 
 [[projects]]
-  digest = "1:4f15e95fe3888cc75dd34f407d6394cbc7fd3ff24920851b92b295f6a8b556e6"
+  digest = "1:f4fcc1a4dbe079b200556ca26c1ff1dacf23712125b9c265d8f02c0dbc318f39"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -449,6 +457,8 @@
     "crypto/ed25519",
     "crypto/encoding/amino",
     "crypto/merkle",
+    "crypto/multisig",
+    "crypto/multisig/bitarray",
     "crypto/secp256k1",
     "crypto/tmhash",
     "crypto/xsalsa20symmetric",
@@ -468,7 +478,6 @@
     "lite",
     "lite/client",
     "lite/errors",
-    "lite/files",
     "lite/proxy",
     "mempool",
     "node",
@@ -491,11 +500,12 @@
     "state/txindex/kv",
     "state/txindex/null",
     "types",
+    "types/time",
     "version",
   ]
   pruneopts = "UT"
-  revision = "81df19e68ab1519399fccf0cab81cb75bf9d782e"
-  version = "v0.23.1-rc0"
+  revision = "d419fffe18531317c28c29a292ad7d253f6cafdf"
+  version = "v0.24.0"
 
 [[projects]]
   digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666"
@@ -526,7 +536,7 @@
     "salsa20/salsa",
   ]
   pruneopts = "UT"
-  revision = "614d502a4dac94afa3a6ce146bd1736da82514c6"
+  revision = "0e37d006457bf46f9e6692014ba72ef82c33022c"
 
 [[projects]]
   digest = "1:d36f55a999540d29b6ea3c2ea29d71c76b1d9853fdcd3e5c5cb4836f2ba118f1"
@@ -546,14 +556,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:ead82e3e398388679f3ad77633a087ac31a47a6be59ae20841e1d1b3a3fbbd22"
+  digest = "1:68023dc297a659d5eb2dafd62eda811456b338c5b3ec3c27da79e8a47d3f456a"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
     "unix",
   ]
   pruneopts = "UT"
-  revision = "4ea2f632f6e912459fe60b26b1749377f0d889d5"
+  revision = "2f1df4e56cdeb503a08d8577e6f1a7eb12efab82"
 
 [[projects]]
   digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18"
@@ -580,11 +590,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:077c1c599507b3b3e9156d17d36e1e61928ee9b53a5b420f10f28ebd4a0b275c"
+  digest = "1:56b0bca90b7e5d1facf5fbdacba23e4e0ce069d25381b8e2f70ef1e7ebfb9c1a"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
   pruneopts = "UT"
-  revision = "c66870c02cf823ceb633bcd05be3c7cda29976f4"
+  revision = "0e822944c569bf5c9afd034adaa56208bd2906ac"
 
 [[projects]]
   digest = "1:2dab32a43451e320e49608ff4542fdfc653c95dcc35d0065ec9c6c3dd540ed74"
diff --git a/Gopkg.toml b/Gopkg.toml
index 3080e3cd35..ca9cac0d82 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -49,7 +49,7 @@
 
 [[override]]
   name = "github.com/tendermint/go-amino"
-  version = "=v0.12.0-rc0"
+  version = "=v0.12.0"
 
 [[override]]
   name = "github.com/tendermint/iavl"
@@ -57,7 +57,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "=v0.23.1-rc0"
+  version = "=0.24.0"
 
 [[constraint]]
   name = "github.com/bartekn/go-bip39"
diff --git a/Makefile b/Makefile
index 49f15b375f..3e04200729 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ test_cover:
 
 test_lint:
 	gometalinter.v2 --config=tools/gometalinter.json ./...
-	!(gometalinter.v2 --disable-all --enable='errcheck' --vendor ./... | grep -v "client/")
+	!(gometalinter.v2 --exclude /usr/lib/go/src/ --disable-all --enable='errcheck' --vendor ./... | grep -v "client/")
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
 	dep status >> /dev/null
 	!(grep -n branch Gopkg.toml)
diff --git a/PENDING.md b/PENDING.md
index f36d4fd3ea..05c677265b 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -42,6 +42,10 @@ BREAKING CHANGES
     * [simulation] \#2162 Added back correct supply invariants
     
 * SDK
+    * [core] \#2219 Update to Tendermint 0.24.0
+      * Validator set updates delayed by one block
+      * BFT timestamp that can safely be used by applications
+      * Fixed maximum block size enforcement
     * [core] [\#1807](https://github.com/cosmos/cosmos-sdk/issues/1807) Switch from use of rational to decimal
     * [types] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator interface's GetOwner() renamed to GetOperator()
     * [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index cbf81d87d3..34c27c1c6c 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -64,9 +64,9 @@ type BaseApp struct {
 	// checkState is set on initialization and reset on Commit.
 	// deliverState is set in InitChain and BeginBlock and cleared on Commit.
 	// See methods setCheckState and setDeliverState.
-	checkState       *state                  // for CheckTx
-	deliverState     *state                  // for DeliverTx
-	signedValidators []abci.SigningValidator // absent validators from begin block
+	checkState   *state          // for CheckTx
+	deliverState *state          // for DeliverTx
+	voteInfos    []abci.VoteInfo // absent validators from begin block
 
 	// minimum fees for spam prevention
 	minimumFees sdk.Coins
@@ -435,7 +435,7 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 
 	// set the signed validators for addition to context in deliverTx
 	// TODO: communicate this result to the address to pubkey map in slashing
-	app.signedValidators = req.LastCommitInfo.GetValidators()
+	app.voteInfos = req.LastCommitInfo.GetVotes()
 	return
 }
 
@@ -509,12 +509,12 @@ func validateBasicTxMsgs(msgs []sdk.Msg) sdk.Error {
 }
 
 // retrieve the context for the ante handler and store the tx bytes; store
-// the signing validators if the tx runs within the deliverTx() state.
+// the vote infos if the tx runs within the deliverTx() state.
 func (app *BaseApp) getContextForAnte(mode runTxMode, txBytes []byte) (ctx sdk.Context) {
 	// Get the context
 	ctx = getState(app, mode).ctx.WithTxBytes(txBytes)
 	if mode == runTxModeDeliver {
-		ctx = ctx.WithSigningValidators(app.signedValidators)
+		ctx = ctx.WithVoteInfos(app.voteInfos)
 	}
 	return
 }
diff --git a/client/config.go b/client/config.go
index fcb2523753..a1d38a016f 100644
--- a/client/config.go
+++ b/client/config.go
@@ -1,15 +1,15 @@
 package client
 
 import (
-	"github.com/spf13/cobra"
-	"github.com/mitchellh/go-homedir"
 	"bufio"
-	"path"
-	"os"
-	"io/ioutil"
-	"github.com/pelletier/go-toml"
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/mitchellh/go-homedir"
+	"github.com/pelletier/go-toml"
+	"github.com/spf13/cobra"
+	"io/ioutil"
+	"os"
+	"path"
 )
 
 type cliConfig struct {
@@ -34,7 +34,7 @@ func ConfigCmd() *cobra.Command {
 	return cfg
 }
 
-func runConfigCmd(cmd *cobra.Command, args [] string) error {
+func runConfigCmd(cmd *cobra.Command, args []string) error {
 	home, err := homedir.Dir()
 	if err != nil {
 		return err
diff --git a/client/context/context.go b/client/context/context.go
index f93240d957..4f106d8572 100644
--- a/client/context/context.go
+++ b/client/context/context.go
@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"os"
+	"path/filepath"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -15,14 +17,18 @@ import (
 	cskeys "github.com/cosmos/cosmos-sdk/crypto/keys"
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/libs/cli"
+	"github.com/tendermint/tendermint/libs/log"
 	tmlite "github.com/tendermint/tendermint/lite"
 	tmliteProxy "github.com/tendermint/tendermint/lite/proxy"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	"os"
 )
 
 const ctxAccStoreName = "acc"
 
+var (
+	verifier tmlite.Verifier
+)
+
 // CLIContext implements a typical CLI context created in SDK modules for
 // transaction handling and queries.
 type CLIContext struct {
@@ -39,7 +45,7 @@ type CLIContext struct {
 	Async         bool
 	JSON          bool
 	PrintResponse bool
-	Certifier     tmlite.Certifier
+	Verifier      tmlite.Verifier
 	DryRun        bool
 	GenerateOnly  bool
 	fromAddress   types.AccAddress
@@ -59,6 +65,11 @@ func NewCLIContext() CLIContext {
 	from := viper.GetString(client.FlagFrom)
 	fromAddress, fromName := fromFields(from)
 
+	// We need to use a single verifier for all contexts
+	if verifier == nil {
+		verifier = createVerifier()
+	}
+
 	return CLIContext{
 		Client:        rpc,
 		Output:        os.Stdout,
@@ -71,7 +82,7 @@ func NewCLIContext() CLIContext {
 		Async:         viper.GetBool(client.FlagAsync),
 		JSON:          viper.GetBool(client.FlagJson),
 		PrintResponse: viper.GetBool(client.FlagPrintResponse),
-		Certifier:     createCertifier(),
+		Verifier:      verifier,
 		DryRun:        viper.GetBool(client.FlagDryRun),
 		GenerateOnly:  viper.GetBool(client.FlagGenerateOnly),
 		fromAddress:   fromAddress,
@@ -79,7 +90,7 @@ func NewCLIContext() CLIContext {
 	}
 }
 
-func createCertifier() tmlite.Certifier {
+func createVerifier() tmlite.Verifier {
 	trustNodeDefined := viper.IsSet(client.FlagTrustNode)
 	if !trustNodeDefined {
 		return nil
@@ -108,15 +119,16 @@ func createCertifier() tmlite.Certifier {
 		fmt.Printf("Must specify these options: %s when --trust-node is false\n", errMsg.String())
 		os.Exit(1)
 	}
+	node := rpcclient.NewHTTP(nodeURI, "/websocket")
+	verifier, err := tmliteProxy.NewVerifier(chainID, filepath.Join(home, ".gaialite"), node, log.NewNopLogger())
 
-	certifier, err := tmliteProxy.GetCertifier(chainID, home, nodeURI)
 	if err != nil {
-		fmt.Printf("Create certifier failed: %s\n", err.Error())
+		fmt.Printf("Create verifier failed: %s\n", err.Error())
 		fmt.Printf("Please check network connection and verify the address of the node to connect to\n")
 		os.Exit(1)
 	}
 
-	return certifier
+	return verifier
 }
 
 func fromFields(from string) (fromAddr types.AccAddress, fromName string) {
@@ -207,8 +219,8 @@ func (ctx CLIContext) WithUseLedger(useLedger bool) CLIContext {
 	return ctx
 }
 
-// WithCertifier - return a copy of the context with an updated Certifier
-func (ctx CLIContext) WithCertifier(certifier tmlite.Certifier) CLIContext {
-	ctx.Certifier = certifier
+// WithVerifier - return a copy of the context with an updated Verifier
+func (ctx CLIContext) WithVerifier(verifier tmlite.Verifier) CLIContext {
+	ctx.Verifier = verifier
 	return ctx
 }
diff --git a/client/context/query.go b/client/context/query.go
index d9bef3f5d1..e4e4881904 100644
--- a/client/context/query.go
+++ b/client/context/query.go
@@ -14,10 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/store"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	"github.com/tendermint/tendermint/lite"
 	tmliteErr "github.com/tendermint/tendermint/lite/errors"
 	tmliteProxy "github.com/tendermint/tendermint/lite/proxy"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
+	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // GetNode returns an RPC client. If the context's client is not defined, an
@@ -184,14 +184,14 @@ func (ctx CLIContext) query(path string, key cmn.HexBytes) (res []byte, err erro
 	return resp.Value, nil
 }
 
-// Certify verifies the consensus proof at given height.
-func (ctx CLIContext) Certify(height int64) (lite.Commit, error) {
-	check, err := tmliteProxy.GetCertifiedCommit(height, ctx.Client, ctx.Certifier)
+// Verify verifies the consensus proof at given height.
+func (ctx CLIContext) Verify(height int64) (tmtypes.SignedHeader, error) {
+	check, err := tmliteProxy.GetCertifiedCommit(height, ctx.Client, ctx.Verifier)
 	switch {
-	case tmliteErr.IsCommitNotFoundErr(err):
-		return lite.Commit{}, ErrVerifyCommit(height)
+	case tmliteErr.IsErrCommitNotFound(err):
+		return tmtypes.SignedHeader{}, ErrVerifyCommit(height)
 	case err != nil:
-		return lite.Commit{}, err
+		return tmtypes.SignedHeader{}, err
 	}
 
 	return check, nil
@@ -199,12 +199,12 @@ func (ctx CLIContext) Certify(height int64) (lite.Commit, error) {
 
 // verifyProof perform response proof verification.
 func (ctx CLIContext) verifyProof(_ string, resp abci.ResponseQuery) error {
-	if ctx.Certifier == nil {
+	if ctx.Verifier == nil {
 		return fmt.Errorf("missing valid certifier to verify data from distrusted node")
 	}
 
 	// the AppHash for height H is in header H+1
-	commit, err := ctx.Certify(resp.Height + 1)
+	commit, err := ctx.Verify(resp.Height + 1)
 	if err != nil {
 		return err
 	}
diff --git a/client/lcd/certificates.go b/client/lcd/certificates.go
index f47f2397c7..1516ed35af 100644
--- a/client/lcd/certificates.go
+++ b/client/lcd/certificates.go
@@ -43,7 +43,7 @@ func generateSelfSignedCert(host string) (certBytes []byte, priv *ecdsa.PrivateK
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 	hosts := strings.Split(host, ",")
 	for _, h := range hosts {
diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go
index 3f60138224..478620d336 100644
--- a/client/lcd/test_helpers.go
+++ b/client/lcd/test_helpers.go
@@ -33,6 +33,7 @@ import (
 	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
 	nm "github.com/tendermint/tendermint/node"
+	"github.com/tendermint/tendermint/p2p"
 	pvm "github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tendermint/proxy"
 	tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
@@ -186,7 +187,8 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress
 	// XXX: Need to set this so LCD knows the tendermint node address!
 	viper.Set(client.FlagNode, config.RPC.ListenAddress)
 	viper.Set(client.FlagChainID, genDoc.ChainID)
-	viper.Set(client.FlagTrustNode, false)
+	// TODO Set to false once the upstream Tendermint proof verification issue is fixed.
+	viper.Set(client.FlagTrustNode, true)
 	dir, err := ioutil.TempDir("", "lcd_test")
 	require.NoError(t, err)
 	viper.Set(cli.HomeFlag, dir)
@@ -222,9 +224,14 @@ func startTM(
 ) (*nm.Node, error) {
 	genDocProvider := func() (*tmtypes.GenesisDoc, error) { return genDoc, nil }
 	dbProvider := func(*nm.DBContext) (dbm.DB, error) { return dbm.NewMemDB(), nil }
+	nodeKey, err := p2p.LoadOrGenNodeKey(tmcfg.NodeKeyFile())
+	if err != nil {
+		return nil, err
+	}
 	node, err := nm.NewNode(
 		tmcfg,
 		privVal,
+		nodeKey,
 		proxy.NewLocalClientCreator(app),
 		genDocProvider,
 		dbProvider,
diff --git a/client/rpc/block.go b/client/rpc/block.go
index 44def2d323..d734dc9898 100644
--- a/client/rpc/block.go
+++ b/client/rpc/block.go
@@ -46,7 +46,7 @@ func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 	}
 
 	if !cliCtx.TrustNode {
-		check, err := cliCtx.Certify(res.Block.Height)
+		check, err := cliCtx.Verify(res.Block.Height)
 		if err != nil {
 			return nil, err
 		}
diff --git a/client/rpc/status.go b/client/rpc/status.go
index 6c42701754..049910ed10 100644
--- a/client/rpc/status.go
+++ b/client/rpc/status.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/spf13/viper"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func statusCommand() *cobra.Command {
diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index 4802e785b4..e3fef4c6e6 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -12,8 +12,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	tmtypes "github.com/tendermint/tendermint/types"
 	"github.com/spf13/viper"
+	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // TODO these next two functions feel kinda hacky based on their placement
@@ -76,12 +76,12 @@ func getValidators(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 	}
 
 	if !cliCtx.TrustNode {
-		check, err := cliCtx.Certify(validatorsRes.BlockHeight)
+		check, err := cliCtx.Verify(validatorsRes.BlockHeight)
 		if err != nil {
 			return nil, err
 		}
 
-		if !bytes.Equal(check.ValidatorsHash(), tmtypes.NewValidatorSet(validatorsRes.Validators).Hash()) {
+		if !bytes.Equal(check.ValidatorsHash, tmtypes.NewValidatorSet(validatorsRes.Validators).Hash()) {
 			return nil, fmt.Errorf("got invalid validatorset")
 		}
 	}
diff --git a/client/tx/query.go b/client/tx/query.go
index f1d13b608a..a1b7e5552a 100644
--- a/client/tx/query.go
+++ b/client/tx/query.go
@@ -3,8 +3,8 @@ package tx
 import (
 	"encoding/hex"
 	"fmt"
-	"net/http"
 	"github.com/tendermint/tendermint/libs/common"
+	"net/http"
 
 	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
@@ -83,7 +83,7 @@ func queryTx(cdc *codec.Codec, cliCtx context.CLIContext, hashHexStr string) ([]
 
 // ValidateTxResult performs transaction verification
 func ValidateTxResult(cliCtx context.CLIContext, res *ctypes.ResultTx) error {
-	check, err := cliCtx.Certify(res.Height)
+	check, err := cliCtx.Verify(res.Height)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/gaia/app/app_test.go b/cmd/gaia/app/app_test.go
index 0fb45863ca..bcd16a1761 100644
--- a/cmd/gaia/app/app_test.go
+++ b/cmd/gaia/app/app_test.go
@@ -31,7 +31,7 @@ func setGenesis(gapp *GaiaApp, accs ...*auth.BaseAccount) error {
 	}
 
 	// Initialize the chain
-	vals := []abci.Validator{}
+	vals := []abci.ValidatorUpdate{}
 	gapp.InitChain(abci.RequestInitChain{Validators: vals, AppStateBytes: stateBytes})
 	gapp.Commit()
 
diff --git a/cmd/gaia/app/benchmarks/txsize_test.go b/cmd/gaia/app/benchmarks/txsize_test.go
index 186ad87e58..24789b10ed 100644
--- a/cmd/gaia/app/benchmarks/txsize_test.go
+++ b/cmd/gaia/app/benchmarks/txsize_test.go
@@ -31,5 +31,5 @@ func ExampleTxSendSize() {
 	fmt.Println(len(cdc.MustMarshalBinaryBare([]sdk.Msg{msg1})))
 	fmt.Println(len(cdc.MustMarshalBinaryBare(tx)))
 	// output: 80
-	// 173
+	// 167
 }
diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
index 5b204f4df7..04bc4c84a5 100644
--- a/cmd/gaia/cli_test/cli_test.go
+++ b/cmd/gaia/cli_test/cli_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"testing"
 	"path"
+	"testing"
 
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go
index 2f66caadd6..5be9d76e82 100644
--- a/cmd/gaia/cmd/gaiacli/main.go
+++ b/cmd/gaia/cmd/gaiacli/main.go
@@ -18,9 +18,9 @@ import (
 	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
-	"path"
-	"os"
 	"github.com/spf13/viper"
+	"os"
+	"path"
 )
 
 const (
@@ -152,7 +152,7 @@ func initConfig(cmd *cobra.Command) error {
 	}
 
 	if err := viper.BindPFlag(cli.EncodingFlag, cmd.PersistentFlags().Lookup(cli.EncodingFlag)); err != nil {
-	    return err
+		return err
 	}
 	return viper.BindPFlag(cli.OutputFlag, cmd.PersistentFlags().Lookup(cli.OutputFlag))
 }
diff --git a/crypto/encode_test.go b/crypto/encode_test.go
index 9e70978555..aef8d8e32b 100644
--- a/crypto/encode_test.go
+++ b/crypto/encode_test.go
@@ -55,6 +55,7 @@ func ExamplePrintRegisteredTypes() {
 	//| PrivKeyLedgerSecp256k1 | tendermint/PrivKeyLedgerSecp256k1 | 0x10CAB393 | variable |  |
 	//| PubKeyEd25519 | tendermint/PubKeyEd25519 | 0x1624DE64 | 0x20 |  |
 	//| PubKeySecp256k1 | tendermint/PubKeySecp256k1 | 0xEB5AE987 | 0x21 |  |
+	//| PubKeyMultisigThreshold | tendermint/PubKeyMultisigThreshold | 0x22C1F7E2 | variable |  |
 	//| PrivKeyEd25519 | tendermint/PrivKeyEd25519 | 0xA3288910 | 0x40 |  |
 	//| PrivKeySecp256k1 | tendermint/PrivKeySecp256k1 | 0xE1B0F79B | 0x20 |  |
 }
diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go
index c9bfd08129..99632e7642 100644
--- a/crypto/keys/keybase.go
+++ b/crypto/keys/keybase.go
@@ -9,12 +9,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/bip39"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/hd"
+	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/pkg/errors"
 	tmcrypto "github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/cosmos/cosmos-sdk/types"
 )
 
 var _ Keybase = dbKeybase{}
diff --git a/crypto/keys/keybase_test.go b/crypto/keys/keybase_test.go
index 2a602461a1..3273c229af 100644
--- a/crypto/keys/keybase_test.go
+++ b/crypto/keys/keybase_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/cosmos/cosmos-sdk/types"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 func init() {
@@ -403,4 +403,4 @@ func ExampleNew() {
 
 func accAddr(info Info) types.AccAddress {
 	return (types.AccAddress)(info.GetPubKey().Address())
-}
\ No newline at end of file
+}
diff --git a/examples/basecoin/app/app_test.go b/examples/basecoin/app/app_test.go
index 24237e6029..da544f4803 100644
--- a/examples/basecoin/app/app_test.go
+++ b/examples/basecoin/app/app_test.go
@@ -29,7 +29,7 @@ func setGenesis(baseApp *BasecoinApp, accounts ...*types.AppAccount) (types.Gene
 
 	// initialize and commit the chain
 	baseApp.InitChain(abci.RequestInitChain{
-		Validators: []abci.Validator{}, AppStateBytes: stateBytes,
+		Validators: []abci.ValidatorUpdate{}, AppStateBytes: stateBytes,
 	})
 	baseApp.Commit()
 
@@ -72,7 +72,7 @@ func TestGenesis(t *testing.T) {
 
 	// initialize the chain with the expected genesis state
 	baseApp.InitChain(abci.RequestInitChain{
-		Validators: []abci.Validator{}, AppStateBytes: stateBytes,
+		Validators: []abci.ValidatorUpdate{}, AppStateBytes: stateBytes,
 	})
 
 	ctx = baseApp.BaseApp.NewContext(true, abci.Header{})
diff --git a/examples/democoin/app/app_test.go b/examples/democoin/app/app_test.go
index eeea84bd46..fc00651b8f 100644
--- a/examples/democoin/app/app_test.go
+++ b/examples/democoin/app/app_test.go
@@ -33,7 +33,7 @@ func setGenesis(bapp *DemocoinApp, trend string, accs ...auth.BaseAccount) error
 	}
 
 	// Initialize the chain
-	vals := []abci.Validator{}
+	vals := []abci.ValidatorUpdate{}
 	bapp.InitChain(abci.RequestInitChain{Validators: vals, AppStateBytes: stateBytes})
 	bapp.Commit()
 
diff --git a/server/start.go b/server/start.go
index 5d5b1b3eb0..170ff9dcb3 100644
--- a/server/start.go
+++ b/server/start.go
@@ -10,6 +10,7 @@ import (
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/node"
+	"github.com/tendermint/tendermint/p2p"
 	pvm "github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tendermint/proxy"
 )
@@ -97,10 +98,16 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
 		return nil, err
 	}
 
+	nodeKey, err := p2p.LoadOrGenNodeKey(cfg.NodeKeyFile())
+	if err != nil {
+		return nil, err
+	}
+
 	// create & start tendermint node
 	tmNode, err := node.NewNode(
 		cfg,
 		pvm.LoadOrGenFilePV(cfg.PrivValidatorFile()),
+		nodeKey,
 		proxy.NewLocalClientCreator(app),
 		node.DefaultGenesisDocProviderFunc(cfg),
 		node.DefaultDBProvider,
diff --git a/store/cachekvstore_test.go b/store/cachekvstore_test.go
index 9d02d57d3a..37e0364fb5 100644
--- a/store/cachekvstore_test.go
+++ b/store/cachekvstore_test.go
@@ -1,6 +1,7 @@
 package store
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -13,8 +14,8 @@ func newCacheKVStore() CacheKVStore {
 	return NewCacheKVStore(mem)
 }
 
-func keyFmt(i int) []byte { return bz(cmn.Fmt("key%0.8d", i)) }
-func valFmt(i int) []byte { return bz(cmn.Fmt("value%0.8d", i)) }
+func keyFmt(i int) []byte { return bz(fmt.Sprintf("key%0.8d", i)) }
+func valFmt(i int) []byte { return bz(fmt.Sprintf("value%0.8d", i)) }
 
 func TestCacheKVStore(t *testing.T) {
 	mem := dbStoreAdapter{dbm.NewMemDB()}
diff --git a/store/firstlast.go b/store/firstlast.go
index 70f6659a87..a47f1396d1 100644
--- a/store/firstlast.go
+++ b/store/firstlast.go
@@ -14,7 +14,7 @@ func First(st KVStore, start, end []byte) (kv cmn.KVPair, ok bool) {
 	}
 	defer iter.Close()
 
-	return cmn.KVPair{iter.Key(), iter.Value()}, true
+	return cmn.KVPair{Key: iter.Key(), Value: iter.Value()}, true
 }
 
 // Gets the last item.  `end` is exclusive.
@@ -22,7 +22,7 @@ func Last(st KVStore, start, end []byte) (kv cmn.KVPair, ok bool) {
 	iter := st.ReverseIterator(end, start)
 	if !iter.Valid() {
 		if v := st.Get(start); v != nil {
-			return cmn.KVPair{cp(start), cp(v)}, true
+			return cmn.KVPair{Key: cp(start), Value: cp(v)}, true
 		}
 		return kv, false
 	}
@@ -36,5 +36,5 @@ func Last(st KVStore, start, end []byte) (kv cmn.KVPair, ok bool) {
 		}
 	}
 
-	return cmn.KVPair{iter.Key(), iter.Value()}, true
+	return cmn.KVPair{Key: iter.Key(), Value: iter.Value()}, true
 }
diff --git a/store/iavlstore.go b/store/iavlstore.go
index d301da771e..d535fd436c 100644
--- a/store/iavlstore.go
+++ b/store/iavlstore.go
@@ -240,7 +240,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 		var KVs []KVPair
 		iterator := sdk.KVStorePrefixIterator(st, subspace)
 		for ; iterator.Valid(); iterator.Next() {
-			KVs = append(KVs, KVPair{iterator.Key(), iterator.Value()})
+			KVs = append(KVs, KVPair{Key: iterator.Key(), Value: iterator.Value()})
 		}
 		iterator.Close()
 		res.Value = cdc.MustMarshalBinary(KVs)
@@ -310,7 +310,7 @@ func (iter *iavlIterator) iterateRoutine() {
 			select {
 			case <-iter.quitCh:
 				return true // done with iteration.
-			case iter.iterCh <- cmn.KVPair{key, value}:
+			case iter.iterCh <- cmn.KVPair{Key: key, Value: value}:
 				return false // yay.
 			}
 		},
diff --git a/store/iavlstore_test.go b/store/iavlstore_test.go
index 49793d3766..1e9263b7bb 100644
--- a/store/iavlstore_test.go
+++ b/store/iavlstore_test.go
@@ -387,12 +387,12 @@ func TestIAVLStoreQuery(t *testing.T) {
 	ksub := []byte("key")
 	KVs0 := []KVPair{}
 	KVs1 := []KVPair{
-		{k1, v1},
-		{k2, v2},
+		{Key: k1, Value: v1},
+		{Key: k2, Value: v2},
 	}
 	KVs2 := []KVPair{
-		{k1, v3},
-		{k2, v2},
+		{Key: k1, Value: v3},
+		{Key: k2, Value: v2},
 	}
 	valExpSubEmpty := cdc.MustMarshalBinary(KVs0)
 	valExpSub1 := cdc.MustMarshalBinary(KVs1)
diff --git a/tools/gometalinter.json b/tools/gometalinter.json
index 42788714bf..a7b9ab5175 100644
--- a/tools/gometalinter.json
+++ b/tools/gometalinter.json
@@ -5,5 +5,6 @@
     "Enable": ["golint", "vet", "ineffassign", "unparam", "unconvert", "misspell"],
     "Deadline": "500s",
     "Vendor": true,
-    "Cyclo": 11
-}
\ No newline at end of file
+    "Cyclo": 11,
+    "Exclude": ["/usr/lib/go/src/"]
+}
diff --git a/types/address_test.go b/types/address_test.go
index 6c6c78d6ec..e2ec36876c 100644
--- a/types/address_test.go
+++ b/types/address_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
 	"github.com/cosmos/cosmos-sdk/types"
-	)
+)
 
 var invalidStrs = []string{
 	"",
diff --git a/types/coin_test.go b/types/coin_test.go
index ba7038010a..bc04412791 100644
--- a/types/coin_test.go
+++ b/types/coin_test.go
@@ -443,7 +443,7 @@ func BenchmarkCoinsAdditionIntersect(b *testing.B) {
 		}
 	}
 
-	benchmarkSizes := [][]int{[]int{1, 1}, []int{5, 5}, []int{5, 20}, []int{1, 1000}, []int{2, 1000}}
+	benchmarkSizes := [][]int{{1, 1}, {5, 5}, {5, 20}, {1, 1000}, {2, 1000}}
 	for i := 0; i < len(benchmarkSizes); i++ {
 		sizeA := benchmarkSizes[i][0]
 		sizeB := benchmarkSizes[i][1]
@@ -469,7 +469,7 @@ func BenchmarkCoinsAdditionNoIntersect(b *testing.B) {
 		}
 	}
 
-	benchmarkSizes := [][]int{[]int{1, 1}, []int{5, 5}, []int{5, 20}, []int{1, 1000}, []int{2, 1000}, []int{1000, 2}}
+	benchmarkSizes := [][]int{{1, 1}, {5, 5}, {5, 20}, {1, 1000}, {2, 1000}, {1000, 2}}
 	for i := 0; i < len(benchmarkSizes); i++ {
 		sizeA := benchmarkSizes[i][0]
 		sizeB := benchmarkSizes[i][1]
diff --git a/types/context.go b/types/context.go
index 6a54f247de..fd2e076881 100644
--- a/types/context.go
+++ b/types/context.go
@@ -45,7 +45,7 @@ func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, logger log.Lo
 	c = c.WithIsCheckTx(isCheckTx)
 	c = c.WithTxBytes(nil)
 	c = c.WithLogger(logger)
-	c = c.WithSigningValidators(nil)
+	c = c.WithVoteInfos(nil)
 	c = c.WithGasMeter(NewInfiniteGasMeter())
 	c = c.WithMinimumFees(Coins{})
 	return c
@@ -138,7 +138,7 @@ const (
 	contextKeyIsCheckTx
 	contextKeyTxBytes
 	contextKeyLogger
-	contextKeySigningValidators
+	contextKeyVoteInfos
 	contextKeyGasMeter
 	contextKeyMinimumFees
 )
@@ -164,8 +164,8 @@ func (c Context) TxBytes() []byte { return c.Value(contextKeyTxBytes).([]byte) }
 
 func (c Context) Logger() log.Logger { return c.Value(contextKeyLogger).(log.Logger) }
 
-func (c Context) SigningValidators() []abci.SigningValidator {
-	return c.Value(contextKeySigningValidators).([]abci.SigningValidator)
+func (c Context) VoteInfos() []abci.VoteInfo {
+	return c.Value(contextKeyVoteInfos).([]abci.VoteInfo)
 }
 
 func (c Context) GasMeter() GasMeter { return c.Value(contextKeyGasMeter).(GasMeter) }
@@ -199,8 +199,8 @@ func (c Context) WithTxBytes(txBytes []byte) Context { return c.withValue(contex
 
 func (c Context) WithLogger(logger log.Logger) Context { return c.withValue(contextKeyLogger, logger) }
 
-func (c Context) WithSigningValidators(SigningValidators []abci.SigningValidator) Context {
-	return c.withValue(contextKeySigningValidators, SigningValidators)
+func (c Context) WithVoteInfos(VoteInfos []abci.VoteInfo) Context {
+	return c.withValue(contextKeyVoteInfos, VoteInfos)
 }
 
 func (c Context) WithGasMeter(meter GasMeter) Context { return c.withValue(contextKeyGasMeter, meter) }
diff --git a/types/context_test.go b/types/context_test.go
index e08aca01ff..0026912298 100644
--- a/types/context_test.go
+++ b/types/context_test.go
@@ -151,7 +151,7 @@ func TestContextWithCustom(t *testing.T) {
 	require.Panics(t, func() { ctx.ChainID() })
 	require.Panics(t, func() { ctx.TxBytes() })
 	require.Panics(t, func() { ctx.Logger() })
-	require.Panics(t, func() { ctx.SigningValidators() })
+	require.Panics(t, func() { ctx.VoteInfos() })
 	require.Panics(t, func() { ctx.GasMeter() })
 
 	header := abci.Header{}
@@ -160,7 +160,7 @@ func TestContextWithCustom(t *testing.T) {
 	ischeck := true
 	txbytes := []byte("txbytes")
 	logger := NewMockLogger()
-	signvals := []abci.SigningValidator{{}}
+	voteinfos := []abci.VoteInfo{{}}
 	meter := types.NewGasMeter(10000)
 	minFees := types.Coins{types.NewInt64Coin("feeCoin", 1)}
 
@@ -168,7 +168,7 @@ func TestContextWithCustom(t *testing.T) {
 		WithBlockHeight(height).
 		WithChainID(chainid).
 		WithTxBytes(txbytes).
-		WithSigningValidators(signvals).
+		WithVoteInfos(voteinfos).
 		WithGasMeter(meter).
 		WithMinimumFees(minFees)
 
@@ -178,7 +178,7 @@ func TestContextWithCustom(t *testing.T) {
 	require.Equal(t, ischeck, ctx.IsCheckTx())
 	require.Equal(t, txbytes, ctx.TxBytes())
 	require.Equal(t, logger, ctx.Logger())
-	require.Equal(t, signvals, ctx.SigningValidators())
+	require.Equal(t, voteinfos, ctx.VoteInfos())
 	require.Equal(t, meter, ctx.GasMeter())
 	require.Equal(t, minFees, types.Coins{types.NewInt64Coin("feeCoin", 1)})
 }
diff --git a/types/errors.go b/types/errors.go
index 46bf748f48..266e6d14c3 100644
--- a/types/errors.go
+++ b/types/errors.go
@@ -2,7 +2,6 @@ package types
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	cmn "github.com/tendermint/tendermint/libs/common"
@@ -231,13 +230,12 @@ func (err *sdkError) TraceSDK(format string, args ...interface{}) Error {
 }
 
 // Implements ABCIError.
-// Overrides err.Error.Error().
 func (err *sdkError) Error() string {
 	return fmt.Sprintf(`ERROR:
 Codespace: %d
 Code: %d
 Message: %#v
-`, err.codespace, err.code, parseCmnError(err.cmnError.Error()))
+`, err.codespace, err.code, err.cmnError.Error())
 }
 
 // Implements ABCIError.
@@ -258,12 +256,12 @@ func (err *sdkError) Code() CodeType {
 // Implements ABCIError.
 func (err *sdkError) ABCILog() string {
 	cdc := codec.New()
-	parsedErrMsg := parseCmnError(err.cmnError.Error())
+	errMsg := err.cmnError.Error()
 	jsonErr := humanReadableError{
 		Codespace: err.codespace,
 		Code:      err.code,
 		ABCICode:  err.ABCICode(),
-		Message:   parsedErrMsg,
+		Message:   errMsg,
 	}
 	bz, er := cdc.MarshalJSON(jsonErr)
 	if er != nil {
@@ -288,13 +286,6 @@ func (err *sdkError) QueryResult() abci.ResponseQuery {
 	}
 }
 
-func parseCmnError(err string) string {
-	if idx := strings.Index(err, "{"); idx != -1 {
-		err = err[idx+1 : len(err)-1]
-	}
-	return err
-}
-
 // nolint
 type humanReadableError struct {
 	Codespace CodespaceType `json:"codespace"`
diff --git a/types/stake.go b/types/stake.go
index 2f92639f33..c84ed8d054 100644
--- a/types/stake.go
+++ b/types/stake.go
@@ -3,7 +3,6 @@ package types
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto"
-	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // status of a validator
@@ -52,7 +51,6 @@ type Validator interface {
 // validator which fulfills abci validator interface for use in Tendermint
 func ABCIValidator(v Validator) abci.Validator {
 	return abci.Validator{
-		PubKey:  tmtypes.TM2PB.PubKey(v.GetConsPubKey()),
 		Address: v.GetConsPubKey().Address(),
 		Power:   v.GetPower().RoundInt64(),
 	}
diff --git a/types/utils.go b/types/utils.go
index 95fc779d73..b196acb230 100644
--- a/types/utils.go
+++ b/types/utils.go
@@ -51,4 +51,4 @@ func DefaultChainID() (string, error) {
 	}
 
 	return doc.ChainID, nil
-}
\ No newline at end of file
+}
diff --git a/x/mock/simulation/random_simulate_blocks.go b/x/mock/simulation/random_simulate_blocks.go
index 25748e15bd..ee93cfea39 100644
--- a/x/mock/simulation/random_simulate_blocks.go
+++ b/x/mock/simulation/random_simulate_blocks.go
@@ -36,7 +36,12 @@ func initChain(r *rand.Rand, accounts []Account, setups []RandSetup, app *baseap
 	res := app.InitChain(abci.RequestInitChain{AppStateBytes: appStateFn(r, accounts)})
 	validators = make(map[string]mockValidator)
 	for _, validator := range res.Validators {
-		validators[string(validator.Address)] = mockValidator{validator, GetMemberOfInitialState(r, initialLivenessWeightings)}
+		pubkey, err := tmtypes.PB2TM.PubKey(validator.PubKey)
+		if err != nil {
+			panic(err)
+		}
+		address := pubkey.Address()
+		validators[string(address)] = mockValidator{validator, GetMemberOfInitialState(r, initialLivenessWeightings)}
 	}
 
 	for i := 0; i < len(setups); i++ {
@@ -91,9 +96,9 @@ func SimulateFromSeed(tb testing.TB, app *baseapp.BaseApp,
 	}()
 
 	var pastTimes []time.Time
-	var pastSigningValidators [][]abci.SigningValidator
+	var pastVoteInfos [][]abci.VoteInfo
 
-	request := RandomRequestBeginBlock(r, validators, livenessTransitionMatrix, evidenceFraction, pastTimes, pastSigningValidators, event, header)
+	request := RandomRequestBeginBlock(r, validators, livenessTransitionMatrix, evidenceFraction, pastTimes, pastVoteInfos, event, header)
 	// These are operations which have been queued by previous operations
 	operationQueue := make(map[int][]Operation)
 	timeOperationQueue := []FutureOperation{}
@@ -122,7 +127,7 @@ func SimulateFromSeed(tb testing.TB, app *baseapp.BaseApp,
 	for i := 0; i < numBlocks && !stopEarly; i++ {
 		// Log the header time for future lookup
 		pastTimes = append(pastTimes, header.Time)
-		pastSigningValidators = append(pastSigningValidators, request.LastCommitInfo.Validators)
+		pastVoteInfos = append(pastVoteInfos, request.LastCommitInfo.Votes)
 
 		// Run the BeginBlock handler
 		app.BeginBlock(request)
@@ -157,7 +162,7 @@ func SimulateFromSeed(tb testing.TB, app *baseapp.BaseApp,
 		}
 
 		// Generate a random RequestBeginBlock with the current validator set for the next block
-		request = RandomRequestBeginBlock(r, validators, livenessTransitionMatrix, evidenceFraction, pastTimes, pastSigningValidators, event, header)
+		request = RandomRequestBeginBlock(r, validators, livenessTransitionMatrix, evidenceFraction, pastTimes, pastVoteInfos, event, header)
 
 		// Update the validator set
 		validators = updateValidators(tb, r, validators, res.ValidatorUpdates, event)
@@ -316,11 +321,11 @@ func getKeys(validators map[string]mockValidator) []string {
 // RandomRequestBeginBlock generates a list of signing validators according to the provided list of validators, signing fraction, and evidence fraction
 // nolint: unparam
 func RandomRequestBeginBlock(r *rand.Rand, validators map[string]mockValidator, livenessTransitions TransitionMatrix, evidenceFraction float64,
-	pastTimes []time.Time, pastSigningValidators [][]abci.SigningValidator, event func(string), header abci.Header) abci.RequestBeginBlock {
+	pastTimes []time.Time, pastVoteInfos [][]abci.VoteInfo, event func(string), header abci.Header) abci.RequestBeginBlock {
 	if len(validators) == 0 {
 		return abci.RequestBeginBlock{Header: header}
 	}
-	signingValidators := make([]abci.SigningValidator, len(validators))
+	voteInfos := make([]abci.VoteInfo, len(validators))
 	i := 0
 	for _, key := range getKeys(validators) {
 		mVal := validators[key]
@@ -341,8 +346,14 @@ func RandomRequestBeginBlock(r *rand.Rand, validators map[string]mockValidator,
 		} else {
 			event("beginblock/signing/missed")
 		}
-		signingValidators[i] = abci.SigningValidator{
-			Validator:       mVal.val,
+		pubkey, err := tmtypes.PB2TM.PubKey(mVal.val.PubKey)
+		if err != nil {
+			panic(err)
+		}
+		voteInfos[i] = abci.VoteInfo{
+			Validator: abci.Validator{
+				Address: pubkey.Address(),
+			},
 			SignedLastBlock: signed,
 		}
 		i++
@@ -354,11 +365,11 @@ func RandomRequestBeginBlock(r *rand.Rand, validators map[string]mockValidator,
 		for r.Float64() < evidenceFraction {
 			height := header.Height
 			time := header.Time
-			vals := signingValidators
+			vals := voteInfos
 			if r.Float64() < pastEvidenceFraction {
 				height = int64(r.Intn(int(header.Height)))
 				time = pastTimes[height]
-				vals = pastSigningValidators[height]
+				vals = pastVoteInfos[height]
 			}
 			validator := vals[r.Intn(len(vals))].Validator
 			var totalVotingPower int64
@@ -378,7 +389,7 @@ func RandomRequestBeginBlock(r *rand.Rand, validators map[string]mockValidator,
 	return abci.RequestBeginBlock{
 		Header: header,
 		LastCommitInfo: abci.LastCommitInfo{
-			Validators: signingValidators,
+			Votes: voteInfos,
 		},
 		ByzantineValidators: evidence,
 	}
@@ -386,7 +397,7 @@ func RandomRequestBeginBlock(r *rand.Rand, validators map[string]mockValidator,
 
 // updateValidators mimicks Tendermint's update logic
 // nolint: unparam
-func updateValidators(tb testing.TB, r *rand.Rand, current map[string]mockValidator, updates []abci.Validator, event func(string)) map[string]mockValidator {
+func updateValidators(tb testing.TB, r *rand.Rand, current map[string]mockValidator, updates []abci.ValidatorUpdate, event func(string)) map[string]mockValidator {
 
 	for _, update := range updates {
 		switch {
diff --git a/x/mock/simulation/types.go b/x/mock/simulation/types.go
index 2e68a428ea..302ebcbd7d 100644
--- a/x/mock/simulation/types.go
+++ b/x/mock/simulation/types.go
@@ -45,7 +45,7 @@ type (
 	}
 
 	mockValidator struct {
-		val           abci.Validator
+		val           abci.ValidatorUpdate
 		livenessState int
 	}
 
diff --git a/x/slashing/keeper.go b/x/slashing/keeper.go
index 6a5fa30148..0c1c70b362 100644
--- a/x/slashing/keeper.go
+++ b/x/slashing/keeper.go
@@ -138,7 +138,7 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, p
 }
 
 // AddValidators adds the validators to the keepers validator addr to pubkey mapping.
-func (k Keeper) AddValidators(ctx sdk.Context, vals []abci.Validator) {
+func (k Keeper) AddValidators(ctx sdk.Context, vals []abci.ValidatorUpdate) {
 	for i := 0; i < len(vals); i++ {
 		val := vals[i]
 		pubkey, err := tmtypes.PB2TM.PubKey(val.PubKey)
diff --git a/x/slashing/tick.go b/x/slashing/tick.go
index 253daa4128..007d937887 100644
--- a/x/slashing/tick.go
+++ b/x/slashing/tick.go
@@ -20,9 +20,8 @@ func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, sk Keeper) (tags
 	// Iterate over all the validators  which *should* have signed this block
 	// Store whether or not they have actually signed it and slash/unbond any
 	// which have missed too many blocks in a row (downtime slashing)
-	for _, signingValidator := range req.LastCommitInfo.GetValidators() {
-		present := signingValidator.SignedLastBlock
-		sk.handleValidatorSignature(ctx, signingValidator.Validator.Address, signingValidator.Validator.Power, present)
+	for _, voteInfo := range req.LastCommitInfo.GetVotes() {
+		sk.handleValidatorSignature(ctx, voteInfo.Validator.Address, voteInfo.Validator.Power, voteInfo.SignedLastBlock)
 	}
 
 	// Iterate through any newly discovered evidence of infraction
diff --git a/x/slashing/tick_test.go b/x/slashing/tick_test.go
index 8225c96347..5f0ccf8ed5 100644
--- a/x/slashing/tick_test.go
+++ b/x/slashing/tick_test.go
@@ -32,7 +32,7 @@ func TestBeginBlocker(t *testing.T) {
 	// mark the validator as having signed
 	req := abci.RequestBeginBlock{
 		LastCommitInfo: abci.LastCommitInfo{
-			Validators: []abci.SigningValidator{{
+			Votes: []abci.VoteInfo{{
 				Validator:       val,
 				SignedLastBlock: true,
 			}},
@@ -54,7 +54,7 @@ func TestBeginBlocker(t *testing.T) {
 		ctx = ctx.WithBlockHeight(height)
 		req = abci.RequestBeginBlock{
 			LastCommitInfo: abci.LastCommitInfo{
-				Validators: []abci.SigningValidator{{
+				Votes: []abci.VoteInfo{{
 					Validator:       val,
 					SignedLastBlock: true,
 				}},
@@ -68,7 +68,7 @@ func TestBeginBlocker(t *testing.T) {
 		ctx = ctx.WithBlockHeight(height)
 		req = abci.RequestBeginBlock{
 			LastCommitInfo: abci.LastCommitInfo{
-				Validators: []abci.SigningValidator{{
+				Votes: []abci.VoteInfo{{
 					Validator:       val,
 					SignedLastBlock: false,
 				}},
diff --git a/x/stake/genesis.go b/x/stake/genesis.go
index 58b7ed1b4f..740eba415f 100644
--- a/x/stake/genesis.go
+++ b/x/stake/genesis.go
@@ -15,7 +15,7 @@ import (
 // addition, it also sets any delegations found in data. Finally, it updates
 // the bonded validators.
 // Returns final validator set after applying all declaration and delegations
-func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) (res []abci.Validator, err error) {
+func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) (res []abci.ValidatorUpdate, err error) {
 	keeper.SetPool(ctx, data.Pool)
 	keeper.SetNewParams(ctx, data.Params)
 	keeper.InitIntraTxCounter(ctx)
@@ -47,9 +47,9 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) (res [
 	keeper.UpdateBondedValidatorsFull(ctx)
 
 	vals := keeper.GetValidatorsBonded(ctx)
-	res = make([]abci.Validator, len(vals))
+	res = make([]abci.ValidatorUpdate, len(vals))
 	for i, val := range vals {
-		res[i] = sdk.ABCIValidator(val)
+		res[i] = val.ABCIValidatorUpdate()
 	}
 	return
 }
diff --git a/x/stake/genesis_test.go b/x/stake/genesis_test.go
index 947bb2e185..0051ff2524 100644
--- a/x/stake/genesis_test.go
+++ b/x/stake/genesis_test.go
@@ -59,9 +59,9 @@ func TestInitGenesis(t *testing.T) {
 	require.Equal(t, sdk.Bonded, resVal.Status)
 	require.Equal(t, int16(1), resVal.BondIntraTxCounter)
 
-	abcivals := make([]abci.Validator, len(vals))
+	abcivals := make([]abci.ValidatorUpdate, len(vals))
 	for i, val := range validators {
-		abcivals[i] = sdk.ABCIValidator(val)
+		abcivals[i] = val.ABCIValidatorUpdate()
 	}
 
 	require.Equal(t, abcivals, vals)
@@ -98,9 +98,9 @@ func TestInitGenesisLargeValidatorSet(t *testing.T) {
 	vals, err := InitGenesis(ctx, keeper, genesisState)
 	require.NoError(t, err)
 
-	abcivals := make([]abci.Validator, 100)
+	abcivals := make([]abci.ValidatorUpdate, 100)
 	for i, val := range validators[:100] {
-		abcivals[i] = sdk.ABCIValidator(val)
+		abcivals[i] = val.ABCIValidatorUpdate()
 	}
 
 	require.Equal(t, abcivals, vals)
diff --git a/x/stake/handler.go b/x/stake/handler.go
index 8b53065ccf..65915a65e5 100644
--- a/x/stake/handler.go
+++ b/x/stake/handler.go
@@ -36,7 +36,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
 }
 
 // Called every block, process inflation, update validator set
-func EndBlocker(ctx sdk.Context, k keeper.Keeper) (ValidatorUpdates []abci.Validator) {
+func EndBlocker(ctx sdk.Context, k keeper.Keeper) (ValidatorUpdates []abci.ValidatorUpdate) {
 	pool := k.GetPool(ctx)
 
 	// Process provision inflation
@@ -52,7 +52,7 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) (ValidatorUpdates []abci.Valid
 	k.SetIntraTxCounter(ctx, 0)
 
 	// calculate validator set changes
-	ValidatorUpdates = k.GetValidTendermintUpdates(ctx)
+	ValidatorUpdates = k.GetTendermintUpdates(ctx)
 	return
 }
 
diff --git a/x/stake/keeper/validator.go b/x/stake/keeper/validator.go
index 84a82dba5f..668a2af232 100644
--- a/x/stake/keeper/validator.go
+++ b/x/stake/keeper/validator.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	abci "github.com/tendermint/tendermint/abci/types"
+	tmtypes "github.com/tendermint/tendermint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/stake/types"
@@ -194,19 +195,22 @@ func (k Keeper) GetValidatorsByPower(ctx sdk.Context) []types.Validator {
 // CONTRACT: Only validators with non-zero power or zero-power that were bonded
 // at the previous block height or were removed from the validator set entirely
 // are returned to Tendermint.
-func (k Keeper) GetValidTendermintUpdates(ctx sdk.Context) (updates []abci.Validator) {
+func (k Keeper) GetTendermintUpdates(ctx sdk.Context) (updates []abci.ValidatorUpdate) {
 	tstore := ctx.TransientStore(k.storeTKey)
 
 	iterator := sdk.KVStorePrefixIterator(tstore, TendermintUpdatesTKey)
 	defer iterator.Close()
-
 	for ; iterator.Valid(); iterator.Next() {
-		var abciVal abci.Validator
+		var abciVal abci.ValidatorUpdate
 
 		abciValBytes := iterator.Value()
 		k.cdc.MustUnmarshalBinary(abciValBytes, &abciVal)
 
-		val, found := k.GetValidator(ctx, abciVal.GetAddress())
+		pub, err := tmtypes.PB2TM.PubKey(abciVal.GetPubKey())
+		if err != nil {
+			panic(err)
+		}
+		val, found := k.GetValidator(ctx, sdk.ValAddress(pub.Address()))
 		if found {
 			// The validator is new or already exists in the store and must adhere to
 			// Tendermint invariants.
@@ -258,7 +262,7 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type
 	case powerIncreasing && !validator.Jailed &&
 		(oldFound && oldValidator.Status == sdk.Bonded):
 
-		bz := k.cdc.MustMarshalBinary(validator.ABCIValidator())
+		bz := k.cdc.MustMarshalBinary(validator.ABCIValidatorUpdate())
 		tstore.Set(GetTendermintUpdatesTKey(validator.OperatorAddr), bz)
 
 		if cliffValExists {
@@ -293,7 +297,7 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type
 
 		// if decreased in power but still bonded, update Tendermint validator
 		if oldFound && oldValidator.BondedTokens().GT(validator.BondedTokens()) {
-			bz := k.cdc.MustMarshalBinary(validator.ABCIValidator())
+			bz := k.cdc.MustMarshalBinary(validator.ABCIValidatorUpdate())
 			tstore.Set(GetTendermintUpdatesTKey(validator.OperatorAddr), bz)
 		}
 	}
@@ -610,7 +614,7 @@ func (k Keeper) beginUnbondingValidator(ctx sdk.Context, validator types.Validat
 	k.SetValidator(ctx, validator)
 
 	// add to accumulated changes for tendermint
-	bzABCI := k.cdc.MustMarshalBinary(validator.ABCIValidatorZero())
+	bzABCI := k.cdc.MustMarshalBinary(validator.ABCIValidatorUpdateZero())
 	tstore := ctx.TransientStore(k.storeTKey)
 	tstore.Set(GetTendermintUpdatesTKey(validator.OperatorAddr), bzABCI)
 
@@ -643,7 +647,7 @@ func (k Keeper) bondValidator(ctx sdk.Context, validator types.Validator) types.
 	store.Set(GetValidatorsBondedIndexKey(validator.OperatorAddr), []byte{})
 
 	// add to accumulated changes for tendermint
-	bzABCI := k.cdc.MustMarshalBinary(validator.ABCIValidator())
+	bzABCI := k.cdc.MustMarshalBinary(validator.ABCIValidatorUpdate())
 	tstore := ctx.TransientStore(k.storeTKey)
 	tstore.Set(GetTendermintUpdatesTKey(validator.OperatorAddr), bzABCI)
 
@@ -676,7 +680,7 @@ func (k Keeper) RemoveValidator(ctx sdk.Context, address sdk.ValAddress) {
 	}
 	store.Delete(GetValidatorsBondedIndexKey(validator.OperatorAddr))
 
-	bz := k.cdc.MustMarshalBinary(validator.ABCIValidatorZero())
+	bz := k.cdc.MustMarshalBinary(validator.ABCIValidatorUpdateZero())
 	tstore := ctx.TransientStore(k.storeTKey)
 	tstore.Set(GetTendermintUpdatesTKey(address), bz)
 }
diff --git a/x/stake/keeper/validator_test.go b/x/stake/keeper/validator_test.go
index 73a391acc7..7533fed6e9 100644
--- a/x/stake/keeper/validator_test.go
+++ b/x/stake/keeper/validator_test.go
@@ -71,9 +71,9 @@ func TestSetValidator(t *testing.T) {
 	require.Equal(t, 1, len(resVals))
 	require.True(ValEq(t, validator, resVals[0]))
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validator.ABCIValidator(), updates[0])
+	require.Equal(t, validator.ABCIValidatorUpdate(), updates[0])
 
 	allVals := keeper.GetAllValidators(ctx)
 	require.Equal(t, 1, len(allVals))
@@ -675,7 +675,7 @@ func TestFullValidatorSetPowerChange(t *testing.T) {
 	assert.True(ValEq(t, validators[2], resValidators[1]))
 }
 
-func TestGetValidTendermintUpdatesAllNone(t *testing.T) {
+func TestGetTendermintUpdatesAllNone(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -693,17 +693,17 @@ func TestGetValidTendermintUpdatesAllNone(t *testing.T) {
 
 	// test from nothing to something
 	//  tendermintUpdate set: {} -> {c1, c3}
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	assert.Equal(t, 2, len(updates))
-	assert.Equal(t, validators[0].ABCIValidator(), updates[0])
-	assert.Equal(t, validators[1].ABCIValidator(), updates[1])
+	assert.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
+	assert.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesIdentical(t *testing.T) {
+func TestGetTendermintUpdatesIdentical(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -717,16 +717,16 @@ func TestGetValidTendermintUpdatesIdentical(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test identical,
 	//  tendermintUpdate set: {} -> {}
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 }
 
-func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
+func TestGetTendermintUpdatesSingleValueChange(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -740,7 +740,7 @@ func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test single value change
 	//  tendermintUpdate set: {} -> {c1'}
@@ -748,13 +748,13 @@ func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
 	validators[0].Tokens = sdk.NewDec(600)
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[0].ABCIValidator(), updates[0])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
 }
 
-func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
+func TestGetTendermintUpdatesMultipleValueChange(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -768,7 +768,7 @@ func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test multiple value change
 	//  tendermintUpdate set: {c1, c3} -> {c1', c3'}
@@ -779,13 +779,13 @@ func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
-	require.Equal(t, validators[0].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesInserted(t *testing.T) {
+func TestGetTendermintUpdatesInserted(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20, 5, 15, 25}
@@ -799,33 +799,33 @@ func TestGetValidTendermintUpdatesInserted(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test validtor added at the beginning
 	//  tendermintUpdate set: {} -> {c0}
 	validators[2] = keeper.UpdateValidator(ctx, validators[2])
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[2].ABCIValidator(), updates[0])
+	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[0])
 
 	// test validtor added at the beginning
 	//  tendermintUpdate set: {} -> {c0}
 	clearTendermintUpdates(ctx, keeper)
 	validators[3] = keeper.UpdateValidator(ctx, validators[3])
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[3].ABCIValidator(), updates[0])
+	require.Equal(t, validators[3].ABCIValidatorUpdate(), updates[0])
 
 	// test validtor added at the end
 	//  tendermintUpdate set: {} -> {c0}
 	clearTendermintUpdates(ctx, keeper)
 	validators[4] = keeper.UpdateValidator(ctx, validators[4])
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[4].ABCIValidator(), updates[0])
+	require.Equal(t, validators[4].ABCIValidatorUpdate(), updates[0])
 }
 
-func TestGetValidTendermintUpdatesWithCliffValidator(t *testing.T) {
+func TestGetTendermintUpdatesWithCliffValidator(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := types.DefaultParams()
 	params.MaxValidators = 2
@@ -842,31 +842,31 @@ func TestGetValidTendermintUpdatesWithCliffValidator(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test validator added at the end but not inserted in the valset
 	//  tendermintUpdate set: {} -> {}
 	keeper.UpdateValidator(ctx, validators[2])
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 0, len(updates))
 
 	// test validator change its power and become a gotValidator (pushing out an existing)
 	//  tendermintUpdate set: {}     -> {c0, c4}
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	pool := keeper.GetPool(ctx)
 	validators[2], pool, _ = validators[2].AddTokensFromDel(pool, sdk.NewInt(10))
 	keeper.SetPool(ctx, pool)
 	validators[2] = keeper.UpdateValidator(ctx, validators[2])
 
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates), "%v", updates)
-	require.Equal(t, validators[0].ABCIValidatorZero(), updates[0])
-	require.Equal(t, validators[2].ABCIValidator(), updates[1])
+	require.Equal(t, validators[0].ABCIValidatorUpdateZero(), updates[0])
+	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
+func TestGetTendermintUpdatesPowerDecrease(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{100, 100}
@@ -880,7 +880,7 @@ func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// check initial power
 	require.Equal(t, sdk.NewDec(100).RoundInt64(), validators[0].GetPower().RoundInt64())
@@ -900,13 +900,13 @@ func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
 	require.Equal(t, sdk.NewDec(70).RoundInt64(), validators[1].GetPower().RoundInt64())
 
 	// Tendermint updates should reflect power change
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
-	require.Equal(t, validators[0].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
+func TestGetTendermintUpdatesNewValidator(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := keeper.GetParams(ctx)
 	params.MaxValidators = uint16(3)
@@ -930,13 +930,13 @@ func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
 	}
 
 	// verify initial Tendermint updates are correct
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, len(validators), len(updates))
-	require.Equal(t, validators[0].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// update initial validator set
 	for i, amt := range amts {
@@ -974,14 +974,14 @@ func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
 	validator = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, len(validators)+1, len(updates))
-	require.Equal(t, validator.ABCIValidator(), updates[0])
-	require.Equal(t, validators[0].ABCIValidator(), updates[1])
-	require.Equal(t, validators[1].ABCIValidator(), updates[2])
+	require.Equal(t, validator.ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[1])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[2])
 }
 
-func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
+func TestGetTendermintUpdatesBondTransition(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := keeper.GetParams(ctx)
 	params.MaxValidators = uint16(2)
@@ -1006,13 +1006,13 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	}
 
 	// verify initial Tendermint updates are correct
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
-	require.Equal(t, validators[2].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// delegate to validator with lowest power but not enough to bond
 	ctx = ctx.WithBlockHeight(1)
@@ -1027,7 +1027,7 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// create a series of events that will bond and unbond the validator with
 	// lowest power in a single block context (height)
@@ -1048,12 +1048,12 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	validators[1] = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[1].ABCIValidator(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[0])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 }
 
 func TestUpdateValidatorCommission(t *testing.T) {
diff --git a/x/stake/types/validator.go b/x/stake/types/validator.go
index 051ffa9e51..57794691f5 100644
--- a/x/stake/types/validator.go
+++ b/x/stake/types/validator.go
@@ -305,22 +305,21 @@ func (d Description) EnsureLength() (Description, sdk.Error) {
 	return d, nil
 }
 
-// ABCIValidator returns an abci.Validator from a staked validator type.
-func (v Validator) ABCIValidator() abci.Validator {
-	return abci.Validator{
-		PubKey:  tmtypes.TM2PB.PubKey(v.ConsPubKey),
-		Address: v.ConsPubKey.Address(),
-		Power:   v.BondedTokens().RoundInt64(),
+// ABCIValidatorUpdate returns an abci.ValidatorUpdate from a staked validator type
+// with the full validator power
+func (v Validator) ABCIValidatorUpdate() abci.ValidatorUpdate {
+	return abci.ValidatorUpdate{
+		PubKey: tmtypes.TM2PB.PubKey(v.ConsPubKey),
+		Power:  v.BondedTokens().RoundInt64(),
 	}
 }
 
-// ABCIValidatorZero returns an abci.Validator from a staked validator type
-// with with zero power used for validator updates.
-func (v Validator) ABCIValidatorZero() abci.Validator {
-	return abci.Validator{
-		PubKey:  tmtypes.TM2PB.PubKey(v.ConsPubKey),
-		Address: v.ConsPubKey.Address(),
-		Power:   0,
+// ABCIValidatorUpdateZero returns an abci.ValidatorUpdate from a staked validator type
+// with zero power used for validator updates.
+func (v Validator) ABCIValidatorUpdateZero() abci.ValidatorUpdate {
+	return abci.ValidatorUpdate{
+		PubKey: tmtypes.TM2PB.PubKey(v.ConsPubKey),
+		Power:  0,
 	}
 }
 
diff --git a/x/stake/types/validator_test.go b/x/stake/types/validator_test.go
index de9e184804..36ac0da576 100644
--- a/x/stake/types/validator_test.go
+++ b/x/stake/types/validator_test.go
@@ -55,18 +55,18 @@ func TestUpdateDescription(t *testing.T) {
 	require.Equal(t, d, d3)
 }
 
-func TestABCIValidator(t *testing.T) {
+func TestABCIValidatorUpdate(t *testing.T) {
 	validator := NewValidator(addr1, pk1, Description{})
 
-	abciVal := validator.ABCIValidator()
+	abciVal := validator.ABCIValidatorUpdate()
 	require.Equal(t, tmtypes.TM2PB.PubKey(validator.ConsPubKey), abciVal.PubKey)
 	require.Equal(t, validator.BondedTokens().RoundInt64(), abciVal.Power)
 }
 
-func TestABCIValidatorZero(t *testing.T) {
+func TestABCIValidatorUpdateZero(t *testing.T) {
 	validator := NewValidator(addr1, pk1, Description{})
 
-	abciVal := validator.ABCIValidatorZero()
+	abciVal := validator.ABCIValidatorUpdateZero()
 	require.Equal(t, tmtypes.TM2PB.PubKey(validator.ConsPubKey), abciVal.PubKey)
 	require.Equal(t, int64(0), abciVal.Power)
 }