certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #1178: Merge master (Tendermint updates) 

* update to tm v0.19.6
* update tm to 0.17.4
* update for tm v0.19.9
* update godep
This commit is contained in:
Ethan Buchman 2018-06-08 21:34:27 -07:00 committed by Christopher Goes
parent 0b9751ac98
commit a277ba91c7
7 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md
View File

@ -80,6 +80,25 @@ BUG FIXES
## 0.17.5
*June 5, 2018*
Update to Tendermint v0.19.9 (Fix evidence reactor, mempool deadlock, WAL panic,
memory leak)
## 0.17.4
*May 31, 2018*
Update to Tendermint v0.19.7 (WAL fixes and more)
## 0.17.3
*May 29, 2018*
Update to Tendermint v0.19.6 (fix fast-sync halt)
## 0.17.2 ## 0.17.2
_May 20, 2018_ _May 20, 2018_

24
Gopkg.lock generated
View File

@ -170,8 +170,8 @@
[[projects]] [[projects]]
name = "github.com/pelletier/go-toml" name = "github.com/pelletier/go-toml"
packages = ["."] packages = ["."]
revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8" revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
version = "v1.1.0" version = "v1.2.0"
[[projects]] [[projects]]
name = "github.com/pkg/errors" name = "github.com/pkg/errors"
@ -256,7 +256,7 @@
"leveldb/table", "leveldb/table",
"leveldb/util" "leveldb/util"
] ]
revision = "5d6fca44a948d2be89a9702de7717f0168403d3d" revision = "e2150783cd35f5b607daca48afd8c57ec54cc995"
[[projects]] [[projects]]
name = "github.com/tendermint/abci" name = "github.com/tendermint/abci"
@ -267,8 +267,8 @@
"server", "server",
"types" "types"
] ]
revision = "9af8b7a7c87478869f8c280ed9539470b8f470b4" revision = "ebee2fe114020aa49c70bbbae50b7079fc7e7b90"
version = "v0.11.0-rc4" version = "v0.11.0"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -330,6 +330,7 @@
"p2p/conn", "p2p/conn",
"p2p/pex", "p2p/pex",
"p2p/upnp", "p2p/upnp",
"privval",
"proxy", "proxy",
"rpc/client", "rpc/client",
"rpc/core", "rpc/core",
@ -344,11 +345,10 @@
"state/txindex/kv", "state/txindex/kv",
"state/txindex/null", "state/txindex/null",
"types", "types",
"types/priv_validator",
"version" "version"
] ]
revision = "b5baab0238c9ec26e3b2d229b0243f9ff9220bdb" revision = "27bd1deabe4ba6a2d9b463b8f3e3f1e31b993e61"
version = "v0.20.0-rc3" version = "v0.20.0"
[[projects]] [[projects]]
branch = "develop" branch = "develop"
@ -366,7 +366,7 @@
"merkle", "merkle",
"merkle/tmhash" "merkle/tmhash"
] ]
revision = "44f1bdb0d55cc6527e38d0a7aab406e2580f56a4" revision = "640af0205d98d1f45fb2f912f9c35c8bf816adc9"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -382,7 +382,7 @@
"ripemd160", "ripemd160",
"salsa20/salsa" "salsa20/salsa"
] ]
revision = "5ba7f63082460102a45837dbd1827e10f9479ac0" revision = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -402,7 +402,7 @@
branch = "master" branch = "master"
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = ["unix"] packages = ["unix"]
revision = "c11f84a56e43e20a78cee75a7c034031ecf57d1f" revision = "9527bec2660bd847c050fda93a0f0c6dee0800bb"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"
@ -463,6 +463,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "ccb2ab7644a38c2d0326280582f758256e37fc98c3ef0403581e3b85cff42188" inputs-digest = "31f69b235b2d8f879a215c9e8ca0919adc62d21f6830b17931a3a0efb058721f"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

4
Gopkg.toml
View File

@ -54,7 +54,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/abci" name = "github.com/tendermint/abci"
version = "=0.11.0-rc4" version = "=0.11.0"
[[constraint]] [[constraint]]
name = "github.com/tendermint/go-crypto" name = "github.com/tendermint/go-crypto"
@ -70,7 +70,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/tendermint" name = "github.com/tendermint/tendermint"
version = "=0.20.0-rc3" version = "=0.20.0"
[[override]] [[override]]
name = "github.com/tendermint/tmlibs" name = "github.com/tendermint/tmlibs"

2
client/lcd/lcd_test.go
View File

@ -26,7 +26,7 @@ import (
ctypes "github.com/tendermint/tendermint/rpc/core/types" ctypes "github.com/tendermint/tendermint/rpc/core/types"
tmrpc "github.com/tendermint/tendermint/rpc/lib/server" tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
tmtypes "github.com/tendermint/tendermint/types" tmtypes "github.com/tendermint/tendermint/types"
pvm "github.com/tendermint/tendermint/types/priv_validator" pvm "github.com/tendermint/tendermint/privval"
"github.com/tendermint/tmlibs/cli" "github.com/tendermint/tmlibs/cli"
dbm "github.com/tendermint/tmlibs/db" dbm "github.com/tendermint/tmlibs/db"
"github.com/tendermint/tmlibs/log" "github.com/tendermint/tmlibs/log"

2
server/init.go
View File

@ -20,7 +20,7 @@ import (
cfg "github.com/tendermint/tendermint/config" cfg "github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p"
tmtypes "github.com/tendermint/tendermint/types" tmtypes "github.com/tendermint/tendermint/types"
pvm "github.com/tendermint/tendermint/types/priv_validator" pvm "github.com/tendermint/tendermint/privval"
tmcli "github.com/tendermint/tmlibs/cli" tmcli "github.com/tendermint/tmlibs/cli"
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
dbm "github.com/tendermint/tmlibs/db" dbm "github.com/tendermint/tmlibs/db"

2
server/start.go
View File

@ -10,7 +10,7 @@ import (
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
"github.com/tendermint/tendermint/node" "github.com/tendermint/tendermint/node"
"github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/proxy"
pvm "github.com/tendermint/tendermint/types/priv_validator" pvm "github.com/tendermint/tendermint/privval"
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
) )

2
server/tm_cmds.go
View File

@ -10,7 +10,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
"github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p"
pvm "github.com/tendermint/tendermint/types/priv_validator" pvm "github.com/tendermint/tendermint/privval"
) )
// ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout // ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout