diff --git a/Gopkg.lock b/Gopkg.lock index c152ac389..87a53b126 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -229,6 +229,7 @@ revision = "714f901b98fdb3aa954b4193d8cbd64a28d80cad" [[projects]] + branch = "develop" name = "github.com/tendermint/abci" packages = [ "client", @@ -238,8 +239,7 @@ "server", "types" ] - revision = "78a8905690ef54f9d57e3b2b0ee7ad3a04ef3f1f" - version = "v0.10.3" + revision = "bcfdd6dbaf10c947392e2b0a097b65b5fb247baf" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 741979774..857070766 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -71,7 +71,7 @@ [[constraint]] name = "github.com/tendermint/abci" - version = "~0.10.3" + branch = "develop" [[constraint]] name = "github.com/tendermint/go-crypto" diff --git a/state/execution.go b/state/execution.go index 61544354f..b8676cad8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -74,7 +74,7 @@ func (blockExec *BlockExecutor) ApplyBlock(s State, blockID types.BlockID, block return s, ErrInvalidBlock(err) } - abciResponses, err := execBlockOnProxyApp(blockExec.logger, blockExec.proxyApp, block) + abciResponses, err := execBlockOnProxyApp(blockExec.logger, blockExec.proxyApp, block, s.Validators) if err != nil { return s, ErrProxyAppConn(err) } @@ -160,7 +160,7 @@ func (blockExec *BlockExecutor) Commit(block *types.Block) ([]byte, error) { // Executes block's transactions on proxyAppConn. // Returns a list of transaction results and updates to the validator set -func execBlockOnProxyApp(logger log.Logger, proxyAppConn proxy.AppConnConsensus, block *types.Block) (*ABCIResponses, error) { +func execBlockOnProxyApp(logger log.Logger, proxyAppConn proxy.AppConnConsensus, block *types.Block, vs *types.ValidatorSet) (*ABCIResponses, error) { var validTxs, invalidTxs = 0, 0 txIndex := 0