Merge branch 'master' into tm_update_1

go.sum

@@ -487,9 +487,24 @@ github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RM
 github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk=
 github.com/tendermint/go-amino v0.15.1 h1:D2uk35eT4iTsvJd9jWIetzthE5C0/k2QmMFkCN+4JgQ=
 github.com/tendermint/go-amino v0.15.1/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
+github.com/tendermint/iavl v0.13.2/go.mod h1:vE1u0XAGXYjHykd4BLp8p/yivrw2PF1TuoljBcsQoGA=
+github.com/tendermint/iavl v0.14.0 h1:Jkff+IFrXxRWtH9Jn/ga/2cxNnzMTv58xEKgCJsKUBg=
+github.com/tendermint/iavl v0.14.0/go.mod h1:QmfViflFiXzxKLQE4tAUuWQHq+RSuQFxablW5oJZ6sE=
+github.com/tendermint/tendermint v0.33.2 h1:NzvRMTuXJxqSsFed2J7uHmMU5N1CVzSpfi3nCc882KY=
+github.com/tendermint/tendermint v0.33.2/go.mod h1:25DqB7YvV1tN3tHsjWoc2vFtlwICfrub9XO6UBO+4xk=
+github.com/tendermint/tendermint v0.33.5 h1:jYgRd9ImkzA9iOyhpmgreYsqSB6tpDa6/rXYPb8HKE8=
+github.com/tendermint/tendermint v0.33.5/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
+github.com/tendermint/tendermint v0.33.7 h1:b5CQD8ggDtl4u0EbXzabi0MaOw9NrcXker6ijEkAE74=
+github.com/tendermint/tendermint v0.33.7/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
+github.com/tendermint/tendermint v0.33.8 h1:Xxu4QhpqcomSE0iQDw1MqLgfsa8fqtPtWFJK6zZOVso=
+github.com/tendermint/tendermint v0.33.8/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
 github.com/tendermint/tendermint v0.34.0-rc2/go.mod h1:+AG8ftE2PD4uMVzGSB7c0oH9xbTlIyMeoX0M9r89x3Y=
 github.com/tendermint/tendermint v0.34.0-rc2.0.20200806175020-3413a0dbd8c3 h1:kiV2No1WgLdtz1qXiVCMkPX1uA66o/fbQyyVDtBXXOQ=
 github.com/tendermint/tendermint v0.34.0-rc2.0.20200806175020-3413a0dbd8c3/go.mod h1:CGdv8jV1jV96tRRkvjQqh3ddnxO2ffaB5B1OFIOv1YM=
+github.com/tendermint/tm-db v0.4.1/go.mod h1:JsJ6qzYkCGiGwm5GHl/H5GLI9XLb6qZX7PRe425dHAY=
+github.com/tendermint/tm-db v0.5.0/go.mod h1:lSq7q5WRR/njf1LnhiZ/lIJHk2S8Y1Zyq5oP/3o9C2U=
+github.com/tendermint/tm-db v0.5.1 h1:H9HDq8UEA7Eeg13kdYckkgwwkQLBnJGgX4PgLJRhieY=
+github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4=
 github.com/tendermint/tm-db v0.6.0 h1:Us30k7H1UDcdqoSPhmP8ztAW/SWV6c6OfsfeCiboTC4=
 github.com/tendermint/tm-db v0.6.0/go.mod h1:xj3AWJ08kBDlCHKijnhJ7mTcDMOikT1r8Poxy2pJn7Q=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=

proto/cosmos/base/abci/v1beta1/abci.proto

@@ -8,7 +8,6 @@ import "google/protobuf/any.proto";
 option go_package                       = "github.com/cosmos/cosmos-sdk/types";
 option (gogoproto.goproto_stringer_all) = false;
 
-
 // TxResponse defines a structure containing relevant tx data and metadata. The
 // tags are stringified and the log is JSON decoded.
 message TxResponse {
@@ -35,7 +34,7 @@ message TxResponse {
   int64 gas_used = 10;
   // The request transaction bytes.
   google.protobuf.Any tx = 11;
-  // Time of the previous block. For heights > 1, it's the weighted median of the 
+  // Time of the previous block. For heights > 1, it's the weighted median of the
   // timestamps of the valid votes in the block.LastCommit. For height == 1, it's genesis time.
   string timestamp = 12;
 }
@@ -45,7 +44,7 @@ message ABCIMessageLog {
   option (gogoproto.stringer) = true;
 
   uint32 msg_index = 1;
-  string log = 2;
+  string log       = 2;
 
   // Events contains a slice of Event objects that were emitted during some
   // execution.
@@ -57,14 +56,14 @@ message ABCIMessageLog {
 message StringEvent {
   option (gogoproto.stringer) = true;
 
-  string type = 1;
+  string             type       = 1;
   repeated Attribute attributes = 2 [(gogoproto.nullable) = false];
 }
 
 // Attribute defines an attribute wrapper where the key and value are
 // strings instead of raw bytes.
 message Attribute {
-  string key = 1;
+  string key   = 1;
   string value = 2;
 }
 
@@ -115,50 +114,3 @@ message TxMsgData {
 
   repeated MsgData data = 1;
 }
-
-// TxResponse defines a structure containing relevant tx data and metadata. The
-// tags are stringified and the log is JSON decoded.
-message TxResponse {
-  option (gogoproto.goproto_getters) = false;
-
-  int64                   height     = 1;
-  string                  txhash     = 2 [(gogoproto.customname) = "TxHash"];
-  string                  codespace  = 3;
-  uint32                  code       = 4;
-  string                  data       = 5;
-  string                  raw_log    = 6;
-  repeated ABCIMessageLog logs       = 7 [(gogoproto.castrepeated) = "ABCIMessageLogs", (gogoproto.nullable) = false];
-  string                  info       = 8;
-  int64                   gas_wanted = 9;
-  int64                   gas_used   = 10;
-  google.protobuf.Any     tx         = 11;
-  string                  timestamp  = 12;
-}
-
-// ABCIMessageLog defines a structure containing an indexed tx ABCI message log.
-message ABCIMessageLog {
-  option (gogoproto.stringer) = true;
-
-  uint32 msg_index = 1;
-  string log       = 2;
-
-  // Events contains a slice of Event objects that were emitted during some
-  // execution.
-  repeated StringEvent events = 3 [(gogoproto.castrepeated) = "StringEvents", (gogoproto.nullable) = false];
-}
-
-// StringAttribute defines en Event object wrapper where all the attributes
-// contain key/value pairs that are strings instead of raw bytes.
-message StringEvent {
-  option (gogoproto.stringer) = true;
-
-  string             type       = 1;
-  repeated Attribute attributes = 2 [(gogoproto.nullable) = false];
-}
-
-// Attribute defines an attribute wrapper where the key and value are
-// strings instead of raw bytes.
-message Attribute {
-  string key   = 1;
-  string value = 2;
-}

proto/cosmos/staking/v1beta1/staking.proto

@@ -9,106 +9,6 @@ import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types";
 
-// MsgCreateValidator defines an SDK message for creating a new validator.
-message MsgCreateValidator {
-  option (gogoproto.equal) = true;
-
-  Description     description         = 1 [(gogoproto.nullable) = false];
-  CommissionRates commission          = 2 [(gogoproto.nullable) = false];
-  string          min_self_delegation = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.moretags)   = "yaml:\"min_self_delegation\"",
-    (gogoproto.nullable)   = false
-  ];
-  bytes delegator_address = 4 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-    (gogoproto.moretags) = "yaml:\"delegator_address\""
-  ];
-  bytes validator_address = 5 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_address\""
-  ];
-  string      pubkey = 6;
-  cosmos.Coin value  = 7 [(gogoproto.nullable) = false];
-}
-
-// MsgEditValidator defines an SDK message for editing an existing validator.
-message MsgEditValidator {
-  option (gogoproto.equal) = true;
-
-  Description description       = 1 [(gogoproto.nullable) = false];
-  bytes       validator_address = 2 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"address\""
-  ];
-
-  // We pass a reference to the new commission rate and min self delegation as
-  // it's not mandatory to update. If not updated, the deserialized rate will be
-  // zero with no way to distinguish if an update was intended.
-  //
-  // REF: #2373
-  string commission_rate = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.moretags)   = "yaml:\"commission_rate\""
-  ];
-  string min_self_delegation = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.moretags)   = "yaml:\"min_self_delegation\""
-  ];
-}
-
-// MsgDelegate defines an SDK message for performing a delegation from a
-// delegate to a validator.
-message MsgDelegate {
-  option (gogoproto.equal) = true;
-
-  bytes delegator_address = 1 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-    (gogoproto.moretags) = "yaml:\"delegator_address\""
-  ];
-  bytes validator_address = 2 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_address\""
-  ];
-  cosmos.Coin amount = 3 [(gogoproto.nullable) = false];
-}
-
-// MsgBeginRedelegate defines an SDK message for performing a redelegation from
-// a delegate and source validator to a destination validator.
-message MsgBeginRedelegate {
-  option (gogoproto.equal) = true;
-
-  bytes delegator_address = 1 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-    (gogoproto.moretags) = "yaml:\"delegator_address\""
-  ];
-  bytes validator_src_address = 2 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_src_address\""
-  ];
-  bytes validator_dst_address = 3 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_dst_address\""
-  ];
-  cosmos.Coin amount = 4 [(gogoproto.nullable) = false];
-}
-
-// MsgUndelegate defines an SDK message for performing an undelegation from a
-// delegate and a validator.
-message MsgUndelegate {
-  option (gogoproto.equal) = true;
-
-  bytes delegator_address = 1 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-    (gogoproto.moretags) = "yaml:\"delegator_address\""
-  ];
-  bytes validator_address = 2 [
-    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_address\""
-  ];
-  cosmos.Coin amount = 3 [(gogoproto.nullable) = false];
-}
-
 // HistoricalInfo contains the historical information that gets stored at
 // each height.
 message HistoricalInfo {
@@ -209,7 +109,7 @@ message Validator {
 // ValAddresses defines a repeated set of validator addresses.
 message ValAddresses {
   option (gogoproto.goproto_stringer) = false;
-  option (gogoproto.stringer) = true;
+  option (gogoproto.stringer)         = true;
 
   repeated bytes addresses = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"];
 }