diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index ff108c664..2b1724a0d 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -832,6 +832,162 @@ func (m *CommitSig) GetVoteExtension() *VoteExtensionToSign { return nil } +type ExtendedCommit struct { + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` + BlockID BlockID `protobuf:"bytes,3,opt,name=block_id,json=blockId,proto3" json:"block_id"` + ExtendedSignatures []ExtendedCommitSig `protobuf:"bytes,4,rep,name=extended_signatures,json=extendedSignatures,proto3" json:"extended_signatures"` +} + +func (m *ExtendedCommit) Reset() { *m = ExtendedCommit{} } +func (m *ExtendedCommit) String() string { return proto.CompactTextString(m) } +func (*ExtendedCommit) ProtoMessage() {} +func (*ExtendedCommit) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{10} +} +func (m *ExtendedCommit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ExtendedCommit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ExtendedCommit.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 *ExtendedCommit) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtendedCommit.Merge(m, src) +} +func (m *ExtendedCommit) XXX_Size() int { + return m.Size() +} +func (m *ExtendedCommit) XXX_DiscardUnknown() { + xxx_messageInfo_ExtendedCommit.DiscardUnknown(m) +} + +var xxx_messageInfo_ExtendedCommit proto.InternalMessageInfo + +func (m *ExtendedCommit) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *ExtendedCommit) GetRound() int32 { + if m != nil { + return m.Round + } + return 0 +} + +func (m *ExtendedCommit) GetBlockID() BlockID { + if m != nil { + return m.BlockID + } + return BlockID{} +} + +func (m *ExtendedCommit) GetExtendedSignatures() []ExtendedCommitSig { + if m != nil { + return m.ExtendedSignatures + } + return nil +} + +// ExtendedCommitSig retains all the same fields as CommitSig but adds vote +// extension-related fields. +type ExtendedCommitSig struct { + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + // Vote extension data + Extension []byte `protobuf:"bytes,5,opt,name=extension,proto3" json:"extension,omitempty"` + // Vote extension signature + ExtensionSignature []byte `protobuf:"bytes,6,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` +} + +func (m *ExtendedCommitSig) Reset() { *m = ExtendedCommitSig{} } +func (m *ExtendedCommitSig) String() string { return proto.CompactTextString(m) } +func (*ExtendedCommitSig) ProtoMessage() {} +func (*ExtendedCommitSig) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{11} +} +func (m *ExtendedCommitSig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ExtendedCommitSig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ExtendedCommitSig.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 *ExtendedCommitSig) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtendedCommitSig.Merge(m, src) +} +func (m *ExtendedCommitSig) XXX_Size() int { + return m.Size() +} +func (m *ExtendedCommitSig) XXX_DiscardUnknown() { + xxx_messageInfo_ExtendedCommitSig.DiscardUnknown(m) +} + +var xxx_messageInfo_ExtendedCommitSig proto.InternalMessageInfo + +func (m *ExtendedCommitSig) GetBlockIdFlag() BlockIDFlag { + if m != nil { + return m.BlockIdFlag + } + return BlockIDFlagUnknown +} + +func (m *ExtendedCommitSig) GetValidatorAddress() []byte { + if m != nil { + return m.ValidatorAddress + } + return nil +} + +func (m *ExtendedCommitSig) GetTimestamp() time.Time { + if m != nil { + return m.Timestamp + } + return time.Time{} +} + +func (m *ExtendedCommitSig) GetSignature() []byte { + if m != nil { + return m.Signature + } + return nil +} + +func (m *ExtendedCommitSig) GetExtension() []byte { + if m != nil { + return m.Extension + } + return nil +} + +func (m *ExtendedCommitSig) GetExtensionSignature() []byte { + if m != nil { + return m.ExtensionSignature + } + return nil +} + type Proposal struct { Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` @@ -846,7 +1002,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -933,7 +1089,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -985,7 +1141,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_d3a6e55e2345de56, []int{14} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1039,7 +1195,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{13} + return fileDescriptor_d3a6e55e2345de56, []int{15} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1107,7 +1263,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{14} + return fileDescriptor_d3a6e55e2345de56, []int{16} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1170,6 +1326,8 @@ func init() { proto.RegisterType((*VoteExtensionToSign)(nil), "tendermint.types.VoteExtensionToSign") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") + proto.RegisterType((*ExtendedCommit)(nil), "tendermint.types.ExtendedCommit") + proto.RegisterType((*ExtendedCommitSig)(nil), "tendermint.types.ExtendedCommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") proto.RegisterType((*SignedHeader)(nil), "tendermint.types.SignedHeader") proto.RegisterType((*LightBlock)(nil), "tendermint.types.LightBlock") @@ -1180,97 +1338,101 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1435 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6f, 0x1a, 0xd7, - 0x16, 0xf7, 0xc0, 0xd8, 0xc0, 0x81, 0xb1, 0xf1, 0x8d, 0x93, 0x60, 0x12, 0x63, 0x34, 0x4f, 0x79, - 0x71, 0xf2, 0x9e, 0x70, 0xea, 0x54, 0xfd, 0x58, 0xb4, 0x15, 0x60, 0x92, 0xa0, 0xd8, 0x98, 0x0e, - 0x24, 0x55, 0xbb, 0x19, 0x0d, 0x70, 0x0d, 0xd3, 0x0c, 0x73, 0x47, 0x33, 0x17, 0xd7, 0xce, 0x5f, - 0x50, 0x79, 0x95, 0x55, 0x77, 0x5e, 0xb5, 0x8b, 0x4a, 0x5d, 0x76, 0xd1, 0x6d, 0xd5, 0x55, 0x96, - 0xd9, 0xb5, 0xab, 0xb4, 0x72, 0xa4, 0xfe, 0x1d, 0xd5, 0xfd, 0x60, 0x18, 0x8c, 0xdd, 0x46, 0x51, - 0xd4, 0x0d, 0x9a, 0x7b, 0xce, 0xef, 0x9c, 0x7b, 0x3e, 0x7e, 0xf7, 0xdc, 0x0b, 0x5c, 0xa7, 0xd8, - 0xed, 0x61, 0x7f, 0x68, 0xbb, 0x74, 0x93, 0x1e, 0x79, 0x38, 0x10, 0xbf, 0x25, 0xcf, 0x27, 0x94, - 0xa0, 0xec, 0x44, 0x5b, 0xe2, 0xf2, 0xfc, 0x4a, 0x9f, 0xf4, 0x09, 0x57, 0x6e, 0xb2, 0x2f, 0x81, - 0xcb, 0xaf, 0xf7, 0x09, 0xe9, 0x3b, 0x78, 0x93, 0xaf, 0x3a, 0xa3, 0xfd, 0x4d, 0x6a, 0x0f, 0x71, - 0x40, 0xad, 0xa1, 0x27, 0x01, 0x6b, 0x91, 0x6d, 0xba, 0xfe, 0x91, 0x47, 0x09, 0xc3, 0x92, 0x7d, - 0xa9, 0x2e, 0x44, 0xd4, 0x07, 0xd8, 0x0f, 0x6c, 0xe2, 0x46, 0xe3, 0xc8, 0x17, 0x67, 0xa2, 0x3c, - 0xb0, 0x1c, 0xbb, 0x67, 0x51, 0xe2, 0x0b, 0x84, 0xfe, 0x21, 0x68, 0x4d, 0xcb, 0xa7, 0x2d, 0x4c, - 0x1f, 0x60, 0xab, 0x87, 0x7d, 0xb4, 0x02, 0xf3, 0x94, 0x50, 0xcb, 0xc9, 0x29, 0x45, 0x65, 0x43, - 0x33, 0xc4, 0x02, 0x21, 0x50, 0x07, 0x56, 0x30, 0xc8, 0xc5, 0x8a, 0xca, 0x46, 0xc6, 0xe0, 0xdf, - 0xfa, 0x00, 0x54, 0x66, 0xca, 0x2c, 0x6c, 0xb7, 0x87, 0x0f, 0xc7, 0x16, 0x7c, 0xc1, 0xa4, 0x9d, - 0x23, 0x8a, 0x03, 0x69, 0x22, 0x16, 0xe8, 0x5d, 0x98, 0xe7, 0xf1, 0xe7, 0xe2, 0x45, 0x65, 0x23, - 0xbd, 0x95, 0x2b, 0x45, 0x0a, 0x25, 0xf2, 0x2b, 0x35, 0x99, 0xbe, 0xa2, 0x3e, 0x7f, 0xb9, 0x3e, - 0x67, 0x08, 0xb0, 0xee, 0x40, 0xa2, 0xe2, 0x90, 0xee, 0x93, 0xfa, 0x76, 0x18, 0x88, 0x32, 0x09, - 0x04, 0xed, 0xc2, 0x92, 0x67, 0xf9, 0xd4, 0x0c, 0x30, 0x35, 0x07, 0x3c, 0x0b, 0xbe, 0x69, 0x7a, - 0x6b, 0xbd, 0x74, 0xb6, 0x0f, 0xa5, 0xa9, 0x64, 0xe5, 0x2e, 0x9a, 0x17, 0x15, 0xea, 0x7f, 0xaa, - 0xb0, 0x20, 0x8b, 0xf1, 0x11, 0x24, 0x64, 0x59, 0xf9, 0x86, 0xe9, 0xad, 0xb5, 0xa8, 0x47, 0xa9, - 0x2a, 0x55, 0x89, 0x1b, 0x60, 0x37, 0x18, 0x05, 0xd2, 0xdf, 0xd8, 0x06, 0xfd, 0x17, 0x92, 0xdd, - 0x81, 0x65, 0xbb, 0xa6, 0xdd, 0xe3, 0x11, 0xa5, 0x2a, 0xe9, 0xd3, 0x97, 0xeb, 0x89, 0x2a, 0x93, - 0xd5, 0xb7, 0x8d, 0x04, 0x57, 0xd6, 0x7b, 0xe8, 0x0a, 0x2c, 0x0c, 0xb0, 0xdd, 0x1f, 0x50, 0x5e, - 0x96, 0xb8, 0x21, 0x57, 0xe8, 0x03, 0x50, 0x19, 0x21, 0x72, 0x2a, 0xdf, 0x3b, 0x5f, 0x12, 0x6c, - 0x29, 0x8d, 0xd9, 0x52, 0x6a, 0x8f, 0xd9, 0x52, 0x49, 0xb2, 0x8d, 0x9f, 0xfd, 0xbe, 0xae, 0x18, - 0xdc, 0x02, 0x55, 0x41, 0x73, 0xac, 0x80, 0x9a, 0x1d, 0x56, 0x36, 0xb6, 0xfd, 0x3c, 0x77, 0xb1, - 0x3a, 0x5b, 0x10, 0x59, 0x58, 0x19, 0x7a, 0x9a, 0x59, 0x09, 0x51, 0x0f, 0x6d, 0x40, 0x96, 0x3b, - 0xe9, 0x92, 0xe1, 0xd0, 0xa6, 0x26, 0xaf, 0xfb, 0x02, 0xaf, 0xfb, 0x22, 0x93, 0x57, 0xb9, 0xf8, - 0x01, 0xeb, 0xc0, 0x35, 0x48, 0xf5, 0x2c, 0x6a, 0x09, 0x48, 0x82, 0x43, 0x92, 0x4c, 0xc0, 0x95, - 0x37, 0x61, 0x29, 0x64, 0x5d, 0x20, 0x20, 0x49, 0xe1, 0x65, 0x22, 0xe6, 0xc0, 0x3b, 0xb0, 0xe2, - 0xe2, 0x43, 0x6a, 0x9e, 0x45, 0xa7, 0x38, 0x1a, 0x31, 0xdd, 0xe3, 0x69, 0x8b, 0x1b, 0xb0, 0xd8, - 0x1d, 0x17, 0x5f, 0x60, 0x81, 0x63, 0xb5, 0x50, 0xca, 0x61, 0xab, 0x90, 0xb4, 0x3c, 0x4f, 0x00, - 0xd2, 0x1c, 0x90, 0xb0, 0x3c, 0x8f, 0xab, 0x6e, 0xc3, 0x32, 0xcf, 0xd1, 0xc7, 0xc1, 0xc8, 0xa1, - 0xd2, 0x49, 0x86, 0x63, 0x96, 0x98, 0xc2, 0x10, 0x72, 0x8e, 0xfd, 0x0f, 0x68, 0xf8, 0xc0, 0xee, - 0x61, 0xb7, 0x8b, 0x05, 0x4e, 0xe3, 0xb8, 0xcc, 0x58, 0xc8, 0x41, 0xb7, 0x20, 0xeb, 0xf9, 0xc4, - 0x23, 0x01, 0xf6, 0x4d, 0xab, 0xd7, 0xf3, 0x71, 0x10, 0xe4, 0x16, 0x85, 0xbf, 0xb1, 0xbc, 0x2c, - 0xc4, 0x7a, 0x0e, 0xd4, 0x6d, 0x8b, 0x5a, 0x28, 0x0b, 0x71, 0x7a, 0x18, 0xe4, 0x94, 0x62, 0x7c, - 0x23, 0x63, 0xb0, 0x4f, 0xfd, 0xa7, 0x38, 0xa8, 0x8f, 0x09, 0xc5, 0xe8, 0x2e, 0xa8, 0xac, 0x4d, - 0x9c, 0x7d, 0x8b, 0xe7, 0xf1, 0xb9, 0x65, 0xf7, 0x5d, 0xdc, 0xdb, 0x0d, 0xfa, 0xed, 0x23, 0x0f, - 0x1b, 0x1c, 0x1c, 0xa1, 0x53, 0x6c, 0x8a, 0x4e, 0x2b, 0x30, 0xef, 0x93, 0x91, 0xdb, 0xe3, 0x2c, - 0x9b, 0x37, 0xc4, 0x02, 0xd5, 0x20, 0x19, 0xb2, 0x44, 0xfd, 0x27, 0x96, 0x2c, 0x31, 0x96, 0x30, - 0x0e, 0x4b, 0x81, 0x91, 0xe8, 0x48, 0xb2, 0x54, 0x20, 0x15, 0x0e, 0x2f, 0xc9, 0xb6, 0xd7, 0x23, - 0xec, 0xc4, 0x0c, 0xfd, 0x0f, 0x96, 0xc3, 0xde, 0x87, 0xc5, 0x13, 0x8c, 0xcb, 0x86, 0x0a, 0x59, - 0xbd, 0x29, 0x5a, 0x99, 0x62, 0x00, 0x25, 0x78, 0x5e, 0x13, 0x5a, 0xd5, 0xf9, 0x24, 0xba, 0x0e, - 0xa9, 0xc0, 0xee, 0xbb, 0x16, 0x1d, 0xf9, 0x58, 0x32, 0x6f, 0x22, 0x60, 0x5a, 0x7c, 0x48, 0xb1, - 0xcb, 0x0f, 0xb9, 0x60, 0xda, 0x44, 0x80, 0x36, 0xe1, 0x52, 0xb8, 0x30, 0x27, 0x5e, 0x04, 0xcb, - 0x50, 0xa8, 0x6a, 0x8d, 0x35, 0xfa, 0x11, 0x68, 0xac, 0x71, 0xb5, 0xd0, 0xc3, 0x4d, 0xc8, 0x32, - 0xee, 0xf1, 0xe3, 0x41, 0x09, 0xf7, 0x21, 0x87, 0x97, 0x66, 0x79, 0x1e, 0xeb, 0x7f, 0x9b, 0x30, - 0x73, 0xf4, 0x09, 0x5c, 0x0f, 0x81, 0x01, 0x76, 0xf6, 0x4d, 0x6b, 0x44, 0x07, 0xd8, 0xa5, 0x76, - 0xd7, 0xa2, 0xb6, 0xdb, 0x97, 0x73, 0x74, 0x55, 0x1a, 0xb5, 0xb0, 0xb3, 0x5f, 0x9e, 0x02, 0xe8, - 0x1f, 0xc3, 0xa5, 0xa9, 0xad, 0xa5, 0xdf, 0xd7, 0x0d, 0x40, 0xff, 0x59, 0x81, 0x05, 0x71, 0xa6, - 0x23, 0x0c, 0x52, 0xce, 0x67, 0x50, 0xec, 0x22, 0x06, 0xc5, 0xdf, 0x9c, 0x41, 0x65, 0x80, 0xb0, - 0xc2, 0x41, 0x4e, 0x2d, 0xc6, 0x37, 0xd2, 0x5b, 0xd7, 0x66, 0x1d, 0x89, 0x10, 0x5b, 0x76, 0x5f, - 0x8e, 0xac, 0x88, 0x91, 0xfe, 0x43, 0x0c, 0x52, 0xa1, 0x1e, 0x95, 0x41, 0x1b, 0xc7, 0x65, 0xee, - 0x3b, 0x56, 0x5f, 0x9e, 0xa2, 0xb5, 0x0b, 0x83, 0xbb, 0xe7, 0x58, 0x7d, 0x23, 0x2d, 0xe3, 0x61, - 0x8b, 0xf3, 0x19, 0x19, 0xbb, 0x80, 0x91, 0x53, 0x47, 0x20, 0xfe, 0x66, 0x47, 0x60, 0x8a, 0xac, - 0xea, 0x59, 0xb2, 0xee, 0xc0, 0xe2, 0x01, 0xa1, 0xd8, 0x9c, 0x30, 0x56, 0x9c, 0xb4, 0x1b, 0xb3, - 0x29, 0x9d, 0x43, 0x05, 0x43, 0x3b, 0x88, 0x0a, 0xf5, 0x1f, 0x63, 0x90, 0x6c, 0xf2, 0x99, 0x64, - 0x39, 0xff, 0xc6, 0xa4, 0xb9, 0x06, 0x29, 0x8f, 0x38, 0xa6, 0xd0, 0xa8, 0x5c, 0x93, 0xf4, 0x88, - 0x63, 0xcc, 0x90, 0x68, 0xfe, 0x2d, 0x8d, 0xa1, 0x85, 0xb7, 0xd0, 0x83, 0xc4, 0x99, 0x1e, 0xe8, - 0x3e, 0x64, 0x44, 0x29, 0xe4, 0x1b, 0xe1, 0x0e, 0xab, 0x01, 0x7f, 0x74, 0x28, 0xb3, 0x6f, 0x1a, - 0x11, 0xb6, 0x40, 0x1a, 0x12, 0xc7, 0x2c, 0xc4, 0x95, 0x2a, 0x9f, 0x29, 0xb9, 0x8b, 0x48, 0x6e, - 0x48, 0x9c, 0xfe, 0x8d, 0x02, 0xb0, 0xc3, 0x2a, 0xcb, 0xf3, 0x65, 0xb7, 0x7b, 0xc0, 0x43, 0x30, - 0xa7, 0x76, 0x2e, 0x5c, 0xd4, 0x34, 0xb9, 0x7f, 0x26, 0x88, 0xc6, 0x5d, 0x05, 0x6d, 0x42, 0xed, - 0x00, 0x8f, 0x83, 0x39, 0xc7, 0x49, 0x78, 0xe9, 0xb6, 0x30, 0x35, 0x32, 0x07, 0x91, 0x95, 0xfe, - 0x8b, 0x02, 0x29, 0x1e, 0xd3, 0x2e, 0xa6, 0xd6, 0x54, 0x0f, 0x95, 0x37, 0xef, 0xe1, 0x1a, 0x80, - 0x70, 0x13, 0xd8, 0x4f, 0xb1, 0x64, 0x56, 0x8a, 0x4b, 0x5a, 0xf6, 0x53, 0x8c, 0xde, 0x0b, 0x0b, - 0x1e, 0xff, 0xfb, 0x82, 0xcb, 0x01, 0x31, 0x2e, 0xfb, 0x55, 0x48, 0xb8, 0xa3, 0xa1, 0xc9, 0xae, - 0x5a, 0x55, 0xb0, 0xd5, 0x1d, 0x0d, 0xdb, 0x87, 0x81, 0xfe, 0x25, 0x24, 0xda, 0x87, 0xfc, 0xd9, - 0xc9, 0x28, 0xea, 0x13, 0x22, 0xdf, 0x3a, 0x62, 0x4a, 0x26, 0x99, 0x80, 0x5f, 0xed, 0x08, 0x54, - 0x36, 0x45, 0xc7, 0x8f, 0x60, 0xf6, 0x8d, 0x4a, 0xaf, 0xf9, 0xa0, 0x95, 0x4f, 0xd9, 0xdb, 0xbf, - 0x2a, 0x90, 0x8e, 0x4c, 0x1b, 0xf4, 0x0e, 0x5c, 0xae, 0xec, 0xec, 0x55, 0x1f, 0x9a, 0xf5, 0x6d, - 0xf3, 0xde, 0x4e, 0xf9, 0xbe, 0xf9, 0xa8, 0xf1, 0xb0, 0xb1, 0xf7, 0x59, 0x23, 0x3b, 0x97, 0xbf, - 0x72, 0x7c, 0x52, 0x44, 0x11, 0xec, 0x23, 0xf7, 0x89, 0x4b, 0xbe, 0x62, 0x77, 0xd2, 0xca, 0xb4, - 0x49, 0xb9, 0xd2, 0xaa, 0x35, 0xda, 0x59, 0x25, 0x7f, 0xf9, 0xf8, 0xa4, 0xb8, 0x1c, 0xb1, 0x28, - 0x77, 0x02, 0xec, 0xd2, 0x59, 0x83, 0xea, 0xde, 0xee, 0x6e, 0xbd, 0x9d, 0x8d, 0xcd, 0x18, 0xc8, - 0xf1, 0x7f, 0x0b, 0x96, 0xa7, 0x0d, 0x1a, 0xf5, 0x9d, 0x6c, 0x3c, 0x8f, 0x8e, 0x4f, 0x8a, 0x8b, - 0x11, 0x74, 0xc3, 0x76, 0xf2, 0xc9, 0xaf, 0xbf, 0x2d, 0xcc, 0x7d, 0xff, 0x5d, 0x41, 0x61, 0x99, - 0x69, 0x53, 0x33, 0x02, 0xfd, 0x1f, 0xae, 0xb6, 0xea, 0xf7, 0x1b, 0xb5, 0x6d, 0x73, 0xb7, 0x75, - 0xdf, 0x6c, 0x7f, 0xde, 0xac, 0x45, 0xb2, 0x5b, 0x3a, 0x3e, 0x29, 0xa6, 0x65, 0x4a, 0x17, 0xa1, - 0x9b, 0x46, 0xed, 0xf1, 0x5e, 0xbb, 0x96, 0x55, 0x04, 0xba, 0xe9, 0x63, 0x36, 0xc0, 0x38, 0xfa, - 0x0e, 0xac, 0x9e, 0x83, 0x0e, 0x13, 0x5b, 0x3e, 0x3e, 0x29, 0x6a, 0x4d, 0x1f, 0x8b, 0xf3, 0xc3, - 0x2d, 0x4a, 0x90, 0x9b, 0xb5, 0xd8, 0x6b, 0xee, 0xb5, 0xca, 0x3b, 0xd9, 0x62, 0x3e, 0x7b, 0x7c, - 0x52, 0xcc, 0x8c, 0x87, 0x21, 0xc3, 0x4f, 0x32, 0xab, 0x7c, 0xfa, 0xfc, 0xb4, 0xa0, 0xbc, 0x38, - 0x2d, 0x28, 0x7f, 0x9c, 0x16, 0x94, 0x67, 0xaf, 0x0a, 0x73, 0x2f, 0x5e, 0x15, 0xe6, 0x7e, 0x7b, - 0x55, 0x98, 0xfb, 0xe2, 0xfd, 0xbe, 0x4d, 0x07, 0xa3, 0x4e, 0xa9, 0x4b, 0x86, 0x9b, 0xd1, 0xbf, - 0x5a, 0x93, 0x4f, 0xf1, 0x97, 0xef, 0xec, 0xdf, 0xb0, 0xce, 0x02, 0x97, 0xdf, 0xfd, 0x2b, 0x00, - 0x00, 0xff, 0xff, 0x4f, 0xab, 0x7f, 0x9d, 0x47, 0x0e, 0x00, 0x00, + // 1493 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcb, 0x6f, 0xdb, 0x46, + 0x13, 0x37, 0x25, 0xda, 0x92, 0x46, 0x92, 0x2d, 0x6f, 0x9c, 0x44, 0x56, 0x62, 0x59, 0x60, 0x90, + 0x2f, 0x4e, 0xbe, 0x0f, 0x72, 0x3e, 0xa7, 0xe8, 0xe3, 0xd0, 0x16, 0x92, 0xed, 0x24, 0x42, 0xfc, + 0x50, 0x29, 0x25, 0x45, 0x73, 0x21, 0x68, 0x71, 0x2d, 0xb1, 0xa1, 0x48, 0x82, 0x5c, 0xb9, 0x76, + 0xfe, 0x82, 0xc2, 0xa7, 0x9c, 0x7a, 0xf3, 0xa9, 0x3d, 0x14, 0xe8, 0xb1, 0x05, 0x7a, 0x2d, 0x7a, + 0xca, 0x31, 0xb7, 0xf6, 0x94, 0xb6, 0x0e, 0xd0, 0xbf, 0xa3, 0xd8, 0x07, 0x5f, 0x96, 0xdd, 0x1a, + 0x41, 0xd0, 0x02, 0xbd, 0x08, 0xdc, 0x99, 0xdf, 0xcc, 0xce, 0xce, 0xfc, 0x76, 0x76, 0x57, 0x70, + 0x95, 0x60, 0xdb, 0xc0, 0xde, 0xd0, 0xb4, 0xc9, 0x32, 0x39, 0x70, 0xb1, 0xcf, 0x7f, 0xeb, 0xae, + 0xe7, 0x10, 0x07, 0x95, 0x22, 0x6d, 0x9d, 0xc9, 0x2b, 0x73, 0x7d, 0xa7, 0xef, 0x30, 0xe5, 0x32, + 0xfd, 0xe2, 0xb8, 0xca, 0x62, 0xdf, 0x71, 0xfa, 0x16, 0x5e, 0x66, 0xa3, 0x9d, 0xd1, 0xee, 0x32, + 0x31, 0x87, 0xd8, 0x27, 0xfa, 0xd0, 0x15, 0x80, 0x85, 0xd8, 0x34, 0x3d, 0xef, 0xc0, 0x25, 0x0e, + 0xc5, 0x3a, 0xbb, 0x42, 0x5d, 0x8d, 0xa9, 0xf7, 0xb0, 0xe7, 0x9b, 0x8e, 0x1d, 0x8f, 0xa3, 0x52, + 0x1b, 0x8b, 0x72, 0x4f, 0xb7, 0x4c, 0x43, 0x27, 0x8e, 0xc7, 0x11, 0xca, 0x7b, 0x50, 0x6c, 0xeb, + 0x1e, 0xe9, 0x60, 0x72, 0x1f, 0xeb, 0x06, 0xf6, 0xd0, 0x1c, 0x4c, 0x12, 0x87, 0xe8, 0x56, 0x59, + 0xaa, 0x49, 0x4b, 0x45, 0x95, 0x0f, 0x10, 0x02, 0x79, 0xa0, 0xfb, 0x83, 0x72, 0xaa, 0x26, 0x2d, + 0x15, 0x54, 0xf6, 0xad, 0x0c, 0x40, 0xa6, 0xa6, 0xd4, 0xc2, 0xb4, 0x0d, 0xbc, 0x1f, 0x58, 0xb0, + 0x01, 0x95, 0xee, 0x1c, 0x10, 0xec, 0x0b, 0x13, 0x3e, 0x40, 0x6f, 0xc1, 0x24, 0x8b, 0xbf, 0x9c, + 0xae, 0x49, 0x4b, 0xf9, 0x95, 0x72, 0x3d, 0x96, 0x28, 0xbe, 0xbe, 0x7a, 0x9b, 0xea, 0x9b, 0xf2, + 0xf3, 0x97, 0x8b, 0x13, 0x2a, 0x07, 0x2b, 0x16, 0x64, 0x9a, 0x96, 0xd3, 0x7b, 0xd2, 0x5a, 0x0b, + 0x03, 0x91, 0xa2, 0x40, 0xd0, 0x26, 0xcc, 0xb8, 0xba, 0x47, 0x34, 0x1f, 0x13, 0x6d, 0xc0, 0x56, + 0xc1, 0x26, 0xcd, 0xaf, 0x2c, 0xd6, 0x4f, 0xd6, 0xa1, 0x9e, 0x58, 0xac, 0x98, 0xa5, 0xe8, 0xc6, + 0x85, 0xca, 0xef, 0x32, 0x4c, 0x89, 0x64, 0xbc, 0x0f, 0x19, 0x91, 0x56, 0x36, 0x61, 0x7e, 0x65, + 0x21, 0xee, 0x51, 0xa8, 0xea, 0xab, 0x8e, 0xed, 0x63, 0xdb, 0x1f, 0xf9, 0xc2, 0x5f, 0x60, 0x83, + 0xfe, 0x03, 0xd9, 0xde, 0x40, 0x37, 0x6d, 0xcd, 0x34, 0x58, 0x44, 0xb9, 0x66, 0xfe, 0xf8, 0xe5, + 0x62, 0x66, 0x95, 0xca, 0x5a, 0x6b, 0x6a, 0x86, 0x29, 0x5b, 0x06, 0xba, 0x04, 0x53, 0x03, 0x6c, + 0xf6, 0x07, 0x84, 0xa5, 0x25, 0xad, 0x8a, 0x11, 0x7a, 0x17, 0x64, 0x4a, 0x88, 0xb2, 0xcc, 0xe6, + 0xae, 0xd4, 0x39, 0x5b, 0xea, 0x01, 0x5b, 0xea, 0xdd, 0x80, 0x2d, 0xcd, 0x2c, 0x9d, 0xf8, 0xd9, + 0x2f, 0x8b, 0x92, 0xca, 0x2c, 0xd0, 0x2a, 0x14, 0x2d, 0xdd, 0x27, 0xda, 0x0e, 0x4d, 0x1b, 0x9d, + 0x7e, 0x92, 0xb9, 0x98, 0x1f, 0x4f, 0x88, 0x48, 0xac, 0x08, 0x3d, 0x4f, 0xad, 0xb8, 0xc8, 0x40, + 0x4b, 0x50, 0x62, 0x4e, 0x7a, 0xce, 0x70, 0x68, 0x12, 0x8d, 0xe5, 0x7d, 0x8a, 0xe5, 0x7d, 0x9a, + 0xca, 0x57, 0x99, 0xf8, 0x3e, 0xad, 0xc0, 0x15, 0xc8, 0x19, 0x3a, 0xd1, 0x39, 0x24, 0xc3, 0x20, + 0x59, 0x2a, 0x60, 0xca, 0x1b, 0x30, 0x13, 0xb2, 0xce, 0xe7, 0x90, 0x2c, 0xf7, 0x12, 0x89, 0x19, + 0xf0, 0x36, 0xcc, 0xd9, 0x78, 0x9f, 0x68, 0x27, 0xd1, 0x39, 0x86, 0x46, 0x54, 0xf7, 0x28, 0x69, + 0x71, 0x1d, 0xa6, 0x7b, 0x41, 0xf2, 0x39, 0x16, 0x18, 0xb6, 0x18, 0x4a, 0x19, 0x6c, 0x1e, 0xb2, + 0xba, 0xeb, 0x72, 0x40, 0x9e, 0x01, 0x32, 0xba, 0xeb, 0x32, 0xd5, 0x2d, 0x98, 0x65, 0x6b, 0xf4, + 0xb0, 0x3f, 0xb2, 0x88, 0x70, 0x52, 0x60, 0x98, 0x19, 0xaa, 0x50, 0xb9, 0x9c, 0x61, 0xaf, 0x41, + 0x11, 0xef, 0x99, 0x06, 0xb6, 0x7b, 0x98, 0xe3, 0x8a, 0x0c, 0x57, 0x08, 0x84, 0x0c, 0x74, 0x13, + 0x4a, 0xae, 0xe7, 0xb8, 0x8e, 0x8f, 0x3d, 0x4d, 0x37, 0x0c, 0x0f, 0xfb, 0x7e, 0x79, 0x9a, 0xfb, + 0x0b, 0xe4, 0x0d, 0x2e, 0x56, 0xca, 0x20, 0xaf, 0xe9, 0x44, 0x47, 0x25, 0x48, 0x93, 0x7d, 0xbf, + 0x2c, 0xd5, 0xd2, 0x4b, 0x05, 0x95, 0x7e, 0x2a, 0xdf, 0xa7, 0x41, 0x7e, 0xe4, 0x10, 0x8c, 0xee, + 0x80, 0x4c, 0xcb, 0xc4, 0xd8, 0x37, 0x7d, 0x1a, 0x9f, 0x3b, 0x66, 0xdf, 0xc6, 0xc6, 0xa6, 0xdf, + 0xef, 0x1e, 0xb8, 0x58, 0x65, 0xe0, 0x18, 0x9d, 0x52, 0x09, 0x3a, 0xcd, 0xc1, 0xa4, 0xe7, 0x8c, + 0x6c, 0x83, 0xb1, 0x6c, 0x52, 0xe5, 0x03, 0xb4, 0x0e, 0xd9, 0x90, 0x25, 0xf2, 0x5f, 0xb1, 0x64, + 0x86, 0xb2, 0x84, 0x72, 0x58, 0x08, 0xd4, 0xcc, 0x8e, 0x20, 0x4b, 0x13, 0x72, 0x61, 0xf3, 0x12, + 0x6c, 0x3b, 0x1f, 0x61, 0x23, 0x33, 0xf4, 0x5f, 0x98, 0x0d, 0x6b, 0x1f, 0x26, 0x8f, 0x33, 0xae, + 0x14, 0x2a, 0x44, 0xf6, 0x12, 0xb4, 0xd2, 0x78, 0x03, 0xca, 0xb0, 0x75, 0x45, 0xb4, 0x6a, 0xb1, + 0x4e, 0x74, 0x15, 0x72, 0xbe, 0xd9, 0xb7, 0x75, 0x32, 0xf2, 0xb0, 0x60, 0x5e, 0x24, 0xa0, 0x5a, + 0xbc, 0x4f, 0xb0, 0xcd, 0x36, 0x39, 0x67, 0x5a, 0x24, 0x40, 0xcb, 0x70, 0x21, 0x1c, 0x68, 0x91, + 0x17, 0xce, 0x32, 0x14, 0xaa, 0x3a, 0x81, 0x46, 0x39, 0x80, 0x22, 0x2d, 0xdc, 0x7a, 0xe8, 0xe1, + 0x06, 0x94, 0x28, 0xf7, 0xd8, 0xf6, 0x20, 0x0e, 0xf3, 0x21, 0x9a, 0x57, 0x51, 0x77, 0x5d, 0x5a, + 0xff, 0xae, 0x43, 0xcd, 0xd1, 0x87, 0x70, 0x35, 0x04, 0xfa, 0xd8, 0xda, 0xd5, 0xf4, 0x11, 0x19, + 0x60, 0x9b, 0x98, 0x3d, 0x9d, 0x98, 0x76, 0x5f, 0xf4, 0xd1, 0x79, 0x61, 0xd4, 0xc1, 0xd6, 0x6e, + 0x23, 0x01, 0x50, 0x3e, 0x80, 0x0b, 0x89, 0xa9, 0x85, 0xdf, 0xf3, 0x06, 0xa0, 0xfc, 0x20, 0xc1, + 0x14, 0xdf, 0xd3, 0x31, 0x06, 0x49, 0xa7, 0x33, 0x28, 0x75, 0x16, 0x83, 0xd2, 0xaf, 0xcf, 0xa0, + 0x06, 0x40, 0x98, 0x61, 0xbf, 0x2c, 0xd7, 0xd2, 0x4b, 0xf9, 0x95, 0x2b, 0xe3, 0x8e, 0x78, 0x88, + 0x1d, 0xb3, 0x2f, 0x5a, 0x56, 0xcc, 0x48, 0xf9, 0x26, 0x05, 0xb9, 0x50, 0x8f, 0x1a, 0x50, 0x0c, + 0xe2, 0xd2, 0x76, 0x2d, 0xbd, 0x2f, 0x76, 0xd1, 0xc2, 0x99, 0xc1, 0xdd, 0xb5, 0xf4, 0xbe, 0x9a, + 0x17, 0xf1, 0xd0, 0xc1, 0xe9, 0x8c, 0x4c, 0x9d, 0xc1, 0xc8, 0xc4, 0x16, 0x48, 0xbf, 0xde, 0x16, + 0x48, 0x90, 0x55, 0x3e, 0x49, 0xd6, 0x0d, 0x98, 0xde, 0x73, 0x08, 0xd6, 0x22, 0xc6, 0xf2, 0x9d, + 0x76, 0x7d, 0x7c, 0x49, 0xa7, 0x50, 0x41, 0x2d, 0xee, 0xc5, 0x85, 0xca, 0x6f, 0x12, 0x4c, 0xb3, + 0x91, 0x81, 0x8d, 0x7f, 0xb2, 0xf0, 0x8f, 0xc5, 0x26, 0x33, 0xb0, 0xa1, 0x8d, 0x31, 0xe0, 0xda, + 0xb8, 0xc7, 0x64, 0xcc, 0x11, 0x13, 0x50, 0xe0, 0xa5, 0x13, 0x31, 0xe2, 0xbb, 0x14, 0xcc, 0x8e, + 0xe1, 0xff, 0x85, 0xcc, 0x48, 0xb4, 0xb1, 0xc9, 0x73, 0xb6, 0xb1, 0xa9, 0x33, 0xdb, 0xd8, 0xb7, + 0x29, 0xc8, 0xb6, 0xd9, 0x71, 0xa5, 0x5b, 0x7f, 0xc7, 0x21, 0x74, 0x05, 0x72, 0xae, 0x63, 0x69, + 0x5c, 0x23, 0x33, 0x4d, 0xd6, 0x75, 0x2c, 0x75, 0x8c, 0x66, 0x93, 0x6f, 0xe8, 0x84, 0x9a, 0x7a, + 0x03, 0x45, 0xc8, 0x9c, 0x28, 0x82, 0xe2, 0x41, 0x81, 0xa7, 0x42, 0x5c, 0x1f, 0x6f, 0xd3, 0x1c, + 0xb0, 0xfb, 0xa8, 0x34, 0x7e, 0xdd, 0xe5, 0x61, 0x73, 0xa4, 0x2a, 0x70, 0xd4, 0x82, 0xdf, 0xb6, + 0xc4, 0x0d, 0xb6, 0x7c, 0x56, 0xff, 0x53, 0x05, 0x4e, 0xf9, 0x42, 0x02, 0xd8, 0xa0, 0x99, 0x65, + 0xeb, 0xa5, 0x17, 0x3f, 0x9f, 0x85, 0xa0, 0x25, 0x66, 0xae, 0x9e, 0x55, 0x34, 0x31, 0x7f, 0xc1, + 0x8f, 0xc7, 0xbd, 0x0a, 0xc5, 0x88, 0xdb, 0x3e, 0x0e, 0x82, 0x39, 0xc5, 0x49, 0x78, 0x1f, 0xeb, + 0x60, 0xa2, 0x16, 0xf6, 0x62, 0x23, 0xe5, 0x47, 0x09, 0x72, 0x2c, 0xa6, 0x4d, 0x4c, 0xf4, 0x44, + 0x0d, 0xa5, 0xd7, 0xaf, 0xe1, 0x02, 0x00, 0x77, 0xe3, 0x9b, 0x4f, 0xb1, 0x60, 0x56, 0x8e, 0x49, + 0x3a, 0xe6, 0x53, 0x8c, 0xde, 0x0e, 0x13, 0x9e, 0xfe, 0xf3, 0x84, 0x8b, 0x8e, 0x11, 0xa4, 0xfd, + 0x32, 0x64, 0xec, 0xd1, 0x50, 0xa3, 0xb7, 0x30, 0x99, 0xb3, 0xd5, 0x1e, 0x0d, 0xbb, 0xfb, 0xbe, + 0xf2, 0x29, 0x64, 0xba, 0xfb, 0xec, 0x45, 0x42, 0x29, 0xea, 0x39, 0x8e, 0xb8, 0x06, 0xf3, 0x03, + 0x34, 0x4b, 0x05, 0xec, 0xd6, 0x87, 0x40, 0xa6, 0x07, 0x6c, 0xf0, 0x3e, 0xa2, 0xdf, 0xa8, 0x7e, + 0xce, 0xb7, 0x8e, 0x78, 0xe5, 0xdc, 0xfa, 0x49, 0x82, 0x7c, 0xac, 0xdd, 0xa0, 0xff, 0xc3, 0xc5, + 0xe6, 0xc6, 0xf6, 0xea, 0x03, 0xad, 0xb5, 0xa6, 0xdd, 0xdd, 0x68, 0xdc, 0xd3, 0x1e, 0x6e, 0x3d, + 0xd8, 0xda, 0xfe, 0x78, 0xab, 0x34, 0x51, 0xb9, 0x74, 0x78, 0x54, 0x43, 0x31, 0xec, 0x43, 0xfb, + 0x89, 0xed, 0x7c, 0x46, 0xf7, 0xf9, 0x5c, 0xd2, 0xa4, 0xd1, 0xec, 0xac, 0x6f, 0x75, 0x4b, 0x52, + 0xe5, 0xe2, 0xe1, 0x51, 0x6d, 0x36, 0x66, 0xd1, 0xd8, 0xf1, 0xb1, 0x4d, 0xc6, 0x0d, 0x56, 0xb7, + 0x37, 0x37, 0x5b, 0xdd, 0x52, 0x6a, 0xcc, 0x40, 0x1c, 0x10, 0x37, 0x61, 0x36, 0x69, 0xb0, 0xd5, + 0xda, 0x28, 0xa5, 0x2b, 0xe8, 0xf0, 0xa8, 0x36, 0x1d, 0x43, 0x6f, 0x99, 0x56, 0x25, 0xfb, 0xf9, + 0x97, 0xd5, 0x89, 0xaf, 0xbf, 0xaa, 0x4a, 0x74, 0x65, 0xc5, 0x44, 0x8f, 0x40, 0xff, 0x83, 0xcb, + 0x9d, 0xd6, 0xbd, 0xad, 0xf5, 0x35, 0x6d, 0xb3, 0x73, 0x4f, 0xeb, 0x7e, 0xd2, 0x5e, 0x8f, 0xad, + 0x6e, 0xe6, 0xf0, 0xa8, 0x96, 0x17, 0x4b, 0x3a, 0x0b, 0xdd, 0x56, 0xd7, 0x1f, 0x6d, 0x77, 0xd7, + 0x4b, 0x12, 0x47, 0xb7, 0x3d, 0x4c, 0xcf, 0x36, 0x86, 0xbe, 0x0d, 0xf3, 0xa7, 0xa0, 0xc3, 0x85, + 0xcd, 0x1e, 0x1e, 0xd5, 0x8a, 0x6d, 0x0f, 0xf3, 0xfd, 0xc3, 0x2c, 0xea, 0x50, 0x1e, 0xb7, 0xd8, + 0x6e, 0x6f, 0x77, 0x1a, 0x1b, 0xa5, 0x5a, 0xa5, 0x74, 0x78, 0x54, 0x2b, 0x04, 0xcd, 0x90, 0xe2, + 0xa3, 0x95, 0x35, 0x3f, 0x7a, 0x7e, 0x5c, 0x95, 0x5e, 0x1c, 0x57, 0xa5, 0x5f, 0x8f, 0xab, 0xd2, + 0xb3, 0x57, 0xd5, 0x89, 0x17, 0xaf, 0xaa, 0x13, 0x3f, 0xbf, 0xaa, 0x4e, 0x3c, 0x7e, 0xa7, 0x6f, + 0x92, 0xc1, 0x68, 0xa7, 0xde, 0x73, 0x86, 0xcb, 0xf1, 0x57, 0x78, 0xf4, 0xc9, 0xff, 0x0d, 0x38, + 0xf9, 0x42, 0xdf, 0x99, 0x62, 0xf2, 0x3b, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x61, 0x3b, 0x18, + 0x58, 0x62, 0x10, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1826,6 +1988,127 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ExtendedCommit) 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 *ExtendedCommit) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ExtendedCommit) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ExtendedSignatures) > 0 { + for iNdEx := len(m.ExtendedSignatures) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ExtendedSignatures[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + { + size, err := m.BlockID.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if m.Round != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Round)) + i-- + dAtA[i] = 0x10 + } + if m.Height != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *ExtendedCommitSig) 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 *ExtendedCommitSig) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ExtendedCommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ExtensionSignature) > 0 { + i -= len(m.ExtensionSignature) + copy(dAtA[i:], m.ExtensionSignature) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ExtensionSignature))) + i-- + dAtA[i] = 0x32 + } + if len(m.Extension) > 0 { + i -= len(m.Extension) + copy(dAtA[i:], m.Extension) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Extension))) + i-- + dAtA[i] = 0x2a + } + if len(m.Signature) > 0 { + i -= len(m.Signature) + copy(dAtA[i:], m.Signature) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Signature))) + i-- + dAtA[i] = 0x22 + } + n12, err12 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + if err12 != nil { + return 0, err12 + } + i -= n12 + i = encodeVarintTypes(dAtA, i, uint64(n12)) + i-- + dAtA[i] = 0x1a + if len(m.ValidatorAddress) > 0 { + i -= len(m.ValidatorAddress) + copy(dAtA[i:], m.ValidatorAddress) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorAddress))) + i-- + dAtA[i] = 0x12 + } + if m.BlockIdFlag != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.BlockIdFlag)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *Proposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1853,12 +2136,12 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) - if err11 != nil { - return 0, err11 + n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + if err13 != nil { + return 0, err13 } - i -= n11 - i = encodeVarintTypes(dAtA, i, uint64(n11)) + i -= n13 + i = encodeVarintTypes(dAtA, i, uint64(n13)) i-- dAtA[i] = 0x32 { @@ -2343,6 +2626,59 @@ func (m *CommitSig) Size() (n int) { return n } +func (m *ExtendedCommit) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Height != 0 { + n += 1 + sovTypes(uint64(m.Height)) + } + if m.Round != 0 { + n += 1 + sovTypes(uint64(m.Round)) + } + l = m.BlockID.Size() + n += 1 + l + sovTypes(uint64(l)) + if len(m.ExtendedSignatures) > 0 { + for _, e := range m.ExtendedSignatures { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + return n +} + +func (m *ExtendedCommitSig) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BlockIdFlag != 0 { + n += 1 + sovTypes(uint64(m.BlockIdFlag)) + } + l = len(m.ValidatorAddress) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + n += 1 + l + sovTypes(uint64(l)) + l = len(m.Signature) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Extension) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ExtensionSignature) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Proposal) Size() (n int) { if m == nil { return 0 @@ -4287,6 +4623,399 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { } return nil } +func (m *ExtendedCommit) 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: ExtendedCommit: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ExtendedCommit: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + 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 2: + 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 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockID", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.BlockID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtendedSignatures", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ExtendedSignatures = append(m.ExtendedSignatures, ExtendedCommitSig{}) + if err := m.ExtendedSignatures[len(m.ExtendedSignatures)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *ExtendedCommitSig) 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: ExtendedCommitSig: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ExtendedCommitSig: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockIdFlag", wireType) + } + m.BlockIdFlag = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockIdFlag |= BlockIDFlag(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", 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.ValidatorAddress = append(m.ValidatorAddress[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorAddress == nil { + m.ValidatorAddress = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Signature", 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.Signature = append(m.Signature[:0], dAtA[iNdEx:postIndex]...) + if m.Signature == nil { + m.Signature = []byte{} + } + iNdEx = postIndex + case 5: + 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 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtensionSignature", 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.ExtensionSignature = append(m.ExtensionSignature[:0], dAtA[iNdEx:postIndex]...) + if m.ExtensionSignature == nil { + m.ExtensionSignature = []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 *Proposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0