Merge branch 'develop' into abci-rs

CHANGELOG.md

@@ -1,16 +1,24 @@
 # CHANGELOG
 
-_January 24, 2020_
+_TBD_
 
-## v0.7.0
+## v0.8.0
 
 - Restructures `abci` to use latest `async`/`await` functionality (new design is based on https://github.com/devashishdxt/abci-rs,
   read documentation for more information)
-- Updates minimum supported tendermint version to `v0.33.0`
 - [Issue #30](https://github.com/tendermint/rust-abci/issues/30): Adds support for unix sockets
 - [Issue #107](https://github.com/tendermint/rust-abci/issues/107): Updates `tokio` to `v0.2`
 - Adds support for `async-std` executor to drive `Future`s.
 
+_March 3, 2020_
+
+## v0.7.0
+
+### BREAKING CHANGES:
+
+- [\#116](https://github.com/tendermint/rust-abci/pull/116): Tendermint 0.33.\*'s ABCI compatibility
+
+
 _January 2, 2020_
 
 Special thanks to external contributors on this release: @devashishdxt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "abci"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Adrian Brink <[email protected]>", "Jackson Lewis <[email protected]>", "Dave Bryson", "Tomas Tauber"]
 edition = "2018"
 license = "MIT/Apache-2.0"

Makefile

@@ -1,11 +1,12 @@
 # Origin
-version_branch = v0.33.0
+version_branch = v0.33.1
 tendermint = https://raw.githubusercontent.com/tendermint/tendermint/$(version_branch)
 
 # Outputs
-tmkv = protobuf/github.com/tendermint/tendermint/libs/kv/types.proto
-tmmerkle = protobuf/github.com/tendermint/tendermint/crypto/merkle/merkle.proto
-tmabci = protobuf/github.com/tendermint/tendermint/abci/types/types.proto
+tmkv = protobuf/libs/kv/types.proto
+tmmerkle = protobuf/crypto/merkle/merkle.proto
+tmabci = protobuf/abci/types/types.proto
+third_party = protobuf/third_party/proto/gogoproto/gogo.proto
 
 # You *only* need to run this to rebuild protobufs from the tendermint source
 update-proto:
@@ -14,4 +15,4 @@ update-proto:
 	curl $(tendermint)/crypto/merkle/merkle.proto > $(tmmerkle)
 	sed 's@package types;@package abci;@' $(tmabci) > protobuf/abci.proto
 	curl $(tendermint)/version/version.go | grep -F -eTMCoreSem -eABCISemVer > version.txt
-
+	curl $(tendermint)/$(third_party) > $(third_party)

README.md

@@ -12,7 +12,7 @@ applications for [Tendermint](https://github.com/tendermint/tendermint/).
 
 ## Supported Version
 
-- Tendermint 0.33.0
+- Tendermint 0.33.1
 - ABCI 0.16.1
 
 ## Usage
@@ -21,7 +21,7 @@ Add `abci` in your `Cargo.toml`'s `dependencies` section:
 
 ```toml
 [dependencies]
-abci = "0.7"
+abci = "0.8"
 ```
 
 Each ABCI application has to implement three core traits corresponding to all three ABCI connections, `Consensus`,
@@ -75,8 +75,8 @@ For a real life example of an ABCI application you can checkout [Cosmos SDK](htt
 
 | Tendermint | Rust-abci |
 | ---------- | :-------: |
-| 0.33.0     |   0.7.0   |
-| 0.32.7     |   0.6.4   |
+| 0.33.1     |   0.7.0   |
+| 0.32.9     |   0.6.5   |
 | 0.31.7     |   0.5.4   |
 
 ## Documentation

build.rs

@@ -5,8 +5,8 @@ fn main() {
         out_dir: "src/proto",
         input: &[
             "protobuf/abci.proto",
-            "protobuf/github.com/tendermint/tendermint/libs/kv/types.proto",
-            "protobuf/github.com/tendermint/tendermint/crypto/merkle/merkle.proto",
+            "protobuf/libs/kv/types.proto",
+            "protobuf/crypto/merkle/merkle.proto",
         ],
         includes: &["protobuf"],
         customize: protobuf_codegen_pure::Customize {