proto: update proto files & add third_party (#116)

abci updated to 0.33

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG
 
-January 2, 2020_
+_January 2, 2020_
 
 Special thanks to external contributors on this release: @devashishdxt
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "abci"
-version = "0.6.5"
+version = "0.7.0"
 authors = ["Adrian Brink <adrian@brink-holdings.com>", "Jackson Lewis <st.japa6@gmail.com>", "Dave Bryson", "Tomas Tauber"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -13,7 +13,7 @@ include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
 bytes = "0.4"
-protobuf = "= 2.10.0"
+protobuf = "= 2.10.2"
 byteorder = "1.3.2"
 integer-encoding = "1.0.5"
 log = "0.4.8"
@@ -22,4 +22,4 @@ tokio = { version = "0.1", default-features = false, features = ["codec", "io",
 futures = "0.3"
 
 [build-dependencies]
-protobuf-codegen-pure = "= 2.10.0"
+protobuf-codegen-pure = "= 2.10.2"

Makefile

@@ -1,17 +1,18 @@
 # Origin
-version_branch = v0.32.8
+version_branch = v0.33.1
 tendermint = https://raw.githubusercontent.com/tendermint/tendermint/$(version_branch)
 
 # Outputs
-tmkv = protobuf/github.com/tendermint/tendermint/libs/common/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:
 	curl $(tendermint)/abci/types/types.proto > $(tmabci)
-	curl $(tendermint)/libs/common/types.proto > $(tmkv)
+	curl $(tendermint)/libs/kv/types.proto > $(tmkv)
 	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)

build.rs

@@ -5,8 +5,8 @@ fn main() {
         out_dir: "src/messages",
         input: &[
             "protobuf/abci.proto",
-            "protobuf/github.com/tendermint/tendermint/libs/common/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 {