From 0116c8113ba1c4b39bdb6280d036a43e280a7c87 Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Thu, 19 Sep 2019 10:53:15 +0200 Subject: [PATCH 1/6] RC1 - 0.32.4 - Release candidate for v0.32.4 Signed-off-by: Marko Baricevic --- CHANGELOG.md | 20 ++++++++++++++++++++ CHANGELOG_PENDING.md | 9 +-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f835811d3..a16d9a7ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## v0.32.4 + +*September 19, 2019* + +Special thanks to external contributors on this release: @jon-certik + +Friendly reminder, we have a [bug bounty +program](https://hackerone.com/tendermint). + +### IMPROVEMENTS: + +- [rpc] [\#2010](https://github.com/tendermint/tendermint/issues/2010) Add NewHTTPWithClient and NewJSONRPCClientWithHTTPClient (note these and NewHTTP, NewJSONRPCClient functions panic if remote is invalid) (@gracenoah) +- [rpc] [\#3984](https://github.com/tendermint/tendermint/issues/3984) Add `MempoolClient` interface to `Client` interface +- [rpc] [\#3882](https://github.com/tendermint/tendermint/issues/3882) Add custom marshalers to proto messages to disable `omitempty` + +### BUG FIXES: + +- [consensus] [\#3908](https://github.com/tendermint/tendermint/issues/3908) Wait `timeout_commit` to pass even if `create_empty_blocks` is `false` +- [mempool] [\#3968](https://github.com/tendermint/tendermint/issues/3968) Fix memory loading error on 32-bit machines (@jon-certik) + ## v0.32.3 *August 28, 2019* diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 405e95696..043c66c7e 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -1,4 +1,4 @@ -## v0.32.4 +## v0.32.5 \*\* @@ -19,11 +19,4 @@ program](https://hackerone.com/tendermint). ### IMPROVEMENTS: -- [rpc] \#2010 Add NewHTTPWithClient and NewJSONRPCClientWithHTTPClient (note these and NewHTTP, NewJSONRPCClient functions panic if remote is invalid) (@gracenoah) -- [rpc] \#3984 Add `MempoolClient` interface to `Client` interface -- [rpc] \#3882 Add custom marshalers to proto messages to disable `omitempty` - ### BUG FIXES: - -- [consensus] \#3908 Wait `timeout_commit` to pass even if `create_empty_blocks` is `false` -- [mempool] \#3968 Fix memory loading error on 32-bit machines (@jon-certik) From fce61cc51c88a11bd6a5be5e2109f12607c6392c Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Thu, 19 Sep 2019 11:03:39 +0200 Subject: [PATCH 2/6] pr suggestions --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a16d9a7ae..54dec0049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,19 @@ *September 19, 2019* -Special thanks to external contributors on this release: @jon-certik +Special thanks to external contributors on this release: @jon-certik, @gracenoah Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermint). +### BREAKING CHANGES: + +- CLI/RPC/Config + - [rpc] [\#3984](https://github.com/tendermint/tendermint/issues/3984) Add `MempoolClient` interface to `Client` interface + ### IMPROVEMENTS: - [rpc] [\#2010](https://github.com/tendermint/tendermint/issues/2010) Add NewHTTPWithClient and NewJSONRPCClientWithHTTPClient (note these and NewHTTP, NewJSONRPCClient functions panic if remote is invalid) (@gracenoah) -- [rpc] [\#3984](https://github.com/tendermint/tendermint/issues/3984) Add `MempoolClient` interface to `Client` interface - [rpc] [\#3882](https://github.com/tendermint/tendermint/issues/3882) Add custom marshalers to proto messages to disable `omitempty` ### BUG FIXES: From a5a19add7772c238eda56420b6ca44e13fc8a24a Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Thu, 19 Sep 2019 11:51:28 +0200 Subject: [PATCH 3/6] bump versions --- version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version/version.go b/version/version.go index e1c01c4c2..816d67f0b 100644 --- a/version/version.go +++ b/version/version.go @@ -20,10 +20,10 @@ const ( // Must be a string because scripts like dist.sh read this file. // XXX: Don't change the name of this variable or you will break // automation :) - TMCoreSemVer = "0.32.3" + TMCoreSemVer = "0.32.4" // ABCISemVer is the semantic version of the ABCI library - ABCISemVer = "0.16.1" + ABCISemVer = "0.16.2" ABCIVersion = ABCISemVer ) From 049f158465119d57b5a68e7f0ebe19e9480b267b Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Thu, 19 Sep 2019 14:08:49 +0200 Subject: [PATCH 4/6] revert abci change --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 816d67f0b..b342d6b21 100644 --- a/version/version.go +++ b/version/version.go @@ -23,7 +23,7 @@ const ( TMCoreSemVer = "0.32.4" // ABCISemVer is the semantic version of the ABCI library - ABCISemVer = "0.16.2" + ABCISemVer = "0.16.1" ABCIVersion = ABCISemVer ) From bf989eb2724a9e3acaaea0f6e1f02544ff082d41 Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 19 Sep 2019 15:31:28 +0200 Subject: [PATCH 5/6] fix linting (#4000) --- .golangci.yml | 1 + blockchain/v2/reactor.go | 6 ++---- blockchain/v2/routine.go | 1 + blockchain/v2/routine_test.go | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 8b7fbd7ec..0991cdf1e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -45,3 +45,4 @@ linters: # disabled-checks: # - wrapperFunc # - commentFormatting # https://github.com/go-critic/go-critic/issues/755 + diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go index f96b325b0..25ec41224 100644 --- a/blockchain/v2/reactor.go +++ b/blockchain/v2/reactor.go @@ -13,16 +13,14 @@ type timeCheck struct { } func schedulerHandle(event Event) (Event, error) { - switch event.(type) { - case timeCheck: + if _, ok := event.(timeCheck); ok { fmt.Println("scheduler handle timeCheck") } return noOp, nil } func processorHandle(event Event) (Event, error) { - switch event.(type) { - case timeCheck: + if _, ok := event.(timeCheck); ok { fmt.Println("processor handle timeCheck") } return noOp, nil diff --git a/blockchain/v2/routine.go b/blockchain/v2/routine.go index cc7e7ea0f..a24a16f09 100644 --- a/blockchain/v2/routine.go +++ b/blockchain/v2/routine.go @@ -42,6 +42,7 @@ func newRoutine(name string, handleFunc handleFunc, bufferSize int) *Routine { } } +// nolint: unused func (rt *Routine) setLogger(logger log.Logger) { rt.logger = logger } diff --git a/blockchain/v2/routine_test.go b/blockchain/v2/routine_test.go index 2bd5a1a30..66a8cc704 100644 --- a/blockchain/v2/routine_test.go +++ b/blockchain/v2/routine_test.go @@ -15,8 +15,7 @@ type eventA struct { var done = fmt.Errorf("done") func simpleHandler(event Event) (Event, error) { - switch event.(type) { - case eventA: + if _, ok := event.(eventA); ok { return noOp, done } return noOp, nil From 0d13736acefd9ac916aec07f40c4ce5e40d74b5c Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 19 Sep 2019 18:24:17 +0200 Subject: [PATCH 6/6] address pr comments in #4002 (#4004) --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54dec0049..7aa703bbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ *September 19, 2019* -Special thanks to external contributors on this release: @jon-certik, @gracenoah +Special thanks to external contributors on this release: @jon-certik, @gracenoah, @PSalant726, @gchaincl Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermint). @@ -18,6 +18,15 @@ program](https://hackerone.com/tendermint). - [rpc] [\#2010](https://github.com/tendermint/tendermint/issues/2010) Add NewHTTPWithClient and NewJSONRPCClientWithHTTPClient (note these and NewHTTP, NewJSONRPCClient functions panic if remote is invalid) (@gracenoah) - [rpc] [\#3882](https://github.com/tendermint/tendermint/issues/3882) Add custom marshalers to proto messages to disable `omitempty` +- [deps] [\#3952](https://github.com/tendermint/tendermint/pull/3952) bump github.com/go-kit/kit from 0.6.0 to 0.9.0 +- [deps] [\#3951](https://github.com/tendermint/tendermint/pull/3951) bump github.com/stretchr/testify from 1.3.0 to 1.4.0 +- [deps] [\#3945](https://github.com/tendermint/tendermint/pull/3945) bump github.com/gorilla/websocket from 1.2.0 to 1.4.1 +- [deps] [\#3948](https://github.com/tendermint/tendermint/pull/3948) bump github.com/libp2p/go-buffer-pool from 0.0.1 to 0.0.2 +- [deps] [\#3943](https://github.com/tendermint/tendermint/pull/3943) bump github.com/fortytw2/leaktest from 1.2.0 to 1.3.0 +- [deps] [\#3939](https://github.com/tendermint/tendermint/pull/3939) bump github.com/rs/cors from 1.6.0 to 1.7.0 +- [deps] [\#3937](https://github.com/tendermint/tendermint/pull/3937) bump github.com/magiconair/properties from 1.8.0 to 1.8.1 +- [deps] [\#3947](https://github.com/tendermint/tendermint/pull/3947) update gogo/protobuf version from v1.2.1 to v1.3.0 +- [deps] [\#4001](https://github.com/tendermint/tendermint/pull/4001) bump github.com/tendermint/tm-db from 0.1.1 to 0.2.0 ### BUG FIXES: