From 595377fac78d9b7ad5089fdb587d0d5ff579dfa0 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Sat, 7 May 2022 12:47:38 -0400 Subject: [PATCH] Rename ExtendedCommit vote_extension field to extension for consistency with domain types Signed-off-by: Thane Thomson --- proto/tendermint/types/types.pb.go | 216 +++++++++++++++-------------- proto/tendermint/types/types.proto | 6 +- types/block.go | 4 +- 3 files changed, 117 insertions(+), 109 deletions(-) diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 6cf7437f8..fcfbc01f5 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -794,13 +794,17 @@ func (m *ExtendedCommit) GetExtendedSignatures() []ExtendedCommitSig { return nil } +// ExtendedCommitSig retains all the same fields as CommitSig but adds vote +// extension-related fields. type ExtendedCommitSig struct { - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` - ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` - VoteExtension []byte `protobuf:"bytes,5,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` - ExtensionSignature []byte `protobuf:"bytes,6,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + // Vote extension data + Extension []byte `protobuf:"bytes,5,opt,name=extension,proto3" json:"extension,omitempty"` + // Vote extension signature + ExtensionSignature []byte `protobuf:"bytes,6,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` } func (m *ExtendedCommitSig) Reset() { *m = ExtendedCommitSig{} } @@ -864,9 +868,9 @@ func (m *ExtendedCommitSig) GetSignature() []byte { return nil } -func (m *ExtendedCommitSig) GetVoteExtension() []byte { +func (m *ExtendedCommitSig) GetExtension() []byte { if m != nil { - return m.VoteExtension + return m.Extension } return nil } @@ -1227,95 +1231,95 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1406 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcd, 0x6f, 0x1b, 0x55, - 0x10, 0xcf, 0xda, 0xeb, 0xaf, 0xb1, 0x9d, 0x38, 0x8f, 0xb4, 0x75, 0xdd, 0xc6, 0xb1, 0x5c, 0x01, - 0x69, 0x41, 0x4e, 0x49, 0x11, 0x1f, 0x07, 0x0e, 0xb6, 0xe3, 0xb6, 0x56, 0x13, 0xc7, 0xac, 0xdd, - 0x22, 0x7a, 0x59, 0xad, 0xbd, 0xaf, 0xf6, 0x52, 0x7b, 0x77, 0xb5, 0xfb, 0x1c, 0x9c, 0xfe, 0x05, - 0x28, 0xa7, 0x9e, 0xb8, 0xe5, 0x04, 0x07, 0xee, 0x1c, 0x38, 0x21, 0x21, 0x4e, 0x3d, 0xf6, 0x06, - 0x17, 0x0a, 0xa4, 0x12, 0x7f, 0x07, 0x7a, 0x1f, 0xfb, 0xe1, 0x38, 0xa6, 0x55, 0x55, 0x81, 0xc4, - 0xc5, 0x7a, 0x6f, 0xe6, 0x37, 0xf3, 0xe6, 0xcd, 0xfc, 0xde, 0x78, 0x16, 0x2e, 0x13, 0x6c, 0xea, - 0xd8, 0x19, 0x1b, 0x26, 0xd9, 0x22, 0x87, 0x36, 0x76, 0xf9, 0x6f, 0xc5, 0x76, 0x2c, 0x62, 0xa1, - 0x5c, 0xa0, 0xad, 0x30, 0x79, 0x61, 0x6d, 0x60, 0x0d, 0x2c, 0xa6, 0xdc, 0xa2, 0x2b, 0x8e, 0x2b, - 0x6c, 0x0c, 0x2c, 0x6b, 0x30, 0xc2, 0x5b, 0x6c, 0xd7, 0x9b, 0x3c, 0xd8, 0x22, 0xc6, 0x18, 0xbb, - 0x44, 0x1b, 0xdb, 0x02, 0xb0, 0x1e, 0x3a, 0xa6, 0xef, 0x1c, 0xda, 0xc4, 0xa2, 0x58, 0xeb, 0x81, - 0x50, 0x17, 0x43, 0xea, 0x03, 0xec, 0xb8, 0x86, 0x65, 0x86, 0xe3, 0x28, 0x94, 0xe6, 0xa2, 0x3c, - 0xd0, 0x46, 0x86, 0xae, 0x11, 0xcb, 0xe1, 0x88, 0xf2, 0xc7, 0x90, 0x6d, 0x6b, 0x0e, 0xe9, 0x60, - 0x72, 0x1b, 0x6b, 0x3a, 0x76, 0xd0, 0x1a, 0xc4, 0x88, 0x45, 0xb4, 0x51, 0x5e, 0x2a, 0x49, 0x9b, - 0x59, 0x85, 0x6f, 0x10, 0x02, 0x79, 0xa8, 0xb9, 0xc3, 0x7c, 0xa4, 0x24, 0x6d, 0x66, 0x14, 0xb6, - 0x2e, 0x0f, 0x41, 0xa6, 0xa6, 0xd4, 0xc2, 0x30, 0x75, 0x3c, 0xf5, 0x2c, 0xd8, 0x86, 0x4a, 0x7b, - 0x87, 0x04, 0xbb, 0xc2, 0x84, 0x6f, 0xd0, 0xfb, 0x10, 0x63, 0xf1, 0xe7, 0xa3, 0x25, 0x69, 0x33, - 0xbd, 0x9d, 0xaf, 0x84, 0x12, 0xc5, 0xef, 0x57, 0x69, 0x53, 0x7d, 0x4d, 0x7e, 0xf2, 0x6c, 0x63, - 0x49, 0xe1, 0xe0, 0xf2, 0x08, 0x12, 0xb5, 0x91, 0xd5, 0x7f, 0xd8, 0xdc, 0xf1, 0x03, 0x91, 0x82, - 0x40, 0xd0, 0x1e, 0xac, 0xd8, 0x9a, 0x43, 0x54, 0x17, 0x13, 0x75, 0xc8, 0x6e, 0xc1, 0x0e, 0x4d, - 0x6f, 0x6f, 0x54, 0x4e, 0xd7, 0xa1, 0x32, 0x73, 0x59, 0x71, 0x4a, 0xd6, 0x0e, 0x0b, 0xcb, 0x7f, - 0xc9, 0x10, 0x17, 0xc9, 0xf8, 0x04, 0x12, 0x22, 0xad, 0xec, 0xc0, 0xf4, 0xf6, 0x7a, 0xd8, 0xa3, - 0x50, 0x55, 0xea, 0x96, 0xe9, 0x62, 0xd3, 0x9d, 0xb8, 0xc2, 0x9f, 0x67, 0x83, 0xde, 0x82, 0x64, - 0x7f, 0xa8, 0x19, 0xa6, 0x6a, 0xe8, 0x2c, 0xa2, 0x54, 0x2d, 0x7d, 0xf2, 0x6c, 0x23, 0x51, 0xa7, - 0xb2, 0xe6, 0x8e, 0x92, 0x60, 0xca, 0xa6, 0x8e, 0xce, 0x43, 0x7c, 0x88, 0x8d, 0xc1, 0x90, 0xb0, - 0xb4, 0x44, 0x15, 0xb1, 0x43, 0x1f, 0x81, 0x4c, 0x09, 0x91, 0x97, 0xd9, 0xd9, 0x85, 0x0a, 0x67, - 0x4b, 0xc5, 0x63, 0x4b, 0xa5, 0xeb, 0xb1, 0xa5, 0x96, 0xa4, 0x07, 0x3f, 0xfe, 0x7d, 0x43, 0x52, - 0x98, 0x05, 0xaa, 0x43, 0x76, 0xa4, 0xb9, 0x44, 0xed, 0xd1, 0xb4, 0xd1, 0xe3, 0x63, 0xcc, 0xc5, - 0xc5, 0xf9, 0x84, 0x88, 0xc4, 0x8a, 0xd0, 0xd3, 0xd4, 0x8a, 0x8b, 0x74, 0xb4, 0x09, 0x39, 0xe6, - 0xa4, 0x6f, 0x8d, 0xc7, 0x06, 0x51, 0x59, 0xde, 0xe3, 0x2c, 0xef, 0xcb, 0x54, 0x5e, 0x67, 0xe2, - 0xdb, 0xb4, 0x02, 0x97, 0x20, 0xa5, 0x6b, 0x44, 0xe3, 0x90, 0x04, 0x83, 0x24, 0xa9, 0x80, 0x29, - 0xdf, 0x86, 0x15, 0x9f, 0x75, 0x2e, 0x87, 0x24, 0xb9, 0x97, 0x40, 0xcc, 0x80, 0xd7, 0x61, 0xcd, - 0xc4, 0x53, 0xa2, 0x9e, 0x46, 0xa7, 0x18, 0x1a, 0x51, 0xdd, 0xbd, 0x59, 0x8b, 0x37, 0x61, 0xb9, - 0xef, 0x25, 0x9f, 0x63, 0x81, 0x61, 0xb3, 0xbe, 0x94, 0xc1, 0x2e, 0x42, 0x52, 0xb3, 0x6d, 0x0e, - 0x48, 0x33, 0x40, 0x42, 0xb3, 0x6d, 0xa6, 0xba, 0x06, 0xab, 0xec, 0x8e, 0x0e, 0x76, 0x27, 0x23, - 0x22, 0x9c, 0x64, 0x18, 0x66, 0x85, 0x2a, 0x14, 0x2e, 0x67, 0xd8, 0x2b, 0x90, 0xc5, 0x07, 0x86, - 0x8e, 0xcd, 0x3e, 0xe6, 0xb8, 0x2c, 0xc3, 0x65, 0x3c, 0x21, 0x03, 0x5d, 0x85, 0x9c, 0xed, 0x58, - 0xb6, 0xe5, 0x62, 0x47, 0xd5, 0x74, 0xdd, 0xc1, 0xae, 0x9b, 0x5f, 0xe6, 0xfe, 0x3c, 0x79, 0x95, - 0x8b, 0xcb, 0x79, 0x90, 0x77, 0x34, 0xa2, 0xa1, 0x1c, 0x44, 0xc9, 0xd4, 0xcd, 0x4b, 0xa5, 0xe8, - 0x66, 0x46, 0xa1, 0xcb, 0xf2, 0x0f, 0x51, 0x90, 0xef, 0x59, 0x04, 0xa3, 0x1b, 0x20, 0xd3, 0x32, - 0x31, 0xf6, 0x2d, 0x9f, 0xc5, 0xe7, 0x8e, 0x31, 0x30, 0xb1, 0xbe, 0xe7, 0x0e, 0xba, 0x87, 0x36, - 0x56, 0x18, 0x38, 0x44, 0xa7, 0xc8, 0x0c, 0x9d, 0xd6, 0x20, 0xe6, 0x58, 0x13, 0x53, 0x67, 0x2c, - 0x8b, 0x29, 0x7c, 0x83, 0x1a, 0x90, 0xf4, 0x59, 0x22, 0xbf, 0x88, 0x25, 0x2b, 0x94, 0x25, 0x94, - 0xc3, 0x42, 0xa0, 0x24, 0x7a, 0x82, 0x2c, 0x35, 0x48, 0xf9, 0xcd, 0x4b, 0xb0, 0xed, 0xe5, 0x08, - 0x1b, 0x98, 0xa1, 0x77, 0x60, 0xd5, 0xaf, 0xbd, 0x9f, 0x3c, 0xce, 0xb8, 0x9c, 0xaf, 0x10, 0xd9, - 0x9b, 0xa1, 0x95, 0xca, 0x1b, 0x50, 0x82, 0xdd, 0x2b, 0xa0, 0x55, 0x93, 0x75, 0xa2, 0xcb, 0x90, - 0x72, 0x8d, 0x81, 0xa9, 0x91, 0x89, 0x83, 0x05, 0xf3, 0x02, 0x01, 0xd5, 0xe2, 0x29, 0xc1, 0x26, - 0x7b, 0xe4, 0x9c, 0x69, 0x81, 0x00, 0x6d, 0xc1, 0x1b, 0xfe, 0x46, 0x0d, 0xbc, 0x70, 0x96, 0x21, - 0x5f, 0xd5, 0xf1, 0x34, 0xe5, 0x9f, 0x24, 0x88, 0xf3, 0x87, 0x11, 0x2a, 0x83, 0x74, 0x76, 0x19, - 0x22, 0x8b, 0xca, 0x10, 0x7d, 0xf5, 0x32, 0x54, 0x01, 0xfc, 0x30, 0xdd, 0xbc, 0x5c, 0x8a, 0x6e, - 0xa6, 0xb7, 0x2f, 0xcd, 0x3b, 0xe2, 0x21, 0x76, 0x8c, 0x81, 0x78, 0xf7, 0x21, 0xa3, 0xf2, 0x6f, - 0x12, 0xa4, 0x7c, 0x3d, 0xaa, 0x42, 0xd6, 0x8b, 0x4b, 0x7d, 0x30, 0xd2, 0x06, 0x82, 0x8a, 0xeb, - 0x0b, 0x83, 0xbb, 0x39, 0xd2, 0x06, 0x4a, 0x5a, 0xc4, 0x43, 0x37, 0x67, 0x97, 0x35, 0xb2, 0xa0, - 0xac, 0x33, 0x3c, 0x8a, 0xbe, 0x1a, 0x8f, 0x66, 0x2a, 0x2e, 0x9f, 0xaa, 0x78, 0xf9, 0x4f, 0x09, - 0x96, 0x1b, 0x53, 0x16, 0xbe, 0xfe, 0x5f, 0x96, 0xea, 0xbe, 0xe0, 0x96, 0x8e, 0x75, 0x75, 0xae, - 0x66, 0x57, 0xe6, 0x3d, 0xce, 0xc6, 0x1c, 0xd4, 0x0e, 0x79, 0x5e, 0x3a, 0x41, 0x0d, 0x7f, 0x8c, - 0xc0, 0xea, 0x1c, 0xfe, 0xff, 0x57, 0x4b, 0xfa, 0x07, 0x70, 0x60, 0x11, 0xac, 0x06, 0x4f, 0x38, - 0xc6, 0xff, 0x00, 0xa8, 0xb4, 0xf1, 0xa2, 0x67, 0x1c, 0x5f, 0xf8, 0x8c, 0xbf, 0x8f, 0x40, 0xb2, - 0xcd, 0xda, 0xb5, 0x36, 0xfa, 0x37, 0x9a, 0xf0, 0x25, 0x48, 0xd9, 0xd6, 0x48, 0xe5, 0x1a, 0x99, - 0x69, 0x92, 0xb6, 0x35, 0x52, 0xe6, 0xf8, 0x16, 0x7b, 0x4d, 0x1d, 0x3a, 0xfe, 0x1a, 0xaa, 0x91, - 0x38, 0xfd, 0xb2, 0x1c, 0xc8, 0xf0, 0x54, 0x88, 0xf1, 0xe9, 0x3a, 0xcd, 0x01, 0x9b, 0xc7, 0xa4, - 0xf9, 0x71, 0x8f, 0x87, 0xcd, 0x91, 0x8a, 0xc0, 0x51, 0x0b, 0x3e, 0x6d, 0x88, 0x09, 0x2e, 0xbf, - 0xa8, 0x75, 0x29, 0x02, 0x57, 0xfe, 0x5a, 0x02, 0xd8, 0xa5, 0x99, 0x65, 0xf7, 0xa5, 0x83, 0x8f, - 0xcb, 0x42, 0x50, 0x67, 0x4e, 0x2e, 0x2e, 0x2a, 0x9a, 0x38, 0x3f, 0xe3, 0x86, 0xe3, 0xae, 0x43, - 0x36, 0x20, 0xb9, 0x8b, 0xbd, 0x60, 0xce, 0x70, 0xe2, 0xcf, 0x23, 0x1d, 0x4c, 0x94, 0xcc, 0x41, - 0x68, 0x57, 0xfe, 0x59, 0x82, 0x14, 0x8b, 0x69, 0x0f, 0x13, 0x6d, 0xa6, 0x86, 0xd2, 0xab, 0xd7, - 0x70, 0x1d, 0x80, 0xbb, 0x71, 0x8d, 0x47, 0x58, 0x30, 0x2b, 0xc5, 0x24, 0x1d, 0xe3, 0x11, 0x46, - 0x1f, 0xf8, 0x09, 0x8f, 0xfe, 0x73, 0xc2, 0x45, 0xeb, 0xf0, 0xd2, 0x7e, 0x01, 0x12, 0xe6, 0x64, - 0xac, 0xd2, 0x29, 0x44, 0xe6, 0x6c, 0x35, 0x27, 0xe3, 0xee, 0xd4, 0x2d, 0x7f, 0x01, 0x89, 0xee, - 0x94, 0x4d, 0xe4, 0x94, 0xa2, 0x8e, 0x65, 0x89, 0x31, 0x90, 0x8f, 0xdf, 0x49, 0x2a, 0x60, 0x53, - 0x0f, 0x02, 0x99, 0xce, 0x7b, 0xde, 0xf7, 0x01, 0x5d, 0xa3, 0xca, 0x4b, 0xce, 0xfa, 0x62, 0xca, - 0xbf, 0xf6, 0x8b, 0x04, 0xe9, 0x50, 0xdf, 0x41, 0xef, 0xc1, 0xb9, 0xda, 0xee, 0x7e, 0xfd, 0x8e, - 0xda, 0xdc, 0x51, 0x6f, 0xee, 0x56, 0x6f, 0xa9, 0x77, 0x5b, 0x77, 0x5a, 0xfb, 0x9f, 0xb5, 0x72, - 0x4b, 0x85, 0xf3, 0x47, 0xc7, 0x25, 0x14, 0xc2, 0xde, 0x35, 0x1f, 0x9a, 0xd6, 0x97, 0xf4, 0x9d, - 0xaf, 0xcd, 0x9a, 0x54, 0x6b, 0x9d, 0x46, 0xab, 0x9b, 0x93, 0x0a, 0xe7, 0x8e, 0x8e, 0x4b, 0xab, - 0x21, 0x8b, 0x6a, 0xcf, 0xc5, 0x26, 0x99, 0x37, 0xa8, 0xef, 0xef, 0xed, 0x35, 0xbb, 0xb9, 0xc8, - 0x9c, 0x81, 0xf8, 0xa7, 0xb8, 0x0a, 0xab, 0xb3, 0x06, 0xad, 0xe6, 0x6e, 0x2e, 0x5a, 0x40, 0x47, - 0xc7, 0xa5, 0xe5, 0x10, 0xba, 0x65, 0x8c, 0x0a, 0xc9, 0xaf, 0xbe, 0x29, 0x2e, 0x7d, 0xf7, 0x6d, - 0x51, 0xa2, 0x37, 0xcb, 0xce, 0xf4, 0x08, 0xf4, 0x2e, 0x5c, 0xe8, 0x34, 0x6f, 0xb5, 0x1a, 0x3b, - 0xea, 0x5e, 0xe7, 0x96, 0xda, 0xfd, 0xbc, 0xdd, 0x08, 0xdd, 0x6e, 0xe5, 0xe8, 0xb8, 0x94, 0x16, - 0x57, 0x5a, 0x84, 0x6e, 0x2b, 0x8d, 0x7b, 0xfb, 0xdd, 0x46, 0x4e, 0xe2, 0xe8, 0xb6, 0x83, 0x69, - 0xc7, 0x63, 0xe8, 0xeb, 0x70, 0xf1, 0x0c, 0xb4, 0x7f, 0xb1, 0xd5, 0xa3, 0xe3, 0x52, 0xb6, 0xed, - 0x60, 0xfe, 0x7e, 0x98, 0x45, 0x05, 0xf2, 0xf3, 0x16, 0xfb, 0xed, 0xfd, 0x4e, 0x75, 0x37, 0x57, - 0x2a, 0xe4, 0x8e, 0x8e, 0x4b, 0x19, 0xaf, 0x19, 0x52, 0x7c, 0x70, 0xb3, 0xda, 0xa7, 0x4f, 0x4e, - 0x8a, 0xd2, 0xd3, 0x93, 0xa2, 0xf4, 0xc7, 0x49, 0x51, 0x7a, 0xfc, 0xbc, 0xb8, 0xf4, 0xf4, 0x79, - 0x71, 0xe9, 0xd7, 0xe7, 0xc5, 0xa5, 0xfb, 0x1f, 0x0e, 0x0c, 0x32, 0x9c, 0xf4, 0x2a, 0x7d, 0x6b, - 0xbc, 0x15, 0xfe, 0x0a, 0x0d, 0x96, 0xfc, 0x6b, 0xf8, 0xf4, 0x17, 0x6a, 0x2f, 0xce, 0xe4, 0x37, - 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xc1, 0x59, 0xe9, 0x62, 0x0f, 0x00, 0x00, + // 1396 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4b, 0x6f, 0x1b, 0xd5, + 0x17, 0xcf, 0xd8, 0xe3, 0xd7, 0xb1, 0x9d, 0x38, 0xf7, 0x9f, 0xb6, 0xae, 0xdb, 0x38, 0x96, 0xab, + 0x3f, 0xa4, 0x05, 0x39, 0x25, 0x45, 0x3c, 0x16, 0x2c, 0x6c, 0xc7, 0x6d, 0xad, 0x26, 0x8e, 0x19, + 0xbb, 0x45, 0x74, 0x33, 0x1a, 0x7b, 0x6e, 0xed, 0xa1, 0xf6, 0xcc, 0x68, 0xe6, 0x3a, 0x38, 0xfd, + 0x04, 0x28, 0xab, 0xae, 0xd8, 0x65, 0x05, 0x0b, 0xf6, 0x20, 0xb1, 0x45, 0xac, 0xba, 0xec, 0x0e, + 0x36, 0x14, 0x48, 0x25, 0x3e, 0x07, 0xba, 0x8f, 0x19, 0xcf, 0xc4, 0x31, 0x54, 0x51, 0x05, 0x12, + 0x9b, 0x68, 0xee, 0x39, 0xbf, 0x73, 0xee, 0x79, 0xfc, 0xee, 0xc9, 0x31, 0x5c, 0x25, 0xd8, 0xd4, + 0xb1, 0x33, 0x36, 0x4c, 0xb2, 0x45, 0x0e, 0x6d, 0xec, 0xf2, 0xbf, 0x15, 0xdb, 0xb1, 0x88, 0x85, + 0x72, 0x33, 0x6d, 0x85, 0xc9, 0x0b, 0x6b, 0x03, 0x6b, 0x60, 0x31, 0xe5, 0x16, 0xfd, 0xe2, 0xb8, + 0xc2, 0xc6, 0xc0, 0xb2, 0x06, 0x23, 0xbc, 0xc5, 0x4e, 0xbd, 0xc9, 0xa3, 0x2d, 0x62, 0x8c, 0xb1, + 0x4b, 0xb4, 0xb1, 0x2d, 0x00, 0xeb, 0x81, 0x6b, 0xfa, 0xce, 0xa1, 0x4d, 0x2c, 0x8a, 0xb5, 0x1e, + 0x09, 0x75, 0x31, 0xa0, 0x3e, 0xc0, 0x8e, 0x6b, 0x58, 0x66, 0x30, 0x8e, 0x42, 0x69, 0x2e, 0xca, + 0x03, 0x6d, 0x64, 0xe8, 0x1a, 0xb1, 0x1c, 0x8e, 0x28, 0x7f, 0x08, 0xd9, 0xb6, 0xe6, 0x90, 0x0e, + 0x26, 0x77, 0xb1, 0xa6, 0x63, 0x07, 0xad, 0x41, 0x8c, 0x58, 0x44, 0x1b, 0xe5, 0xa5, 0x92, 0xb4, + 0x99, 0x55, 0xf8, 0x01, 0x21, 0x90, 0x87, 0x9a, 0x3b, 0xcc, 0x47, 0x4a, 0xd2, 0x66, 0x46, 0x61, + 0xdf, 0xe5, 0x21, 0xc8, 0xd4, 0x94, 0x5a, 0x18, 0xa6, 0x8e, 0xa7, 0x9e, 0x05, 0x3b, 0x50, 0x69, + 0xef, 0x90, 0x60, 0x57, 0x98, 0xf0, 0x03, 0x7a, 0x17, 0x62, 0x2c, 0xfe, 0x7c, 0xb4, 0x24, 0x6d, + 0xa6, 0xb7, 0xf3, 0x95, 0x40, 0xa1, 0x78, 0x7e, 0x95, 0x36, 0xd5, 0xd7, 0xe4, 0x67, 0x2f, 0x36, + 0x96, 0x14, 0x0e, 0x2e, 0x8f, 0x20, 0x51, 0x1b, 0x59, 0xfd, 0xc7, 0xcd, 0x1d, 0x3f, 0x10, 0x69, + 0x16, 0x08, 0xda, 0x83, 0x15, 0x5b, 0x73, 0x88, 0xea, 0x62, 0xa2, 0x0e, 0x59, 0x16, 0xec, 0xd2, + 0xf4, 0xf6, 0x46, 0xe5, 0x74, 0x1f, 0x2a, 0xa1, 0x64, 0xc5, 0x2d, 0x59, 0x3b, 0x28, 0x2c, 0xff, + 0x21, 0x43, 0x5c, 0x14, 0xe3, 0x23, 0x48, 0x88, 0xb2, 0xb2, 0x0b, 0xd3, 0xdb, 0xeb, 0x41, 0x8f, + 0x42, 0x55, 0xa9, 0x5b, 0xa6, 0x8b, 0x4d, 0x77, 0xe2, 0x0a, 0x7f, 0x9e, 0x0d, 0x7a, 0x03, 0x92, + 0xfd, 0xa1, 0x66, 0x98, 0xaa, 0xa1, 0xb3, 0x88, 0x52, 0xb5, 0xf4, 0xc9, 0x8b, 0x8d, 0x44, 0x9d, + 0xca, 0x9a, 0x3b, 0x4a, 0x82, 0x29, 0x9b, 0x3a, 0xba, 0x08, 0xf1, 0x21, 0x36, 0x06, 0x43, 0xc2, + 0xca, 0x12, 0x55, 0xc4, 0x09, 0x7d, 0x00, 0x32, 0x25, 0x44, 0x5e, 0x66, 0x77, 0x17, 0x2a, 0x9c, + 0x2d, 0x15, 0x8f, 0x2d, 0x95, 0xae, 0xc7, 0x96, 0x5a, 0x92, 0x5e, 0xfc, 0xf4, 0xd7, 0x0d, 0x49, + 0x61, 0x16, 0xa8, 0x0e, 0xd9, 0x91, 0xe6, 0x12, 0xb5, 0x47, 0xcb, 0x46, 0xaf, 0x8f, 0x31, 0x17, + 0x97, 0xe7, 0x0b, 0x22, 0x0a, 0x2b, 0x42, 0x4f, 0x53, 0x2b, 0x2e, 0xd2, 0xd1, 0x26, 0xe4, 0x98, + 0x93, 0xbe, 0x35, 0x1e, 0x1b, 0x44, 0x65, 0x75, 0x8f, 0xb3, 0xba, 0x2f, 0x53, 0x79, 0x9d, 0x89, + 0xef, 0xd2, 0x0e, 0x5c, 0x81, 0x94, 0xae, 0x11, 0x8d, 0x43, 0x12, 0x0c, 0x92, 0xa4, 0x02, 0xa6, + 0x7c, 0x13, 0x56, 0x7c, 0xd6, 0xb9, 0x1c, 0x92, 0xe4, 0x5e, 0x66, 0x62, 0x06, 0xbc, 0x09, 0x6b, + 0x26, 0x9e, 0x12, 0xf5, 0x34, 0x3a, 0xc5, 0xd0, 0x88, 0xea, 0x1e, 0x84, 0x2d, 0xfe, 0x0f, 0xcb, + 0x7d, 0xaf, 0xf8, 0x1c, 0x0b, 0x0c, 0x9b, 0xf5, 0xa5, 0x0c, 0x76, 0x19, 0x92, 0x9a, 0x6d, 0x73, + 0x40, 0x9a, 0x01, 0x12, 0x9a, 0x6d, 0x33, 0xd5, 0x0d, 0x58, 0x65, 0x39, 0x3a, 0xd8, 0x9d, 0x8c, + 0x88, 0x70, 0x92, 0x61, 0x98, 0x15, 0xaa, 0x50, 0xb8, 0x9c, 0x61, 0xaf, 0x41, 0x16, 0x1f, 0x18, + 0x3a, 0x36, 0xfb, 0x98, 0xe3, 0xb2, 0x0c, 0x97, 0xf1, 0x84, 0x0c, 0x74, 0x1d, 0x72, 0xb6, 0x63, + 0xd9, 0x96, 0x8b, 0x1d, 0x55, 0xd3, 0x75, 0x07, 0xbb, 0x6e, 0x7e, 0x99, 0xfb, 0xf3, 0xe4, 0x55, + 0x2e, 0x2e, 0xe7, 0x41, 0xde, 0xd1, 0x88, 0x86, 0x72, 0x10, 0x25, 0x53, 0x37, 0x2f, 0x95, 0xa2, + 0x9b, 0x19, 0x85, 0x7e, 0x96, 0xbf, 0x8f, 0x82, 0xfc, 0xc0, 0x22, 0x18, 0xdd, 0x02, 0x99, 0xb6, + 0x89, 0xb1, 0x6f, 0xf9, 0x2c, 0x3e, 0x77, 0x8c, 0x81, 0x89, 0xf5, 0x3d, 0x77, 0xd0, 0x3d, 0xb4, + 0xb1, 0xc2, 0xc0, 0x01, 0x3a, 0x45, 0x42, 0x74, 0x5a, 0x83, 0x98, 0x63, 0x4d, 0x4c, 0x9d, 0xb1, + 0x2c, 0xa6, 0xf0, 0x03, 0x6a, 0x40, 0xd2, 0x67, 0x89, 0xfc, 0x77, 0x2c, 0x59, 0xa1, 0x2c, 0xa1, + 0x1c, 0x16, 0x02, 0x25, 0xd1, 0x13, 0x64, 0xa9, 0x41, 0xca, 0x1f, 0x5e, 0x82, 0x6d, 0xaf, 0x46, + 0xd8, 0x99, 0x19, 0x7a, 0x0b, 0x56, 0xfd, 0xde, 0xfb, 0xc5, 0xe3, 0x8c, 0xcb, 0xf9, 0x0a, 0x51, + 0xbd, 0x10, 0xad, 0x54, 0x3e, 0x80, 0x12, 0x2c, 0xaf, 0x19, 0xad, 0x9a, 0x6c, 0x12, 0x5d, 0x85, + 0x94, 0x6b, 0x0c, 0x4c, 0x8d, 0x4c, 0x1c, 0x2c, 0x98, 0x37, 0x13, 0x50, 0x2d, 0x9e, 0x12, 0x6c, + 0xb2, 0x47, 0xce, 0x99, 0x36, 0x13, 0xa0, 0x2d, 0xf8, 0x9f, 0x7f, 0x50, 0x67, 0x5e, 0x38, 0xcb, + 0x90, 0xaf, 0xea, 0x78, 0x9a, 0xf2, 0x0f, 0x12, 0xc4, 0xf9, 0xc3, 0x08, 0xb4, 0x41, 0x3a, 0xbb, + 0x0d, 0x91, 0x45, 0x6d, 0x88, 0x9e, 0xbf, 0x0d, 0x55, 0x00, 0x3f, 0x4c, 0x37, 0x2f, 0x97, 0xa2, + 0x9b, 0xe9, 0xed, 0x2b, 0xf3, 0x8e, 0x78, 0x88, 0x1d, 0x63, 0x20, 0xde, 0x7d, 0xc0, 0xa8, 0xfc, + 0x8b, 0x04, 0x29, 0x5f, 0x8f, 0xaa, 0x90, 0xf5, 0xe2, 0x52, 0x1f, 0x8d, 0xb4, 0x81, 0xa0, 0xe2, + 0xfa, 0xc2, 0xe0, 0x6e, 0x8f, 0xb4, 0x81, 0x92, 0x16, 0xf1, 0xd0, 0xc3, 0xd9, 0x6d, 0x8d, 0x2c, + 0x68, 0x6b, 0x88, 0x47, 0xd1, 0xf3, 0xf1, 0x28, 0xd4, 0x71, 0xf9, 0x54, 0xc7, 0xcb, 0xbf, 0x4b, + 0xb0, 0xdc, 0x98, 0xb2, 0xf0, 0xf5, 0x7f, 0xb3, 0x55, 0x0f, 0x05, 0xb7, 0x74, 0xac, 0xab, 0x73, + 0x3d, 0xbb, 0x36, 0xef, 0x31, 0x1c, 0xf3, 0xac, 0x77, 0xc8, 0xf3, 0xd2, 0x99, 0xf5, 0xf0, 0xbb, + 0x08, 0xac, 0xce, 0xe1, 0xff, 0x7b, 0xbd, 0x0c, 0xbf, 0xde, 0xd8, 0x2b, 0xbe, 0xde, 0xf8, 0xc2, + 0xd7, 0xfb, 0x6d, 0x04, 0x92, 0x6d, 0x36, 0xa5, 0xb5, 0xd1, 0x3f, 0x31, 0x7b, 0xaf, 0x40, 0xca, + 0xb6, 0x46, 0x2a, 0xd7, 0xc8, 0x4c, 0x93, 0xb4, 0xad, 0x91, 0x32, 0x47, 0xb3, 0xd8, 0x6b, 0x1a, + 0xcc, 0xf1, 0xd7, 0xd0, 0x84, 0xc4, 0xe9, 0x07, 0xe5, 0x40, 0x86, 0x97, 0x42, 0x6c, 0x4d, 0x37, + 0x69, 0x0d, 0xd8, 0x1a, 0x26, 0xcd, 0x6f, 0x79, 0x3c, 0x6c, 0x8e, 0x54, 0x04, 0x8e, 0x5a, 0xf0, + 0x25, 0x43, 0x2c, 0x6e, 0xf9, 0x45, 0x13, 0x4b, 0x11, 0xb8, 0xf2, 0x97, 0x12, 0xc0, 0x2e, 0xad, + 0x2c, 0xcb, 0x97, 0xee, 0x3b, 0x2e, 0x0b, 0x41, 0x0d, 0xdd, 0x5c, 0x5c, 0xd4, 0x34, 0x71, 0x7f, + 0xc6, 0x0d, 0xc6, 0x5d, 0x87, 0xec, 0x8c, 0xdb, 0x2e, 0xf6, 0x82, 0x39, 0xc3, 0x89, 0xbf, 0x86, + 0x74, 0x30, 0x51, 0x32, 0x07, 0x81, 0x53, 0xf9, 0x47, 0x09, 0x52, 0x2c, 0xa6, 0x3d, 0x4c, 0xb4, + 0x50, 0x0f, 0xa5, 0xf3, 0xf7, 0x70, 0x1d, 0x80, 0xbb, 0x71, 0x8d, 0x27, 0x58, 0x30, 0x2b, 0xc5, + 0x24, 0x1d, 0xe3, 0x09, 0x46, 0xef, 0xf9, 0x05, 0x8f, 0xfe, 0x75, 0xc1, 0xc5, 0xc4, 0xf0, 0xca, + 0x7e, 0x09, 0x12, 0xe6, 0x64, 0xac, 0xd2, 0xe5, 0x43, 0xe6, 0x6c, 0x35, 0x27, 0xe3, 0xee, 0xd4, + 0x2d, 0x7f, 0x06, 0x89, 0xee, 0x94, 0x2d, 0xe2, 0x94, 0xa2, 0x8e, 0x65, 0x89, 0xed, 0x8f, 0x6f, + 0xdd, 0x49, 0x2a, 0x60, 0xcb, 0x0e, 0x02, 0x99, 0xae, 0x79, 0xde, 0xcf, 0x02, 0xfa, 0x8d, 0x2a, + 0xaf, 0xb8, 0xe2, 0x8b, 0xe5, 0xfe, 0xc6, 0x4f, 0x12, 0xa4, 0x03, 0xe3, 0x06, 0xbd, 0x03, 0x17, + 0x6a, 0xbb, 0xfb, 0xf5, 0x7b, 0x6a, 0x73, 0x47, 0xbd, 0xbd, 0x5b, 0xbd, 0xa3, 0xde, 0x6f, 0xdd, + 0x6b, 0xed, 0x7f, 0xd2, 0xca, 0x2d, 0x15, 0x2e, 0x1e, 0x1d, 0x97, 0x50, 0x00, 0x7b, 0xdf, 0x7c, + 0x6c, 0x5a, 0x9f, 0xd3, 0x77, 0xbe, 0x16, 0x36, 0xa9, 0xd6, 0x3a, 0x8d, 0x56, 0x37, 0x27, 0x15, + 0x2e, 0x1c, 0x1d, 0x97, 0x56, 0x03, 0x16, 0xd5, 0x9e, 0x8b, 0x4d, 0x32, 0x6f, 0x50, 0xdf, 0xdf, + 0xdb, 0x6b, 0x76, 0x73, 0x91, 0x39, 0x03, 0xf1, 0x0f, 0xe2, 0x3a, 0xac, 0x86, 0x0d, 0x5a, 0xcd, + 0xdd, 0x5c, 0xb4, 0x80, 0x8e, 0x8e, 0x4b, 0xcb, 0x01, 0x74, 0xcb, 0x18, 0x15, 0x92, 0x5f, 0x7c, + 0x55, 0x5c, 0xfa, 0xe6, 0xeb, 0xa2, 0x44, 0x33, 0xcb, 0x86, 0x66, 0x04, 0x7a, 0x1b, 0x2e, 0x75, + 0x9a, 0x77, 0x5a, 0x8d, 0x1d, 0x75, 0xaf, 0x73, 0x47, 0xed, 0x7e, 0xda, 0x6e, 0x04, 0xb2, 0x5b, + 0x39, 0x3a, 0x2e, 0xa5, 0x45, 0x4a, 0x8b, 0xd0, 0x6d, 0xa5, 0xf1, 0x60, 0xbf, 0xdb, 0xc8, 0x49, + 0x1c, 0xdd, 0x76, 0xf0, 0x81, 0x45, 0x30, 0x43, 0xdf, 0x84, 0xcb, 0x67, 0xa0, 0xfd, 0xc4, 0x56, + 0x8f, 0x8e, 0x4b, 0xd9, 0xb6, 0x83, 0xf9, 0xfb, 0x61, 0x16, 0x15, 0xc8, 0xcf, 0x5b, 0xec, 0xb7, + 0xf7, 0x3b, 0xd5, 0xdd, 0x5c, 0xa9, 0x90, 0x3b, 0x3a, 0x2e, 0x65, 0xbc, 0x61, 0x48, 0xf1, 0xb3, + 0xcc, 0x6a, 0x1f, 0x3f, 0x3b, 0x29, 0x4a, 0xcf, 0x4f, 0x8a, 0xd2, 0x6f, 0x27, 0x45, 0xe9, 0xe9, + 0xcb, 0xe2, 0xd2, 0xf3, 0x97, 0xc5, 0xa5, 0x9f, 0x5f, 0x16, 0x97, 0x1e, 0xbe, 0x3f, 0x30, 0xc8, + 0x70, 0xd2, 0xab, 0xf4, 0xad, 0xf1, 0x56, 0xf0, 0xc7, 0xe7, 0xec, 0x93, 0xff, 0x08, 0x3e, 0xfd, + 0xc3, 0xb4, 0x17, 0x67, 0xf2, 0x5b, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x46, 0xcf, 0x37, 0x28, + 0x59, 0x0f, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1876,10 +1880,10 @@ func (m *ExtendedCommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - if len(m.VoteExtension) > 0 { - i -= len(m.VoteExtension) - copy(dAtA[i:], m.VoteExtension) - i = encodeVarintTypes(dAtA, i, uint64(len(m.VoteExtension))) + if len(m.Extension) > 0 { + i -= len(m.Extension) + copy(dAtA[i:], m.Extension) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Extension))) i-- dAtA[i] = 0x2a } @@ -2438,7 +2442,7 @@ func (m *ExtendedCommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.VoteExtension) + l = len(m.Extension) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -4461,7 +4465,7 @@ func (m *ExtendedCommitSig) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Extension", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4488,9 +4492,9 @@ func (m *ExtendedCommitSig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.VoteExtension = append(m.VoteExtension[:0], dAtA[iNdEx:postIndex]...) - if m.VoteExtension == nil { - m.VoteExtension = []byte{} + m.Extension = append(m.Extension[:0], dAtA[iNdEx:postIndex]...) + if m.Extension == nil { + m.Extension = []byte{} } iNdEx = postIndex case 6: diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 7e7e6f3af..52668f719 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -150,13 +150,17 @@ message ExtendedCommit { repeated ExtendedCommitSig extended_signatures = 4 [(gogoproto.nullable) = false]; } +// ExtendedCommitSig retains all the same fields as CommitSig but adds vote +// extension-related fields. message ExtendedCommitSig { BlockIDFlag block_id_flag = 1; bytes validator_address = 2; google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes signature = 4; - bytes vote_extension = 5; + // Vote extension data + bytes extension = 5; + // Vote extension signature bytes extension_signature = 6; } diff --git a/types/block.go b/types/block.go index 1208f65e3..2e3b67e37 100644 --- a/types/block.go +++ b/types/block.go @@ -787,7 +787,7 @@ func (ecs *ExtendedCommitSig) ToProto() *tmproto.ExtendedCommitSig { ValidatorAddress: ecs.ValidatorAddress, Timestamp: ecs.Timestamp, Signature: ecs.Signature, - VoteExtension: ecs.Extension, + Extension: ecs.Extension, ExtensionSignature: ecs.ExtensionSignature, } } @@ -800,7 +800,7 @@ func (ecs *ExtendedCommitSig) FromProto(ecsp tmproto.ExtendedCommitSig) error { ecs.ValidatorAddress = ecsp.ValidatorAddress ecs.Timestamp = ecsp.Timestamp ecs.Signature = ecsp.Signature - ecs.Extension = ecsp.VoteExtension + ecs.Extension = ecsp.Extension ecs.ExtensionSignature = ecsp.ExtensionSignature return ecs.ValidateBasic()