Updat abci-rs to work with tendermint 0.33.0 (#10)

devashishdxt · web-flow · commit 496b1a79b19b · 2020-01-17T17:24:50.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "abci-rs"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Devashish Dixit <devashishdxt@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A Rust crate for creating ABCI applications"
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Add `abci-rs` in your `Cargo.toml`'s `dependencies` section:
 
 ```toml
 [dependencies]
-abci-rs = "0.5"
+abci-rs = "0.6"
 ```
 
 Each ABCI application has to implement three core traits corresponding to all three ABCI connections, `Consensus`,
@@ -55,8 +55,7 @@ will fail if either both of them are enabled or none of them are enabled.
 
 ## Minimum Supported Versions
 
-- Tendermint v0.32.8
-- ABCI v0.16.1
+- Tendermint: [`v0.33.0`](https://github.com/tendermint/tendermint/releases/tag/v0.33.0)
 
 ## License
 
diff --git a/gen-proto/assets/github.com/tendermint/tendermint/abci/types/abci.proto b/gen-proto/assets/github.com/tendermint/tendermint/abci/types/abci.proto
@@ -1,12 +1,14 @@
 syntax = "proto3";
-package types;
+package tendermint.abci.types;
+option go_package = "github.com/tendermint/tendermint/abci/types";
 
 // For more information on gogo.proto, see:
 // https://github.com/gogo/protobuf/blob/master/extensions.md
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/tendermint/tendermint/crypto/merkle/merkle.proto";
-import "github.com/tendermint/tendermint/libs/common/types.proto";
+import "github.com/tendermint/tendermint/libs/kv/types.proto";
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/duration.proto";
 
 // This file is copied from http://github.com/tendermint/abci
 // NOTE: When using custom types, mind the warnings.
@@ -165,7 +167,7 @@ message ResponseQuery {
   int64 index = 5;
   bytes key = 6;
   bytes value = 7;
-  merkle.Proof proof = 8;
+  tendermint.crypto.merkle.Proof proof = 8;
   int64 height = 9;
   string codespace = 10;
 }
@@ -226,10 +228,10 @@ message BlockParams {
   int64 max_gas = 2;
 }
 
-// EvidenceParams contains limits on the evidence.
 message EvidenceParams {
   // Note: must be greater than 0
-  int64 max_age = 1;
+  int64 max_age_num_blocks = 1;
+  google.protobuf.Duration max_age_duration = 2 [(gogoproto.nullable)=false, (gogoproto.stdduration)=true];
 }
 
 // ValidatorParams contains limits on validators.
@@ -244,7 +246,7 @@ message LastCommitInfo {
 
 message Event {
   string type = 1;
-  repeated common.KVPair attributes = 2 [(gogoproto.nullable)=false, (gogoproto.jsontag)="attributes,omitempty"];
+  repeated tendermint.libs.kv.Pair attributes = 2 [(gogoproto.nullable)=false, (gogoproto.jsontag)="attributes,omitempty"];
 }
 
 //----------------------------------------
@@ -256,26 +258,24 @@ message Header {
   string chain_id = 2 [(gogoproto.customname)="ChainID"];
   int64 height = 3;
   google.protobuf.Timestamp time = 4 [(gogoproto.nullable)=false, (gogoproto.stdtime)=true];
-  int64 num_txs = 5;
-  int64 total_txs = 6;
 
   // prev block info
-  BlockID last_block_id = 7 [(gogoproto.nullable)=false];
+  BlockID last_block_id = 5 [(gogoproto.nullable)=false];
 
   // hashes of block data
-  bytes last_commit_hash = 8; // commit from validators from the last block
-  bytes data_hash = 9;        // transactions
+  bytes last_commit_hash = 6; // commit from validators from the last block
+  bytes data_hash = 7;        // transactions
 
   // hashes from the app output from the prev block
-  bytes validators_hash = 10;   // validators for the current block
-  bytes next_validators_hash = 11;   // validators for the next block
-  bytes consensus_hash = 12;   // consensus params for current block
-  bytes app_hash = 13;         // state after txs from the previous block
-  bytes last_results_hash = 14;// root hash of all results from the txs from the previous block
+  bytes validators_hash = 8;   // validators for the current block
+  bytes next_validators_hash = 9;   // validators for the next block
+  bytes consensus_hash = 10;   // consensus params for current block
+  bytes app_hash = 11;         // state after txs from the previous block
+  bytes last_results_hash = 12;// root hash of all results from the txs from the previous block
 
   // consensus info
-  bytes evidence_hash = 15;    // evidence included in the block
-  bytes proposer_address = 16; // original proposer of the block
+  bytes evidence_hash = 13;    // evidence included in the block
+  bytes proposer_address = 14; // original proposer of the block
 }
 
 message Version {
diff --git a/gen-proto/assets/github.com/tendermint/tendermint/crypto/merkle/merkle.proto b/gen-proto/assets/github.com/tendermint/tendermint/crypto/merkle/merkle.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
-package merkle;
+package tendermint.crypto.merkle;
+option go_package = "github.com/tendermint/tendermint/crypto/merkle";
 
 // For more information on gogo.proto, see:
 // https://github.com/gogo/protobuf/blob/master/extensions.md
diff --git a/gen-proto/assets/github.com/tendermint/tendermint/libs/kv/types.proto b/gen-proto/assets/github.com/tendermint/tendermint/libs/kv/types.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
-package common;
+package tendermint.libs.kv;
+option go_package = "github.com/tendermint/tendermint/libs/kv";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
@@ -16,7 +17,7 @@ option (gogoproto.testgen_all) = true;
 // Abstract types
 
 // Define these here for compatibility but use tmlibs/common.KVPair.
-message KVPair {
+message Pair {
   bytes key = 1;
   bytes value = 2;
 }
diff --git a/gen-proto/assets/google/protobuf/duration.proto b/gen-proto/assets/google/protobuf/duration.proto
@@ -0,0 +1,116 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option cc_enable_arenas = true;
+option go_package = "github.com/golang/protobuf/ptypes/duration";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "DurationProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+
+// A Duration represents a signed, fixed-length span of time represented
+// as a count of seconds and fractions of seconds at nanosecond
+// resolution. It is independent of any calendar and concepts like "day"
+// or "month". It is related to Timestamp in that the difference between
+// two Timestamp values is a Duration and it can be added or subtracted
+// from a Timestamp. Range is approximately +-10,000 years.
+//
+// # Examples
+//
+// Example 1: Compute Duration from two Timestamps in pseudo code.
+//
+//     Timestamp start = ...;
+//     Timestamp end = ...;
+//     Duration duration = ...;
+//
+//     duration.seconds = end.seconds - start.seconds;
+//     duration.nanos = end.nanos - start.nanos;
+//
+//     if (duration.seconds < 0 && duration.nanos > 0) {
+//       duration.seconds += 1;
+//       duration.nanos -= 1000000000;
+//     } else if (duration.seconds > 0 && duration.nanos < 0) {
+//       duration.seconds -= 1;
+//       duration.nanos += 1000000000;
+//     }
+//
+// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
+//
+//     Timestamp start = ...;
+//     Duration duration = ...;
+//     Timestamp end = ...;
+//
+//     end.seconds = start.seconds + duration.seconds;
+//     end.nanos = start.nanos + duration.nanos;
+//
+//     if (end.nanos < 0) {
+//       end.seconds -= 1;
+//       end.nanos += 1000000000;
+//     } else if (end.nanos >= 1000000000) {
+//       end.seconds += 1;
+//       end.nanos -= 1000000000;
+//     }
+//
+// Example 3: Compute Duration from datetime.timedelta in Python.
+//
+//     td = datetime.timedelta(days=3, minutes=10)
+//     duration = Duration()
+//     duration.FromTimedelta(td)
+//
+// # JSON Mapping
+//
+// In JSON format, the Duration type is encoded as a string rather than an
+// object, where the string ends in the suffix "s" (indicating seconds) and
+// is preceded by the number of seconds, with nanoseconds expressed as
+// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
+// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
+// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
+// microsecond should be expressed in JSON format as "3.000001s".
+//
+//
+message Duration {
+  // Signed seconds of the span of time. Must be from -315,576,000,000
+  // to +315,576,000,000 inclusive. Note: these bounds are computed from:
+  // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
+  int64 seconds = 1;
+
+  // Signed fractions of a second at nanosecond resolution of the span
+  // of time. Durations less than one second are represented with a 0
+  // `seconds` field and a positive or negative `nanos` field. For durations
+  // of one second or more, a non-zero value for the `nanos` field must be
+  // of the same sign as the `seconds` field. Must be from -999,999,999
+  // to +999,999,999 inclusive.
+  int32 nanos = 2;
+}
diff --git a/gen-proto/src/main.rs b/gen-proto/src/main.rs
@@ -4,12 +4,12 @@ use bytes::Bytes;
 use protobuf_codegen_pure::{run, Args};
 use reqwest::Result;
 
-const TENDERMINT_URL: &str = "https://raw.githubusercontent.com/tendermint/tendermint/v0.32.8/";
+const TENDERMINT_URL: &str = "https://raw.githubusercontent.com/tendermint/tendermint/v0.33.0/";
 
 const FILES_TO_DOWNLOAD: [(&str, &str); 3] = [
     (
-        "libs/common/types.proto",
-        "gen-proto/assets/github.com/tendermint/tendermint/libs/common/types.proto",
+        "libs/kv/types.proto",
+        "gen-proto/assets/github.com/tendermint/tendermint/libs/kv/types.proto",
     ),
     (
         "abci/types/types.proto",
@@ -44,7 +44,7 @@ async fn main() {
         includes: &["gen-proto/assets"],
         input: &[
             "gen-proto/assets/github.com/tendermint/tendermint/abci/types/abci.proto",
-            "gen-proto/assets/github.com/tendermint/tendermint/libs/common/types.proto",
+            "gen-proto/assets/github.com/tendermint/tendermint/libs/kv/types.proto",
             "gen-proto/assets/github.com/tendermint/tendermint/crypto/merkle/merkle.proto",
         ],
         customize: Default::default(),
diff --git a/src/lib.rs b/src/lib.rs
@@ -25,7 +25,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! abci-rs = "0.5"
+//! abci-rs = "0.6"
 //! ```
 //!
 //! Each ABCI application has to implement three core traits corresponding to all three ABCI connections, `Consensus`,
@@ -54,8 +54,7 @@
 //!
 //! ## Minimum Supported Versions
 //!
-//! - Tendermint v0.32.8
-//! - ABCI v0.16.1
+//! - Tendermint: [`v0.33.0`](https://github.com/tendermint/tendermint/releases/tag/v0.33.0)
 #![cfg_attr(feature = "doc", feature(doc_cfg))]
 
 #[cfg(all(feature = "async-std", feature = "tokio"))]
diff --git a/src/proto/abci.rs b/src/proto/abci.rs
diff --git a/src/proto/merkle.rs b/src/proto/merkle.rs
diff --git a/src/proto/types.rs b/src/proto/types.rs
diff --git a/src/types/misc.rs b/src/types/misc.rs
