From dcd70c94065090993fad5faf8e332f5361076377 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Thu, 22 Sep 2022 23:18:13 -0400 Subject: [PATCH 1/4] Prepare changelog for release Signed-off-by: Thane Thomson --- .../bug-fixes/1194-dup-vote-evidence-parsing.md | 0 .../dependencies/1199-unpin-time-dep.md | 0 .../enhancements/1189-no-generated-wkts-in-proto.md | 0 .../enhancements/1198-tmcore-v0.34.21.md | 0 .changelog/v0.25.0/summary.md | 11 +++++++++++ 5 files changed, 11 insertions(+) rename .changelog/{unreleased => v0.25.0}/bug-fixes/1194-dup-vote-evidence-parsing.md (100%) rename .changelog/{unreleased => v0.25.0}/dependencies/1199-unpin-time-dep.md (100%) rename .changelog/{unreleased => v0.25.0}/enhancements/1189-no-generated-wkts-in-proto.md (100%) rename .changelog/{unreleased => v0.25.0}/enhancements/1198-tmcore-v0.34.21.md (100%) create mode 100644 .changelog/v0.25.0/summary.md diff --git a/.changelog/unreleased/bug-fixes/1194-dup-vote-evidence-parsing.md b/.changelog/v0.25.0/bug-fixes/1194-dup-vote-evidence-parsing.md similarity index 100% rename from .changelog/unreleased/bug-fixes/1194-dup-vote-evidence-parsing.md rename to .changelog/v0.25.0/bug-fixes/1194-dup-vote-evidence-parsing.md diff --git a/.changelog/unreleased/dependencies/1199-unpin-time-dep.md b/.changelog/v0.25.0/dependencies/1199-unpin-time-dep.md similarity index 100% rename from .changelog/unreleased/dependencies/1199-unpin-time-dep.md rename to .changelog/v0.25.0/dependencies/1199-unpin-time-dep.md diff --git a/.changelog/unreleased/enhancements/1189-no-generated-wkts-in-proto.md b/.changelog/v0.25.0/enhancements/1189-no-generated-wkts-in-proto.md similarity index 100% rename from .changelog/unreleased/enhancements/1189-no-generated-wkts-in-proto.md rename to .changelog/v0.25.0/enhancements/1189-no-generated-wkts-in-proto.md diff --git a/.changelog/unreleased/enhancements/1198-tmcore-v0.34.21.md b/.changelog/v0.25.0/enhancements/1198-tmcore-v0.34.21.md similarity index 100% rename from .changelog/unreleased/enhancements/1198-tmcore-v0.34.21.md rename to .changelog/v0.25.0/enhancements/1198-tmcore-v0.34.21.md diff --git a/.changelog/v0.25.0/summary.md b/.changelog/v0.25.0/summary.md new file mode 100644 index 000000000..c8e99f4ae --- /dev/null +++ b/.changelog/v0.25.0/summary.md @@ -0,0 +1,11 @@ +*Sep 23, 2022* + +This release follows from v0.23.9, with the v0.24 series skipped due to +Tendermint Core [abandoning the v0.35 and v0.36 +releases](https://github.com/informalsystems/tendermint-rs/discussions/1179). As +such, it is a non-breaking change, and removes the need to pin one's +tendermint-rs dependencies to a specific version (as was the case for the v0.23 +series). + +This release still targets compatibility with Tendermint Core v0.34, and +specifically provides compatibility with v0.34.21. From 99100d5cbd7f7f4ea5438cbd47c565213a2317bb Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Thu, 22 Sep 2022 23:18:23 -0400 Subject: [PATCH 2/4] Build changelog Signed-off-by: Thane Thomson --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aadbd61b0..c8a8ac824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,38 @@ # CHANGELOG +## v0.25.0 + +*Sep 23, 2022* + +This release follows from v0.23.9, with the v0.24 series skipped due to +Tendermint Core [abandoning the v0.35 and v0.36 +releases](https://github.com/informalsystems/tendermint-rs/discussions/1179). As +such, it is a non-breaking change, and removes the need to pin one's +tendermint-rs dependencies to a specific version (as was the case for the v0.23 +series). + +This release still targets compatibility with Tendermint Core v0.34, and +specifically provides compatibility with v0.34.21. + +### BUG FIXES + +- `[tendermint-rpc]` Fix deserialization of `/block_results` response when it contains evidence for a duplicate vote + ([#1194](https://github.com/informalsystems/tendermint-rs/issues/1194)) + +### DEPENDENCIES + +- Unpin `time` dependency + ([#1199](https://github.com/informalsystems/tendermint-rs/pull/1199)) + +### ENHANCEMENTS + +- `[proto]` Do not generate types in `google::protobuf` + ([#1188](https://github.com/informalsystems/tendermint-rs/issues/1188)). +- Add support for [Tendermint Core + v0.34.21](https://github.com/tendermint/tendermint/blob/v0.34.21/CHANGELOG.md#v03421), + which primarily involves a small addition to the configuration file + ([#1198](https://github.com/informalsystems/tendermint-rs/pull/1198)) + ## v0.23.9 *Aug 5, 2022* From 48e79059cd0ff081ab55272756e7b02a5a8ce477 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Thu, 22 Sep 2022 23:21:35 -0400 Subject: [PATCH 3/4] Bump version to v0.25.0 Signed-off-by: Thane Thomson --- abci/Cargo.toml | 4 ++-- config/Cargo.toml | 4 ++-- light-client-js/Cargo.toml | 6 +++--- light-client-verifier/Cargo.toml | 4 ++-- light-client/Cargo.toml | 8 ++++---- light-client/src/lib.rs | 2 +- p2p/Cargo.toml | 8 ++++---- p2p/src/lib.rs | 2 +- pbt-gen/Cargo.toml | 2 +- proto/Cargo.toml | 2 +- proto/src/lib.rs | 2 +- rpc/Cargo.toml | 8 ++++---- std-ext/Cargo.toml | 2 +- tendermint/Cargo.toml | 4 ++-- tendermint/src/lib.rs | 2 +- test/Cargo.toml | 2 +- testgen/Cargo.toml | 4 ++-- tools/abci-test/Cargo.toml | 8 ++++---- tools/kvstore-test/Cargo.toml | 6 +++--- tools/rpc-probe/Cargo.toml | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/abci/Cargo.toml b/abci/Cargo.toml index 93025cd05..a7ed8f7f6 100644 --- a/abci/Cargo.toml +++ b/abci/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-abci" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" license = "Apache-2.0" @@ -33,7 +33,7 @@ binary = [ [dependencies] bytes = { version = "1.0", default-features = false } prost = { version = "0.11", default-features = false } -tendermint-proto = { version = "0.23.9", default-features = false, path = "../proto" } +tendermint-proto = { version = "0.25.0", default-features = false, path = "../proto" } tracing = { version = "0.1", default-features = false } flex-error = { version = "0.4.4", default-features = false } structopt = { version = "0.3", optional = true, default-features = false } diff --git a/config/Cargo.toml b/config/Cargo.toml index 5be649e71..7c22e49c8 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-config" -version = "0.23.9" # Also update `html_root_url` in lib.rs and +version = "0.25.0" # Also update `html_root_url` in lib.rs and # depending crates (rpc, light-node, ..) when bumping this license = "Apache-2.0" homepage = "https://www.tendermint.com/" @@ -25,7 +25,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies] -tendermint = { version = "0.23.9", default-features = false, path = "../tendermint" } +tendermint = { version = "0.25.0", default-features = false, path = "../tendermint" } flex-error = { version = "0.4.4", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/light-client-js/Cargo.toml b/light-client-js/Cargo.toml index 284484932..65b3bf4be 100644 --- a/light-client-js/Cargo.toml +++ b/light-client-js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-light-client-js" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" license = "Apache-2.0" @@ -24,8 +24,8 @@ serde = { version = "1.0", default-features = false, features = [ "derive" ] } serde_json = { version = "1.0", default-features = false } # TODO(thane): Remove once https://github.com/rustwasm/wasm-bindgen/issues/2508 is resolved syn = { version = "=1.0.65", default-features = false } -tendermint = { version = "0.23.9", default-features = false, path = "../tendermint" } -tendermint-light-client-verifier = { version = "0.23.9", default-features = false, path = "../light-client-verifier" } +tendermint = { version = "0.25.0", default-features = false, path = "../tendermint" } +tendermint-light-client-verifier = { version = "0.25.0", default-features = false, path = "../light-client-verifier" } wasm-bindgen = { version = "0.2.63", default-features = false, features = [ "serde-serialize" ] } # The `console_error_panic_hook` crate provides better debugging of panics by diff --git a/light-client-verifier/Cargo.toml b/light-client-verifier/Cargo.toml index 603cf66c2..c5d33da2b 100644 --- a/light-client-verifier/Cargo.toml +++ b/light-client-verifier/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-light-client-verifier" -version = "0.23.9" +version = "0.25.0" edition = "2021" license = "Apache-2.0" readme = "README.md" @@ -26,7 +26,7 @@ rustdoc-args = ["--cfg", "docsrs"] default = ["flex-error/std", "flex-error/eyre_tracer"] [dependencies] -tendermint = { version = "0.23.9", path = "../tendermint", default-features = false } +tendermint = { version = "0.25.0", path = "../tendermint", default-features = false } derive_more = { version = "0.99.5", default-features = false, features = ["display"] } serde = { version = "1.0.106", default-features = false } diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index 4009634b3..dd4c5c244 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-light-client" -version = "0.23.9" +version = "0.25.0" edition = "2018" license = "Apache-2.0" readme = "README.md" @@ -34,9 +34,9 @@ unstable = [] mbt = [] [dependencies] -tendermint = { version = "0.23.9", path = "../tendermint", default-features = false } -tendermint-rpc = { version = "0.23.9", path = "../rpc", default-features = false } -tendermint-light-client-verifier = { version = "0.23.9", path = "../light-client-verifier", default-features = false } +tendermint = { version = "0.25.0", path = "../tendermint", default-features = false } +tendermint-rpc = { version = "0.25.0", path = "../rpc", default-features = false } +tendermint-light-client-verifier = { version = "0.25.0", path = "../light-client-verifier", default-features = false } contracts = { version = "0.6.2", default-features = false } crossbeam-channel = { version = "0.4.2", default-features = false } diff --git a/light-client/src/lib.rs b/light-client/src/lib.rs index 44d98c3eb..5c428c40c 100644 --- a/light-client/src/lib.rs +++ b/light-client/src/lib.rs @@ -9,7 +9,7 @@ nonstandard_style )] #![doc( - html_root_url = "https://docs.rs/tendermint-light-client/0.23.9", + html_root_url = "https://docs.rs/tendermint-light-client/0.25.0", html_logo_url = "https://raw.githubusercontent.com/informalsystems/tendermint-rs/master/img/logo-tendermint-rs_3961x4001.png" )] #![cfg_attr(docsrs, feature(doc_cfg))] diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 20a856069..ee9cf581d 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-p2p" -version = "0.23.9" +version = "0.25.0" edition = "2018" license = "Apache-2.0" repository = "https://github.com/informalsystems/tendermint-rs" @@ -44,9 +44,9 @@ aead = { version = "0.4.1", default-features = false } flex-error = { version = "0.4.4", default-features = false } # path dependencies -tendermint = { path = "../tendermint", version = "0.23.9", default-features = false } -tendermint-proto = { path = "../proto", version = "0.23.9", default-features = false } -tendermint-std-ext = { path = "../std-ext", version = "0.23.9", default-features = false } +tendermint = { path = "../tendermint", version = "0.25.0", default-features = false } +tendermint-proto = { path = "../proto", version = "0.25.0", default-features = false } +tendermint-std-ext = { path = "../std-ext", version = "0.25.0", default-features = false } # optional dependencies prost-derive = { version = "0.11", optional = true } diff --git a/p2p/src/lib.rs b/p2p/src/lib.rs index 63dccd956..4be36fd63 100644 --- a/p2p/src/lib.rs +++ b/p2p/src/lib.rs @@ -20,7 +20,7 @@ unused_qualifications )] #![doc( - html_root_url = "https://docs.rs/tendermint-p2p/0.23.9", + html_root_url = "https://docs.rs/tendermint-p2p/0.25.0", html_logo_url = "https://raw.githubusercontent.com/informalsystems/tendermint-rs/master/img/logo-tendermint-rs_3961x4001.png" )] diff --git a/pbt-gen/Cargo.toml b/pbt-gen/Cargo.toml index 47f9a0523..cd5d3710b 100644 --- a/pbt-gen/Cargo.toml +++ b/pbt-gen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-pbt-gen" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" license = "Apache-2.0" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 2675dbb7b..be7b5a9e2 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-proto" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" license = "Apache-2.0" diff --git a/proto/src/lib.rs b/proto/src/lib.rs index 49e41fde6..d87c8d695 100644 --- a/proto/src/lib.rs +++ b/proto/src/lib.rs @@ -4,7 +4,7 @@ #![deny(warnings, trivial_casts, trivial_numeric_casts, unused_import_braces)] #![allow(clippy::large_enum_variant)] #![forbid(unsafe_code)] -#![doc(html_root_url = "https://docs.rs/tendermint-proto/0.23.9")] +#![doc(html_root_url = "https://docs.rs/tendermint-proto/0.25.0")] extern crate alloc; diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 8f674867b..547c49dff 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-rpc" -version = "0.23.9" +version = "0.25.0" edition = "2018" license = "Apache-2.0" homepage = "https://www.tendermint.com/" @@ -69,9 +69,9 @@ pin-project = { version = "1.0.1", default-features = false } serde = { version = "1", default-features = false, features = [ "derive" ] } serde_bytes = { version = "0.11", default-features = false } serde_json = { version = "1", default-features = false, features = ["std"] } -tendermint-config = { version = "0.23.9", path = "../config", default-features = false } -tendermint = { version = "0.23.9", default-features = false, path = "../tendermint" } -tendermint-proto = { version = "0.23.9", default-features = false, path = "../proto" } +tendermint-config = { version = "0.25.0", path = "../config", default-features = false } +tendermint = { version = "0.25.0", default-features = false, path = "../tendermint" } +tendermint-proto = { version = "0.25.0", default-features = false, path = "../proto" } thiserror = { version = "1", default-features = false } time = { version = "0.3", default-features = false, features = ["macros", "parsing"] } uuid = { version = "0.8", default-features = false } diff --git a/std-ext/Cargo.toml b/std-ext/Cargo.toml index 8191d2a08..4936ed970 100644 --- a/std-ext/Cargo.toml +++ b/std-ext/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-std-ext" -version = "0.23.9" +version = "0.25.0" edition = "2018" license = "Apache-2.0" homepage = "https://www.tendermint.com/" diff --git a/tendermint/Cargo.toml b/tendermint/Cargo.toml index 87c1eb519..9b80ecdba 100644 --- a/tendermint/Cargo.toml +++ b/tendermint/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint" -version = "0.23.9" # Also update `html_root_url` in lib.rs and +version = "0.25.0" # Also update `html_root_url` in lib.rs and # depending crates (rpc, light-node, ..) when bumping this license = "Apache-2.0" homepage = "https://www.tendermint.com/" @@ -47,7 +47,7 @@ sha2 = { version = "0.9", default-features = false } signature = { version = "1", default-features = false } subtle = { version = "2", default-features = false } subtle-encoding = { version = "0.5", default-features = false, features = ["bech32-preview"] } -tendermint-proto = { version = "0.23.9", default-features = false, path = "../proto" } +tendermint-proto = { version = "0.25.0", default-features = false, path = "../proto" } time = { version = "0.3", default-features = false, features = ["macros", "parsing"] } zeroize = { version = "1.1", default-features = false, features = ["zeroize_derive", "alloc"] } flex-error = { version = "0.4.4", default-features = false } diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs index 36f41e8b2..f57f0ac56 100644 --- a/tendermint/src/lib.rs +++ b/tendermint/src/lib.rs @@ -15,7 +15,7 @@ )] #![forbid(unsafe_code)] #![doc( - html_root_url = "https://docs.rs/tendermint/0.23.9", + html_root_url = "https://docs.rs/tendermint/0.25.0", html_logo_url = "https://raw.githubusercontent.com/informalsystems/tendermint-rs/master/img/logo-tendermint-rs_3961x4001.png" )] diff --git a/test/Cargo.toml b/test/Cargo.toml index fe378ce39..8bfdc7e61 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tendermint-test" description = "Tendermint workspace tests and common utilities for testing." -version = "0.23.9" +version = "0.25.0" edition = "2018" license = "Apache-2.0" categories = ["development", "test", "tools"] diff --git a/testgen/Cargo.toml b/testgen/Cargo.toml index 3e3a12926..05453985f 100644 --- a/testgen/Cargo.toml +++ b/testgen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-testgen" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" readme = "README.md" @@ -16,7 +16,7 @@ description = """ """ [dependencies] -tendermint = { version = "0.23.9", path = "../tendermint", features = ["clock"] } +tendermint = { version = "0.25.0", path = "../tendermint", features = ["clock"] } serde = { version = "1", default-features = false, features = ["derive"] } serde_json = { version = "1", default-features = false, features = ["std"] } ed25519-dalek = { version = "1", default-features = false } diff --git a/tools/abci-test/Cargo.toml b/tools/abci-test/Cargo.toml index d9594c59b..678814867 100644 --- a/tools/abci-test/Cargo.toml +++ b/tools/abci-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "abci-test" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" description = """ @@ -14,9 +14,9 @@ description = """ flex-error = { version = "0.4.4", default-features = false, features = ["std", "eyre_tracer"] } futures = "0.3" structopt = "0.3" -tendermint = { version = "0.23.9", path = "../../tendermint" } -tendermint-config = { version = "0.23.9", path = "../../config" } -tendermint-rpc = { version = "0.23.9", path = "../../rpc", features = [ "websocket-client" ] } +tendermint = { version = "0.25.0", path = "../../tendermint" } +tendermint-config = { version = "0.25.0", path = "../../config" } +tendermint-rpc = { version = "0.25.0", path = "../../rpc", features = [ "websocket-client" ] } tracing = "0.1" tracing-subscriber = "0.2" tokio = { version = "1.20", features = ["full"] } diff --git a/tools/kvstore-test/Cargo.toml b/tools/kvstore-test/Cargo.toml index c1deb63f5..b3635d03b 100644 --- a/tools/kvstore-test/Cargo.toml +++ b/tools/kvstore-test/Cargo.toml @@ -10,9 +10,9 @@ edition = "2018" [dev-dependencies] futures = "0.3" -tendermint = { version = "0.23.9", path = "../../tendermint" } -tendermint-light-client = { version = "0.23.9", path = "../../light-client", features = ["unstable"] } -tendermint-rpc = { version = "0.23.9", path = "../../rpc", features = [ "http-client", "websocket-client" ] } +tendermint = { version = "0.25.0", path = "../../tendermint" } +tendermint-light-client = { version = "0.25.0", path = "../../light-client", features = ["unstable"] } +tendermint-rpc = { version = "0.25.0", path = "../../rpc", features = [ "http-client", "websocket-client" ] } tokio = { version = "1.0", features = [ "rt-multi-thread", "macros" ] } tracing = "0.1" tracing-subscriber = "0.2" diff --git a/tools/rpc-probe/Cargo.toml b/tools/rpc-probe/Cargo.toml index eef233323..34825e6b4 100644 --- a/tools/rpc-probe/Cargo.toml +++ b/tools/rpc-probe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tendermint-rpc-probe" -version = "0.23.9" +version = "0.25.0" authors = ["Informal Systems "] edition = "2018" license = "Apache-2.0" From cfda309fd0f00a9b39cece3148b9f8aa5d881d14 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Fri, 23 Sep 2022 11:24:05 -0400 Subject: [PATCH 4/4] ci: Bump Tendermint image version used in kvstore integration test Signed-off-by: Thane Thomson --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e4ee01a1..4aea8308d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest services: tendermint: - image: informaldev/tendermint:0.34.20 + image: informaldev/tendermint:0.34.21 ports: - 26656:26656 - 26657:26657