From 5b2a5c948ce6142ec2262886aafdc2a6a982cc54 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 24 May 2018 18:00:59 -0400 Subject: [PATCH 1/4] update to tm v0.19.6 --- CHANGELOG.md | 6 ++++++ Gopkg.lock | 20 ++++++++++---------- Gopkg.toml | 4 ++-- version/version.go | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b0853dc0c..1075450e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.17.3 + +*May 29, 2018* + +Update to Tendermint v0.19.6 (fix fast-sync halt) + ## 0.17.2 *May 20, 2018* diff --git a/Gopkg.lock b/Gopkg.lock index 37a32820c2..3216a0f79e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,7 +11,7 @@ branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "1432d294a5b055c297457c25434efbf13384cc46" + revision = "bc0944904505aab55e089371a892be2f87883161" [[projects]] name = "github.com/davecgh/go-spew" @@ -250,7 +250,7 @@ "leveldb/table", "leveldb/util" ] - revision = "e6d6b529196422703d54ff5c40e79809ec2020b3" + revision = "5d6fca44a948d2be89a9702de7717f0168403d3d" [[projects]] name = "github.com/tendermint/abci" @@ -341,8 +341,8 @@ "types/priv_validator", "version" ] - revision = "018e096748bafe1d2d1e69b909e4158f3b26f6b2" - version = "v0.19.5-rc1" + revision = "fd6021876b017cbf45cdf6dd55a0d6cdf431e826" + version = "v0.19.6-rc2" [[projects]] name = "github.com/tendermint/tmlibs" @@ -359,8 +359,8 @@ "pubsub", "pubsub/query" ] - revision = "cc5f287c4798ffe88c04d02df219ecb6932080fd" - version = "v0.8.3-rc0" + revision = "d970af87248a4e162590300dbb74e102183a417d" + version = "v0.8.3" [[projects]] branch = "master" @@ -376,7 +376,7 @@ "ripemd160", "salsa20/salsa" ] - revision = "1a580b3eff7814fc9b40602fd35256c63b50f491" + revision = "ab813273cd59e1333f7ae7bff5d027d4aadf528c" [[projects]] branch = "master" @@ -390,13 +390,13 @@ "internal/timeseries", "trace" ] - revision = "57065200b4b034a1c8ad54ff77069408c2218ae6" + revision = "dfa909b99c79129e1100513e5cd36307665e5723" [[projects]] branch = "master" name = "golang.org/x/sys" packages = ["unix"] - revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b" + revision = "c11f84a56e43e20a78cee75a7c034031ecf57d1f" [[projects]] name = "golang.org/x/text" @@ -457,6 +457,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "7540d2ecdb5d7d5084ab4e6132e929bbd501bd6add3006d8f08a6b2c127e0c7d" + inputs-digest = "2e868c5ad771cb647fd85a357375c559287602e886b7a040ddde0fac7f4f3365" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 5480bc03fc..3a7ee9cfc9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -66,7 +66,7 @@ [[constraint]] name = "github.com/tendermint/go-amino" - version = "~0.9.9" + version = "=0.9.9" [[constraint]] name = "github.com/tendermint/iavl" @@ -74,7 +74,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.19.5-rc1" + version = "0.19.6-rc2" [[override]] name = "github.com/tendermint/tmlibs" diff --git a/version/version.go b/version/version.go index ea365bda9e..ae9433bcd0 100644 --- a/version/version.go +++ b/version/version.go @@ -7,9 +7,9 @@ package version const Maj = "0" const Min = "17" -const Fix = "2" +const Fix = "3" -const Version = "0.17.2" +const Version = "0.17.3" // GitCommit set by build flags var GitCommit = "" From 36b3e530abb706c85f5373116d80850972c58324 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 31 May 2018 09:31:42 -0400 Subject: [PATCH 2/4] update tm to 0.17.4 --- CHANGELOG.md | 6 ++++++ Gopkg.lock | 17 +++++++++-------- Gopkg.toml | 2 +- version/version.go | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1075450e20..271be8fb9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.17.4 + +*May 31, 2018* + +Update to Tendermint v0.19.7 (WAL fixes and more) + ## 0.17.3 *May 29, 2018* diff --git a/Gopkg.lock b/Gopkg.lock index 3216a0f79e..3873b91550 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,7 +11,7 @@ branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "bc0944904505aab55e089371a892be2f87883161" + revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64" [[projects]] name = "github.com/davecgh/go-spew" @@ -313,6 +313,9 @@ "consensus", "consensus/types", "evidence", + "libs/events", + "libs/pubsub", + "libs/pubsub/query", "lite", "lite/client", "lite/errors", @@ -341,8 +344,8 @@ "types/priv_validator", "version" ] - revision = "fd6021876b017cbf45cdf6dd55a0d6cdf431e826" - version = "v0.19.6-rc2" + revision = "a017f2fdd41496a81e04a2216630a405189da6e2" + version = "v0.19.7-rc0" [[projects]] name = "github.com/tendermint/tmlibs" @@ -355,9 +358,7 @@ "db", "flowrate", "log", - "merkle", - "pubsub", - "pubsub/query" + "merkle" ] revision = "d970af87248a4e162590300dbb74e102183a417d" version = "v0.8.3" @@ -390,7 +391,7 @@ "internal/timeseries", "trace" ] - revision = "dfa909b99c79129e1100513e5cd36307665e5723" + revision = "1e491301e022f8f977054da4c2d852decd59571f" [[projects]] branch = "master" @@ -457,6 +458,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "2e868c5ad771cb647fd85a357375c559287602e886b7a040ddde0fac7f4f3365" + inputs-digest = "a3a75136fb6921c4c4d413e4c8366f203b77367762763c97b8669ea854fbd62d" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 3a7ee9cfc9..b8838920a5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -74,7 +74,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.19.6-rc2" + version = "0.19.7-rc0" [[override]] name = "github.com/tendermint/tmlibs" diff --git a/version/version.go b/version/version.go index ae9433bcd0..0871aee005 100644 --- a/version/version.go +++ b/version/version.go @@ -7,9 +7,9 @@ package version const Maj = "0" const Min = "17" -const Fix = "3" +const Fix = "4" -const Version = "0.17.3" +const Version = "0.17.4" // GitCommit set by build flags var GitCommit = "" From f3f2729b117677977ce6740813d0d737e238d848 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 5 Jun 2018 18:04:16 -0700 Subject: [PATCH 3/4] update for tm v0.19.9 --- CHANGELOG.md | 7 +++++++ Gopkg.lock | 18 +++++++++--------- Gopkg.toml | 4 ++-- client/lcd/lcd_test.go | 2 +- server/init.go | 2 +- server/start.go | 2 +- server/tm_cmds.go | 2 +- version/version.go | 4 ++-- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 271be8fb9f..c017ca91ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 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* diff --git a/Gopkg.lock b/Gopkg.lock index 3873b91550..a084270421 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -164,8 +164,8 @@ [[projects]] name = "github.com/pelletier/go-toml" packages = ["."] - revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8" - version = "v1.1.0" + revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" + version = "v1.2.0" [[projects]] name = "github.com/pkg/errors" @@ -327,6 +327,7 @@ "p2p/conn", "p2p/pex", "p2p/upnp", + "privval", "proxy", "rpc/client", "rpc/core", @@ -341,11 +342,10 @@ "state/txindex/kv", "state/txindex/null", "types", - "types/priv_validator", "version" ] - revision = "a017f2fdd41496a81e04a2216630a405189da6e2" - version = "v0.19.7-rc0" + revision = "775fef31c2b8fb7ea36f0d57bae3bfa74d353100" + version = "v0.19.9-rc0" [[projects]] name = "github.com/tendermint/tmlibs" @@ -360,8 +360,8 @@ "log", "merkle" ] - revision = "d970af87248a4e162590300dbb74e102183a417d" - version = "v0.8.3" + revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38" + version = "v0.8.4" [[projects]] branch = "master" @@ -377,7 +377,7 @@ "ripemd160", "salsa20/salsa" ] - revision = "ab813273cd59e1333f7ae7bff5d027d4aadf528c" + revision = "78e79280f680f7dd6b8e48c751887111ebdbcbd8" [[projects]] branch = "master" @@ -458,6 +458,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "a3a75136fb6921c4c4d413e4c8366f203b77367762763c97b8669ea854fbd62d" + inputs-digest = "71d11bd2a8f3f46ba3fd16759b501ad5b6b48037717d82020ebb25e021b67117" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index b8838920a5..c25623bba8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -74,11 +74,11 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.19.7-rc0" + version = "0.19.9-rc0" [[override]] name = "github.com/tendermint/tmlibs" - version = "~0.8.3-rc0" + version = "~0.8.4" # this got updated and broke, so locked to an old working commit ... [[override]] diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go index 66a8a4085f..73f5ad2c55 100644 --- a/client/lcd/lcd_test.go +++ b/client/lcd/lcd_test.go @@ -24,7 +24,7 @@ import ( ctypes "github.com/tendermint/tendermint/rpc/core/types" tmrpc "github.com/tendermint/tendermint/rpc/lib/server" 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" dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" diff --git a/server/init.go b/server/init.go index 68a1709bc8..512751bed0 100644 --- a/server/init.go +++ b/server/init.go @@ -20,7 +20,7 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/p2p" 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" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/server/start.go b/server/start.go index 23e38749be..9bf2d30cdb 100644 --- a/server/start.go +++ b/server/start.go @@ -10,7 +10,7 @@ import ( tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" "github.com/tendermint/tendermint/node" "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" ) diff --git a/server/tm_cmds.go b/server/tm_cmds.go index d581ca5f76..4d8edacabb 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -11,7 +11,7 @@ import ( tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" "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 diff --git a/version/version.go b/version/version.go index 0871aee005..be9f7858b0 100644 --- a/version/version.go +++ b/version/version.go @@ -7,9 +7,9 @@ package version const Maj = "0" const Min = "17" -const Fix = "4" +const Fix = "5" -const Version = "0.17.4" +const Version = "0.17.5" // GitCommit set by build flags var GitCommit = "" From 5ddcf23aca71a2adb13051c900b3dd6c65559b26 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 8 Jun 2018 21:34:26 -0700 Subject: [PATCH 4/4] update godep --- Gopkg.lock | 38 +++++++++----------------------------- Gopkg.toml | 6 +----- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0e62793003..612e8e3b32 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -256,7 +256,7 @@ "leveldb/table", "leveldb/util" ] - revision = "5d6fca44a948d2be89a9702de7717f0168403d3d" + revision = "e2150783cd35f5b607daca48afd8c57ec54cc995" [[projects]] name = "github.com/tendermint/abci" @@ -267,8 +267,8 @@ "server", "types" ] - revision = "9af8b7a7c87478869f8c280ed9539470b8f470b4" - version = "v0.11.0-rc4" + revision = "ebee2fe114020aa49c70bbbae50b7079fc7e7b90" + version = "v0.11.0" [[projects]] branch = "master" @@ -347,13 +347,8 @@ "types", "version" ] -<<<<<<< HEAD - revision = "b5baab0238c9ec26e3b2d229b0243f9ff9220bdb" - version = "v0.20.0-rc3" -======= - revision = "775fef31c2b8fb7ea36f0d57bae3bfa74d353100" - version = "v0.19.9-rc0" ->>>>>>> master + revision = "27bd1deabe4ba6a2d9b463b8f3e3f1e31b993e61" + version = "v0.20.0" [[projects]] branch = "develop" @@ -368,17 +363,10 @@ "db", "flowrate", "log", -<<<<<<< HEAD "merkle", "merkle/tmhash" ] - revision = "44f1bdb0d55cc6527e38d0a7aab406e2580f56a4" -======= - "merkle" - ] - revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38" - version = "v0.8.4" ->>>>>>> master + revision = "640af0205d98d1f45fb2f912f9c35c8bf816adc9" [[projects]] branch = "master" @@ -394,11 +382,7 @@ "ripemd160", "salsa20/salsa" ] -<<<<<<< HEAD - revision = "5ba7f63082460102a45837dbd1827e10f9479ac0" -======= - revision = "78e79280f680f7dd6b8e48c751887111ebdbcbd8" ->>>>>>> master + revision = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9" [[projects]] branch = "master" @@ -418,7 +402,7 @@ branch = "master" name = "golang.org/x/sys" packages = ["unix"] - revision = "c11f84a56e43e20a78cee75a7c034031ecf57d1f" + revision = "9527bec2660bd847c050fda93a0f0c6dee0800bb" [[projects]] name = "golang.org/x/text" @@ -479,10 +463,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 -<<<<<<< HEAD - inputs-digest = "ccb2ab7644a38c2d0326280582f758256e37fc98c3ef0403581e3b85cff42188" -======= - inputs-digest = "71d11bd2a8f3f46ba3fd16759b501ad5b6b48037717d82020ebb25e021b67117" ->>>>>>> master + inputs-digest = "31f69b235b2d8f879a215c9e8ca0919adc62d21f6830b17931a3a0efb058721f" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 141371304a..77de1b78de 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -54,7 +54,7 @@ [[constraint]] name = "github.com/tendermint/abci" - version = "=0.11.0-rc4" + version = "=0.11.0" [[constraint]] name = "github.com/tendermint/go-crypto" @@ -76,10 +76,6 @@ name = "github.com/tendermint/tmlibs" branch = "develop" -[[override]] - name = "github.com/tendermint/tmlibs" - version = "~0.8.4" - # this got updated and broke, so locked to an old working commit ... [[override]] name = "google.golang.org/genproto"