mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-22 07:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

proto/types: use fixed-length 64-bit integers for rounds in CanonicalVoteExtension

Browse Source 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
This commit is contained in:
Thane Thomson
2022-04-14 16:40:03 -04:00
parent 77ac2b3c08
commit c89890b111
3 changed files with 60 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/tendermint/types/canonical.pb.go
+55 -71
View File
@@ -312,8 +312,8 @@ func (m *CanonicalVote) GetChainID() string {
// a particular validator such that we can sign over those serialized bytes.
type CanonicalVoteExtension struct {
Extension []byte `protobuf:"bytes,1,opt,name=extension,proto3" json:"extension,omitempty"`
Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"`
Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"`
Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"`
ChainId string `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
}
@@ -364,7 +364,7 @@ func (m *CanonicalVoteExtension) GetHeight() int64 {
return 0
}
func (m *CanonicalVoteExtension) GetRound() int32 {
func (m *CanonicalVoteExtension) GetRound() int64 {
if m != nil {
return m.Round
}
@@ -389,40 +389,40 @@ func init() {
func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) }
var fileDescriptor_8d1a1a84ff7267ed = []byte{
// 528 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
0x10, 0xc6, 0xe3, 0xc4, 0x49, 0xec, 0x6d, 0x03, 0x61, 0x55, 0x55, 0x26, 0xaa, 0x6c, 0xcb, 0x07,
0x64, 0x2e, 0xb6, 0xd4, 0x1e, 0xb8, 0xbb, 0x20, 0x11, 0x04, 0xa2, 0xb8, 0x55, 0x0f, 0x5c, 0xa2,
0x8d, 0xbd, 0xd8, 0x16, 0x8e, 0xd7, 0xb2, 0x37, 0x12, 0xbd, 0xc0, 0x2b, 0xf4, 0x39, 0x78, 0x92,
0x1e, 0x7b, 0x84, 0x4b, 0x40, 0xce, 0x8b, 0xa0, 0x5d, 0xff, 0x55, 0x5a, 0xf5, 0x02, 0xe2, 0x12,
0xed, 0xcc, 0x7c, 0x3b, 0xf3, 0xe9, 0x37, 0xf1, 0x02, 0x9d, 0xe2, 0xc4, 0xc7, 0xd9, 0x2a, 0x4a,
0xa8, 0x4d, 0xaf, 0x52, 0x9c, 0xdb, 0x1e, 0x4a, 0x48, 0x12, 0x79, 0x28, 0xb6, 0xd2, 0x8c, 0x50,
0x02, 0xa7, 0xad, 0xc2, 0xe2, 0x8a, 0xd9, 0x41, 0x40, 0x02, 0xc2, 0x8b, 0x36, 0x3b, 0x95, 0xba,
0xd9, 0xd1, 0x9d, 0x4e, 0xfc, 0xb7, 0xaa, 0x6a, 0x01, 0x21, 0x41, 0x8c, 0x6d, 0x1e, 0x2d, 0xd7,
0x9f, 0x6c, 0x1a, 0xad, 0x70, 0x4e, 0xd1, 0x2a, 0x2d, 0x05, 0xc6, 0x57, 0x30, 0x3d, 0xad, 0x27,
0x3b, 0x31, 0xf1, 0x3e, 0xcf, 0x5f, 0x42, 0x08, 0xc4, 0x10, 0xe5, 0xa1, 0x22, 0xe8, 0x82, 0xb9,
0xef, 0xf2, 0x33, 0xbc, 0x04, 0x8f, 0x53, 0x94, 0xd1, 0x45, 0x8e, 0xe9, 0x22, 0xc4, 0xc8, 0xc7,
0x99, 0xd2, 0xd7, 0x05, 0x73, 0xef, 0xd8, 0xb4, 0x76, 0x8d, 0x5a, 0x4d, 0xc3, 0x33, 0x94, 0xd1,
0x73, 0x4c, 0x5f, 0x73, 0xbd, 0x23, 0xde, 0x6c, 0xb4, 0x9e, 0x3b, 0x49, 0xbb, 0x49, 0xc3, 0x01,
0x87, 0xf7, 0xcb, 0xe1, 0x01, 0x18, 0x52, 0x42, 0x51, 0xcc, 0x6d, 0x4c, 0xdc, 0x32, 0x68, 0xbc,
0xf5, 0x5b, 0x6f, 0xc6, 0xcf, 0x3e, 0x78, 0xd2, 0x36, 0xc9, 0x48, 0x4a, 0x72, 0x14, 0xc3, 0x13,
0x20, 0x32, 0x3b, 0xfc, 0xfa, 0xa3, 0x63, 0xed, 0xae, 0xcd, 0xf3, 0x28, 0x48, 0xb0, 0xff, 0x2e,
0x0f, 0x2e, 0xae, 0x52, 0xec, 0x72, 0x31, 0x3c, 0x04, 0xa3, 0x10, 0x47, 0x41, 0x48, 0xf9, 0x80,
0xa9, 0x5b, 0x45, 0xcc, 0x4c, 0x46, 0xd6, 0x89, 0xaf, 0x0c, 0x78, 0xba, 0x0c, 0xe0, 0x73, 0x20,
0xa7, 0x24, 0x5e, 0x94, 0x15, 0x51, 0x17, 0xcc, 0x81, 0xb3, 0x5f, 0x6c, 0x34, 0xe9, 0xec, 0xfd,
0x5b, 0x97, 0xe5, 0x5c, 0x29, 0x25, 0x31, 0x3f, 0xc1, 0x37, 0x40, 0x5a, 0x32, 0xbc, 0x8b, 0xc8,
0x57, 0x86, 0x1c, 0x9c, 0xf1, 0x00, 0xb8, 0x6a, 0x13, 0xce, 0x5e, 0xb1, 0xd1, 0xc6, 0x55, 0xe0,
0x8e, 0x79, 0x83, 0xb9, 0x0f, 0x1d, 0x20, 0x37, 0x6b, 0x54, 0x46, 0xbc, 0xd9, 0xcc, 0x2a, 0x17,
0x6d, 0xd5, 0x8b, 0xb6, 0x2e, 0x6a, 0x85, 0x23, 0x31, 0xee, 0xd7, 0xbf, 0x34, 0xc1, 0x6d, 0xaf,
0xc1, 0x67, 0x40, 0xf2, 0x42, 0x14, 0x25, 0xcc, 0xcf, 0x58, 0x17, 0x4c, 0xb9, 0x9c, 0x75, 0xca,
0x72, 0x6c, 0x16, 0x2f, 0xce, 0x7d, 0xe3, 0x7b, 0x1f, 0x4c, 0x1a, 0x5b, 0x97, 0x84, 0xe2, 0xff,
0xc1, 0xb5, 0x0b, 0x4b, 0xfc, 0x97, 0xb0, 0x86, 0x7f, 0x0f, 0x6b, 0xf4, 0x00, 0xac, 0x6f, 0x9d,
0x3f, 0x33, 0x63, 0xf5, 0xea, 0x0b, 0xc5, 0x49, 0x1e, 0x91, 0x04, 0x1e, 0x01, 0x19, 0xd7, 0x41,
0xf5, 0x5d, 0xb5, 0x89, 0x1d, 0x3a, 0x83, 0xfb, 0xe9, 0x0c, 0x6b, 0x3a, 0x4f, 0x3b, 0x6e, 0x18,
0x1d, 0xb9, 0x31, 0xe0, 0x7c, 0xb8, 0x29, 0x54, 0xe1, 0xb6, 0x50, 0x85, 0xdf, 0x85, 0x2a, 0x5c,
0x6f, 0xd5, 0xde, 0xed, 0x56, 0xed, 0xfd, 0xd8, 0xaa, 0xbd, 0x8f, 0x2f, 0x82, 0x88, 0x86, 0xeb,
0xa5, 0xe5, 0x91, 0x95, 0xdd, 0x7d, 0x31, 0xda, 0x63, 0xf9, 0xb2, 0xec, 0xbe, 0x26, 0xcb, 0x11,
0xcf, 0x9f, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xa0, 0x6a, 0x61, 0xb2, 0x04, 0x00, 0x00,
// 523 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
0x10, 0x8d, 0x53, 0x27, 0xb1, 0xb7, 0x0d, 0x84, 0x55, 0x55, 0x99, 0xa8, 0xb2, 0x2d, 0x1f, 0x90,
0xb9, 0xd8, 0x52, 0x7b, 0xe0, 0xee, 0x82, 0x44, 0x10, 0x88, 0xe2, 0x56, 0x3d, 0x70, 0x89, 0x36,
0xf6, 0x62, 0x5b, 0x38, 0xde, 0x95, 0xbd, 0x91, 0xe8, 0x05, 0x7e, 0xa1, 0xdf, 0xc1, 0x97, 0xf4,
0xd8, 0x23, 0x5c, 0x02, 0x72, 0x7e, 0x04, 0xed, 0xda, 0xb1, 0xad, 0x16, 0x55, 0x42, 0x20, 0x2e,
0xd1, 0xcc, 0x9b, 0xb7, 0x33, 0x4f, 0x6f, 0xe2, 0x01, 0x26, 0xc3, 0x59, 0x88, 0xf3, 0x65, 0x92,
0x31, 0x97, 0x5d, 0x52, 0x5c, 0xb8, 0x01, 0xca, 0x48, 0x96, 0x04, 0x28, 0x75, 0x68, 0x4e, 0x18,
0x81, 0x93, 0x96, 0xe1, 0x08, 0xc6, 0x74, 0x3f, 0x22, 0x11, 0x11, 0x45, 0x97, 0x47, 0x15, 0x6f,
0x7a, 0x78, 0xa7, 0x93, 0xf8, 0xad, 0xab, 0x46, 0x44, 0x48, 0x94, 0x62, 0x57, 0x64, 0x8b, 0xd5,
0x07, 0x97, 0x25, 0x4b, 0x5c, 0x30, 0xb4, 0xa4, 0x15, 0xc1, 0xfa, 0x0c, 0x26, 0x27, 0xdb, 0xc9,
0x5e, 0x4a, 0x82, 0x8f, 0xb3, 0xe7, 0x10, 0x02, 0x39, 0x46, 0x45, 0xac, 0x49, 0xa6, 0x64, 0xef,
0xf9, 0x22, 0x86, 0x17, 0xe0, 0x21, 0x45, 0x39, 0x9b, 0x17, 0x98, 0xcd, 0x63, 0x8c, 0x42, 0x9c,
0x6b, 0x7d, 0x53, 0xb2, 0x77, 0x8f, 0x6c, 0xe7, 0xb6, 0x50, 0xa7, 0x69, 0x78, 0x8a, 0x72, 0x76,
0x86, 0xd9, 0x4b, 0xc1, 0xf7, 0xe4, 0xeb, 0xb5, 0xd1, 0xf3, 0xc7, 0xb4, 0x0b, 0x5a, 0x1e, 0x38,
0xf8, 0x3d, 0x1d, 0xee, 0x83, 0x01, 0x23, 0x0c, 0xa5, 0x42, 0xc6, 0xd8, 0xaf, 0x92, 0x46, 0x5b,
0xbf, 0xd5, 0x66, 0x7d, 0xef, 0x83, 0x47, 0x6d, 0x93, 0x9c, 0x50, 0x52, 0xa0, 0x14, 0x1e, 0x03,
0x99, 0xcb, 0x11, 0xcf, 0x1f, 0x1c, 0x19, 0x77, 0x65, 0x9e, 0x25, 0x51, 0x86, 0xc3, 0x37, 0x45,
0x74, 0x7e, 0x49, 0xb1, 0x2f, 0xc8, 0xf0, 0x00, 0x0c, 0x63, 0x9c, 0x44, 0x31, 0x13, 0x03, 0x26,
0x7e, 0x9d, 0x71, 0x31, 0x39, 0x59, 0x65, 0xa1, 0xb6, 0x23, 0xe0, 0x2a, 0x81, 0x4f, 0x81, 0x4a,
0x49, 0x3a, 0xaf, 0x2a, 0xb2, 0x29, 0xd9, 0x3b, 0xde, 0x5e, 0xb9, 0x36, 0x94, 0xd3, 0xb7, 0xaf,
0x7d, 0x8e, 0xf9, 0x0a, 0x25, 0xa9, 0x88, 0xe0, 0x2b, 0xa0, 0x2c, 0xb8, 0xbd, 0xf3, 0x24, 0xd4,
0x06, 0xc2, 0x38, 0xeb, 0x1e, 0xe3, 0xea, 0x4d, 0x78, 0xbb, 0xe5, 0xda, 0x18, 0xd5, 0x89, 0x3f,
0x12, 0x0d, 0x66, 0x21, 0xf4, 0x80, 0xda, 0xac, 0x51, 0x1b, 0x8a, 0x66, 0x53, 0xa7, 0x5a, 0xb4,
0xb3, 0x5d, 0xb4, 0x73, 0xbe, 0x65, 0x78, 0x0a, 0xf7, 0xfd, 0xea, 0x87, 0x21, 0xf9, 0xed, 0x33,
0xf8, 0x04, 0x28, 0x41, 0x8c, 0x92, 0x8c, 0xeb, 0x19, 0x99, 0x92, 0xad, 0x56, 0xb3, 0x4e, 0x38,
0xc6, 0x67, 0x89, 0xe2, 0x2c, 0xb4, 0xbe, 0xf6, 0xc1, 0xb8, 0x91, 0x75, 0x41, 0x18, 0xfe, 0x1f,
0xbe, 0x76, 0xcd, 0x92, 0xff, 0xa5, 0x59, 0x83, 0xbf, 0x37, 0x6b, 0x78, 0x8f, 0x59, 0x5f, 0x3a,
0x7f, 0x66, 0xee, 0xd5, 0x8b, 0x4f, 0x0c, 0x67, 0x45, 0x42, 0x32, 0x78, 0x08, 0x54, 0xbc, 0x4d,
0xea, 0xef, 0xaa, 0x05, 0xfe, 0xd0, 0x9d, 0xc7, 0x1d, 0x35, 0xdc, 0x1d, 0xb5, 0x11, 0xe0, 0xbd,
0xbb, 0x2e, 0x75, 0xe9, 0xa6, 0xd4, 0xa5, 0x9f, 0xa5, 0x2e, 0x5d, 0x6d, 0xf4, 0xde, 0xcd, 0x46,
0xef, 0x7d, 0xdb, 0xe8, 0xbd, 0xf7, 0xcf, 0xa2, 0x84, 0xc5, 0xab, 0x85, 0x13, 0x90, 0xa5, 0xdb,
0xbd, 0x18, 0x6d, 0x58, 0x5d, 0x96, 0xdb, 0xd7, 0x64, 0x31, 0x14, 0xf8, 0xf1, 0xaf, 0x00, 0x00,
0x00, 0xff, 0xff, 0x2b, 0x89, 0x89, 0x5b, 0xb2, 0x04, 0x00, 0x00,
}
func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) {
@@ -667,14 +667,16 @@ func (m *CanonicalVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error)
dAtA[i] = 0x22
}
if m.Round != 0 {
i = encodeVarintCanonical(dAtA, i, uint64(m.Round))
i -= 8
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Round))
i--
dAtA[i] = 0x18
dAtA[i] = 0x19
}
if m.Height != 0 {
i = encodeVarintCanonical(dAtA, i, uint64(m.Height))
i -= 8
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Height))
i--
dAtA[i] = 0x10
dAtA[i] = 0x11
}
if len(m.Extension) > 0 {
i -= len(m.Extension)
@@ -798,10 +800,10 @@ func (m *CanonicalVoteExtension) Size() (n int) {
n += 1 + l + sovCanonical(uint64(l))
}
if m.Height != 0 {
n += 1 + sovCanonical(uint64(m.Height))
n += 9
}
if m.Round != 0 {
n += 1 + sovCanonical(uint64(m.Round))
n += 9
}
l = len(m.ChainId)
if l > 0 {
@@ -1499,43 +1501,25 @@ func (m *CanonicalVoteExtension) Unmarshal(dAtA []byte) error {
}
iNdEx = postIndex
case 2:
if wireType != 0 {
if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
}
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowCanonical
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Height |= int64(b&0x7F) << shift
if b < 0x80 {
break
}
if (iNdEx + 8) > l {
return io.ErrUnexpectedEOF
}
m.Height = int64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
iNdEx += 8
case 3:
if wireType != 0 {
if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType)
}
m.Round = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowCanonical
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Round |= int32(b&0x7F) << shift
if b < 0x80 {
break
}
if (iNdEx + 8) > l {
return io.ErrUnexpectedEOF
}
m.Round = int64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
iNdEx += 8
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType)
proto/tendermint/types/canonical.proto
+4 -4
View File
@@ -39,8 +39,8 @@ message CanonicalVote {
// CanonicalVoteExtension provides us a way to serialize a vote extension from
// a particular validator such that we can sign over those serialized bytes.
message CanonicalVoteExtension {
bytes extension = 1;
int64 height = 2;
int32 round = 3;
string chain_id = 4;
bytes extension = 1;
sfixed64 height = 2;
sfixed64 round = 3;
string chain_id = 4;
}
types/canonical.go
+1 -1
View File
@@ -72,7 +72,7 @@ func CanonicalizeVoteExtension(chainID string, vote *tmproto.Vote) tmproto.Canon
return tmproto.CanonicalVoteExtension{
Extension: vote.Extension,
Height: vote.Height,
Round: vote.Round,
Round: int64(vote.Round),
ChainId: chainID,
}
}