From 306d56870a41a90820b59824c31dbfa51f615a45 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Thu, 17 Mar 2022 18:00:28 -0400 Subject: [PATCH] Regenerate protos including latest PBTS synchrony params update Signed-off-by: Thane Thomson --- abci/types/types.pb.go | 779 +++++++------------------ proto/tendermint/types/canonical.pb.go | 414 ++++++++++++- proto/tendermint/types/params.pb.go | 726 +++++++++++++++++++++-- 3 files changed, 1270 insertions(+), 649 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 206286cd6..e5fb1f9ad 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -3890,84 +3890,6 @@ func (m *ExtendedVoteInfo) GetVoteExtension() []byte { return nil } -// CanonicalVoteExtension -// TODO: move this to core Tendermint data structures -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"` - ChainId string `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Address []byte `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"` -} - -func (m *CanonicalVoteExtension) Reset() { *m = CanonicalVoteExtension{} } -func (m *CanonicalVoteExtension) String() string { return proto.CompactTextString(m) } -func (*CanonicalVoteExtension) ProtoMessage() {} -func (*CanonicalVoteExtension) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{52} -} -func (m *CanonicalVoteExtension) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CanonicalVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CanonicalVoteExtension.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CanonicalVoteExtension) XXX_Merge(src proto.Message) { - xxx_messageInfo_CanonicalVoteExtension.Merge(m, src) -} -func (m *CanonicalVoteExtension) XXX_Size() int { - return m.Size() -} -func (m *CanonicalVoteExtension) XXX_DiscardUnknown() { - xxx_messageInfo_CanonicalVoteExtension.DiscardUnknown(m) -} - -var xxx_messageInfo_CanonicalVoteExtension proto.InternalMessageInfo - -func (m *CanonicalVoteExtension) GetExtension() []byte { - if m != nil { - return m.Extension - } - return nil -} - -func (m *CanonicalVoteExtension) GetHeight() int64 { - if m != nil { - return m.Height - } - return 0 -} - -func (m *CanonicalVoteExtension) GetRound() int32 { - if m != nil { - return m.Round - } - return 0 -} - -func (m *CanonicalVoteExtension) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - -func (m *CanonicalVoteExtension) GetAddress() []byte { - if m != nil { - return m.Address - } - return nil -} - type Evidence struct { Type EvidenceType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.EvidenceType" json:"type,omitempty"` // The offending validator @@ -3986,7 +3908,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{53} + return fileDescriptor_252557cfdd89a31a, []int{52} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4062,7 +3984,7 @@ func (m *Snapshot) Reset() { *m = Snapshot{} } func (m *Snapshot) String() string { return proto.CompactTextString(m) } func (*Snapshot) ProtoMessage() {} func (*Snapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{54} + return fileDescriptor_252557cfdd89a31a, []int{53} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4184,7 +4106,6 @@ func init() { proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") proto.RegisterType((*ExtendedVoteInfo)(nil), "tendermint.abci.ExtendedVoteInfo") - proto.RegisterType((*CanonicalVoteExtension)(nil), "tendermint.abci.CanonicalVoteExtension") proto.RegisterType((*Evidence)(nil), "tendermint.abci.Evidence") proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") } @@ -4192,221 +4113,218 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3417 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0x4b, 0x73, 0x1b, 0xc7, - 0xf1, 0xc7, 0xfb, 0xd1, 0x20, 0x1e, 0x1c, 0xd2, 0x34, 0x04, 0x4b, 0xa4, 0xbc, 0x2a, 0xdb, 0xb2, - 0x6c, 0x53, 0x7f, 0xcb, 0x25, 0xff, 0xe5, 0xc8, 0x8e, 0x8b, 0x04, 0x21, 0x83, 0x16, 0x45, 0xd2, - 0x4b, 0x50, 0x2e, 0xe7, 0xa1, 0xf5, 0x72, 0x77, 0x08, 0xac, 0x05, 0xec, 0xae, 0x77, 0x17, 0x34, - 0xe8, 0x53, 0x2a, 0x55, 0xbe, 0xb8, 0x52, 0x15, 0xdf, 0x92, 0x54, 0xe2, 0xca, 0x29, 0x55, 0xf9, - 0x00, 0x39, 0xe4, 0x94, 0x4b, 0x72, 0xf0, 0x21, 0x07, 0xdf, 0x92, 0xca, 0xc1, 0x49, 0xd9, 0xb7, - 0x7c, 0x01, 0x9f, 0xf2, 0xa8, 0x79, 0xec, 0x0b, 0xd8, 0x05, 0x40, 0x4b, 0xf2, 0x25, 0x37, 0x4c, - 0x6f, 0x77, 0xef, 0x4e, 0xcf, 0x4c, 0x77, 0xff, 0xba, 0x07, 0xf0, 0x84, 0x83, 0x75, 0x15, 0x5b, - 0x03, 0x4d, 0x77, 0xae, 0xca, 0x47, 0x8a, 0x76, 0xd5, 0x39, 0x35, 0xb1, 0xbd, 0x6e, 0x5a, 0x86, - 0x63, 0xa0, 0xaa, 0xff, 0x70, 0x9d, 0x3c, 0x6c, 0x5c, 0x08, 0x70, 0x2b, 0xd6, 0xa9, 0xe9, 0x18, - 0x57, 0x4d, 0xcb, 0x30, 0x8e, 0x19, 0x7f, 0xe3, 0x7c, 0xe0, 0x31, 0xd5, 0x13, 0xd4, 0x16, 0x7a, - 0xca, 0x85, 0xef, 0xe3, 0x53, 0xf7, 0xe9, 0x85, 0x09, 0x59, 0x53, 0xb6, 0xe4, 0x81, 0xfb, 0x78, - 0xad, 0x6b, 0x18, 0xdd, 0x3e, 0xbe, 0x4a, 0x47, 0x47, 0xc3, 0xe3, 0xab, 0x8e, 0x36, 0xc0, 0xb6, - 0x23, 0x0f, 0x4c, 0xce, 0xb0, 0xdc, 0x35, 0xba, 0x06, 0xfd, 0x79, 0x95, 0xfc, 0x62, 0x54, 0xe1, - 0x3f, 0x00, 0x79, 0x11, 0xbf, 0x3f, 0xc4, 0xb6, 0x83, 0xae, 0x41, 0x06, 0x2b, 0x3d, 0xa3, 0x9e, - 0xbc, 0x98, 0xbc, 0x5c, 0xba, 0x76, 0x7e, 0x7d, 0x6c, 0x72, 0xeb, 0x9c, 0xaf, 0xa5, 0xf4, 0x8c, - 0x76, 0x42, 0xa4, 0xbc, 0xe8, 0x3a, 0x64, 0x8f, 0xfb, 0x43, 0xbb, 0x57, 0x4f, 0x51, 0xa1, 0x0b, - 0x71, 0x42, 0xb7, 0x08, 0x53, 0x3b, 0x21, 0x32, 0x6e, 0xf2, 0x2a, 0x4d, 0x3f, 0x36, 0xea, 0xe9, - 0xe9, 0xaf, 0xda, 0xd6, 0x8f, 0xe9, 0xab, 0x08, 0x2f, 0xda, 0x04, 0xd0, 0x74, 0xcd, 0x91, 0x94, - 0x9e, 0xac, 0xe9, 0xf5, 0x0c, 0x95, 0x7c, 0x32, 0x5e, 0x52, 0x73, 0x9a, 0x84, 0xb1, 0x9d, 0x10, - 0x8b, 0x9a, 0x3b, 0x20, 0x9f, 0xfb, 0xfe, 0x10, 0x5b, 0xa7, 0xf5, 0xec, 0xf4, 0xcf, 0x7d, 0x8b, - 0x30, 0x91, 0xcf, 0xa5, 0xdc, 0x68, 0x1b, 0x4a, 0x47, 0xb8, 0xab, 0xe9, 0xd2, 0x51, 0xdf, 0x50, - 0xee, 0xd7, 0x73, 0x54, 0x58, 0x88, 0x13, 0xde, 0x24, 0xac, 0x9b, 0x84, 0x73, 0x33, 0x55, 0x4f, - 0xb6, 0x13, 0x22, 0x1c, 0x79, 0x14, 0xf4, 0x2a, 0x14, 0x94, 0x1e, 0x56, 0xee, 0x4b, 0xce, 0xa8, - 0x9e, 0xa7, 0x7a, 0xd6, 0xe2, 0xf4, 0x34, 0x09, 0x5f, 0x67, 0xd4, 0x4e, 0x88, 0x79, 0x85, 0xfd, - 0x44, 0xb7, 0x00, 0x54, 0xdc, 0xd7, 0x4e, 0xb0, 0x45, 0xe4, 0x0b, 0xd3, 0x6d, 0xb0, 0xc5, 0x38, - 0x3b, 0x23, 0xfe, 0x19, 0x45, 0xd5, 0x25, 0xa0, 0x26, 0x14, 0xb1, 0xae, 0xf2, 0xe9, 0x14, 0xa9, - 0x9a, 0x8b, 0xb1, 0xeb, 0xad, 0xab, 0xc1, 0xc9, 0x14, 0x30, 0x1f, 0xa3, 0x1b, 0x90, 0x53, 0x8c, - 0xc1, 0x40, 0x73, 0xea, 0x40, 0x35, 0xac, 0xc6, 0x4e, 0x84, 0x72, 0xb5, 0x13, 0x22, 0xe7, 0x47, - 0xbb, 0x50, 0xe9, 0x6b, 0xb6, 0x23, 0xd9, 0xba, 0x6c, 0xda, 0x3d, 0xc3, 0xb1, 0xeb, 0x25, 0xaa, - 0xe1, 0xa9, 0x38, 0x0d, 0x3b, 0x9a, 0xed, 0x1c, 0xb8, 0xcc, 0xed, 0x84, 0x58, 0xee, 0x07, 0x09, - 0x44, 0x9f, 0x71, 0x7c, 0x8c, 0x2d, 0x4f, 0x61, 0x7d, 0x61, 0xba, 0xbe, 0x3d, 0xc2, 0xed, 0xca, - 0x13, 0x7d, 0x46, 0x90, 0x80, 0xbe, 0x0f, 0x4b, 0x7d, 0x43, 0x56, 0x3d, 0x75, 0x92, 0xd2, 0x1b, - 0xea, 0xf7, 0xeb, 0x65, 0xaa, 0xf4, 0xd9, 0xd8, 0x8f, 0x34, 0x64, 0xd5, 0x55, 0xd1, 0x24, 0x02, - 0xed, 0x84, 0xb8, 0xd8, 0x1f, 0x27, 0xa2, 0x7b, 0xb0, 0x2c, 0x9b, 0x66, 0xff, 0x74, 0x5c, 0x7b, - 0x85, 0x6a, 0xbf, 0x12, 0xa7, 0x7d, 0x83, 0xc8, 0x8c, 0xab, 0x47, 0xf2, 0x04, 0x15, 0x75, 0xa0, - 0x66, 0x5a, 0xd8, 0x94, 0x2d, 0x2c, 0x99, 0x96, 0x61, 0x1a, 0xb6, 0xdc, 0xaf, 0x57, 0xa9, 0xee, - 0x67, 0xe2, 0x74, 0xef, 0x33, 0xfe, 0x7d, 0xce, 0xde, 0x4e, 0x88, 0x55, 0x33, 0x4c, 0x62, 0x5a, - 0x0d, 0x05, 0xdb, 0xb6, 0xaf, 0xb5, 0x36, 0x4b, 0x2b, 0xe5, 0x0f, 0x6b, 0x0d, 0x91, 0x50, 0x0b, - 0x4a, 0x78, 0x44, 0xc4, 0xa5, 0x13, 0xc3, 0xc1, 0xf5, 0xc5, 0xe9, 0x07, 0xab, 0x45, 0x59, 0xef, - 0x1a, 0x0e, 0x26, 0x87, 0x0a, 0x7b, 0x23, 0x24, 0xc3, 0x63, 0x27, 0xd8, 0xd2, 0x8e, 0x4f, 0xa9, - 0x1a, 0x89, 0x3e, 0xb1, 0x35, 0x43, 0xaf, 0x23, 0xaa, 0xf0, 0xb9, 0x38, 0x85, 0x77, 0xa9, 0x10, - 0x51, 0xd1, 0x72, 0x45, 0xda, 0x09, 0x71, 0xe9, 0x64, 0x92, 0x4c, 0xb6, 0xd8, 0xb1, 0xa6, 0xcb, - 0x7d, 0xed, 0x43, 0xcc, 0x8f, 0xcd, 0xd2, 0xf4, 0x2d, 0x76, 0x8b, 0x73, 0xd3, 0xb3, 0x42, 0xb6, - 0xd8, 0x71, 0x90, 0xb0, 0x99, 0x87, 0xec, 0x89, 0xdc, 0x1f, 0x62, 0xe1, 0x19, 0x28, 0x05, 0x1c, - 0x2b, 0xaa, 0x43, 0x7e, 0x80, 0x6d, 0x5b, 0xee, 0x62, 0xea, 0x87, 0x8b, 0xa2, 0x3b, 0x14, 0x2a, - 0xb0, 0x10, 0x74, 0xa6, 0xc2, 0x27, 0x49, 0x4f, 0x92, 0xf8, 0x49, 0x22, 0x79, 0x82, 0x2d, 0x3a, - 0x6d, 0x2e, 0xc9, 0x87, 0xe8, 0x12, 0x94, 0xe9, 0x27, 0x4b, 0xee, 0x73, 0xe2, 0xac, 0x33, 0xe2, - 0x02, 0x25, 0xde, 0xe5, 0x4c, 0x6b, 0x50, 0x32, 0xaf, 0x99, 0x1e, 0x4b, 0x9a, 0xb2, 0x80, 0x79, - 0xcd, 0x74, 0x19, 0x9e, 0x84, 0x05, 0x32, 0x3f, 0x8f, 0x23, 0x43, 0x5f, 0x52, 0x22, 0x34, 0xce, - 0x22, 0xfc, 0x39, 0x05, 0xb5, 0x71, 0x07, 0x8c, 0x6e, 0x40, 0x86, 0xc4, 0x22, 0x1e, 0x56, 0x1a, - 0xeb, 0x2c, 0x50, 0xad, 0xbb, 0x81, 0x6a, 0xbd, 0xe3, 0x06, 0xaa, 0xcd, 0xc2, 0x67, 0x5f, 0xac, - 0x25, 0x3e, 0xf9, 0xfb, 0x5a, 0x52, 0xa4, 0x12, 0xe8, 0x1c, 0xf1, 0x95, 0xb2, 0xa6, 0x4b, 0x9a, - 0x4a, 0x3f, 0xb9, 0x48, 0x1c, 0xa1, 0xac, 0xe9, 0xdb, 0x2a, 0xda, 0x81, 0x9a, 0x62, 0xe8, 0x36, - 0xd6, 0xed, 0xa1, 0x2d, 0xb1, 0x40, 0xc8, 0x83, 0x49, 0xc8, 0x1d, 0xb2, 0xf0, 0xda, 0x74, 0x39, - 0xf7, 0x29, 0xa3, 0x58, 0x55, 0xc2, 0x04, 0xe2, 0x56, 0x4f, 0xe4, 0xbe, 0xa6, 0xca, 0x8e, 0x61, - 0xd9, 0xf5, 0xcc, 0xc5, 0x74, 0xa4, 0x3f, 0xbc, 0xeb, 0xb2, 0x1c, 0x9a, 0xaa, 0xec, 0xe0, 0xcd, - 0x0c, 0xf9, 0x5c, 0x31, 0x20, 0x89, 0x9e, 0x86, 0xaa, 0x6c, 0x9a, 0x92, 0xed, 0xc8, 0x0e, 0x96, - 0x8e, 0x4e, 0x1d, 0x6c, 0xd3, 0x40, 0xb3, 0x20, 0x96, 0x65, 0xd3, 0x3c, 0x20, 0xd4, 0x4d, 0x42, - 0x44, 0x4f, 0x41, 0x85, 0xc4, 0x24, 0x4d, 0xee, 0x4b, 0x3d, 0xac, 0x75, 0x7b, 0x0e, 0x0d, 0x29, - 0x69, 0xb1, 0xcc, 0xa9, 0x6d, 0x4a, 0x14, 0x54, 0x6f, 0xc5, 0x69, 0x3c, 0x42, 0x08, 0x32, 0xaa, - 0xec, 0xc8, 0xd4, 0x92, 0x0b, 0x22, 0xfd, 0x4d, 0x68, 0xa6, 0xec, 0xf4, 0xb8, 0x7d, 0xe8, 0x6f, - 0xb4, 0x02, 0x39, 0xae, 0x36, 0x4d, 0xd5, 0xf2, 0x11, 0x5a, 0x86, 0xac, 0x69, 0x19, 0x27, 0x98, - 0x2e, 0x5d, 0x41, 0x64, 0x03, 0xe1, 0x47, 0x29, 0x58, 0x9c, 0x88, 0x5c, 0x44, 0x6f, 0x4f, 0xb6, - 0x7b, 0xee, 0xbb, 0xc8, 0x6f, 0xf4, 0x32, 0xd1, 0x2b, 0xab, 0xd8, 0xe2, 0xd1, 0xbe, 0x3e, 0x69, - 0xea, 0x36, 0x7d, 0xce, 0x4d, 0xc3, 0xb9, 0xd1, 0x6d, 0xa8, 0xf5, 0x65, 0xdb, 0x91, 0x98, 0xf7, - 0x97, 0x02, 0x91, 0xff, 0x89, 0x09, 0x23, 0xb3, 0x58, 0x41, 0x36, 0x34, 0x57, 0x52, 0x21, 0xa2, - 0x3e, 0x15, 0x89, 0xb0, 0x7c, 0x74, 0xfa, 0xa1, 0xac, 0x3b, 0x9a, 0x8e, 0xa5, 0x89, 0x55, 0x3b, - 0x37, 0xa1, 0xb0, 0x75, 0xa2, 0xa9, 0x58, 0x57, 0xdc, 0xe5, 0x5a, 0xf2, 0x84, 0xbd, 0xe5, 0xb4, - 0x05, 0x11, 0x2a, 0xe1, 0x98, 0x8b, 0x2a, 0x90, 0x72, 0x46, 0x7c, 0xf2, 0x29, 0x67, 0x84, 0xfe, - 0x0f, 0x32, 0x64, 0x82, 0x74, 0xe2, 0x95, 0x88, 0x84, 0x85, 0xcb, 0x75, 0x4e, 0x4d, 0x2c, 0x52, - 0x4e, 0x41, 0xf0, 0x8e, 0x82, 0x17, 0x87, 0xc7, 0xb5, 0x0a, 0xcf, 0x42, 0x75, 0x2c, 0xc8, 0x06, - 0xd6, 0x2e, 0x19, 0x5c, 0x3b, 0xa1, 0x0a, 0xe5, 0x50, 0x34, 0x15, 0x56, 0x60, 0x39, 0x2a, 0x38, - 0x0a, 0x3d, 0x8f, 0x1e, 0x0a, 0x72, 0xe8, 0x3a, 0x14, 0xbc, 0xe8, 0xc8, 0x8e, 0xe2, 0xa4, 0xad, - 0x5c, 0x66, 0xd1, 0x63, 0x25, 0x67, 0x90, 0x6c, 0x69, 0xba, 0x17, 0x52, 0xf4, 0xc3, 0xf3, 0xb2, - 0x69, 0xb6, 0x65, 0xbb, 0x27, 0xbc, 0x0b, 0xf5, 0xb8, 0xc8, 0x37, 0x36, 0x8d, 0x8c, 0xb7, 0x05, - 0x57, 0x20, 0x77, 0x6c, 0x58, 0x03, 0xd9, 0xa1, 0xca, 0xca, 0x22, 0x1f, 0x91, 0xad, 0xc9, 0xa2, - 0x60, 0x9a, 0x92, 0xd9, 0x40, 0x90, 0xe0, 0x5c, 0x6c, 0xf4, 0x23, 0x22, 0x9a, 0xae, 0x62, 0x66, - 0xcf, 0xb2, 0xc8, 0x06, 0xbe, 0x22, 0xf6, 0xb1, 0x6c, 0x40, 0x5e, 0x6b, 0xd3, 0xb9, 0x52, 0xfd, - 0x45, 0x91, 0x8f, 0x84, 0x3f, 0xa6, 0x60, 0x25, 0x3a, 0x06, 0x3e, 0xd4, 0x03, 0x50, 0x83, 0xb4, - 0x33, 0x22, 0x0e, 0x2a, 0x7d, 0x79, 0x41, 0x24, 0x3f, 0xd1, 0x21, 0x2c, 0xf6, 0x0d, 0x45, 0xee, - 0x4b, 0x81, 0x83, 0xc1, 0x73, 0xda, 0x4b, 0x93, 0x5b, 0x98, 0x46, 0x3a, 0xac, 0x4e, 0x9c, 0x8d, - 0x2a, 0xd5, 0xb1, 0xe3, 0x1d, 0x90, 0xd8, 0xc3, 0x91, 0xfd, 0xe6, 0x87, 0x03, 0x5d, 0x84, 0x85, - 0x81, 0x3c, 0x92, 0x9c, 0x11, 0xf7, 0x68, 0xcc, 0x55, 0xc1, 0x40, 0x1e, 0x75, 0x46, 0xd4, 0x9d, - 0x09, 0xbf, 0x0e, 0x5a, 0x31, 0x1c, 0xe0, 0x1f, 0xad, 0x15, 0x0f, 0x60, 0x99, 0x25, 0x23, 0x58, - 0x8d, 0x30, 0xe4, 0x1c, 0xce, 0x05, 0xb9, 0xe2, 0x8f, 0xd6, 0x86, 0xc2, 0xeb, 0x9e, 0x8b, 0xf5, - 0x73, 0x98, 0x48, 0xdb, 0xf8, 0xe7, 0x26, 0x15, 0x3a, 0xfe, 0xbf, 0x4a, 0x42, 0x23, 0x3e, 0x69, - 0x89, 0x54, 0xf5, 0x1c, 0x2c, 0x7a, 0x5f, 0x2f, 0xc9, 0xaa, 0x6a, 0x61, 0xdb, 0xe6, 0xa7, 0xa2, - 0xe6, 0x3d, 0xd8, 0x60, 0xf4, 0xd8, 0x90, 0xf1, 0x14, 0x54, 0xc6, 0x52, 0xaa, 0x0c, 0x0b, 0x68, - 0x27, 0xc1, 0xf7, 0x0b, 0xbf, 0x4c, 0x79, 0x5e, 0x27, 0x94, 0xf7, 0x3c, 0xe2, 0xf5, 0x7f, 0x0b, - 0x96, 0x54, 0xac, 0x68, 0xea, 0x37, 0x5d, 0xfe, 0x45, 0x2e, 0xfd, 0x88, 0x57, 0xff, 0x2f, 0x25, - 0x28, 0x88, 0xd8, 0x36, 0x49, 0xd6, 0x81, 0x36, 0xa1, 0x88, 0x47, 0x0a, 0x36, 0x1d, 0x37, 0x51, - 0x8b, 0x4e, 0x78, 0x19, 0x77, 0xcb, 0xe5, 0x24, 0xf0, 0xcd, 0x13, 0x43, 0x2f, 0x71, 0xa4, 0x1e, - 0x0f, 0xba, 0xb9, 0x78, 0x10, 0xaa, 0xbf, 0xec, 0x42, 0xf5, 0x74, 0x2c, 0x5a, 0x63, 0x52, 0x63, - 0x58, 0xfd, 0x25, 0x8e, 0xd5, 0x33, 0x33, 0x5e, 0x16, 0x02, 0xeb, 0xcd, 0x10, 0x58, 0xcf, 0xce, - 0x98, 0x66, 0x0c, 0x5a, 0x7f, 0xd9, 0x45, 0xeb, 0xb9, 0x19, 0x5f, 0x3c, 0x06, 0xd7, 0xdf, 0x0c, - 0xc3, 0xf5, 0x7c, 0x8c, 0x5b, 0x75, 0xa5, 0xa7, 0xe2, 0xf5, 0xd7, 0x02, 0x78, 0xbd, 0x10, 0x0b, - 0x94, 0x99, 0xa2, 0x08, 0xc0, 0xfe, 0x46, 0x08, 0xb0, 0x17, 0x67, 0xd8, 0x61, 0x0a, 0x62, 0xdf, - 0x0a, 0x22, 0x76, 0x88, 0x05, 0xfe, 0x7c, 0xdd, 0xe3, 0x20, 0xfb, 0x2b, 0x1e, 0x64, 0x2f, 0xc5, - 0xd6, 0x1e, 0xf8, 0x5c, 0xc6, 0x31, 0xfb, 0xde, 0x04, 0x66, 0x67, 0x18, 0xfb, 0xe9, 0x58, 0x15, - 0x33, 0x40, 0xfb, 0xde, 0x04, 0x68, 0x2f, 0xcf, 0x50, 0x38, 0x03, 0xb5, 0xff, 0x20, 0x1a, 0xb5, - 0xc7, 0xe3, 0x6a, 0xfe, 0x99, 0xf3, 0xc1, 0x76, 0x29, 0x06, 0xb6, 0x57, 0x63, 0x21, 0x26, 0x53, - 0x3f, 0x37, 0x6e, 0x3f, 0x8c, 0xc0, 0xed, 0x0c, 0x61, 0x5f, 0x8e, 0x55, 0x3e, 0x07, 0x70, 0x3f, - 0x8c, 0x00, 0xee, 0x8b, 0x33, 0xd5, 0xce, 0x44, 0xee, 0xb7, 0xc2, 0xc8, 0x1d, 0xcd, 0x38, 0x63, - 0xb1, 0xd0, 0xfd, 0x28, 0x0e, 0xba, 0x33, 0x78, 0xfd, 0x7c, 0xac, 0xc6, 0x33, 0x60, 0xf7, 0xbd, - 0x09, 0xec, 0xbe, 0x3c, 0x63, 0xa7, 0xcd, 0x0b, 0xde, 0x9f, 0x25, 0x71, 0x7d, 0xcc, 0x55, 0x93, - 0x14, 0x14, 0x5b, 0x96, 0x61, 0x71, 0x18, 0xce, 0x06, 0xc2, 0x65, 0x02, 0xe6, 0x7c, 0xb7, 0x3c, - 0x05, 0xe8, 0xd3, 0x54, 0x3f, 0xe0, 0x8a, 0x85, 0xdf, 0x27, 0x7d, 0x59, 0x8a, 0x81, 0x82, 0x40, - 0xb0, 0xc8, 0x81, 0x60, 0x00, 0xfe, 0xa7, 0xc2, 0xf0, 0x7f, 0x0d, 0x4a, 0x24, 0x85, 0x1f, 0x43, - 0xf6, 0xb2, 0xe9, 0x21, 0xfb, 0x2b, 0xb0, 0x48, 0xc3, 0x27, 0x2b, 0x12, 0xf0, 0x3c, 0x20, 0x43, - 0xf3, 0x80, 0x2a, 0x79, 0xc0, 0xac, 0xc0, 0x12, 0x82, 0x17, 0x60, 0x29, 0xc0, 0xeb, 0x41, 0x03, - 0x06, 0x73, 0x6b, 0x1e, 0xf7, 0x06, 0xc7, 0x08, 0x7f, 0x4a, 0xfa, 0x16, 0xf2, 0x4b, 0x02, 0x51, - 0xe8, 0x3d, 0xf9, 0x90, 0xd0, 0x7b, 0xea, 0x1b, 0xa3, 0xf7, 0x20, 0xd4, 0x49, 0x87, 0xa1, 0xce, - 0xd7, 0x49, 0x7f, 0x4d, 0x3c, 0x2c, 0xae, 0x18, 0x2a, 0xe6, 0xe0, 0x83, 0xfe, 0x26, 0x09, 0x4a, - 0xdf, 0xe8, 0x72, 0x88, 0x41, 0x7e, 0x12, 0x2e, 0x2f, 0x76, 0x16, 0x79, 0x68, 0xf4, 0x70, 0x4b, - 0x96, 0x5a, 0x98, 0xe3, 0x96, 0x1a, 0xa4, 0xef, 0x63, 0x16, 0xe9, 0x16, 0x44, 0xf2, 0x93, 0xf0, - 0xd1, 0x4d, 0x46, 0xe3, 0xd7, 0x82, 0xc8, 0x06, 0xe8, 0x06, 0x14, 0x69, 0x47, 0x41, 0x32, 0x4c, - 0x9b, 0x07, 0xa4, 0x50, 0xa2, 0xc3, 0x1a, 0x07, 0xeb, 0xfb, 0x84, 0x67, 0xcf, 0xb4, 0xc5, 0x82, - 0xc9, 0x7f, 0x05, 0x52, 0xbc, 0x62, 0x28, 0xc5, 0x3b, 0x0f, 0x45, 0xf2, 0xf5, 0xb6, 0x29, 0x2b, - 0x98, 0x46, 0x96, 0xa2, 0xe8, 0x13, 0x84, 0x7b, 0x80, 0x26, 0xe3, 0x24, 0x6a, 0x43, 0x0e, 0x9f, - 0x60, 0xdd, 0x21, 0xcb, 0x46, 0xcc, 0xbd, 0x12, 0x91, 0x17, 0x61, 0xdd, 0xd9, 0xac, 0x13, 0x23, - 0xff, 0xf3, 0x8b, 0xb5, 0x1a, 0xe3, 0x7e, 0xde, 0x18, 0x68, 0x0e, 0x1e, 0x98, 0xce, 0xa9, 0xc8, - 0xe5, 0x85, 0xbf, 0xa5, 0x08, 0x06, 0x0e, 0xc5, 0xcf, 0x48, 0xdb, 0xba, 0x5b, 0x3e, 0x15, 0xa8, - 0x7d, 0xcc, 0x67, 0xef, 0x0b, 0x00, 0x5d, 0xd9, 0x96, 0x3e, 0x90, 0x75, 0x07, 0xab, 0xdc, 0xe8, - 0xc5, 0xae, 0x6c, 0xbf, 0x4d, 0x09, 0x64, 0xd5, 0xc9, 0xe3, 0xa1, 0x8d, 0x55, 0x0e, 0x6d, 0xf2, - 0x5d, 0xd9, 0x3e, 0xb4, 0xb1, 0x1a, 0x98, 0x65, 0xfe, 0xc1, 0x66, 0x19, 0xb6, 0x71, 0x61, 0xcc, - 0xc6, 0x01, 0x74, 0x5a, 0x0c, 0xa2, 0x53, 0xd4, 0x80, 0x82, 0x69, 0x69, 0x86, 0xa5, 0x39, 0xa7, - 0x74, 0x61, 0xd2, 0xa2, 0x37, 0x46, 0x97, 0xa0, 0x3c, 0xc0, 0x03, 0xd3, 0x30, 0xfa, 0x12, 0x73, - 0x36, 0x25, 0x2a, 0xba, 0xc0, 0x89, 0x2d, 0xea, 0x73, 0x3e, 0x4a, 0xf9, 0xa7, 0xcf, 0xaf, 0x42, - 0x3c, 0x5c, 0xf3, 0xae, 0x46, 0x98, 0x37, 0x40, 0x21, 0x93, 0x18, 0xb3, 0xaf, 0x37, 0xfe, 0xb6, - 0x0c, 0x2c, 0xfc, 0x84, 0xd6, 0x25, 0xc3, 0xb9, 0x11, 0x3a, 0x08, 0xe2, 0xa3, 0x21, 0x75, 0x0a, - 0xee, 0x76, 0x9e, 0xd7, 0x7b, 0xf8, 0x38, 0x8a, 0x91, 0x6d, 0xf4, 0x0e, 0x3c, 0x3e, 0xe6, 0xd9, - 0x3c, 0xd5, 0xa9, 0x79, 0x1d, 0xdc, 0x63, 0x61, 0x07, 0xe7, 0xaa, 0xf6, 0x8d, 0x95, 0x7e, 0xc0, - 0x33, 0xb7, 0x0d, 0x95, 0x70, 0x9a, 0x17, 0xb9, 0xfc, 0x97, 0xa0, 0x6c, 0x61, 0x47, 0xd6, 0x74, - 0x29, 0x84, 0x0c, 0x17, 0x18, 0x91, 0x97, 0x28, 0xf7, 0xe1, 0xb1, 0xc8, 0x74, 0x0f, 0xfd, 0x3f, - 0x14, 0xfd, 0x4c, 0x31, 0x19, 0x03, 0x9e, 0xbc, 0x7a, 0x93, 0xcf, 0x2b, 0xfc, 0x21, 0xe9, 0xab, - 0x0c, 0x57, 0xb0, 0x5a, 0x90, 0xb3, 0xb0, 0x3d, 0xec, 0xb3, 0x9a, 0x52, 0xe5, 0xda, 0x0b, 0xf3, - 0x25, 0x8a, 0x84, 0x3a, 0xec, 0x3b, 0x22, 0x17, 0x16, 0xee, 0x41, 0x8e, 0x51, 0x50, 0x09, 0xf2, - 0x87, 0xbb, 0xb7, 0x77, 0xf7, 0xde, 0xde, 0xad, 0x25, 0x10, 0x40, 0x6e, 0xa3, 0xd9, 0x6c, 0xed, - 0x77, 0x6a, 0x49, 0x54, 0x84, 0xec, 0xc6, 0xe6, 0x9e, 0xd8, 0xa9, 0xa5, 0x08, 0x59, 0x6c, 0xbd, - 0xd9, 0x6a, 0x76, 0x6a, 0x69, 0xb4, 0x08, 0x65, 0xf6, 0x5b, 0xba, 0xb5, 0x27, 0xde, 0xd9, 0xe8, - 0xd4, 0x32, 0x01, 0xd2, 0x41, 0x6b, 0x77, 0xab, 0x25, 0xd6, 0xb2, 0xc2, 0x8b, 0x70, 0x2e, 0x36, - 0xb5, 0xf4, 0xcb, 0x53, 0xc9, 0x40, 0x79, 0x4a, 0xf8, 0x79, 0x8a, 0xa0, 0xfb, 0xb8, 0x7c, 0x11, - 0xbd, 0x39, 0x36, 0xf1, 0x6b, 0x67, 0x48, 0x36, 0xc7, 0x66, 0x4f, 0x00, 0xbd, 0x85, 0x8f, 0xb1, - 0xa3, 0xf4, 0x58, 0xfe, 0xca, 0x02, 0x66, 0x59, 0x2c, 0x73, 0x2a, 0x15, 0xb2, 0x19, 0xdb, 0x7b, - 0x58, 0x71, 0x24, 0xe6, 0x8b, 0xd8, 0xa6, 0x2b, 0x12, 0x36, 0x42, 0x3d, 0x60, 0x44, 0xe1, 0xdd, - 0x33, 0xd9, 0xb2, 0x08, 0x59, 0xb1, 0xd5, 0x11, 0xdf, 0xa9, 0xa5, 0x11, 0x82, 0x0a, 0xfd, 0x29, - 0x1d, 0xec, 0x6e, 0xec, 0x1f, 0xb4, 0xf7, 0x88, 0x2d, 0x97, 0xa0, 0xea, 0xda, 0xd2, 0x25, 0x66, - 0x85, 0xaf, 0x53, 0xf0, 0x78, 0x4c, 0xb6, 0x4b, 0x12, 0x9b, 0x81, 0xa1, 0x6a, 0xc7, 0x1a, 0x56, - 0x25, 0x5e, 0x57, 0x2d, 0x88, 0xe0, 0x92, 0x3a, 0x23, 0x74, 0x03, 0xc0, 0x19, 0x49, 0x16, 0x56, - 0x0c, 0x4b, 0x75, 0x33, 0x83, 0xc9, 0x5d, 0xd8, 0x19, 0x89, 0x94, 0x43, 0x2c, 0x3a, 0xfc, 0xd7, - 0xb4, 0x5c, 0x00, 0xbd, 0xca, 0x95, 0x92, 0x69, 0xbb, 0x65, 0xe7, 0x0b, 0x11, 0x35, 0x3b, 0xac, - 0x10, 0xc5, 0xd4, 0xf8, 0x54, 0x31, 0xe5, 0x47, 0x77, 0xa2, 0xbc, 0x4e, 0x76, 0x3e, 0xaf, 0x73, - 0x36, 0x7f, 0x93, 0x7b, 0x30, 0x7f, 0x23, 0xfc, 0x2e, 0x64, 0xf9, 0x70, 0xf6, 0xbf, 0x02, 0x39, - 0x59, 0x21, 0xf9, 0x2e, 0x37, 0x3a, 0x1f, 0x4d, 0xa9, 0x16, 0x8f, 0x99, 0x2d, 0xfd, 0x30, 0xcc, - 0x96, 0x79, 0x14, 0x66, 0xcb, 0x3e, 0xa0, 0xd9, 0x6e, 0xfa, 0x09, 0x53, 0xa0, 0xd6, 0x37, 0x59, - 0x47, 0x4b, 0x46, 0xd5, 0xd1, 0xae, 0xc3, 0x13, 0x53, 0xf0, 0x4d, 0x9c, 0xd9, 0x85, 0x9f, 0xa6, - 0x7d, 0x9f, 0x19, 0xae, 0xbf, 0x3d, 0xb4, 0x44, 0x6d, 0x6c, 0xfd, 0x52, 0x67, 0x5c, 0xbf, 0xc8, - 0x60, 0x9b, 0x7e, 0x74, 0xc1, 0x36, 0xf3, 0x80, 0xc1, 0x36, 0xb8, 0x91, 0xb3, 0xe1, 0x8d, 0x3c, - 0x11, 0x17, 0x73, 0x11, 0x71, 0xf1, 0x1d, 0x80, 0x40, 0xcf, 0x6a, 0x19, 0xb2, 0x96, 0x31, 0xd4, - 0x55, 0xba, 0x6c, 0x59, 0x91, 0x0d, 0xd0, 0x75, 0xc8, 0x92, 0xd5, 0x8f, 0x77, 0x4c, 0x64, 0xf1, - 0x03, 0xd5, 0x4a, 0xc6, 0x2d, 0x68, 0x80, 0x26, 0x1b, 0x02, 0x31, 0xaf, 0x78, 0x2d, 0xfc, 0x8a, - 0x27, 0x63, 0x5b, 0x0b, 0xd1, 0xaf, 0xfa, 0x10, 0xb2, 0x74, 0x7b, 0x90, 0xfc, 0x80, 0xb6, 0xbf, - 0x38, 0xe0, 0x24, 0xbf, 0xd1, 0x0f, 0x01, 0x64, 0xc7, 0xb1, 0xb4, 0xa3, 0xa1, 0xff, 0x82, 0xb5, - 0xe8, 0xed, 0xb5, 0xe1, 0xf2, 0x6d, 0x9e, 0xe7, 0xfb, 0x6c, 0xd9, 0x17, 0x0d, 0xec, 0xb5, 0x80, - 0x42, 0x61, 0x17, 0x2a, 0x61, 0x59, 0x17, 0x22, 0xb1, 0x6f, 0x08, 0x43, 0x24, 0x86, 0x78, 0x39, - 0x44, 0xf2, 0x00, 0x56, 0x9a, 0xb5, 0x39, 0xe9, 0x40, 0xf8, 0x77, 0x12, 0x16, 0x82, 0xbb, 0xf3, - 0x7f, 0x0d, 0x65, 0x08, 0x1f, 0x25, 0xa1, 0xe0, 0x4d, 0x3e, 0xa6, 0xcd, 0xe8, 0xdb, 0x2e, 0x15, - 0x6c, 0xaa, 0xb1, 0xbe, 0x65, 0xda, 0xeb, 0x86, 0xde, 0xf4, 0x12, 0x92, 0xb8, 0xa2, 0x70, 0xd0, - 0xd2, 0x6e, 0x19, 0x9f, 0xe7, 0x5f, 0x3f, 0xe3, 0xdf, 0x41, 0x02, 0x2d, 0xfa, 0x0e, 0xf1, 0x68, - 0x5e, 0x29, 0xbc, 0x12, 0x51, 0x1b, 0x75, 0x59, 0xd7, 0x3b, 0xa3, 0x0d, 0xca, 0x29, 0x72, 0x09, - 0xfe, 0x55, 0x29, 0xaf, 0x9b, 0xfa, 0x3a, 0xd1, 0xcb, 0x78, 0xc2, 0xe9, 0x48, 0x05, 0xe0, 0x70, - 0xf7, 0xce, 0xde, 0xd6, 0xf6, 0xad, 0xed, 0xd6, 0x16, 0x4f, 0x49, 0xb6, 0xb6, 0x5a, 0x5b, 0xb5, - 0x14, 0xe1, 0x13, 0x5b, 0x77, 0xf6, 0xee, 0xb6, 0xb6, 0x6a, 0x69, 0xe1, 0x26, 0x14, 0x3d, 0xd7, - 0x83, 0xea, 0x90, 0x77, 0x9b, 0x26, 0x49, 0xee, 0x00, 0x78, 0xaf, 0x64, 0x19, 0xb2, 0xa6, 0xf1, - 0x01, 0xef, 0x25, 0xa6, 0x45, 0x36, 0x10, 0x54, 0xa8, 0x8e, 0xf9, 0x2d, 0x74, 0x13, 0xf2, 0xe6, - 0xf0, 0x48, 0x72, 0x37, 0xed, 0xd8, 0x45, 0x37, 0x17, 0xa9, 0x0f, 0x8f, 0xfa, 0x9a, 0x72, 0x1b, - 0x9f, 0xba, 0x66, 0x32, 0x87, 0x47, 0xb7, 0xd9, 0xde, 0x66, 0x6f, 0x49, 0x05, 0xdf, 0x72, 0x02, - 0x05, 0xf7, 0xa8, 0xa2, 0xef, 0x42, 0xd1, 0x73, 0x89, 0xde, 0xed, 0x8a, 0x58, 0x5f, 0xca, 0xd5, - 0xfb, 0x22, 0xe8, 0x0a, 0x2c, 0xda, 0x5a, 0x57, 0x77, 0x9b, 0x27, 0xac, 0x32, 0x96, 0xa2, 0x67, - 0xa6, 0xca, 0x1e, 0xec, 0xb8, 0xe5, 0x1c, 0xe1, 0x37, 0x49, 0xa8, 0x8d, 0xfb, 0x8a, 0x6f, 0xf3, - 0x03, 0x22, 0x02, 0x68, 0x3a, 0x2a, 0x80, 0xfe, 0x22, 0x09, 0x2b, 0x4d, 0x59, 0x37, 0x74, 0x4d, - 0x91, 0xfb, 0xe1, 0xe0, 0x79, 0x1e, 0x8a, 0xe3, 0xd1, 0xd7, 0x27, 0xc4, 0x35, 0xde, 0x7c, 0xbf, - 0x9a, 0x0e, 0xfa, 0xd5, 0xe0, 0xcd, 0x94, 0x4c, 0xf8, 0x66, 0x4a, 0x60, 0xdf, 0x64, 0x43, 0xfb, - 0x46, 0xf8, 0x57, 0x12, 0x0a, 0x6e, 0xbb, 0x08, 0xbd, 0x18, 0xf0, 0xa8, 0x95, 0xa8, 0x03, 0xc4, - 0x19, 0xfd, 0x1b, 0x05, 0x61, 0x73, 0xa7, 0xce, 0x6e, 0xee, 0xb8, 0x1e, 0x9f, 0x7b, 0x41, 0x27, - 0x73, 0xe6, 0x0b, 0x3a, 0xcf, 0x03, 0x72, 0x0c, 0x47, 0xee, 0x4b, 0x27, 0x86, 0xa3, 0xe9, 0x5d, - 0x89, 0x6d, 0x58, 0xe6, 0xfc, 0x6a, 0xf4, 0xc9, 0x5d, 0xfa, 0x60, 0x9f, 0xee, 0xdd, 0x1f, 0x27, - 0xa1, 0xe0, 0x81, 0xb9, 0xb3, 0x5e, 0x10, 0x58, 0x81, 0x1c, 0xc7, 0x2b, 0xec, 0x86, 0x00, 0x1f, - 0x79, 0x0d, 0xc6, 0x4c, 0xa0, 0xc1, 0xd8, 0x80, 0xc2, 0x00, 0x3b, 0x32, 0xf5, 0xe4, 0x6c, 0x0d, - 0xbc, 0xf1, 0x95, 0x57, 0xa0, 0x14, 0xb8, 0xab, 0x41, 0x9c, 0xfb, 0x6e, 0xeb, 0xed, 0x5a, 0xa2, - 0x91, 0xff, 0xf8, 0xd3, 0x8b, 0xe9, 0x5d, 0xfc, 0x01, 0x59, 0x3f, 0xb1, 0xd5, 0x6c, 0xb7, 0x9a, - 0xb7, 0x6b, 0xc9, 0x46, 0xe9, 0xe3, 0x4f, 0x2f, 0xe6, 0x45, 0x4c, 0xbb, 0x39, 0x57, 0xda, 0xb0, - 0x10, 0x5c, 0x95, 0xb0, 0x8f, 0x41, 0x50, 0xd9, 0x3a, 0xdc, 0xdf, 0xd9, 0x6e, 0x6e, 0x74, 0x5a, - 0xd2, 0xdd, 0xbd, 0x4e, 0xab, 0x96, 0x44, 0x8f, 0xc3, 0xd2, 0xce, 0xf6, 0x1b, 0xed, 0x8e, 0xd4, - 0xdc, 0xd9, 0x6e, 0xed, 0x76, 0xa4, 0x8d, 0x4e, 0x67, 0xa3, 0x79, 0xbb, 0x96, 0xba, 0xf6, 0xdb, - 0x12, 0x54, 0x37, 0x36, 0x9b, 0xdb, 0x04, 0xae, 0x69, 0x8a, 0x4c, 0x3d, 0x56, 0x13, 0x32, 0xb4, - 0x2e, 0x3c, 0xf5, 0xde, 0x6d, 0x63, 0x7a, 0xaf, 0x0f, 0xdd, 0x82, 0x2c, 0x2d, 0x19, 0xa3, 0xe9, - 0x17, 0x71, 0x1b, 0x33, 0x9a, 0x7f, 0xe4, 0x63, 0xe8, 0x09, 0x9f, 0x7a, 0x33, 0xb7, 0x31, 0xbd, - 0x17, 0x88, 0x76, 0x20, 0xef, 0x56, 0xf4, 0x66, 0xdd, 0x71, 0x6d, 0xcc, 0x6c, 0xaa, 0x91, 0xa9, - 0xb1, 0xca, 0xeb, 0xf4, 0x4b, 0xbb, 0x8d, 0x19, 0x5d, 0x42, 0xb4, 0x0d, 0x39, 0x5e, 0xf4, 0x98, - 0x71, 0x5f, 0xb5, 0x31, 0xab, 0x39, 0x86, 0x44, 0x28, 0xfa, 0x35, 0xed, 0xd9, 0x57, 0x91, 0x1b, - 0x73, 0x34, 0x40, 0xd1, 0x3d, 0x28, 0x87, 0x0b, 0x29, 0xf3, 0xdd, 0x89, 0x6d, 0xcc, 0xd9, 0x86, - 0x23, 0xfa, 0xc3, 0x55, 0x95, 0xf9, 0xee, 0xc8, 0x36, 0xe6, 0xec, 0xca, 0xa1, 0xf7, 0x60, 0x71, - 0xb2, 0xea, 0x31, 0xff, 0x95, 0xd9, 0xc6, 0x19, 0xfa, 0x74, 0x68, 0x00, 0x28, 0xa2, 0x5a, 0x72, - 0x86, 0x1b, 0xb4, 0x8d, 0xb3, 0xb4, 0xed, 0x90, 0x0a, 0xd5, 0xf1, 0x0a, 0xc4, 0xbc, 0x37, 0x6a, - 0x1b, 0x73, 0xb7, 0xf0, 0xd8, 0x5b, 0xc2, 0x68, 0x7b, 0xde, 0x1b, 0xb6, 0x8d, 0xb9, 0x3b, 0x7a, - 0xe8, 0x10, 0x20, 0x80, 0x4e, 0xe7, 0xb8, 0x71, 0xdb, 0x98, 0xa7, 0xb7, 0x87, 0x4c, 0x58, 0x8a, - 0xc2, 0xad, 0x67, 0xb9, 0x80, 0xdb, 0x38, 0x53, 0xcb, 0x8f, 0xec, 0xe7, 0x30, 0xe2, 0x9d, 0xef, - 0x42, 0x6e, 0x63, 0xce, 0xde, 0xdf, 0x66, 0xeb, 0xb3, 0x2f, 0x57, 0x93, 0x9f, 0x7f, 0xb9, 0x9a, - 0xfc, 0xc7, 0x97, 0xab, 0xc9, 0x4f, 0xbe, 0x5a, 0x4d, 0x7c, 0xfe, 0xd5, 0x6a, 0xe2, 0xaf, 0x5f, - 0xad, 0x26, 0xbe, 0xf7, 0x5c, 0x57, 0x73, 0x7a, 0xc3, 0xa3, 0x75, 0xc5, 0x18, 0x5c, 0x0d, 0xfe, - 0x37, 0x23, 0xea, 0xff, 0x22, 0x47, 0x39, 0x1a, 0x4d, 0x5f, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x11, 0xf3, 0x55, 0x1e, 0x4f, 0x32, 0x00, 0x00, + // 3372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcd, 0x73, 0x23, 0xd5, + 0x11, 0xd7, 0xf7, 0x47, 0xcb, 0xfa, 0xf0, 0xb3, 0x59, 0xb4, 0x62, 0xd7, 0x5e, 0x66, 0x0b, 0x58, + 0x16, 0xf0, 0x86, 0xa5, 0x96, 0x2c, 0x59, 0x08, 0x65, 0xcb, 0x5a, 0x64, 0xd6, 0x6b, 0x9b, 0xb1, + 0x6c, 0x8a, 0x7c, 0xec, 0x30, 0x9e, 0x79, 0x96, 0x86, 0x95, 0x66, 0x86, 0x99, 0x91, 0x91, 0x39, + 0xa5, 0x52, 0xc5, 0x85, 0x4a, 0x55, 0xb8, 0x25, 0x55, 0x09, 0x95, 0x53, 0xaa, 0xf2, 0x07, 0xe4, + 0x90, 0x53, 0x2e, 0xc9, 0x81, 0x43, 0x0e, 0xdc, 0x92, 0xca, 0x81, 0xa4, 0xe0, 0x96, 0x7f, 0x80, + 0x53, 0x3e, 0xea, 0x7d, 0xcc, 0x97, 0x34, 0x23, 0xc9, 0xec, 0x2e, 0x97, 0xdc, 0xf4, 0x7a, 0xba, + 0x7b, 0xe6, 0xf5, 0x7b, 0xaf, 0xbb, 0x7f, 0xdd, 0x4f, 0xf0, 0x84, 0x83, 0x75, 0x15, 0x5b, 0x03, + 0x4d, 0x77, 0xae, 0xc9, 0x47, 0x8a, 0x76, 0xcd, 0x39, 0x35, 0xb1, 0xbd, 0x66, 0x5a, 0x86, 0x63, + 0xa0, 0xaa, 0xff, 0x70, 0x8d, 0x3c, 0x6c, 0x5c, 0x0c, 0x70, 0x2b, 0xd6, 0xa9, 0xe9, 0x18, 0xd7, + 0x4c, 0xcb, 0x30, 0x8e, 0x19, 0x7f, 0xe3, 0x42, 0xe0, 0x31, 0xd5, 0x13, 0xd4, 0x16, 0x7a, 0xca, + 0x85, 0xef, 0xe3, 0x53, 0xf7, 0xe9, 0xc5, 0x09, 0x59, 0x53, 0xb6, 0xe4, 0x81, 0xfb, 0x78, 0xb5, + 0x6b, 0x18, 0xdd, 0x3e, 0xbe, 0x46, 0x47, 0x47, 0xc3, 0xe3, 0x6b, 0x8e, 0x36, 0xc0, 0xb6, 0x23, + 0x0f, 0x4c, 0xce, 0xb0, 0xdc, 0x35, 0xba, 0x06, 0xfd, 0x79, 0x8d, 0xfc, 0x62, 0x54, 0xe1, 0xbf, + 0x00, 0x79, 0x11, 0xbf, 0x3f, 0xc4, 0xb6, 0x83, 0xae, 0x43, 0x06, 0x2b, 0x3d, 0xa3, 0x9e, 0xbc, + 0x94, 0xbc, 0x52, 0xba, 0x7e, 0x61, 0x6d, 0x6c, 0x72, 0x6b, 0x9c, 0xaf, 0xa5, 0xf4, 0x8c, 0x76, + 0x42, 0xa4, 0xbc, 0xe8, 0x06, 0x64, 0x8f, 0xfb, 0x43, 0xbb, 0x57, 0x4f, 0x51, 0xa1, 0x8b, 0x71, + 0x42, 0xb7, 0x09, 0x53, 0x3b, 0x21, 0x32, 0x6e, 0xf2, 0x2a, 0x4d, 0x3f, 0x36, 0xea, 0xe9, 0xe9, + 0xaf, 0xda, 0xd2, 0x8f, 0xe9, 0xab, 0x08, 0x2f, 0xda, 0x00, 0xd0, 0x74, 0xcd, 0x91, 0x94, 0x9e, + 0xac, 0xe9, 0xf5, 0x0c, 0x95, 0x7c, 0x32, 0x5e, 0x52, 0x73, 0x9a, 0x84, 0xb1, 0x9d, 0x10, 0x8b, + 0x9a, 0x3b, 0x20, 0x9f, 0xfb, 0xfe, 0x10, 0x5b, 0xa7, 0xf5, 0xec, 0xf4, 0xcf, 0x7d, 0x8b, 0x30, + 0x91, 0xcf, 0xa5, 0xdc, 0x68, 0x0b, 0x4a, 0x47, 0xb8, 0xab, 0xe9, 0xd2, 0x51, 0xdf, 0x50, 0xee, + 0xd7, 0x73, 0x54, 0x58, 0x88, 0x13, 0xde, 0x20, 0xac, 0x1b, 0x84, 0x73, 0x23, 0x55, 0x4f, 0xb6, + 0x13, 0x22, 0x1c, 0x79, 0x14, 0xf4, 0x2a, 0x14, 0x94, 0x1e, 0x56, 0xee, 0x4b, 0xce, 0xa8, 0x9e, + 0xa7, 0x7a, 0x56, 0xe3, 0xf4, 0x34, 0x09, 0x5f, 0x67, 0xd4, 0x4e, 0x88, 0x79, 0x85, 0xfd, 0x44, + 0xb7, 0x01, 0x54, 0xdc, 0xd7, 0x4e, 0xb0, 0x45, 0xe4, 0x0b, 0xd3, 0x6d, 0xb0, 0xc9, 0x38, 0x3b, + 0x23, 0xfe, 0x19, 0x45, 0xd5, 0x25, 0xa0, 0x26, 0x14, 0xb1, 0xae, 0xf2, 0xe9, 0x14, 0xa9, 0x9a, + 0x4b, 0xb1, 0xeb, 0xad, 0xab, 0xc1, 0xc9, 0x14, 0x30, 0x1f, 0xa3, 0x9b, 0x90, 0x53, 0x8c, 0xc1, + 0x40, 0x73, 0xea, 0x40, 0x35, 0xac, 0xc4, 0x4e, 0x84, 0x72, 0xb5, 0x13, 0x22, 0xe7, 0x47, 0x3b, + 0x50, 0xe9, 0x6b, 0xb6, 0x23, 0xd9, 0xba, 0x6c, 0xda, 0x3d, 0xc3, 0xb1, 0xeb, 0x25, 0xaa, 0xe1, + 0xa9, 0x38, 0x0d, 0xdb, 0x9a, 0xed, 0xec, 0xbb, 0xcc, 0xed, 0x84, 0x58, 0xee, 0x07, 0x09, 0x44, + 0x9f, 0x71, 0x7c, 0x8c, 0x2d, 0x4f, 0x61, 0x7d, 0x61, 0xba, 0xbe, 0x5d, 0xc2, 0xed, 0xca, 0x13, + 0x7d, 0x46, 0x90, 0x80, 0x7e, 0x08, 0x4b, 0x7d, 0x43, 0x56, 0x3d, 0x75, 0x92, 0xd2, 0x1b, 0xea, + 0xf7, 0xeb, 0x65, 0xaa, 0xf4, 0xd9, 0xd8, 0x8f, 0x34, 0x64, 0xd5, 0x55, 0xd1, 0x24, 0x02, 0xed, + 0x84, 0xb8, 0xd8, 0x1f, 0x27, 0xa2, 0x7b, 0xb0, 0x2c, 0x9b, 0x66, 0xff, 0x74, 0x5c, 0x7b, 0x85, + 0x6a, 0xbf, 0x1a, 0xa7, 0x7d, 0x9d, 0xc8, 0x8c, 0xab, 0x47, 0xf2, 0x04, 0x15, 0x75, 0xa0, 0x66, + 0x5a, 0xd8, 0x94, 0x2d, 0x2c, 0x99, 0x96, 0x61, 0x1a, 0xb6, 0xdc, 0xaf, 0x57, 0xa9, 0xee, 0x67, + 0xe2, 0x74, 0xef, 0x31, 0xfe, 0x3d, 0xce, 0xde, 0x4e, 0x88, 0x55, 0x33, 0x4c, 0x62, 0x5a, 0x0d, + 0x05, 0xdb, 0xb6, 0xaf, 0xb5, 0x36, 0x4b, 0x2b, 0xe5, 0x0f, 0x6b, 0x0d, 0x91, 0x50, 0x0b, 0x4a, + 0x78, 0x44, 0xc4, 0xa5, 0x13, 0xc3, 0xc1, 0xf5, 0xc5, 0xe9, 0x07, 0xab, 0x45, 0x59, 0x0f, 0x0d, + 0x07, 0x93, 0x43, 0x85, 0xbd, 0x11, 0x92, 0xe1, 0xb1, 0x13, 0x6c, 0x69, 0xc7, 0xa7, 0x54, 0x8d, + 0x44, 0x9f, 0xd8, 0x9a, 0xa1, 0xd7, 0x11, 0x55, 0xf8, 0x5c, 0x9c, 0xc2, 0x43, 0x2a, 0x44, 0x54, + 0xb4, 0x5c, 0x91, 0x76, 0x42, 0x5c, 0x3a, 0x99, 0x24, 0x93, 0x2d, 0x76, 0xac, 0xe9, 0x72, 0x5f, + 0xfb, 0x10, 0xf3, 0x63, 0xb3, 0x34, 0x7d, 0x8b, 0xdd, 0xe6, 0xdc, 0xf4, 0xac, 0x90, 0x2d, 0x76, + 0x1c, 0x24, 0x6c, 0xe4, 0x21, 0x7b, 0x22, 0xf7, 0x87, 0x58, 0x78, 0x06, 0x4a, 0x01, 0xc7, 0x8a, + 0xea, 0x90, 0x1f, 0x60, 0xdb, 0x96, 0xbb, 0x98, 0xfa, 0xe1, 0xa2, 0xe8, 0x0e, 0x85, 0x0a, 0x2c, + 0x04, 0x9d, 0xa9, 0xf0, 0x49, 0xd2, 0x93, 0x24, 0x7e, 0x92, 0x48, 0x9e, 0x60, 0x8b, 0x4e, 0x9b, + 0x4b, 0xf2, 0x21, 0xba, 0x0c, 0x65, 0xfa, 0xc9, 0x92, 0xfb, 0x9c, 0x38, 0xeb, 0x8c, 0xb8, 0x40, + 0x89, 0x87, 0x9c, 0x69, 0x15, 0x4a, 0xe6, 0x75, 0xd3, 0x63, 0x49, 0x53, 0x16, 0x30, 0xaf, 0x9b, + 0x2e, 0xc3, 0x93, 0xb0, 0x40, 0xe6, 0xe7, 0x71, 0x64, 0xe8, 0x4b, 0x4a, 0x84, 0xc6, 0x59, 0x84, + 0xbf, 0xa4, 0xa0, 0x36, 0xee, 0x80, 0xd1, 0x4d, 0xc8, 0x90, 0x58, 0xc4, 0xc3, 0x4a, 0x63, 0x8d, + 0x05, 0xaa, 0x35, 0x37, 0x50, 0xad, 0x75, 0xdc, 0x40, 0xb5, 0x51, 0xf8, 0xec, 0x8b, 0xd5, 0xc4, + 0x27, 0xff, 0x58, 0x4d, 0x8a, 0x54, 0x02, 0x9d, 0x27, 0xbe, 0x52, 0xd6, 0x74, 0x49, 0x53, 0xe9, + 0x27, 0x17, 0x89, 0x23, 0x94, 0x35, 0x7d, 0x4b, 0x45, 0xdb, 0x50, 0x53, 0x0c, 0xdd, 0xc6, 0xba, + 0x3d, 0xb4, 0x25, 0x16, 0x08, 0x79, 0x30, 0x09, 0xb9, 0x43, 0x16, 0x5e, 0x9b, 0x2e, 0xe7, 0x1e, + 0x65, 0x14, 0xab, 0x4a, 0x98, 0x40, 0xdc, 0xea, 0x89, 0xdc, 0xd7, 0x54, 0xd9, 0x31, 0x2c, 0xbb, + 0x9e, 0xb9, 0x94, 0x8e, 0xf4, 0x87, 0x87, 0x2e, 0xcb, 0x81, 0xa9, 0xca, 0x0e, 0xde, 0xc8, 0x90, + 0xcf, 0x15, 0x03, 0x92, 0xe8, 0x69, 0xa8, 0xca, 0xa6, 0x29, 0xd9, 0x8e, 0xec, 0x60, 0xe9, 0xe8, + 0xd4, 0xc1, 0x36, 0x0d, 0x34, 0x0b, 0x62, 0x59, 0x36, 0xcd, 0x7d, 0x42, 0xdd, 0x20, 0x44, 0xf4, + 0x14, 0x54, 0x48, 0x4c, 0xd2, 0xe4, 0xbe, 0xd4, 0xc3, 0x5a, 0xb7, 0xe7, 0xd0, 0x90, 0x92, 0x16, + 0xcb, 0x9c, 0xda, 0xa6, 0x44, 0x41, 0xf5, 0x56, 0x9c, 0xc6, 0x23, 0x84, 0x20, 0xa3, 0xca, 0x8e, + 0x4c, 0x2d, 0xb9, 0x20, 0xd2, 0xdf, 0x84, 0x66, 0xca, 0x4e, 0x8f, 0xdb, 0x87, 0xfe, 0x46, 0xe7, + 0x20, 0xc7, 0xd5, 0xa6, 0xa9, 0x5a, 0x3e, 0x42, 0xcb, 0x90, 0x35, 0x2d, 0xe3, 0x04, 0xd3, 0xa5, + 0x2b, 0x88, 0x6c, 0x20, 0xfc, 0x24, 0x05, 0x8b, 0x13, 0x91, 0x8b, 0xe8, 0xed, 0xc9, 0x76, 0xcf, + 0x7d, 0x17, 0xf9, 0x8d, 0x5e, 0x26, 0x7a, 0x65, 0x15, 0x5b, 0x3c, 0xda, 0xd7, 0x27, 0x4d, 0xdd, + 0xa6, 0xcf, 0xb9, 0x69, 0x38, 0x37, 0xba, 0x03, 0xb5, 0xbe, 0x6c, 0x3b, 0x12, 0xf3, 0xfe, 0x52, + 0x20, 0xf2, 0x3f, 0x31, 0x61, 0x64, 0x16, 0x2b, 0xc8, 0x86, 0xe6, 0x4a, 0x2a, 0x44, 0xd4, 0xa7, + 0x22, 0x11, 0x96, 0x8f, 0x4e, 0x3f, 0x94, 0x75, 0x47, 0xd3, 0xb1, 0x34, 0xb1, 0x6a, 0xe7, 0x27, + 0x14, 0xb6, 0x4e, 0x34, 0x15, 0xeb, 0x8a, 0xbb, 0x5c, 0x4b, 0x9e, 0xb0, 0xb7, 0x9c, 0xb6, 0x20, + 0x42, 0x25, 0x1c, 0x73, 0x51, 0x05, 0x52, 0xce, 0x88, 0x4f, 0x3e, 0xe5, 0x8c, 0xd0, 0x77, 0x20, + 0x43, 0x26, 0x48, 0x27, 0x5e, 0x89, 0x48, 0x58, 0xb8, 0x5c, 0xe7, 0xd4, 0xc4, 0x22, 0xe5, 0x14, + 0x04, 0xef, 0x28, 0x78, 0x71, 0x78, 0x5c, 0xab, 0xf0, 0x2c, 0x54, 0xc7, 0x82, 0x6c, 0x60, 0xed, + 0x92, 0xc1, 0xb5, 0x13, 0xaa, 0x50, 0x0e, 0x45, 0x53, 0xe1, 0x1c, 0x2c, 0x47, 0x05, 0x47, 0xa1, + 0xe7, 0xd1, 0x43, 0x41, 0x0e, 0xdd, 0x80, 0x82, 0x17, 0x1d, 0xd9, 0x51, 0x9c, 0xb4, 0x95, 0xcb, + 0x2c, 0x7a, 0xac, 0xe4, 0x0c, 0x92, 0x2d, 0x4d, 0xf7, 0x42, 0x8a, 0x7e, 0x78, 0x5e, 0x36, 0xcd, + 0xb6, 0x6c, 0xf7, 0x84, 0x77, 0xa1, 0x1e, 0x17, 0xf9, 0xc6, 0xa6, 0x91, 0xf1, 0xb6, 0xe0, 0x39, + 0xc8, 0x1d, 0x1b, 0xd6, 0x40, 0x76, 0xa8, 0xb2, 0xb2, 0xc8, 0x47, 0x64, 0x6b, 0xb2, 0x28, 0x98, + 0xa6, 0x64, 0x36, 0x10, 0x24, 0x38, 0x1f, 0x1b, 0xfd, 0x88, 0x88, 0xa6, 0xab, 0x98, 0xd9, 0xb3, + 0x2c, 0xb2, 0x81, 0xaf, 0x88, 0x7d, 0x2c, 0x1b, 0x90, 0xd7, 0xda, 0x74, 0xae, 0x54, 0x7f, 0x51, + 0xe4, 0x23, 0xe1, 0x4f, 0x29, 0x38, 0x17, 0x1d, 0x03, 0x1f, 0xea, 0x01, 0xa8, 0x41, 0xda, 0x19, + 0x11, 0x07, 0x95, 0xbe, 0xb2, 0x20, 0x92, 0x9f, 0xe8, 0x00, 0x16, 0xfb, 0x86, 0x22, 0xf7, 0xa5, + 0xc0, 0xc1, 0xe0, 0x39, 0xed, 0xe5, 0xc9, 0x2d, 0x4c, 0x23, 0x1d, 0x56, 0x27, 0xce, 0x46, 0x95, + 0xea, 0xd8, 0xf6, 0x0e, 0x48, 0xec, 0xe1, 0xc8, 0x7e, 0xf3, 0xc3, 0x81, 0x2e, 0xc1, 0xc2, 0x40, + 0x1e, 0x49, 0xce, 0x88, 0x7b, 0x34, 0xe6, 0xaa, 0x60, 0x20, 0x8f, 0x3a, 0x23, 0xea, 0xce, 0x84, + 0xdf, 0x04, 0xad, 0x18, 0x0e, 0xf0, 0x8f, 0xd6, 0x8a, 0xfb, 0xb0, 0xcc, 0x92, 0x11, 0xac, 0x46, + 0x18, 0x72, 0x0e, 0xe7, 0x82, 0x5c, 0xf1, 0x47, 0x6b, 0x43, 0xe1, 0x75, 0xcf, 0xc5, 0xfa, 0x39, + 0x4c, 0xa4, 0x6d, 0xfc, 0x73, 0x93, 0x0a, 0x1d, 0xff, 0x5f, 0x27, 0xa1, 0x11, 0x9f, 0xb4, 0x44, + 0xaa, 0x7a, 0x0e, 0x16, 0xbd, 0xaf, 0x97, 0x64, 0x55, 0xb5, 0xb0, 0x6d, 0xf3, 0x53, 0x51, 0xf3, + 0x1e, 0xac, 0x33, 0x7a, 0x6c, 0xc8, 0x78, 0x0a, 0x2a, 0x63, 0x29, 0x55, 0x86, 0x05, 0xb4, 0x93, + 0xe0, 0xfb, 0x85, 0x5f, 0xa5, 0x3c, 0xaf, 0x13, 0xca, 0x7b, 0x1e, 0xf1, 0xfa, 0xbf, 0x05, 0x4b, + 0x2a, 0x56, 0x34, 0xf5, 0x9b, 0x2e, 0xff, 0x22, 0x97, 0x7e, 0xc4, 0xab, 0xff, 0xd7, 0x12, 0x14, + 0x44, 0x6c, 0x9b, 0x24, 0xeb, 0x40, 0x1b, 0x50, 0xc4, 0x23, 0x05, 0x9b, 0x8e, 0x9b, 0xa8, 0x45, + 0x27, 0xbc, 0x8c, 0xbb, 0xe5, 0x72, 0x12, 0xf8, 0xe6, 0x89, 0xa1, 0x97, 0x38, 0x52, 0x8f, 0x07, + 0xdd, 0x5c, 0x3c, 0x08, 0xd5, 0x5f, 0x76, 0xa1, 0x7a, 0x3a, 0x16, 0xad, 0x31, 0xa9, 0x31, 0xac, + 0xfe, 0x12, 0xc7, 0xea, 0x99, 0x19, 0x2f, 0x0b, 0x81, 0xf5, 0x66, 0x08, 0xac, 0x67, 0x67, 0x4c, + 0x33, 0x06, 0xad, 0xbf, 0xec, 0xa2, 0xf5, 0xdc, 0x8c, 0x2f, 0x1e, 0x83, 0xeb, 0x6f, 0x86, 0xe1, + 0x7a, 0x3e, 0xc6, 0xad, 0xba, 0xd2, 0x53, 0xf1, 0xfa, 0x6b, 0x01, 0xbc, 0x5e, 0x88, 0x05, 0xca, + 0x4c, 0x51, 0x04, 0x60, 0x7f, 0x23, 0x04, 0xd8, 0x8b, 0x33, 0xec, 0x30, 0x05, 0xb1, 0x6f, 0x06, + 0x11, 0x3b, 0xc4, 0x02, 0x7f, 0xbe, 0xee, 0x71, 0x90, 0xfd, 0x15, 0x0f, 0xb2, 0x97, 0x62, 0x6b, + 0x0f, 0x7c, 0x2e, 0xe3, 0x98, 0x7d, 0x77, 0x02, 0xb3, 0x33, 0x8c, 0xfd, 0x74, 0xac, 0x8a, 0x19, + 0xa0, 0x7d, 0x77, 0x02, 0xb4, 0x97, 0x67, 0x28, 0x9c, 0x81, 0xda, 0x7f, 0x14, 0x8d, 0xda, 0xe3, + 0x71, 0x35, 0xff, 0xcc, 0xf9, 0x60, 0xbb, 0x14, 0x03, 0xdb, 0xab, 0xb1, 0x10, 0x93, 0xa9, 0x9f, + 0x1b, 0xb7, 0x1f, 0x44, 0xe0, 0x76, 0x86, 0xb0, 0xaf, 0xc4, 0x2a, 0x9f, 0x03, 0xb8, 0x1f, 0x44, + 0x00, 0xf7, 0xc5, 0x99, 0x6a, 0x67, 0x22, 0xf7, 0xdb, 0x61, 0xe4, 0x8e, 0x66, 0x9c, 0xb1, 0x58, + 0xe8, 0x7e, 0x14, 0x07, 0xdd, 0x19, 0xbc, 0x7e, 0x3e, 0x56, 0xe3, 0x19, 0xb0, 0xfb, 0xee, 0x04, + 0x76, 0x5f, 0x9e, 0xb1, 0xd3, 0xe6, 0x05, 0xef, 0xcf, 0x92, 0xb8, 0x3e, 0xe6, 0xaa, 0x49, 0x0a, + 0x8a, 0x2d, 0xcb, 0xb0, 0x38, 0x0c, 0x67, 0x03, 0xe1, 0x0a, 0x01, 0x73, 0xbe, 0x5b, 0x9e, 0x02, + 0xf4, 0x69, 0xaa, 0x1f, 0x70, 0xc5, 0xc2, 0x1f, 0x92, 0xbe, 0x2c, 0xc5, 0x40, 0x41, 0x20, 0x58, + 0xe4, 0x40, 0x30, 0x00, 0xff, 0x53, 0x61, 0xf8, 0xbf, 0x0a, 0x25, 0x92, 0xc2, 0x8f, 0x21, 0x7b, + 0xd9, 0xf4, 0x90, 0xfd, 0x55, 0x58, 0xa4, 0xe1, 0x93, 0x15, 0x09, 0x78, 0x1e, 0x90, 0xa1, 0x79, + 0x40, 0x95, 0x3c, 0x60, 0x56, 0x60, 0x09, 0xc1, 0x0b, 0xb0, 0x14, 0xe0, 0xf5, 0xa0, 0x01, 0x83, + 0xb9, 0x35, 0x8f, 0x7b, 0x9d, 0x63, 0x84, 0x3f, 0x27, 0x7d, 0x0b, 0xf9, 0x25, 0x81, 0x28, 0xf4, + 0x9e, 0x7c, 0x48, 0xe8, 0x3d, 0xf5, 0x8d, 0xd1, 0x7b, 0x10, 0xea, 0xa4, 0xc3, 0x50, 0xe7, 0xeb, + 0xa4, 0xbf, 0x26, 0x1e, 0x16, 0x57, 0x0c, 0x15, 0x73, 0xf0, 0x41, 0x7f, 0x93, 0x04, 0xa5, 0x6f, + 0x74, 0x39, 0xc4, 0x20, 0x3f, 0x09, 0x97, 0x17, 0x3b, 0x8b, 0x3c, 0x34, 0x7a, 0xb8, 0x25, 0x4b, + 0x2d, 0xcc, 0x71, 0x4b, 0x0d, 0xd2, 0xf7, 0x31, 0x8b, 0x74, 0x0b, 0x22, 0xf9, 0x49, 0xf8, 0xe8, + 0x26, 0xa3, 0xf1, 0x6b, 0x41, 0x64, 0x03, 0x74, 0x13, 0x8a, 0xb4, 0xa3, 0x20, 0x19, 0xa6, 0xcd, + 0x03, 0x52, 0x28, 0xd1, 0x61, 0x8d, 0x83, 0xb5, 0x3d, 0xc2, 0xb3, 0x6b, 0xda, 0x62, 0xc1, 0xe4, + 0xbf, 0x02, 0x29, 0x5e, 0x31, 0x94, 0xe2, 0x5d, 0x80, 0x22, 0xf9, 0x7a, 0xdb, 0x94, 0x15, 0x4c, + 0x23, 0x4b, 0x51, 0xf4, 0x09, 0xc2, 0x3d, 0x40, 0x93, 0x71, 0x12, 0xb5, 0x21, 0x87, 0x4f, 0xb0, + 0xee, 0x90, 0x65, 0x23, 0xe6, 0x3e, 0x17, 0x91, 0x17, 0x61, 0xdd, 0xd9, 0xa8, 0x13, 0x23, 0xff, + 0xeb, 0x8b, 0xd5, 0x1a, 0xe3, 0x7e, 0xde, 0x18, 0x68, 0x0e, 0x1e, 0x98, 0xce, 0xa9, 0xc8, 0xe5, + 0x85, 0xbf, 0xa7, 0x08, 0x06, 0x0e, 0xc5, 0xcf, 0x48, 0xdb, 0xba, 0x5b, 0x3e, 0x15, 0xa8, 0x7d, + 0xcc, 0x67, 0xef, 0x8b, 0x00, 0x5d, 0xd9, 0x96, 0x3e, 0x90, 0x75, 0x07, 0xab, 0xdc, 0xe8, 0xc5, + 0xae, 0x6c, 0xbf, 0x4d, 0x09, 0x64, 0xd5, 0xc9, 0xe3, 0xa1, 0x8d, 0x55, 0x0e, 0x6d, 0xf2, 0x5d, + 0xd9, 0x3e, 0xb0, 0xb1, 0x1a, 0x98, 0x65, 0xfe, 0xc1, 0x66, 0x19, 0xb6, 0x71, 0x61, 0xcc, 0xc6, + 0x01, 0x74, 0x5a, 0x0c, 0xa2, 0x53, 0xd4, 0x80, 0x82, 0x69, 0x69, 0x86, 0xa5, 0x39, 0xa7, 0x74, + 0x61, 0xd2, 0xa2, 0x37, 0x46, 0x97, 0xa1, 0x3c, 0xc0, 0x03, 0xd3, 0x30, 0xfa, 0x12, 0x73, 0x36, + 0x25, 0x2a, 0xba, 0xc0, 0x89, 0x2d, 0xea, 0x73, 0x3e, 0x4a, 0xf9, 0xa7, 0xcf, 0xaf, 0x42, 0x3c, + 0x5c, 0xf3, 0xae, 0x44, 0x98, 0x37, 0x40, 0x21, 0x93, 0x18, 0xb3, 0xaf, 0x37, 0xfe, 0xb6, 0x0c, + 0x2c, 0xfc, 0x8c, 0xd6, 0x25, 0xc3, 0xb9, 0x11, 0xda, 0x0f, 0xe2, 0xa3, 0x21, 0x75, 0x0a, 0xee, + 0x76, 0x9e, 0xd7, 0x7b, 0xf8, 0x38, 0x8a, 0x91, 0x6d, 0xf4, 0x0e, 0x3c, 0x3e, 0xe6, 0xd9, 0x3c, + 0xd5, 0xa9, 0x79, 0x1d, 0xdc, 0x63, 0x61, 0x07, 0xe7, 0xaa, 0xf6, 0x8d, 0x95, 0x7e, 0xc0, 0x33, + 0xb7, 0x05, 0x95, 0x70, 0x9a, 0x17, 0xb9, 0xfc, 0x97, 0xa1, 0x6c, 0x61, 0x47, 0xd6, 0x74, 0x29, + 0x84, 0x0c, 0x17, 0x18, 0x91, 0x97, 0x28, 0xf7, 0xe0, 0xb1, 0xc8, 0x74, 0x0f, 0x7d, 0x17, 0x8a, + 0x7e, 0xa6, 0x98, 0x8c, 0x01, 0x4f, 0x5e, 0xbd, 0xc9, 0xe7, 0x15, 0xfe, 0x98, 0xf4, 0x55, 0x86, + 0x2b, 0x58, 0x2d, 0xc8, 0x59, 0xd8, 0x1e, 0xf6, 0x59, 0x4d, 0xa9, 0x72, 0xfd, 0x85, 0xf9, 0x12, + 0x45, 0x42, 0x1d, 0xf6, 0x1d, 0x91, 0x0b, 0x0b, 0xf7, 0x20, 0xc7, 0x28, 0xa8, 0x04, 0xf9, 0x83, + 0x9d, 0x3b, 0x3b, 0xbb, 0x6f, 0xef, 0xd4, 0x12, 0x08, 0x20, 0xb7, 0xde, 0x6c, 0xb6, 0xf6, 0x3a, + 0xb5, 0x24, 0x2a, 0x42, 0x76, 0x7d, 0x63, 0x57, 0xec, 0xd4, 0x52, 0x84, 0x2c, 0xb6, 0xde, 0x6c, + 0x35, 0x3b, 0xb5, 0x34, 0x5a, 0x84, 0x32, 0xfb, 0x2d, 0xdd, 0xde, 0x15, 0xef, 0xae, 0x77, 0x6a, + 0x99, 0x00, 0x69, 0xbf, 0xb5, 0xb3, 0xd9, 0x12, 0x6b, 0x59, 0xe1, 0x45, 0x38, 0x1f, 0x9b, 0x5a, + 0xfa, 0xe5, 0xa9, 0x64, 0xa0, 0x3c, 0x25, 0xfc, 0x32, 0x45, 0xd0, 0x7d, 0x5c, 0xbe, 0x88, 0xde, + 0x1c, 0x9b, 0xf8, 0xf5, 0x33, 0x24, 0x9b, 0x63, 0xb3, 0x27, 0x80, 0xde, 0xc2, 0xc7, 0xd8, 0x51, + 0x7a, 0x2c, 0x7f, 0x65, 0x01, 0xb3, 0x2c, 0x96, 0x39, 0x95, 0x0a, 0xd9, 0x8c, 0xed, 0x3d, 0xac, + 0x38, 0x12, 0xf3, 0x45, 0x6c, 0xd3, 0x15, 0x09, 0x1b, 0xa1, 0xee, 0x33, 0xa2, 0xf0, 0xee, 0x99, + 0x6c, 0x59, 0x84, 0xac, 0xd8, 0xea, 0x88, 0xef, 0xd4, 0xd2, 0x08, 0x41, 0x85, 0xfe, 0x94, 0xf6, + 0x77, 0xd6, 0xf7, 0xf6, 0xdb, 0xbb, 0xc4, 0x96, 0x4b, 0x50, 0x75, 0x6d, 0xe9, 0x12, 0xb3, 0xc2, + 0xd7, 0x29, 0x78, 0x3c, 0x26, 0xdb, 0x25, 0x89, 0xcd, 0xc0, 0x50, 0xb5, 0x63, 0x0d, 0xab, 0x12, + 0xaf, 0xab, 0x16, 0x44, 0x70, 0x49, 0x9d, 0x11, 0xba, 0x09, 0xe0, 0x8c, 0x24, 0x0b, 0x2b, 0x86, + 0xa5, 0xba, 0x99, 0xc1, 0xe4, 0x2e, 0xec, 0x8c, 0x44, 0xca, 0x21, 0x16, 0x1d, 0xfe, 0x6b, 0x5a, + 0x2e, 0x80, 0x5e, 0xe5, 0x4a, 0xc9, 0xb4, 0xdd, 0xb2, 0xf3, 0xc5, 0x88, 0x9a, 0x1d, 0x56, 0x88, + 0x62, 0x6a, 0x7c, 0xaa, 0x98, 0xf2, 0xa3, 0xbb, 0x51, 0x5e, 0x27, 0x3b, 0x9f, 0xd7, 0x39, 0x9b, + 0xbf, 0xc9, 0x3d, 0x98, 0xbf, 0x11, 0x7e, 0x1f, 0xb2, 0x7c, 0x38, 0xfb, 0x3f, 0x07, 0x39, 0x59, + 0x21, 0xf9, 0x2e, 0x37, 0x3a, 0x1f, 0x4d, 0xa9, 0x16, 0x8f, 0x99, 0x2d, 0xfd, 0x30, 0xcc, 0x96, + 0x79, 0x14, 0x66, 0xcb, 0x3e, 0xa0, 0xd9, 0x6e, 0xf9, 0x09, 0x53, 0xa0, 0xd6, 0x37, 0x59, 0x47, + 0x4b, 0x46, 0xd5, 0xd1, 0x6e, 0xc0, 0x13, 0x53, 0xf0, 0x4d, 0x9c, 0xd9, 0x85, 0x9f, 0xa7, 0x7d, + 0x9f, 0x19, 0xae, 0xbf, 0x3d, 0xb4, 0x44, 0x6d, 0x6c, 0xfd, 0x52, 0x67, 0x5c, 0xbf, 0xc8, 0x60, + 0x9b, 0x7e, 0x74, 0xc1, 0x36, 0xf3, 0x80, 0xc1, 0x36, 0xb8, 0x91, 0xb3, 0xe1, 0x8d, 0x3c, 0x11, + 0x17, 0x73, 0x11, 0x71, 0xf1, 0x1d, 0x80, 0x40, 0xcf, 0x6a, 0x19, 0xb2, 0x96, 0x31, 0xd4, 0x55, + 0xba, 0x6c, 0x59, 0x91, 0x0d, 0xd0, 0x0d, 0xc8, 0x92, 0xd5, 0x8f, 0x77, 0x4c, 0x64, 0xf1, 0x03, + 0xd5, 0x4a, 0xc6, 0x2d, 0x68, 0x80, 0x26, 0x1b, 0x02, 0x31, 0xaf, 0x78, 0x2d, 0xfc, 0x8a, 0x27, + 0x63, 0x5b, 0x0b, 0xd1, 0xaf, 0xfa, 0x10, 0xb2, 0x74, 0x7b, 0x90, 0xfc, 0x80, 0xb6, 0xbf, 0x38, + 0xe0, 0x24, 0xbf, 0xd1, 0x8f, 0x01, 0x64, 0xc7, 0xb1, 0xb4, 0xa3, 0xa1, 0xff, 0x82, 0xd5, 0xe8, + 0xed, 0xb5, 0xee, 0xf2, 0x6d, 0x5c, 0xe0, 0xfb, 0x6c, 0xd9, 0x17, 0x0d, 0xec, 0xb5, 0x80, 0x42, + 0x61, 0x07, 0x2a, 0x61, 0x59, 0x17, 0x22, 0xb1, 0x6f, 0x08, 0x43, 0x24, 0x86, 0x78, 0x39, 0x44, + 0xf2, 0x00, 0x56, 0x9a, 0xb5, 0x39, 0xe9, 0x40, 0xf8, 0x4f, 0x12, 0x16, 0x82, 0xbb, 0xf3, 0xff, + 0x0d, 0x65, 0x08, 0x1f, 0x25, 0xa1, 0xe0, 0x4d, 0x3e, 0xa6, 0xcd, 0xe8, 0xdb, 0x2e, 0x15, 0x6c, + 0xaa, 0xb1, 0xbe, 0x65, 0xda, 0xeb, 0x86, 0xde, 0xf2, 0x12, 0x92, 0xb8, 0xa2, 0x70, 0xd0, 0xd2, + 0x6e, 0x19, 0x9f, 0xe7, 0x5f, 0xbf, 0xe0, 0xdf, 0x41, 0x02, 0x2d, 0xfa, 0x1e, 0xf1, 0x68, 0x5e, + 0x29, 0xbc, 0x12, 0x51, 0x1b, 0x75, 0x59, 0xd7, 0x3a, 0xa3, 0x75, 0xca, 0x29, 0x72, 0x09, 0xfe, + 0x55, 0x29, 0xaf, 0x9b, 0xfa, 0x3a, 0xd1, 0xcb, 0x78, 0xc2, 0xe9, 0x48, 0x05, 0xe0, 0x60, 0xe7, + 0xee, 0xee, 0xe6, 0xd6, 0xed, 0xad, 0xd6, 0x26, 0x4f, 0x49, 0x36, 0x37, 0x5b, 0x9b, 0xb5, 0x14, + 0xe1, 0x13, 0x5b, 0x77, 0x77, 0x0f, 0x5b, 0x9b, 0xb5, 0xb4, 0x70, 0x0b, 0x8a, 0x9e, 0xeb, 0x41, + 0x75, 0xc8, 0xbb, 0x4d, 0x93, 0x24, 0x77, 0x00, 0xbc, 0x57, 0xb2, 0x0c, 0x59, 0xd3, 0xf8, 0x80, + 0xf7, 0x12, 0xd3, 0x22, 0x1b, 0x08, 0x2a, 0x54, 0xc7, 0xfc, 0x16, 0xba, 0x05, 0x79, 0x73, 0x78, + 0x24, 0xb9, 0x9b, 0x76, 0xec, 0xa2, 0x9b, 0x8b, 0xd4, 0x87, 0x47, 0x7d, 0x4d, 0xb9, 0x83, 0x4f, + 0x5d, 0x33, 0x99, 0xc3, 0xa3, 0x3b, 0x6c, 0x6f, 0xb3, 0xb7, 0xa4, 0x82, 0x6f, 0x39, 0x81, 0x82, + 0x7b, 0x54, 0xd1, 0xf7, 0xa1, 0xe8, 0xb9, 0x44, 0xef, 0x76, 0x45, 0xac, 0x2f, 0xe5, 0xea, 0x7d, + 0x11, 0x74, 0x15, 0x16, 0x6d, 0xad, 0xab, 0xbb, 0xcd, 0x13, 0x56, 0x19, 0x4b, 0xd1, 0x33, 0x53, + 0x65, 0x0f, 0xb6, 0xdd, 0x72, 0x8e, 0xf0, 0xdb, 0x24, 0xd4, 0xc6, 0x7d, 0xc5, 0xb7, 0xf9, 0x01, + 0x11, 0x01, 0x34, 0x1d, 0x15, 0x40, 0xff, 0x9d, 0x84, 0x82, 0xdb, 0x92, 0x41, 0x2f, 0x06, 0xbc, + 0x56, 0x25, 0x6a, 0x93, 0x72, 0x46, 0xbf, 0x6b, 0x1f, 0x9e, 0x52, 0xea, 0xec, 0x53, 0x8a, 0xeb, + 0xa3, 0xb9, 0x97, 0x60, 0x32, 0x67, 0xbe, 0x04, 0xf3, 0x3c, 0x20, 0xc7, 0x70, 0xe4, 0xbe, 0x74, + 0x62, 0x38, 0x9a, 0xde, 0x95, 0xd8, 0xa6, 0x60, 0x0e, 0xa6, 0x46, 0x9f, 0x1c, 0xd2, 0x07, 0x7b, + 0x74, 0x7f, 0xfc, 0x34, 0x09, 0x05, 0x0f, 0x30, 0x9d, 0xb5, 0x09, 0x7f, 0x0e, 0x72, 0x1c, 0x13, + 0xb0, 0x2e, 0x3c, 0x1f, 0x79, 0x4d, 0xbc, 0x4c, 0xa0, 0x89, 0xd7, 0x80, 0xc2, 0x00, 0x3b, 0x32, + 0xf5, 0x96, 0x2c, 0x40, 0x7a, 0xe3, 0xab, 0xaf, 0x40, 0x29, 0x70, 0x1f, 0x82, 0x38, 0xd0, 0x9d, + 0xd6, 0xdb, 0xb5, 0x44, 0x23, 0xff, 0xf1, 0xa7, 0x97, 0xd2, 0x3b, 0xf8, 0x03, 0x72, 0xb6, 0xc4, + 0x56, 0xb3, 0xdd, 0x6a, 0xde, 0xa9, 0x25, 0x1b, 0xa5, 0x8f, 0x3f, 0xbd, 0x94, 0x17, 0x31, 0xed, + 0x98, 0x5c, 0x6d, 0xc3, 0x42, 0x70, 0x55, 0xc2, 0xe7, 0x18, 0x41, 0x65, 0xf3, 0x60, 0x6f, 0x7b, + 0xab, 0xb9, 0xde, 0x69, 0x49, 0x87, 0xbb, 0x9d, 0x56, 0x2d, 0x89, 0x1e, 0x87, 0xa5, 0xed, 0xad, + 0x37, 0xda, 0x1d, 0xa9, 0xb9, 0xbd, 0xd5, 0xda, 0xe9, 0x48, 0xeb, 0x9d, 0xce, 0x7a, 0xf3, 0x4e, + 0x2d, 0x75, 0xfd, 0x77, 0x25, 0xa8, 0xae, 0x6f, 0x34, 0xb7, 0x08, 0x24, 0xd2, 0x14, 0x99, 0x7a, + 0x85, 0x26, 0x64, 0x68, 0xed, 0x75, 0xea, 0xdd, 0xd6, 0xc6, 0xf4, 0x7e, 0x1a, 0xba, 0x0d, 0x59, + 0x5a, 0x96, 0x45, 0xd3, 0x2f, 0xbb, 0x36, 0x66, 0x34, 0xd8, 0xc8, 0xc7, 0xd0, 0x53, 0x34, 0xf5, + 0xf6, 0x6b, 0x63, 0x7a, 0xbf, 0x0d, 0x6d, 0x43, 0xde, 0xad, 0x9a, 0xcd, 0xba, 0x47, 0xda, 0x98, + 0xd9, 0xb8, 0x22, 0x53, 0x63, 0xd5, 0xcd, 0xe9, 0x17, 0x63, 0x1b, 0x33, 0x3a, 0x71, 0x68, 0x0b, + 0x72, 0xbc, 0xb0, 0x30, 0xe3, 0x4e, 0x68, 0x63, 0x56, 0x03, 0x0a, 0x89, 0x50, 0xf4, 0xeb, 0xc6, + 0xb3, 0xaf, 0xfb, 0x36, 0xe6, 0x68, 0x32, 0xa2, 0x7b, 0x50, 0x0e, 0x17, 0x2b, 0xe6, 0xbb, 0x77, + 0xda, 0x98, 0xb3, 0xd5, 0x45, 0xf4, 0x87, 0x2b, 0x17, 0xf3, 0xdd, 0x43, 0x6d, 0xcc, 0xd9, 0xf9, + 0x42, 0xef, 0xc1, 0xe2, 0x64, 0x65, 0x61, 0xfe, 0x6b, 0xa9, 0x8d, 0x33, 0xf4, 0xc2, 0xd0, 0x00, + 0x50, 0x44, 0x45, 0xe2, 0x0c, 0xb7, 0x54, 0x1b, 0x67, 0x69, 0x8d, 0x21, 0x15, 0xaa, 0xe3, 0x28, + 0x7f, 0xde, 0x5b, 0xab, 0x8d, 0xb9, 0xdb, 0x64, 0xec, 0x2d, 0x61, 0x44, 0x3b, 0xef, 0x2d, 0xd6, + 0xc6, 0xdc, 0x5d, 0x33, 0x74, 0x00, 0x10, 0x40, 0x80, 0x73, 0xdc, 0x6a, 0x6d, 0xcc, 0xd3, 0x3f, + 0x43, 0x26, 0x2c, 0x45, 0x61, 0xc3, 0xb3, 0x5c, 0x72, 0x6d, 0x9c, 0xa9, 0xad, 0x46, 0xf6, 0x73, + 0x18, 0x55, 0xce, 0x77, 0xe9, 0xb5, 0x31, 0x67, 0x7f, 0x6d, 0xa3, 0xf5, 0xd9, 0x97, 0x2b, 0xc9, + 0xcf, 0xbf, 0x5c, 0x49, 0xfe, 0xf3, 0xcb, 0x95, 0xe4, 0x27, 0x5f, 0xad, 0x24, 0x3e, 0xff, 0x6a, + 0x25, 0xf1, 0xb7, 0xaf, 0x56, 0x12, 0x3f, 0x78, 0xae, 0xab, 0x39, 0xbd, 0xe1, 0xd1, 0x9a, 0x62, + 0x0c, 0xae, 0x05, 0xff, 0xff, 0x10, 0xf5, 0x9f, 0x8c, 0xa3, 0x1c, 0x8d, 0xa6, 0x2f, 0xfd, 0x2f, + 0x00, 0x00, 0xff, 0xff, 0xe8, 0x59, 0xbe, 0x94, 0xb3, 0x31, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -8365,60 +8283,6 @@ func (m *ExtendedVoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *CanonicalVoteExtension) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CanonicalVoteExtension) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CanonicalVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0x2a - } - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ChainId))) - i-- - dAtA[i] = 0x22 - } - if m.Round != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Round)) - i-- - dAtA[i] = 0x18 - } - if m.Height != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) - i-- - dAtA[i] = 0x10 - } - 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] = 0xa - } - return len(dAtA) - i, nil -} - func (m *Evidence) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -10083,33 +9947,6 @@ func (m *ExtendedVoteInfo) Size() (n int) { return n } -func (m *CanonicalVoteExtension) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Extension) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) - } - if m.Round != 0 { - n += 1 + sovTypes(uint64(m.Round)) - } - l = len(m.ChainId) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Address) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - func (m *Evidence) Size() (n int) { if m == nil { return 0 @@ -18665,194 +18502,6 @@ func (m *ExtendedVoteInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *CanonicalVoteExtension) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CanonicalVoteExtension: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CanonicalVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Extension", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Extension = append(m.Extension[:0], dAtA[iNdEx:postIndex]...) - if m.Extension == nil { - m.Extension = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - m.Height = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Height |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType) - } - m.Round = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Round |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChainId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = append(m.Address[:0], dAtA[iNdEx:postIndex]...) - if m.Address == nil { - m.Address = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *Evidence) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 709831043..457aa2deb 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -308,48 +308,129 @@ func (m *CanonicalVote) GetChainID() string { return "" } +// CanonicalVoteExtension +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"` + ChainId string `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Address []byte `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"` +} + +func (m *CanonicalVoteExtension) Reset() { *m = CanonicalVoteExtension{} } +func (m *CanonicalVoteExtension) String() string { return proto.CompactTextString(m) } +func (*CanonicalVoteExtension) ProtoMessage() {} +func (*CanonicalVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_8d1a1a84ff7267ed, []int{4} +} +func (m *CanonicalVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CanonicalVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CanonicalVoteExtension.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CanonicalVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_CanonicalVoteExtension.Merge(m, src) +} +func (m *CanonicalVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *CanonicalVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_CanonicalVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_CanonicalVoteExtension proto.InternalMessageInfo + +func (m *CanonicalVoteExtension) GetExtension() []byte { + if m != nil { + return m.Extension + } + return nil +} + +func (m *CanonicalVoteExtension) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *CanonicalVoteExtension) GetRound() int32 { + if m != nil { + return m.Round + } + return 0 +} + +func (m *CanonicalVoteExtension) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + +func (m *CanonicalVoteExtension) GetAddress() []byte { + if m != nil { + return m.Address + } + return nil +} + func init() { proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID") proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader") proto.RegisterType((*CanonicalProposal)(nil), "tendermint.types.CanonicalProposal") proto.RegisterType((*CanonicalVote)(nil), "tendermint.types.CanonicalVote") + proto.RegisterType((*CanonicalVoteExtension)(nil), "tendermint.types.CanonicalVoteExtension") } func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xce, 0xa5, 0x4e, 0xe2, 0x5c, 0x1b, 0x08, 0xa7, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x1e, 0x90, - 0x59, 0x6c, 0xa9, 0x1d, 0xd8, 0x5d, 0x06, 0x82, 0x40, 0x94, 0x6b, 0xd5, 0x81, 0x25, 0xba, 0xd8, - 0x87, 0x6d, 0xe1, 0xf8, 0x4e, 0xf6, 0x65, 0xe8, 0xc2, 0x6f, 0xe8, 0xef, 0xe0, 0x97, 0x74, 0xec, - 0x08, 0x4b, 0x40, 0xce, 0x1f, 0x41, 0x77, 0x4e, 0xec, 0xa8, 0x01, 0x16, 0x10, 0xcb, 0xe9, 0xfd, - 0x78, 0xee, 0x79, 0x1f, 0x3d, 0xaf, 0x5e, 0x68, 0x0b, 0x9a, 0x47, 0xb4, 0x58, 0xa4, 0xb9, 0xf0, - 0xc5, 0x0d, 0xa7, 0xa5, 0x1f, 0x92, 0x9c, 0xe5, 0x69, 0x48, 0x32, 0x8f, 0x17, 0x4c, 0x30, 0x34, - 0x6e, 0x11, 0x9e, 0x42, 0x4c, 0x8e, 0x63, 0x16, 0x33, 0xd5, 0xf4, 0x65, 0x54, 0xe3, 0x26, 0x4f, - 0xf7, 0x98, 0xd4, 0xbb, 0xe9, 0x5a, 0x31, 0x63, 0x71, 0x46, 0x7d, 0x95, 0xcd, 0x97, 0x1f, 0x7d, - 0x91, 0x2e, 0x68, 0x29, 0xc8, 0x82, 0xd7, 0x00, 0xe7, 0x33, 0x1c, 0x9f, 0x6f, 0x27, 0x07, 0x19, - 0x0b, 0x3f, 0x4d, 0x5f, 0x22, 0x04, 0xb5, 0x84, 0x94, 0x89, 0x01, 0x6c, 0xe0, 0x1e, 0x61, 0x15, - 0xa3, 0x6b, 0xf8, 0x98, 0x93, 0x42, 0xcc, 0x4a, 0x2a, 0x66, 0x09, 0x25, 0x11, 0x2d, 0x8c, 0xae, - 0x0d, 0xdc, 0xc3, 0x53, 0xd7, 0x7b, 0x28, 0xd4, 0x6b, 0x08, 0x2f, 0x48, 0x21, 0x2e, 0xa9, 0x78, - 0xa5, 0xf0, 0x81, 0x76, 0xb7, 0xb2, 0x3a, 0x78, 0xc4, 0x77, 0x8b, 0x4e, 0x00, 0x4f, 0x7e, 0x0d, - 0x47, 0xc7, 0xb0, 0x27, 0x98, 0x20, 0x99, 0x92, 0x31, 0xc2, 0x75, 0xd2, 0x68, 0xeb, 0xb6, 0xda, - 0x9c, 0x6f, 0x5d, 0xf8, 0xa4, 0x25, 0x29, 0x18, 0x67, 0x25, 0xc9, 0xd0, 0x19, 0xd4, 0xa4, 0x1c, - 0xf5, 0xfd, 0xd1, 0xa9, 0xb5, 0x2f, 0xf3, 0x32, 0x8d, 0x73, 0x1a, 0xbd, 0x2d, 0xe3, 0xab, 0x1b, - 0x4e, 0xb1, 0x02, 0xa3, 0x13, 0xd8, 0x4f, 0x68, 0x1a, 0x27, 0x42, 0x0d, 0x18, 0xe3, 0x4d, 0x26, - 0xc5, 0x14, 0x6c, 0x99, 0x47, 0xc6, 0x81, 0x2a, 0xd7, 0x09, 0x7a, 0x0e, 0x87, 0x9c, 0x65, 0xb3, - 0xba, 0xa3, 0xd9, 0xc0, 0x3d, 0x08, 0x8e, 0xaa, 0x95, 0xa5, 0x5f, 0xbc, 0x7b, 0x83, 0x65, 0x0d, - 0xeb, 0x9c, 0x65, 0x2a, 0x42, 0xaf, 0xa1, 0x3e, 0x97, 0xf6, 0xce, 0xd2, 0xc8, 0xe8, 0x29, 0xe3, - 0x9c, 0x3f, 0x18, 0xb7, 0xd9, 0x44, 0x70, 0x58, 0xad, 0xac, 0xc1, 0x26, 0xc1, 0x03, 0x45, 0x30, - 0x8d, 0x50, 0x00, 0x87, 0xcd, 0x1a, 0x8d, 0xbe, 0x22, 0x9b, 0x78, 0xf5, 0xa2, 0xbd, 0xed, 0xa2, - 0xbd, 0xab, 0x2d, 0x22, 0xd0, 0xa5, 0xef, 0xb7, 0xdf, 0x2d, 0x80, 0xdb, 0x6f, 0xe8, 0x19, 0xd4, - 0xc3, 0x84, 0xa4, 0xb9, 0xd4, 0x33, 0xb0, 0x81, 0x3b, 0xac, 0x67, 0x9d, 0xcb, 0x9a, 0x9c, 0xa5, - 0x9a, 0xd3, 0xc8, 0xf9, 0xd2, 0x85, 0xa3, 0x46, 0xd6, 0x35, 0x13, 0xf4, 0x7f, 0xf8, 0xba, 0x6b, - 0x96, 0xf6, 0x2f, 0xcd, 0xea, 0xfd, 0xbd, 0x59, 0xfd, 0xdf, 0x9b, 0x15, 0xbc, 0xbf, 0xab, 0x4c, - 0x70, 0x5f, 0x99, 0xe0, 0x47, 0x65, 0x82, 0xdb, 0xb5, 0xd9, 0xb9, 0x5f, 0x9b, 0x9d, 0xaf, 0x6b, - 0xb3, 0xf3, 0xe1, 0x45, 0x9c, 0x8a, 0x64, 0x39, 0xf7, 0x42, 0xb6, 0xf0, 0x77, 0x0f, 0xb6, 0x0d, - 0xeb, 0xc3, 0x7e, 0x78, 0xcc, 0xf3, 0xbe, 0xaa, 0x9f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, - 0xdd, 0x12, 0x5d, 0x31, 0x04, 0x00, 0x00, + // 542 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xce, 0xa6, 0xf9, 0xdd, 0x26, 0x10, 0x56, 0x55, 0x65, 0xa2, 0xca, 0x8e, 0x7c, 0x40, 0xe6, + 0x62, 0x4b, 0xed, 0x81, 0xbb, 0x0b, 0x12, 0x41, 0x20, 0xca, 0xb6, 0xea, 0x81, 0x4b, 0xb4, 0xb1, + 0x17, 0xdb, 0xc2, 0xf1, 0x5a, 0xf6, 0x46, 0xa2, 0x17, 0x9e, 0xa1, 0x57, 0x5e, 0x81, 0x27, 0xe9, + 0xb1, 0x47, 0xb8, 0x04, 0xe4, 0xbc, 0x08, 0xda, 0xf5, 0xaf, 0xd2, 0xaa, 0x17, 0x10, 0x17, 0x6b, + 0xbe, 0x99, 0x6f, 0x67, 0x3e, 0x7f, 0x63, 0x2f, 0x9c, 0x71, 0x1a, 0xb9, 0x34, 0x59, 0x05, 0x11, + 0xb7, 0xf8, 0x55, 0x4c, 0x53, 0xcb, 0x21, 0x11, 0x8b, 0x02, 0x87, 0x84, 0x66, 0x9c, 0x30, 0xce, + 0xd0, 0xa4, 0x66, 0x98, 0x92, 0x31, 0x3d, 0xf0, 0x98, 0xc7, 0x64, 0xd1, 0x12, 0x51, 0xce, 0x9b, + 0x1e, 0xdd, 0xe9, 0x24, 0x9f, 0x45, 0x55, 0xf3, 0x18, 0xf3, 0x42, 0x6a, 0x49, 0xb4, 0x5c, 0x7f, + 0xb2, 0x78, 0xb0, 0xa2, 0x29, 0x27, 0xab, 0x38, 0x27, 0xe8, 0x5f, 0xe1, 0xe4, 0xb4, 0x9c, 0x6c, + 0x87, 0xcc, 0xf9, 0x3c, 0x7f, 0x89, 0x10, 0xec, 0xf8, 0x24, 0xf5, 0x15, 0x30, 0x03, 0xc6, 0x08, + 0xcb, 0x18, 0x5d, 0xc2, 0xc7, 0x31, 0x49, 0xf8, 0x22, 0xa5, 0x7c, 0xe1, 0x53, 0xe2, 0xd2, 0x44, + 0x69, 0xcf, 0x80, 0xb1, 0x7f, 0x6c, 0x98, 0xbb, 0x42, 0xcd, 0xaa, 0xe1, 0x19, 0x49, 0xf8, 0x39, + 0xe5, 0xaf, 0x25, 0xdf, 0xee, 0xdc, 0x6c, 0xb4, 0x16, 0x1e, 0xc7, 0xcd, 0xa4, 0x6e, 0xc3, 0xc3, + 0xfb, 0xe9, 0xe8, 0x00, 0x76, 0x39, 0xe3, 0x24, 0x94, 0x32, 0xc6, 0x38, 0x07, 0x95, 0xb6, 0x76, + 0xad, 0x4d, 0xff, 0xd9, 0x86, 0x4f, 0xea, 0x26, 0x09, 0x8b, 0x59, 0x4a, 0x42, 0x74, 0x02, 0x3b, + 0x42, 0x8e, 0x3c, 0xfe, 0xe8, 0x58, 0xbb, 0x2b, 0xf3, 0x3c, 0xf0, 0x22, 0xea, 0xbe, 0x4b, 0xbd, + 0x8b, 0xab, 0x98, 0x62, 0x49, 0x46, 0x87, 0xb0, 0xe7, 0xd3, 0xc0, 0xf3, 0xb9, 0x1c, 0x30, 0xc1, + 0x05, 0x12, 0x62, 0x12, 0xb6, 0x8e, 0x5c, 0x65, 0x4f, 0xa6, 0x73, 0x80, 0x9e, 0xc3, 0x61, 0xcc, + 0xc2, 0x45, 0x5e, 0xe9, 0xcc, 0x80, 0xb1, 0x67, 0x8f, 0xb2, 0x8d, 0x36, 0x38, 0x7b, 0xff, 0x16, + 0x8b, 0x1c, 0x1e, 0xc4, 0x2c, 0x94, 0x11, 0x7a, 0x03, 0x07, 0x4b, 0x61, 0xef, 0x22, 0x70, 0x95, + 0xae, 0x34, 0x4e, 0x7f, 0xc0, 0xb8, 0x62, 0x13, 0xf6, 0x7e, 0xb6, 0xd1, 0xfa, 0x05, 0xc0, 0x7d, + 0xd9, 0x60, 0xee, 0x22, 0x1b, 0x0e, 0xab, 0x35, 0x2a, 0x3d, 0xd9, 0x6c, 0x6a, 0xe6, 0x8b, 0x36, + 0xcb, 0x45, 0x9b, 0x17, 0x25, 0xc3, 0x1e, 0x08, 0xdf, 0xaf, 0x7f, 0x69, 0x00, 0xd7, 0xc7, 0xd0, + 0x33, 0x38, 0x70, 0x7c, 0x12, 0x44, 0x42, 0x4f, 0x7f, 0x06, 0x8c, 0x61, 0x3e, 0xeb, 0x54, 0xe4, + 0xc4, 0x2c, 0x59, 0x9c, 0xbb, 0xfa, 0xf7, 0x36, 0x1c, 0x57, 0xb2, 0x2e, 0x19, 0xa7, 0xff, 0xc3, + 0xd7, 0xa6, 0x59, 0x9d, 0x7f, 0x69, 0x56, 0xf7, 0xef, 0xcd, 0xea, 0x3d, 0x60, 0xd6, 0x37, 0xd0, + 0xf8, 0x9a, 0x85, 0x59, 0xaf, 0xbe, 0x70, 0x1a, 0xa5, 0x01, 0x8b, 0xd0, 0x11, 0x1c, 0xd2, 0x12, + 0x14, 0x3f, 0x56, 0x9d, 0xd8, 0xb1, 0x67, 0xef, 0x7e, 0x7b, 0xba, 0xa5, 0x3d, 0x4f, 0x1b, 0x72, + 0x84, 0x3d, 0xc3, 0x4a, 0x01, 0x52, 0x60, 0x9f, 0xb8, 0x6e, 0x42, 0xd3, 0x54, 0xbe, 0xeb, 0x08, + 0x97, 0xd0, 0xfe, 0x70, 0x93, 0xa9, 0xe0, 0x36, 0x53, 0xc1, 0xef, 0x4c, 0x05, 0xd7, 0x5b, 0xb5, + 0x75, 0xbb, 0x55, 0x5b, 0x3f, 0xb6, 0x6a, 0xeb, 0xe3, 0x0b, 0x2f, 0xe0, 0xfe, 0x7a, 0x69, 0x3a, + 0x6c, 0x65, 0x35, 0x2f, 0x93, 0x3a, 0xcc, 0x2f, 0x9d, 0xdd, 0x8b, 0x66, 0xd9, 0x93, 0xf9, 0x93, + 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xba, 0xba, 0x40, 0xcd, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -566,6 +647,60 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *CanonicalVoteExtension) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *CanonicalVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CanonicalVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintCanonical(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0x2a + } + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintCanonical(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0x22 + } + if m.Round != 0 { + i = encodeVarintCanonical(dAtA, i, uint64(m.Round)) + i-- + dAtA[i] = 0x18 + } + if m.Height != 0 { + i = encodeVarintCanonical(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x10 + } + if len(m.Extension) > 0 { + i -= len(m.Extension) + copy(dAtA[i:], m.Extension) + i = encodeVarintCanonical(dAtA, i, uint64(len(m.Extension))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintCanonical(dAtA []byte, offset int, v uint64) int { offset -= sovCanonical(v) base := offset @@ -667,6 +802,33 @@ func (m *CanonicalVote) Size() (n int) { return n } +func (m *CanonicalVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Extension) + if l > 0 { + n += 1 + l + sovCanonical(uint64(l)) + } + if m.Height != 0 { + n += 1 + sovCanonical(uint64(m.Height)) + } + if m.Round != 0 { + n += 1 + sovCanonical(uint64(m.Round)) + } + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovCanonical(uint64(l)) + } + l = len(m.Address) + if l > 0 { + n += 1 + l + sovCanonical(uint64(l)) + } + return n +} + func sovCanonical(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1292,6 +1454,194 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { } return nil } +func (m *CanonicalVoteExtension) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: CanonicalVoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CanonicalVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Extension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCanonical + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCanonical + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Extension = append(m.Extension[:0], dAtA[iNdEx:postIndex]...) + if m.Extension == nil { + m.Extension = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 0 { + 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 + } + } + case 3: + if wireType != 0 { + 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 + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCanonical + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCanonical + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCanonical + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCanonical + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = append(m.Address[:0], dAtA[iNdEx:postIndex]...) + if m.Address == nil { + m.Address = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCanonical(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCanonical + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipCanonical(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/proto/tendermint/types/params.pb.go b/proto/tendermint/types/params.pb.go index ff55379df..b6ad7214e 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/tendermint/types/params.pb.go @@ -35,6 +35,7 @@ type ConsensusParams struct { Validator *ValidatorParams `protobuf:"bytes,3,opt,name=validator,proto3" json:"validator,omitempty"` Version *VersionParams `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` Synchrony *SynchronyParams `protobuf:"bytes,5,opt,name=synchrony,proto3" json:"synchrony,omitempty"` + Timeout *TimeoutParams `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } @@ -105,6 +106,13 @@ func (m *ConsensusParams) GetSynchrony() *SynchronyParams { return nil } +func (m *ConsensusParams) GetTimeout() *TimeoutParams { + if m != nil { + return m.Timeout + } + return nil +} + // BlockParams contains limits on the block size. type BlockParams struct { // Max block size, in bytes. @@ -441,6 +449,123 @@ func (m *SynchronyParams) GetPrecision() *time.Duration { return nil } +// TimeoutParams configure the timeouts for the steps of the Tendermint consensus algorithm. +type TimeoutParams struct { + // These fields configure the timeouts for the propose step of the Tendermint + // consensus algorithm: propose is the initial timeout and propose_delta + // determines how much the timeout grows in subsequent rounds. + // For the first round, this propose timeout is used and for every subsequent + // round, the timeout grows by propose_delta. + // + // For example: + // With propose = 10ms, propose_delta = 5ms, the first round's propose phase + // timeout would be 10ms, the second round's would be 15ms, the third 20ms and so on. + // + // If a node waiting for a proposal message does not receive one matching its + // current height and round before this timeout, the node will issue a + // nil prevote for the round and advance to the next step. + Propose *time.Duration `protobuf:"bytes,1,opt,name=propose,proto3,stdduration" json:"propose,omitempty"` + ProposeDelta *time.Duration `protobuf:"bytes,2,opt,name=propose_delta,json=proposeDelta,proto3,stdduration" json:"propose_delta,omitempty"` + // vote along with vote_delta configure the timeout for both of the prevote and + // precommit steps of the Tendermint consensus algorithm. + // + // These parameters influence the vote step timeouts in the the same way that + // the propose and propose_delta parameters do to the proposal step. + // + // The vote timeout does not begin until a quorum of votes has been received. Once + // a quorum of votes has been seen and this timeout elapses, Tendermint will + // procced to the next step of the consensus algorithm. If Tendermint receives + // all of the remaining votes before the end of the timeout, it will proceed + // to the next step immediately. + Vote *time.Duration `protobuf:"bytes,3,opt,name=vote,proto3,stdduration" json:"vote,omitempty"` + VoteDelta *time.Duration `protobuf:"bytes,4,opt,name=vote_delta,json=voteDelta,proto3,stdduration" json:"vote_delta,omitempty"` + // commit configures how long Tendermint will wait after receiving a quorum of + // precommits before beginning consensus for the next height. This can be + // used to allow slow precommits to arrive for inclusion in the next height before progressing. + Commit *time.Duration `protobuf:"bytes,5,opt,name=commit,proto3,stdduration" json:"commit,omitempty"` + // enable_commit_timeout_bypass configures the node to proceed immediately to + // the next height once the node has received all precommits for a block, forgoing + // the remaining commit timeout. + // Setting enable_commit_timeout_bypass false (the default) causes Tendermint to wait + // for the full commit. + EnableCommitTimeoutBypass bool `protobuf:"varint,6,opt,name=enable_commit_timeout_bypass,json=enableCommitTimeoutBypass,proto3" json:"enable_commit_timeout_bypass,omitempty"` +} + +func (m *TimeoutParams) Reset() { *m = TimeoutParams{} } +func (m *TimeoutParams) String() string { return proto.CompactTextString(m) } +func (*TimeoutParams) ProtoMessage() {} +func (*TimeoutParams) Descriptor() ([]byte, []int) { + return fileDescriptor_e12598271a686f57, []int{7} +} +func (m *TimeoutParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TimeoutParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TimeoutParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TimeoutParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_TimeoutParams.Merge(m, src) +} +func (m *TimeoutParams) XXX_Size() int { + return m.Size() +} +func (m *TimeoutParams) XXX_DiscardUnknown() { + xxx_messageInfo_TimeoutParams.DiscardUnknown(m) +} + +var xxx_messageInfo_TimeoutParams proto.InternalMessageInfo + +func (m *TimeoutParams) GetPropose() *time.Duration { + if m != nil { + return m.Propose + } + return nil +} + +func (m *TimeoutParams) GetProposeDelta() *time.Duration { + if m != nil { + return m.ProposeDelta + } + return nil +} + +func (m *TimeoutParams) GetVote() *time.Duration { + if m != nil { + return m.Vote + } + return nil +} + +func (m *TimeoutParams) GetVoteDelta() *time.Duration { + if m != nil { + return m.VoteDelta + } + return nil +} + +func (m *TimeoutParams) GetCommit() *time.Duration { + if m != nil { + return m.Commit + } + return nil +} + +func (m *TimeoutParams) GetEnableCommitTimeoutBypass() bool { + if m != nil { + return m.EnableCommitTimeoutBypass + } + return false +} + func init() { proto.RegisterType((*ConsensusParams)(nil), "tendermint.types.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "tendermint.types.BlockParams") @@ -449,48 +574,56 @@ func init() { proto.RegisterType((*VersionParams)(nil), "tendermint.types.VersionParams") proto.RegisterType((*HashedParams)(nil), "tendermint.types.HashedParams") proto.RegisterType((*SynchronyParams)(nil), "tendermint.types.SynchronyParams") + proto.RegisterType((*TimeoutParams)(nil), "tendermint.types.TimeoutParams") } func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) } var fileDescriptor_e12598271a686f57 = []byte{ - // 565 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4d, 0x8b, 0xd3, 0x40, - 0x18, 0xc7, 0x9b, 0xed, 0xbe, 0xb4, 0x4f, 0xb7, 0xdb, 0x65, 0x10, 0x8c, 0x2b, 0x9b, 0xd6, 0x1c, - 0x64, 0x41, 0x48, 0xc4, 0x45, 0x44, 0x50, 0xc4, 0x6e, 0x45, 0x41, 0x56, 0x24, 0xbe, 0x1c, 0xf6, - 0x12, 0x26, 0xed, 0x98, 0x86, 0x6d, 0x32, 0x43, 0x26, 0x29, 0xcd, 0xb7, 0xf0, 0x24, 0x7e, 0x04, - 0xfd, 0x18, 0xde, 0xf6, 0xb8, 0x47, 0x4f, 0x2a, 0xed, 0x17, 0x91, 0x99, 0xcc, 0x6c, 0xb6, 0x5d, - 0x15, 0x6f, 0xc9, 0x3c, 0xff, 0xdf, 0x3c, 0xcc, 0xef, 0x49, 0x06, 0xf6, 0x33, 0x92, 0x8c, 0x48, - 0x1a, 0x47, 0x49, 0xe6, 0x66, 0x05, 0x23, 0xdc, 0x65, 0x38, 0xc5, 0x31, 0x77, 0x58, 0x4a, 0x33, - 0x8a, 0x76, 0xab, 0xb2, 0x23, 0xcb, 0x7b, 0xd7, 0x42, 0x1a, 0x52, 0x59, 0x74, 0xc5, 0x53, 0x99, - 0xdb, 0xb3, 0x42, 0x4a, 0xc3, 0x09, 0x71, 0xe5, 0x5b, 0x90, 0x7f, 0x70, 0x47, 0x79, 0x8a, 0xb3, - 0x88, 0x26, 0x65, 0xdd, 0xfe, 0xb6, 0x06, 0x9d, 0x23, 0x9a, 0x70, 0x92, 0xf0, 0x9c, 0xbf, 0x96, - 0x1d, 0xd0, 0x21, 0x6c, 0x04, 0x13, 0x3a, 0x3c, 0x35, 0x8d, 0x9e, 0x71, 0xd0, 0xba, 0xb7, 0xef, - 0xac, 0xf6, 0x72, 0xfa, 0xa2, 0x5c, 0xa6, 0xbd, 0x32, 0x8b, 0x1e, 0x41, 0x83, 0x4c, 0xa3, 0x11, - 0x49, 0x86, 0xc4, 0x5c, 0x93, 0x5c, 0xef, 0x2a, 0xf7, 0x4c, 0x25, 0x14, 0x7a, 0x41, 0xa0, 0x27, - 0xd0, 0x9c, 0xe2, 0x49, 0x34, 0xc2, 0x19, 0x4d, 0xcd, 0xba, 0xc4, 0x6f, 0x5d, 0xc5, 0xdf, 0xeb, - 0x88, 0xe2, 0x2b, 0x06, 0x3d, 0x84, 0xad, 0x29, 0x49, 0x79, 0x44, 0x13, 0x73, 0x5d, 0xe2, 0xdd, - 0x3f, 0xe0, 0x65, 0x40, 0xc1, 0x3a, 0x2f, 0x7a, 0xf3, 0x22, 0x19, 0x8e, 0x53, 0x9a, 0x14, 0xe6, - 0xc6, 0xdf, 0x7a, 0xbf, 0xd1, 0x11, 0xdd, 0xfb, 0x82, 0xb1, 0x8f, 0xa0, 0x75, 0x49, 0x08, 0xba, - 0x09, 0xcd, 0x18, 0xcf, 0xfc, 0xa0, 0xc8, 0x08, 0x97, 0x0a, 0xeb, 0x5e, 0x23, 0xc6, 0xb3, 0xbe, - 0x78, 0x47, 0xd7, 0x61, 0x4b, 0x14, 0x43, 0xcc, 0xa5, 0xa5, 0xba, 0xb7, 0x19, 0xe3, 0xd9, 0x73, - 0xcc, 0xed, 0xaf, 0x06, 0xec, 0x2c, 0xeb, 0x41, 0x77, 0x00, 0x89, 0x2c, 0x0e, 0x89, 0x9f, 0xe4, - 0xb1, 0x2f, 0x3d, 0xeb, 0x1d, 0x3b, 0x31, 0x9e, 0x3d, 0x0d, 0xc9, 0xab, 0x3c, 0x96, 0xad, 0x39, - 0x3a, 0x86, 0x5d, 0x1d, 0xd6, 0x23, 0x56, 0x73, 0xb8, 0xe1, 0x94, 0xdf, 0x80, 0xa3, 0xbf, 0x01, - 0x67, 0xa0, 0x02, 0xfd, 0xc6, 0xd9, 0x8f, 0x6e, 0xed, 0xf3, 0xcf, 0xae, 0xe1, 0xed, 0x94, 0xfb, - 0xe9, 0xca, 0xf2, 0x21, 0xea, 0xcb, 0x87, 0xb0, 0xef, 0x43, 0x67, 0x65, 0x14, 0xc8, 0x86, 0x36, - 0xcb, 0x03, 0xff, 0x94, 0x14, 0xbe, 0xf4, 0x65, 0x1a, 0xbd, 0xfa, 0x41, 0xd3, 0x6b, 0xb1, 0x3c, - 0x78, 0x49, 0x8a, 0xb7, 0x62, 0xc9, 0xbe, 0x0b, 0xed, 0xa5, 0x11, 0xa0, 0x2e, 0xb4, 0x30, 0x63, - 0xbe, 0x1e, 0x9c, 0x38, 0xd9, 0xba, 0x07, 0x98, 0x31, 0x15, 0xb3, 0x4f, 0x60, 0xfb, 0x05, 0xe6, - 0x63, 0x32, 0x52, 0xc0, 0x6d, 0xe8, 0x48, 0x0b, 0xfe, 0xaa, 0xe0, 0xb6, 0x5c, 0x3e, 0xd6, 0x96, - 0x6d, 0x68, 0x57, 0xb9, 0xca, 0x75, 0x4b, 0xa7, 0x84, 0xf0, 0x4f, 0x06, 0x74, 0x56, 0x86, 0x8a, - 0x06, 0xd0, 0x8e, 0x09, 0xe7, 0x52, 0x22, 0x99, 0xe0, 0x42, 0xfd, 0x01, 0xff, 0x30, 0xb8, 0x2e, - 0xed, 0x6d, 0x2b, 0x6a, 0x20, 0x20, 0xf4, 0x18, 0x9a, 0x2c, 0x25, 0xc3, 0x88, 0xff, 0xd7, 0x0c, - 0xca, 0x1d, 0x2a, 0xa2, 0xff, 0xee, 0xcb, 0xdc, 0x32, 0xce, 0xe6, 0x96, 0x71, 0x3e, 0xb7, 0x8c, - 0x5f, 0x73, 0xcb, 0xf8, 0xb8, 0xb0, 0x6a, 0xe7, 0x0b, 0xab, 0xf6, 0x7d, 0x61, 0xd5, 0x4e, 0x1e, - 0x84, 0x51, 0x36, 0xce, 0x03, 0x67, 0x48, 0x63, 0xf7, 0xf2, 0x15, 0x51, 0x3d, 0x96, 0x77, 0xc0, - 0xea, 0xf5, 0x11, 0x6c, 0xca, 0xf5, 0xc3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x57, 0x89, 0x7c, - 0xd9, 0x59, 0x04, 0x00, 0x00, + // 687 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x6e, 0xd3, 0x4a, + 0x14, 0xc6, 0xe3, 0x26, 0x4d, 0x93, 0x93, 0xa6, 0xa9, 0x46, 0x57, 0xba, 0x6e, 0xef, 0xad, 0xd3, + 0xeb, 0xc5, 0x55, 0x25, 0x24, 0x07, 0x51, 0xa1, 0x0a, 0x09, 0xa8, 0x48, 0x83, 0x40, 0x42, 0x45, + 0xc8, 0x14, 0x16, 0xdd, 0x58, 0xe3, 0x64, 0x70, 0xad, 0xc6, 0x1e, 0xcb, 0x63, 0x47, 0xf1, 0x5b, + 0xb0, 0x42, 0x3c, 0x02, 0xbc, 0x49, 0x97, 0x5d, 0xb2, 0x02, 0x94, 0xbe, 0x06, 0x12, 0x68, 0xfe, + 0x35, 0x4d, 0x4a, 0x69, 0x56, 0x71, 0xe6, 0xfc, 0x3e, 0x7f, 0x9e, 0xef, 0x9c, 0x19, 0xd8, 0xca, + 0x48, 0x3c, 0x20, 0x69, 0x14, 0xc6, 0x59, 0x27, 0x2b, 0x12, 0xc2, 0x3a, 0x09, 0x4e, 0x71, 0xc4, + 0x9c, 0x24, 0xa5, 0x19, 0x45, 0xeb, 0xd3, 0xb2, 0x23, 0xca, 0x9b, 0x7f, 0x05, 0x34, 0xa0, 0xa2, + 0xd8, 0xe1, 0x4f, 0x92, 0xdb, 0xb4, 0x02, 0x4a, 0x83, 0x21, 0xe9, 0x88, 0x7f, 0x7e, 0xfe, 0xae, + 0x33, 0xc8, 0x53, 0x9c, 0x85, 0x34, 0x96, 0x75, 0xfb, 0xc7, 0x12, 0xb4, 0x0e, 0x68, 0xcc, 0x48, + 0xcc, 0x72, 0xf6, 0x4a, 0x38, 0xa0, 0x5d, 0x58, 0xf6, 0x87, 0xb4, 0x7f, 0x6a, 0x1a, 0xdb, 0xc6, + 0x4e, 0xe3, 0xde, 0x96, 0x33, 0xef, 0xe5, 0x74, 0x79, 0x59, 0xd2, 0xae, 0x64, 0xd1, 0x43, 0xa8, + 0x91, 0x51, 0x38, 0x20, 0x71, 0x9f, 0x98, 0x4b, 0x42, 0xb7, 0x7d, 0x5d, 0xf7, 0x54, 0x11, 0x4a, + 0x7a, 0xa9, 0x40, 0xfb, 0x50, 0x1f, 0xe1, 0x61, 0x38, 0xc0, 0x19, 0x4d, 0xcd, 0xb2, 0x90, 0xff, + 0x77, 0x5d, 0xfe, 0x56, 0x23, 0x4a, 0x3f, 0xd5, 0xa0, 0x07, 0xb0, 0x32, 0x22, 0x29, 0x0b, 0x69, + 0x6c, 0x56, 0x84, 0xbc, 0xfd, 0x1b, 0xb9, 0x04, 0x94, 0x58, 0xf3, 0xdc, 0x9b, 0x15, 0x71, 0xff, + 0x24, 0xa5, 0x71, 0x61, 0x2e, 0xdf, 0xe4, 0xfd, 0x5a, 0x23, 0xda, 0xfb, 0x52, 0xc3, 0xbd, 0xb3, + 0x30, 0x22, 0x34, 0xcf, 0xcc, 0xea, 0x4d, 0xde, 0x47, 0x12, 0xd0, 0xde, 0x8a, 0xb7, 0x0f, 0xa0, + 0x71, 0x25, 0x4b, 0xf4, 0x0f, 0xd4, 0x23, 0x3c, 0xf6, 0xfc, 0x22, 0x23, 0x4c, 0xa4, 0x5f, 0x76, + 0x6b, 0x11, 0x1e, 0x77, 0xf9, 0x7f, 0xf4, 0x37, 0xac, 0xf0, 0x62, 0x80, 0x99, 0x08, 0xb8, 0xec, + 0x56, 0x23, 0x3c, 0x7e, 0x86, 0x99, 0xfd, 0xd9, 0x80, 0xb5, 0xd9, 0x64, 0xd1, 0x1d, 0x40, 0x9c, + 0xc5, 0x01, 0xf1, 0xe2, 0x3c, 0xf2, 0x44, 0x8b, 0xf4, 0x1b, 0x5b, 0x11, 0x1e, 0x3f, 0x09, 0xc8, + 0xcb, 0x3c, 0x12, 0xd6, 0x0c, 0x1d, 0xc2, 0xba, 0x86, 0xf5, 0x74, 0xa8, 0x16, 0x6e, 0x38, 0x72, + 0x7c, 0x1c, 0x3d, 0x3e, 0x4e, 0x4f, 0x01, 0xdd, 0xda, 0xd9, 0xd7, 0x76, 0xe9, 0xe3, 0xb7, 0xb6, + 0xe1, 0xae, 0xc9, 0xf7, 0xe9, 0xca, 0xec, 0x26, 0xca, 0xb3, 0x9b, 0xb0, 0xef, 0x43, 0x6b, 0xae, + 0x8b, 0xc8, 0x86, 0x66, 0x92, 0xfb, 0xde, 0x29, 0x29, 0x3c, 0x91, 0x95, 0x69, 0x6c, 0x97, 0x77, + 0xea, 0x6e, 0x23, 0xc9, 0xfd, 0x17, 0xa4, 0x38, 0xe2, 0x4b, 0xf6, 0x5d, 0x68, 0xce, 0x74, 0x0f, + 0xb5, 0xa1, 0x81, 0x93, 0xc4, 0xd3, 0x3d, 0xe7, 0x3b, 0xab, 0xb8, 0x80, 0x93, 0x44, 0x61, 0xf6, + 0x31, 0xac, 0x3e, 0xc7, 0xec, 0x84, 0x0c, 0x94, 0xe0, 0x7f, 0x68, 0x89, 0x14, 0xbc, 0xf9, 0x80, + 0x9b, 0x62, 0xf9, 0x50, 0xa7, 0x6c, 0x43, 0x73, 0xca, 0x4d, 0xb3, 0x6e, 0x68, 0x8a, 0x07, 0xfe, + 0xc1, 0x80, 0xd6, 0xdc, 0x3c, 0xa0, 0x1e, 0x34, 0x23, 0xc2, 0x98, 0x08, 0x91, 0x0c, 0x71, 0xa1, + 0x0e, 0xcf, 0x1f, 0x12, 0xac, 0x88, 0xf4, 0x56, 0x95, 0xaa, 0xc7, 0x45, 0xe8, 0x11, 0xd4, 0x93, + 0x94, 0xf4, 0x43, 0xb6, 0x50, 0x0f, 0xe4, 0x1b, 0xa6, 0x0a, 0xfb, 0xe7, 0x12, 0x34, 0x67, 0x26, + 0x8d, 0xcf, 0x66, 0x92, 0xd2, 0x84, 0x32, 0xb2, 0xe8, 0x07, 0x69, 0x9e, 0xef, 0x48, 0x3d, 0xf2, + 0x1d, 0x65, 0x78, 0xd1, 0xef, 0x59, 0x55, 0xaa, 0x1e, 0x17, 0xa1, 0x5d, 0xa8, 0x8c, 0x68, 0x46, + 0xd4, 0xa1, 0xbe, 0x55, 0x2c, 0x60, 0xf4, 0x18, 0x80, 0xff, 0x2a, 0xdf, 0xca, 0x82, 0x39, 0x70, + 0x89, 0x34, 0xdd, 0x83, 0x6a, 0x9f, 0x46, 0x51, 0x98, 0xa9, 0xf3, 0x7c, 0xab, 0x56, 0xe1, 0x68, + 0x1f, 0xfe, 0x25, 0x31, 0xf6, 0x87, 0xc4, 0x93, 0x0b, 0x9e, 0x3a, 0xa8, 0x9e, 0x5f, 0x24, 0x98, + 0x31, 0x71, 0xbe, 0x6b, 0xee, 0x86, 0x64, 0x0e, 0x04, 0xa2, 0xf2, 0xee, 0x0a, 0xa0, 0xfb, 0xe6, + 0xd3, 0xc4, 0x32, 0xce, 0x26, 0x96, 0x71, 0x3e, 0xb1, 0x8c, 0xef, 0x13, 0xcb, 0x78, 0x7f, 0x61, + 0x95, 0xce, 0x2f, 0xac, 0xd2, 0x97, 0x0b, 0xab, 0x74, 0xbc, 0x17, 0x84, 0xd9, 0x49, 0xee, 0x3b, + 0x7d, 0x1a, 0x75, 0xae, 0xde, 0xef, 0xd3, 0x47, 0x79, 0x81, 0xcf, 0xdf, 0xfd, 0x7e, 0x55, 0xac, + 0xef, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xad, 0x03, 0x4c, 0x16, 0x06, 0x00, 0x00, } func (this *ConsensusParams) Equal(that interface{}) bool { @@ -527,6 +660,9 @@ func (this *ConsensusParams) Equal(that interface{}) bool { if !this.Synchrony.Equal(that1.Synchrony) { return false } + if !this.Timeout.Equal(that1.Timeout) { + return false + } return true } func (this *BlockParams) Equal(that interface{}) bool { @@ -705,6 +841,75 @@ func (this *SynchronyParams) Equal(that interface{}) bool { } return true } +func (this *TimeoutParams) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*TimeoutParams) + if !ok { + that2, ok := that.(TimeoutParams) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Propose != nil && that1.Propose != nil { + if *this.Propose != *that1.Propose { + return false + } + } else if this.Propose != nil { + return false + } else if that1.Propose != nil { + return false + } + if this.ProposeDelta != nil && that1.ProposeDelta != nil { + if *this.ProposeDelta != *that1.ProposeDelta { + return false + } + } else if this.ProposeDelta != nil { + return false + } else if that1.ProposeDelta != nil { + return false + } + if this.Vote != nil && that1.Vote != nil { + if *this.Vote != *that1.Vote { + return false + } + } else if this.Vote != nil { + return false + } else if that1.Vote != nil { + return false + } + if this.VoteDelta != nil && that1.VoteDelta != nil { + if *this.VoteDelta != *that1.VoteDelta { + return false + } + } else if this.VoteDelta != nil { + return false + } else if that1.VoteDelta != nil { + return false + } + if this.Commit != nil && that1.Commit != nil { + if *this.Commit != *that1.Commit { + return false + } + } else if this.Commit != nil { + return false + } else if that1.Commit != nil { + return false + } + if this.EnableCommitTimeoutBypass != that1.EnableCommitTimeoutBypass { + return false + } + return true +} func (m *ConsensusParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -725,6 +930,18 @@ func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Timeout != nil { + { + size, err := m.Timeout.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } if m.Synchrony != nil { { size, err := m.Synchrony.MarshalToSizedBuffer(dAtA[:i]) @@ -846,12 +1063,12 @@ func (m *EvidenceParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - n6, err6 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) - if err6 != nil { - return 0, err6 + n7, err7 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) + if err7 != nil { + return 0, err7 } - i -= n6 - i = encodeVarintParams(dAtA, i, uint64(n6)) + i -= n7 + i = encodeVarintParams(dAtA, i, uint64(n7)) i-- dAtA[i] = 0x12 if m.MaxAgeNumBlocks != 0 { @@ -976,22 +1193,105 @@ func (m *SynchronyParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.Precision != nil { - n7, err7 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Precision, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Precision):]) - if err7 != nil { - return 0, err7 + n8, err8 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Precision, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Precision):]) + if err8 != nil { + return 0, err8 } - i -= n7 - i = encodeVarintParams(dAtA, i, uint64(n7)) + i -= n8 + i = encodeVarintParams(dAtA, i, uint64(n8)) i-- dAtA[i] = 0x12 } if m.MessageDelay != nil { - n8, err8 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.MessageDelay, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.MessageDelay):]) - if err8 != nil { - return 0, err8 + n9, err9 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.MessageDelay, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.MessageDelay):]) + if err9 != nil { + return 0, err9 } - i -= n8 - i = encodeVarintParams(dAtA, i, uint64(n8)) + i -= n9 + i = encodeVarintParams(dAtA, i, uint64(n9)) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *TimeoutParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TimeoutParams) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TimeoutParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.EnableCommitTimeoutBypass { + i-- + if m.EnableCommitTimeoutBypass { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x30 + } + if m.Commit != nil { + n10, err10 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Commit, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Commit):]) + if err10 != nil { + return 0, err10 + } + i -= n10 + i = encodeVarintParams(dAtA, i, uint64(n10)) + i-- + dAtA[i] = 0x2a + } + if m.VoteDelta != nil { + n11, err11 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.VoteDelta, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.VoteDelta):]) + if err11 != nil { + return 0, err11 + } + i -= n11 + i = encodeVarintParams(dAtA, i, uint64(n11)) + i-- + dAtA[i] = 0x22 + } + if m.Vote != nil { + n12, err12 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Vote, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Vote):]) + if err12 != nil { + return 0, err12 + } + i -= n12 + i = encodeVarintParams(dAtA, i, uint64(n12)) + i-- + dAtA[i] = 0x1a + } + if m.ProposeDelta != nil { + n13, err13 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.ProposeDelta, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.ProposeDelta):]) + if err13 != nil { + return 0, err13 + } + i -= n13 + i = encodeVarintParams(dAtA, i, uint64(n13)) + i-- + dAtA[i] = 0x12 + } + if m.Propose != nil { + n14, err14 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Propose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Propose):]) + if err14 != nil { + return 0, err14 + } + i -= n14 + i = encodeVarintParams(dAtA, i, uint64(n14)) i-- dAtA[i] = 0xa } @@ -1035,6 +1335,10 @@ func (m *ConsensusParams) Size() (n int) { l = m.Synchrony.Size() n += 1 + l + sovParams(uint64(l)) } + if m.Timeout != nil { + l = m.Timeout.Size() + n += 1 + l + sovParams(uint64(l)) + } return n } @@ -1129,6 +1433,38 @@ func (m *SynchronyParams) Size() (n int) { return n } +func (m *TimeoutParams) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Propose != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Propose) + n += 1 + l + sovParams(uint64(l)) + } + if m.ProposeDelta != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.ProposeDelta) + n += 1 + l + sovParams(uint64(l)) + } + if m.Vote != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Vote) + n += 1 + l + sovParams(uint64(l)) + } + if m.VoteDelta != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.VoteDelta) + n += 1 + l + sovParams(uint64(l)) + } + if m.Commit != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Commit) + n += 1 + l + sovParams(uint64(l)) + } + if m.EnableCommitTimeoutBypass { + n += 2 + } + return n +} + func sovParams(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1344,6 +1680,42 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Timeout == nil { + m.Timeout = &TimeoutParams{} + } + if err := m.Timeout.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) @@ -1935,6 +2307,256 @@ func (m *SynchronyParams) Unmarshal(dAtA []byte) error { } return nil } +func (m *TimeoutParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TimeoutParams: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TimeoutParams: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Propose", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Propose == nil { + m.Propose = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.Propose, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposeDelta", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ProposeDelta == nil { + m.ProposeDelta = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.ProposeDelta, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Vote == nil { + m.Vote = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.Vote, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteDelta", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteDelta == nil { + m.VoteDelta = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.VoteDelta, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Commit == nil { + m.Commit = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.Commit, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EnableCommitTimeoutBypass", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.EnableCommitTimeoutBypass = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipParams(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthParams + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipParams(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0