From c978c29515b94194155a4b6b80505b17de8001fc Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Thu, 17 Mar 2022 17:57:05 -0400 Subject: [PATCH] Move CanonicalVoteExtension to canonical types proto defs Signed-off-by: Thane Thomson --- proto/tendermint/abci/types.proto | 10 ---------- proto/tendermint/types/canonical.proto | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index c67bb1329..4a0d092be 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -451,16 +451,6 @@ message ExtendedVoteInfo { bytes vote_extension = 3; } -// CanonicalVoteExtension -// TODO: move this to core Tendermint data structures -message CanonicalVoteExtension { - bytes extension = 1; - int64 height = 2; - int32 round = 3; - string chain_id = 4; - bytes address = 5; -} - enum EvidenceType { UNKNOWN = 0; DUPLICATE_VOTE = 1; diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index e88fd6ffe..38bb0600a 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -35,3 +35,12 @@ message CanonicalVote { google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; } + +// CanonicalVoteExtension +message CanonicalVoteExtension { + bytes extension = 1; + int64 height = 2; + int32 round = 3; + string chain_id = 4; + bytes address = 5; +}