From 4d5d3449f6339993e0c1319e5419e9df104da462 Mon Sep 17 00:00:00 2001 From: akhil pune Date: Fri, 12 Jan 2024 03:49:35 +0530 Subject: [PATCH] changes: side-tx-results updates --- abci/types/types.pb.go | 930 ++++++++++++++---- consensus/state.go | 2 +- proto/tendermint/abci/types.proto | 28 +- proto/tendermint/types/canonical.pb.go | 181 +++- proto/tendermint/types/canonical.proto | 4 +- proto/tendermint/types/types.pb.go | 1189 +++++++++--------------- proto/tendermint/types/types.proto | 27 +- state/execution.go | 21 +- types/block.go | 4 +- types/vote.go | 7 +- 10 files changed, 1389 insertions(+), 1004 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 7697d1c2988..b5b80607057 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -87,6 +87,35 @@ func (EvidenceType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{1} } +// Side-tx result type +type SideTxResultType int32 + +const ( + SideTxResultType_Skip SideTxResultType = 0 + SideTxResultType_Yes SideTxResultType = 1 + SideTxResultType_No SideTxResultType = 2 +) + +var SideTxResultType_name = map[int32]string{ + 0: "Skip", + 1: "Yes", + 2: "No", +} + +var SideTxResultType_value = map[string]int32{ + "Skip": 0, + "Yes": 1, + "No": 2, +} + +func (x SideTxResultType) String() string { + return proto.EnumName(SideTxResultType_name, int32(x)) +} + +func (SideTxResultType) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{2} +} + type ResponseOfferSnapshot_Result int32 const ( @@ -1243,9 +1272,9 @@ func (m *RequestApplySnapshotChunk) GetSender() string { } type RequestBeginSideBlock struct { - Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - Header types.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` - SideTxResults []types.SideTxResult `protobuf:"bytes,3,rep,name=side_tx_results,json=sideTxResults,proto3" json:"side_tx_results"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header types.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` + SideTxResults []SideTxResult `protobuf:"bytes,3,rep,name=side_tx_results,json=sideTxResults,proto3" json:"side_tx_results"` } func (m *RequestBeginSideBlock) Reset() { *m = RequestBeginSideBlock{} } @@ -1295,7 +1324,7 @@ func (m *RequestBeginSideBlock) GetHeader() types.Header { return types.Header{} } -func (m *RequestBeginSideBlock) GetSideTxResults() []types.SideTxResult { +func (m *RequestBeginSideBlock) GetSideTxResults() []SideTxResult { if m != nil { return m.SideTxResults } @@ -2666,10 +2695,10 @@ func (m *ResponseBeginSideBlock) GetEvents() []Event { } type ResponseDeliverSideTx struct { - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Codespace string `protobuf:"bytes,2,opt,name=codespace,proto3" json:"codespace,omitempty"` - Result types.SideTxResultType `protobuf:"varint,4,opt,name=result,proto3,enum=tendermint.types.SideTxResultType" json:"result,omitempty"` - Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Codespace string `protobuf:"bytes,2,opt,name=codespace,proto3" json:"codespace,omitempty"` + Result SideTxResultType `protobuf:"varint,4,opt,name=result,proto3,enum=tendermint.abci.SideTxResultType" json:"result,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` } func (m *ResponseDeliverSideTx) Reset() { *m = ResponseDeliverSideTx{} } @@ -2719,11 +2748,11 @@ func (m *ResponseDeliverSideTx) GetCodespace() string { return "" } -func (m *ResponseDeliverSideTx) GetResult() types.SideTxResultType { +func (m *ResponseDeliverSideTx) GetResult() SideTxResultType { if m != nil { return m.Result } - return types.SideTxResultType_Skip + return SideTxResultType_Skip } func (m *ResponseDeliverSideTx) GetData() []byte { @@ -3284,6 +3313,120 @@ func (m *Evidence) GetTotalVotingPower() int64 { return 0 } +// Side-tx sig +type SideTxSig struct { + Result SideTxResultType `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.SideTxResultType" json:"result,omitempty"` + Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"` + Address []byte `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` +} + +func (m *SideTxSig) Reset() { *m = SideTxSig{} } +func (m *SideTxSig) String() string { return proto.CompactTextString(m) } +func (*SideTxSig) ProtoMessage() {} +func (*SideTxSig) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{46} +} +func (m *SideTxSig) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SideTxSig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SideTxSig.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 *SideTxSig) XXX_Merge(src proto.Message) { + xxx_messageInfo_SideTxSig.Merge(m, src) +} +func (m *SideTxSig) XXX_Size() int { + return m.Size() +} +func (m *SideTxSig) XXX_DiscardUnknown() { + xxx_messageInfo_SideTxSig.DiscardUnknown(m) +} + +var xxx_messageInfo_SideTxSig proto.InternalMessageInfo + +func (m *SideTxSig) GetResult() SideTxResultType { + if m != nil { + return m.Result + } + return SideTxResultType_Skip +} + +func (m *SideTxSig) GetSig() []byte { + if m != nil { + return m.Sig + } + return nil +} + +func (m *SideTxSig) GetAddress() []byte { + if m != nil { + return m.Address + } + return nil +} + +// Side tx results +type SideTxResult struct { + TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` + Sigs []SideTxSig `protobuf:"bytes,2,rep,name=sigs,proto3" json:"sigs"` +} + +func (m *SideTxResult) Reset() { *m = SideTxResult{} } +func (m *SideTxResult) String() string { return proto.CompactTextString(m) } +func (*SideTxResult) ProtoMessage() {} +func (*SideTxResult) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{47} +} +func (m *SideTxResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SideTxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SideTxResult.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 *SideTxResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_SideTxResult.Merge(m, src) +} +func (m *SideTxResult) XXX_Size() int { + return m.Size() +} +func (m *SideTxResult) XXX_DiscardUnknown() { + xxx_messageInfo_SideTxResult.DiscardUnknown(m) +} + +var xxx_messageInfo_SideTxResult proto.InternalMessageInfo + +func (m *SideTxResult) GetTxHash() []byte { + if m != nil { + return m.TxHash + } + return nil +} + +func (m *SideTxResult) GetSigs() []SideTxSig { + if m != nil { + return m.Sigs + } + return nil +} + type Snapshot struct { Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Format uint32 `protobuf:"varint,2,opt,name=format,proto3" json:"format,omitempty"` @@ -3296,7 +3439,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{46} + return fileDescriptor_252557cfdd89a31a, []int{48} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3363,6 +3506,7 @@ func (m *Snapshot) GetMetadata() []byte { func init() { proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) + proto.RegisterEnum("tendermint.abci.SideTxResultType", SideTxResultType_name, SideTxResultType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") @@ -3411,195 +3555,203 @@ func init() { proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") proto.RegisterType((*Evidence)(nil), "tendermint.abci.Evidence") + proto.RegisterType((*SideTxSig)(nil), "tendermint.abci.SideTxSig") + proto.RegisterType((*SideTxResult)(nil), "tendermint.abci.SideTxResult") proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") } func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2905 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x93, 0x23, 0xc5, - 0x11, 0xd6, 0xfb, 0x91, 0x33, 0x7a, 0x4c, 0xed, 0x32, 0x88, 0x66, 0x99, 0x59, 0x9a, 0x60, 0x81, - 0x35, 0xcc, 0x98, 0xd9, 0x00, 0xf3, 0xb2, 0x61, 0x24, 0xb4, 0xd6, 0xb0, 0xc3, 0x68, 0xdc, 0xa3, - 0x5d, 0xfc, 0x62, 0x9b, 0x96, 0xba, 0x46, 0x6a, 0x56, 0xea, 0x6e, 0xd4, 0xa5, 0xd9, 0x1d, 0x4e, - 0x0e, 0x3f, 0x2e, 0xd8, 0x07, 0x8e, 0xf6, 0x81, 0x1f, 0xe1, 0x8b, 0xc3, 0x27, 0x5f, 0x1c, 0xe1, - 0x20, 0xc2, 0x17, 0x8e, 0x3e, 0x61, 0x07, 0xdc, 0xfc, 0x07, 0x7c, 0x72, 0x84, 0xa3, 0x5e, 0xfd, - 0x90, 0xd4, 0x92, 0x06, 0xf6, 0xe6, 0x5b, 0x57, 0x76, 0x66, 0x56, 0x57, 0x56, 0x56, 0xe6, 0x97, - 0xd9, 0x05, 0x8f, 0x13, 0x6c, 0x9b, 0x78, 0x3c, 0xb2, 0x6c, 0xb2, 0x6b, 0x74, 0x7b, 0xd6, 0x2e, - 0x39, 0x77, 0xb1, 0xb7, 0xe3, 0x8e, 0x1d, 0xe2, 0xa0, 0x4a, 0xf0, 0x72, 0x87, 0xbe, 0x54, 0x9e, - 0x08, 0x71, 0xf7, 0xc6, 0xe7, 0x2e, 0x71, 0x76, 0xdd, 0xb1, 0xe3, 0x9c, 0x72, 0x7e, 0xe5, 0x4a, - 0xe8, 0x35, 0xd3, 0x13, 0xd6, 0x16, 0x79, 0x2b, 0x84, 0xef, 0xe1, 0x73, 0xf9, 0xf6, 0x89, 0x19, - 0x59, 0xd7, 0x18, 0x1b, 0x23, 0xf9, 0x7a, 0xbb, 0xef, 0x38, 0xfd, 0x21, 0xde, 0x65, 0xa3, 0xee, - 0xe4, 0x74, 0x97, 0x58, 0x23, 0xec, 0x11, 0x63, 0xe4, 0x0a, 0x86, 0xcb, 0x7d, 0xa7, 0xef, 0xb0, - 0xc7, 0x5d, 0xfa, 0xc4, 0xa9, 0xea, 0x9f, 0x8a, 0x90, 0xd7, 0xf0, 0x47, 0x13, 0xec, 0x11, 0xb4, - 0x07, 0x19, 0xdc, 0x1b, 0x38, 0xb5, 0xe4, 0xd5, 0xe4, 0xb3, 0x6b, 0x7b, 0x57, 0x76, 0xa6, 0x16, - 0xb7, 0x23, 0xf8, 0x9a, 0xbd, 0x81, 0xd3, 0x4a, 0x68, 0x8c, 0x17, 0xbd, 0x04, 0xd9, 0xd3, 0xe1, - 0xc4, 0x1b, 0xd4, 0x52, 0x4c, 0xe8, 0x89, 0x38, 0xa1, 0x9b, 0x94, 0xa9, 0x95, 0xd0, 0x38, 0x37, - 0x9d, 0xca, 0xb2, 0x4f, 0x9d, 0x5a, 0x7a, 0xf1, 0x54, 0x07, 0xf6, 0x29, 0x9b, 0x8a, 0xf2, 0xa2, - 0x3a, 0x80, 0x87, 0x89, 0xee, 0xb8, 0xc4, 0x72, 0xec, 0x5a, 0x86, 0x49, 0x3e, 0x19, 0x27, 0x79, - 0x82, 0x49, 0x9b, 0x31, 0xb6, 0x12, 0x5a, 0xd1, 0x93, 0x03, 0xaa, 0xc3, 0xb2, 0x2d, 0xa2, 0xf7, - 0x06, 0x86, 0x65, 0xd7, 0xb2, 0x8b, 0x75, 0x1c, 0xd8, 0x16, 0x69, 0x50, 0x46, 0xaa, 0xc3, 0x92, - 0x03, 0xba, 0xe4, 0x8f, 0x26, 0x78, 0x7c, 0x5e, 0xcb, 0x2d, 0x5e, 0xf2, 0x8f, 0x28, 0x13, 0x5d, - 0x32, 0xe3, 0x46, 0x4d, 0x58, 0xeb, 0xe2, 0xbe, 0x65, 0xeb, 0xdd, 0xa1, 0xd3, 0xbb, 0x57, 0xcb, - 0x33, 0x61, 0x35, 0x4e, 0xb8, 0x4e, 0x59, 0xeb, 0x94, 0xb3, 0x95, 0xd0, 0xa0, 0xeb, 0x8f, 0xd0, - 0x1b, 0x50, 0xe8, 0x0d, 0x70, 0xef, 0x9e, 0x4e, 0x1e, 0xd4, 0x0a, 0x4c, 0xc7, 0x76, 0x9c, 0x8e, - 0x06, 0xe5, 0xeb, 0x3c, 0x68, 0x25, 0xb4, 0x7c, 0x8f, 0x3f, 0xd2, 0xf5, 0x9b, 0x78, 0x68, 0x9d, - 0xe1, 0x31, 0x95, 0x2f, 0x2e, 0x5e, 0xff, 0xdb, 0x9c, 0x93, 0x69, 0x28, 0x9a, 0x72, 0x80, 0xde, - 0x84, 0x22, 0xb6, 0x4d, 0xb1, 0x0c, 0x60, 0x2a, 0xae, 0xc6, 0xfa, 0x8a, 0x6d, 0xca, 0x45, 0x14, - 0xb0, 0x78, 0x46, 0xaf, 0x40, 0xae, 0xe7, 0x8c, 0x46, 0x16, 0xa9, 0xad, 0x31, 0xe9, 0xad, 0xd8, - 0x05, 0x30, 0xae, 0x56, 0x42, 0x13, 0xfc, 0xe8, 0x08, 0xca, 0x43, 0xcb, 0x23, 0xba, 0x67, 0x1b, - 0xae, 0x37, 0x70, 0x88, 0x57, 0x5b, 0x67, 0x1a, 0x9e, 0x8e, 0xd3, 0x70, 0x68, 0x79, 0xe4, 0x44, - 0x32, 0xb7, 0x12, 0x5a, 0x69, 0x18, 0x26, 0x50, 0x7d, 0xce, 0xe9, 0x29, 0x1e, 0xfb, 0x0a, 0x6b, - 0xa5, 0xc5, 0xfa, 0xda, 0x94, 0x5b, 0xca, 0x53, 0x7d, 0x4e, 0x98, 0x80, 0x7e, 0x06, 0x97, 0x86, - 0x8e, 0x61, 0xfa, 0xea, 0xf4, 0xde, 0x60, 0x62, 0xdf, 0xab, 0x95, 0x99, 0xd2, 0xe7, 0x62, 0x3f, - 0xd2, 0x31, 0x4c, 0xa9, 0xa2, 0x41, 0x05, 0x5a, 0x09, 0x6d, 0x63, 0x38, 0x4d, 0x44, 0x77, 0xe1, - 0xb2, 0xe1, 0xba, 0xc3, 0xf3, 0x69, 0xed, 0x15, 0xa6, 0xfd, 0x7a, 0x9c, 0xf6, 0x7d, 0x2a, 0x33, - 0xad, 0x1e, 0x19, 0x33, 0x54, 0xa4, 0x41, 0x95, 0x3b, 0xa8, 0x67, 0x99, 0x58, 0x6c, 0xef, 0x23, - 0x4c, 0xf7, 0xb5, 0x85, 0x5e, 0x7a, 0x62, 0x99, 0x58, 0x6e, 0x72, 0xb9, 0x1b, 0xa1, 0xa0, 0x36, - 0x54, 0xa4, 0xbf, 0x31, 0xad, 0xe4, 0x41, 0x6d, 0x73, 0xb1, 0x85, 0x85, 0xd3, 0x51, 0x15, 0xcc, - 0xf1, 0x4a, 0x66, 0x98, 0x50, 0xcf, 0x43, 0xf6, 0xcc, 0x18, 0x4e, 0xb0, 0xfa, 0x0c, 0xac, 0x85, - 0xe2, 0x11, 0xaa, 0x41, 0x7e, 0x84, 0x3d, 0xcf, 0xe8, 0x63, 0x16, 0xbe, 0x8a, 0x9a, 0x1c, 0xaa, - 0x65, 0x58, 0x0f, 0xc7, 0x20, 0x75, 0xe4, 0x0b, 0xd2, 0xe8, 0x42, 0x05, 0xcf, 0xf0, 0xd8, 0xa3, - 0x21, 0x45, 0x08, 0x8a, 0x21, 0x7a, 0x0a, 0x4a, 0xcc, 0x08, 0xba, 0x7c, 0x4f, 0x43, 0x5c, 0x46, - 0x5b, 0x67, 0xc4, 0x3b, 0x82, 0x69, 0x1b, 0xd6, 0xdc, 0x3d, 0xd7, 0x67, 0x49, 0x33, 0x16, 0x70, - 0xf7, 0x5c, 0xc1, 0xa0, 0xbe, 0x06, 0xd5, 0xe9, 0x90, 0x84, 0xaa, 0x90, 0xbe, 0x87, 0xcf, 0xc5, - 0x7c, 0xf4, 0x11, 0x5d, 0x16, 0xcb, 0x62, 0x73, 0x14, 0x35, 0xb1, 0xc6, 0xbf, 0xa7, 0x7c, 0x61, - 0x3f, 0x16, 0xa1, 0x57, 0x20, 0x43, 0x43, 0xbb, 0x88, 0xd2, 0xca, 0x0e, 0x8f, 0xfb, 0x3b, 0x32, - 0xee, 0xef, 0x74, 0x64, 0xdc, 0xaf, 0x17, 0x3e, 0xff, 0x72, 0x3b, 0xf1, 0xe9, 0x3f, 0xb7, 0x93, - 0x1a, 0x93, 0x40, 0x8f, 0xd1, 0xd0, 0x61, 0x58, 0xb6, 0x6e, 0x99, 0x62, 0x9e, 0x3c, 0x1b, 0x1f, - 0x98, 0xe8, 0x16, 0x54, 0x7b, 0x8e, 0xed, 0x61, 0xdb, 0x9b, 0x78, 0x3a, 0xcf, 0x2b, 0x22, 0x36, - 0xcf, 0x1e, 0xed, 0x86, 0x64, 0x3c, 0x66, 0x7c, 0x5a, 0xa5, 0x17, 0x25, 0xa0, 0x9b, 0x00, 0x67, - 0xc6, 0xd0, 0x32, 0x0d, 0xe2, 0x8c, 0xbd, 0x5a, 0xe6, 0x6a, 0x7a, 0xae, 0x9a, 0x3b, 0x92, 0xe5, - 0xb6, 0x6b, 0x1a, 0x04, 0xd7, 0x33, 0xf4, 0x6b, 0xb5, 0x90, 0x24, 0xba, 0x06, 0x15, 0xc3, 0x75, - 0x75, 0x8f, 0x18, 0x04, 0xeb, 0xdd, 0x73, 0x82, 0x3d, 0x16, 0xb1, 0xd7, 0xb5, 0x92, 0xe1, 0xba, - 0x27, 0x94, 0x5a, 0xa7, 0x44, 0xf4, 0x34, 0x94, 0x69, 0x74, 0xb6, 0x8c, 0xa1, 0x3e, 0xc0, 0x56, - 0x7f, 0x40, 0x58, 0x64, 0x4e, 0x6b, 0x25, 0x41, 0x6d, 0x31, 0xa2, 0x6a, 0xfa, 0x8e, 0xc0, 0x22, - 0x33, 0x42, 0x90, 0x31, 0x0d, 0x62, 0x30, 0x43, 0xae, 0x6b, 0xec, 0x99, 0xd2, 0x5c, 0x83, 0x0c, - 0x84, 0x79, 0xd8, 0x33, 0xda, 0x84, 0x9c, 0x50, 0x9b, 0x66, 0x6a, 0xc5, 0x88, 0xee, 0x99, 0x3b, - 0x76, 0xce, 0x30, 0x4b, 0x45, 0x05, 0x8d, 0x0f, 0xd4, 0x5f, 0xa7, 0x60, 0x63, 0x26, 0x86, 0x53, - 0xbd, 0x03, 0xc3, 0x1b, 0xc8, 0xb9, 0xe8, 0x33, 0x7a, 0x99, 0xea, 0x35, 0x4c, 0x3c, 0x16, 0xb9, - 0xb3, 0x16, 0x36, 0x11, 0xc7, 0x05, 0x2d, 0xf6, 0x5e, 0x98, 0x46, 0x70, 0xa3, 0x36, 0x54, 0x87, - 0x86, 0x47, 0x74, 0x1e, 0x13, 0xf5, 0x50, 0x1e, 0x9d, 0xcd, 0x04, 0x87, 0x86, 0x8c, 0xa2, 0xd4, - 0xd9, 0x85, 0xa2, 0xf2, 0x30, 0x42, 0x45, 0x1a, 0x5c, 0xee, 0x9e, 0x7f, 0x6c, 0xd8, 0xc4, 0xb2, - 0xb1, 0x3e, 0xb3, 0x73, 0x8f, 0xcd, 0x28, 0x6d, 0x9e, 0x59, 0x26, 0xb6, 0x7b, 0x72, 0xcb, 0x2e, - 0xf9, 0xc2, 0xfe, 0x96, 0x7a, 0xaa, 0x06, 0xe5, 0x68, 0x16, 0x42, 0x65, 0x48, 0x91, 0x07, 0xc2, - 0x00, 0x29, 0xf2, 0x00, 0x7d, 0x17, 0x32, 0x74, 0x91, 0x6c, 0xf1, 0xe5, 0x39, 0x10, 0x40, 0xc8, - 0x75, 0xce, 0x5d, 0xac, 0x31, 0x4e, 0x55, 0xf5, 0x4f, 0x83, 0x9f, 0x99, 0xa6, 0xb5, 0xaa, 0xcf, - 0x41, 0x65, 0x2a, 0xf5, 0x84, 0xf6, 0x2f, 0x19, 0xde, 0x3f, 0xb5, 0x02, 0xa5, 0x48, 0x9e, 0x51, - 0x37, 0xe1, 0xf2, 0xbc, 0xb4, 0xa1, 0x0e, 0x7c, 0x7a, 0x24, 0xfc, 0xa3, 0x97, 0xa0, 0xe0, 0xe7, - 0x0d, 0x7e, 0x1a, 0x67, 0x6d, 0x25, 0x99, 0x35, 0x9f, 0x95, 0x1e, 0x43, 0xea, 0xd6, 0xcc, 0x1f, - 0x52, 0xec, 0xc3, 0xf3, 0x86, 0xeb, 0xb6, 0x0c, 0x6f, 0xa0, 0x7e, 0x00, 0xb5, 0xb8, 0x9c, 0x30, - 0xb5, 0x8c, 0x8c, 0xef, 0x86, 0x9b, 0x90, 0x3b, 0x75, 0xc6, 0x23, 0x83, 0x30, 0x65, 0x25, 0x4d, - 0x8c, 0xa8, 0x7b, 0xf2, 0xfc, 0x90, 0x66, 0x64, 0x3e, 0x50, 0x75, 0x78, 0x2c, 0x36, 0x2f, 0x50, - 0x11, 0xcb, 0x36, 0x31, 0xb7, 0x67, 0x49, 0xe3, 0x83, 0x40, 0x11, 0xff, 0x58, 0x3e, 0xa0, 0xd3, - 0x7a, 0x6c, 0xad, 0x4c, 0x7f, 0x51, 0x13, 0x23, 0xf5, 0x8f, 0x49, 0x78, 0x64, 0x6e, 0x76, 0x78, - 0xa8, 0x67, 0xe0, 0x10, 0x2a, 0x22, 0x9f, 0xe8, 0x63, 0xec, 0x4d, 0x86, 0x84, 0x86, 0xab, 0xf4, - 0x34, 0x96, 0xe0, 0x0a, 0x78, 0xe6, 0xd0, 0x18, 0x9b, 0x50, 0x53, 0xf2, 0x42, 0x34, 0x4f, 0xbd, - 0xe6, 0x6f, 0x70, 0x24, 0xfb, 0xcc, 0x38, 0xd7, 0xef, 0x00, 0x0a, 0x1a, 0xf6, 0x5c, 0x1a, 0xef, - 0x50, 0x1d, 0x8a, 0xf8, 0x41, 0x0f, 0x73, 0x34, 0x9a, 0x8c, 0x45, 0x73, 0x9c, 0xbb, 0x29, 0x39, - 0x29, 0x94, 0xf2, 0xc5, 0xd0, 0x0d, 0x81, 0xb8, 0xe3, 0xc1, 0xb3, 0x10, 0x0f, 0x43, 0xee, 0x97, - 0x25, 0xe4, 0x4e, 0xc7, 0xa2, 0x27, 0x2e, 0x35, 0x85, 0xb9, 0x6f, 0x08, 0xcc, 0x9d, 0x59, 0x32, - 0x59, 0x04, 0x74, 0x37, 0x22, 0xa0, 0x3b, 0xbb, 0x64, 0x99, 0x31, 0xa8, 0xbb, 0x11, 0x41, 0xdd, - 0xb9, 0x25, 0x4a, 0x62, 0x60, 0xf7, 0xcb, 0x12, 0x76, 0xe7, 0x97, 0x2c, 0x7b, 0x0a, 0x77, 0xdf, - 0x8c, 0xe2, 0x6e, 0x8e, 0x99, 0x9f, 0x8a, 0x95, 0x8e, 0x05, 0xde, 0xdf, 0x0f, 0x01, 0xef, 0x62, - 0x2c, 0xea, 0xe5, 0x4a, 0xe6, 0x20, 0xef, 0x46, 0x04, 0x79, 0xc3, 0x12, 0x1b, 0xc4, 0x40, 0xef, - 0xb7, 0xc2, 0xd0, 0x7b, 0x2d, 0x16, 0xbd, 0x0b, 0xa7, 0x99, 0x87, 0xbd, 0x5f, 0xf5, 0xb1, 0xf7, - 0x7a, 0x6c, 0xf1, 0x20, 0xd6, 0x30, 0x0d, 0xbe, 0xdb, 0x33, 0xe0, 0xbb, 0x14, 0x8b, 0x0e, 0xb9, - 0x8a, 0x25, 0xe8, 0xbb, 0x3d, 0x83, 0xbe, 0xcb, 0x4b, 0x14, 0x2e, 0x81, 0xdf, 0x3f, 0x9f, 0x0f, - 0xbf, 0xe3, 0x01, 0xb2, 0xf8, 0xcc, 0xd5, 0xf0, 0xb7, 0x1e, 0x83, 0xbf, 0xab, 0x4c, 0xfd, 0x77, - 0x62, 0xd5, 0xaf, 0x0c, 0xc0, 0x4f, 0x62, 0x01, 0xf8, 0x33, 0x8b, 0xdd, 0x75, 0x11, 0x02, 0x3f, - 0x8e, 0x43, 0xe0, 0xd7, 0x96, 0x39, 0xdf, 0x52, 0x08, 0xfe, 0x1c, 0x45, 0x3a, 0x53, 0xf1, 0x8d, - 0x66, 0x0b, 0x3c, 0x1e, 0x3b, 0x63, 0x81, 0x6e, 0xf9, 0x40, 0x7d, 0x96, 0x62, 0xaf, 0x20, 0x96, - 0x2d, 0x80, 0xeb, 0x2c, 0x2b, 0x87, 0xe2, 0x97, 0xfa, 0xe7, 0x64, 0x20, 0xcb, 0xe0, 0x4a, 0x18, - 0xb7, 0x15, 0x05, 0x6e, 0x0b, 0xa1, 0xf8, 0x54, 0x14, 0xc5, 0x6f, 0xc3, 0x1a, 0xcd, 0xb6, 0x53, - 0x00, 0xdd, 0x70, 0x25, 0x40, 0x47, 0xd7, 0x61, 0x83, 0xc1, 0x29, 0x8e, 0xf5, 0x45, 0x8a, 0xcd, - 0x30, 0xa4, 0x50, 0xa1, 0x2f, 0xb8, 0x61, 0x79, 0xae, 0x7d, 0x01, 0x2e, 0x85, 0x78, 0xfd, 0x2c, - 0xce, 0x51, 0x69, 0xd5, 0xe7, 0xde, 0x17, 0xe9, 0xfc, 0xdd, 0xc0, 0x40, 0x01, 0xf8, 0x47, 0x90, - 0xe9, 0x39, 0x26, 0x16, 0x39, 0x96, 0x3d, 0xd3, 0x82, 0x60, 0xe8, 0xf4, 0x45, 0x26, 0xa5, 0x8f, - 0x94, 0xcb, 0x0f, 0xd6, 0x45, 0x1e, 0x8b, 0xd5, 0xbf, 0x26, 0x03, 0x7d, 0x41, 0x3d, 0x30, 0x0f, - 0xba, 0x27, 0x1f, 0x0e, 0x74, 0x4f, 0x7d, 0x63, 0xe8, 0x1e, 0xc6, 0x38, 0xe9, 0x28, 0xc6, 0xf9, - 0x4f, 0x32, 0xd8, 0x61, 0x1f, 0x88, 0x7f, 0x33, 0x8b, 0x04, 0x80, 0x25, 0xcb, 0xf6, 0x4b, 0x00, - 0x16, 0x51, 0x5e, 0xe5, 0xd8, 0xbc, 0xd1, 0xf2, 0x2a, 0xcf, 0x21, 0x0c, 0x1b, 0xa0, 0x57, 0xa0, - 0xc8, 0x9a, 0x73, 0xba, 0xe3, 0x7a, 0x22, 0x2f, 0x3c, 0x1e, 0x5e, 0x2b, 0xef, 0xc1, 0xed, 0x1c, - 0x53, 0x9e, 0xb6, 0xeb, 0x69, 0x05, 0x57, 0x3c, 0x85, 0xb0, 0x58, 0x31, 0x52, 0x12, 0x5c, 0x81, - 0x22, 0xfd, 0x7a, 0xcf, 0x35, 0x7a, 0x98, 0xc5, 0xf8, 0xa2, 0x16, 0x10, 0xd4, 0xbb, 0x80, 0x66, - 0xb3, 0x0c, 0x6a, 0x41, 0x0e, 0x9f, 0x61, 0x9b, 0xd0, 0x5d, 0xa3, 0xe6, 0xde, 0x9c, 0x83, 0xb7, - 0xb1, 0x4d, 0xea, 0x35, 0x6a, 0xe4, 0x7f, 0x7f, 0xb9, 0x5d, 0xe5, 0xdc, 0xcf, 0x3b, 0x23, 0x8b, - 0xe0, 0x91, 0x4b, 0xce, 0x35, 0x21, 0xaf, 0xfe, 0x2a, 0x45, 0xc1, 0x6f, 0x24, 0x03, 0xcd, 0xb5, - 0xad, 0x3c, 0x40, 0xa9, 0x50, 0xe1, 0xb3, 0x9a, 0xbd, 0xb7, 0x00, 0xfa, 0x86, 0xa7, 0xdf, 0x37, - 0x6c, 0x82, 0x4d, 0x61, 0xf4, 0x10, 0x05, 0x29, 0x50, 0xa0, 0xa3, 0x89, 0x87, 0x4d, 0x51, 0x83, - 0xf9, 0xe3, 0xd0, 0x3a, 0xf3, 0xdf, 0x6e, 0x9d, 0x51, 0x2b, 0x17, 0xa6, 0xad, 0xfc, 0x9b, 0x54, - 0x70, 0x4a, 0x82, 0x3a, 0xe1, 0xff, 0xcf, 0x0e, 0xbf, 0x65, 0xcd, 0x83, 0x28, 0x14, 0x40, 0x27, - 0xb0, 0xe1, 0x9f, 0x52, 0x7d, 0xc2, 0x4e, 0xaf, 0xf4, 0xbb, 0x55, 0x8f, 0x79, 0xf5, 0x2c, 0x4a, - 0xf6, 0xd0, 0x8f, 0xe1, 0xd1, 0xa9, 0x08, 0xe4, 0xab, 0x4e, 0xad, 0x18, 0x88, 0x1e, 0x89, 0x06, - 0x22, 0xa9, 0x39, 0xb0, 0x55, 0xfa, 0x5b, 0x9e, 0x8d, 0x03, 0x5a, 0x8f, 0x86, 0x81, 0xcd, 0xdc, - 0xdd, 0x7f, 0x0a, 0x4a, 0x63, 0x4c, 0x0c, 0xcb, 0xd6, 0x23, 0x15, 0xff, 0x3a, 0x27, 0x8a, 0x3e, - 0xc2, 0x31, 0x2d, 0x70, 0xe6, 0x00, 0x1c, 0xf4, 0x3d, 0x28, 0x06, 0xd8, 0x28, 0x19, 0x53, 0x3c, - 0xfb, 0x05, 0x61, 0xc0, 0xab, 0xfe, 0x25, 0x19, 0xa8, 0x8c, 0x96, 0x98, 0x4d, 0xc8, 0xf1, 0xfa, - 0x86, 0x39, 0x6e, 0x79, 0xef, 0x85, 0xd5, 0xa0, 0xd1, 0x0e, 0xaf, 0x6c, 0x34, 0x21, 0xac, 0xde, - 0x85, 0x1c, 0xa7, 0xa0, 0x35, 0xc8, 0xdf, 0x3e, 0xba, 0x75, 0xd4, 0x7e, 0xef, 0xa8, 0x9a, 0x40, - 0x00, 0xb9, 0xfd, 0x46, 0xa3, 0x79, 0xdc, 0xa9, 0x26, 0x51, 0x11, 0xb2, 0xfb, 0xf5, 0xb6, 0xd6, - 0xa9, 0xa6, 0x28, 0x59, 0x6b, 0xbe, 0xd3, 0x6c, 0x74, 0xaa, 0x69, 0xb4, 0x01, 0x25, 0xfe, 0xac, - 0xdf, 0x6c, 0x6b, 0xef, 0xee, 0x77, 0xaa, 0x99, 0x10, 0xe9, 0xa4, 0x79, 0xf4, 0x76, 0x53, 0xab, - 0x66, 0xd5, 0x17, 0x69, 0x55, 0x19, 0x03, 0xa6, 0x82, 0xfa, 0x31, 0x19, 0xaa, 0x1f, 0xd5, 0xdf, - 0xa7, 0x40, 0x89, 0x47, 0x48, 0xe8, 0x9d, 0xa9, 0x85, 0xef, 0x5d, 0x00, 0x5e, 0x4d, 0xad, 0x1e, - 0x3d, 0x0d, 0xe5, 0x31, 0x3e, 0xc5, 0xa4, 0x37, 0xe0, 0x88, 0x8d, 0x27, 0xb6, 0x92, 0x56, 0x12, - 0x54, 0x26, 0xe4, 0x71, 0xb6, 0x0f, 0x71, 0x8f, 0xe8, 0xbc, 0x94, 0xe5, 0x4e, 0x57, 0xa4, 0x6c, - 0x94, 0x7a, 0xc2, 0x89, 0xea, 0x07, 0x17, 0xb2, 0x65, 0x11, 0xb2, 0x5a, 0xb3, 0xa3, 0xfd, 0xa4, - 0x9a, 0x46, 0x08, 0xca, 0xec, 0x51, 0x3f, 0x39, 0xda, 0x3f, 0x3e, 0x69, 0xb5, 0xa9, 0x2d, 0x2f, - 0x41, 0x45, 0xda, 0x52, 0x12, 0xb3, 0x6a, 0x17, 0x36, 0xe7, 0xc3, 0xbb, 0x87, 0x98, 0x2b, 0xfe, - 0x10, 0x72, 0xb9, 0x68, 0xd1, 0x3b, 0x2f, 0x52, 0x46, 0x22, 0x4d, 0x6a, 0x2a, 0xd2, 0xa0, 0xd7, - 0xfc, 0xbd, 0xca, 0xb0, 0xbd, 0x52, 0x17, 0xd7, 0xe0, 0xac, 0xa3, 0x23, 0xf7, 0x46, 0x9e, 0xc2, - 0x74, 0x70, 0x0a, 0xd5, 0x5f, 0xa4, 0xa0, 0x32, 0x15, 0x20, 0xd0, 0x0d, 0xc8, 0x72, 0x40, 0x9c, - 0x9c, 0xad, 0x5e, 0xf9, 0x14, 0xcc, 0x42, 0x22, 0x9c, 0x70, 0x5e, 0xf4, 0x06, 0x14, 0xb0, 0xe8, - 0x55, 0xcd, 0x8b, 0x44, 0x5c, 0x4e, 0x76, 0xb3, 0x84, 0xa8, 0x2f, 0x81, 0xde, 0x84, 0xa2, 0x1f, - 0xea, 0x44, 0xad, 0xfd, 0xe4, 0xac, 0xb8, 0x1f, 0x24, 0x85, 0x7c, 0x20, 0x83, 0x5e, 0x0d, 0x40, - 0x69, 0x66, 0xb6, 0xd8, 0x12, 0xe2, 0x9c, 0x41, 0x08, 0x4b, 0x7e, 0xf5, 0x7d, 0x28, 0x47, 0x5b, - 0x77, 0xf4, 0x14, 0x8d, 0x9d, 0x89, 0x6d, 0x32, 0x03, 0x64, 0x35, 0x3e, 0x40, 0x2f, 0x41, 0xf6, - 0xcc, 0xe1, 0x81, 0x76, 0x7e, 0xb8, 0xb9, 0xe3, 0x10, 0x1c, 0x6a, 0xfd, 0x71, 0x6e, 0xf5, 0x63, - 0xc8, 0x32, 0x47, 0xa1, 0xe6, 0x67, 0x4d, 0x38, 0x81, 0xa5, 0xe9, 0x33, 0x7a, 0x1f, 0xc0, 0x20, - 0x64, 0x6c, 0x75, 0x27, 0x81, 0xe2, 0xed, 0xf9, 0x8e, 0xb6, 0x2f, 0xf9, 0xea, 0x57, 0x84, 0xc7, - 0x5d, 0x0e, 0x44, 0x43, 0x5e, 0x17, 0x52, 0xa8, 0x1e, 0x41, 0x39, 0x2a, 0x1b, 0x6e, 0x87, 0xaf, - 0xcf, 0x69, 0x87, 0xfb, 0x78, 0xcd, 0x47, 0x7b, 0x69, 0xde, 0x70, 0x65, 0x03, 0xf5, 0x93, 0x24, - 0x14, 0xa4, 0x6b, 0xc5, 0xf5, 0xfa, 0x02, 0xd1, 0x54, 0xb8, 0xb3, 0xc5, 0xfb, 0x3b, 0x69, 0xbf, - 0x25, 0xf9, 0x56, 0xc4, 0x91, 0x57, 0xaa, 0xcf, 0x65, 0x5f, 0x4a, 0x04, 0xda, 0xd7, 0xa1, 0xe8, - 0x3b, 0x04, 0x2d, 0x4a, 0x0c, 0xd3, 0x1c, 0x63, 0xcf, 0x13, 0x6b, 0x93, 0x43, 0xd6, 0x3a, 0x76, - 0xee, 0x8b, 0xde, 0x59, 0x5a, 0xe3, 0x03, 0xd5, 0x84, 0xca, 0x54, 0xca, 0x45, 0xaf, 0x43, 0xde, - 0x9d, 0x74, 0x75, 0x69, 0x9e, 0xa9, 0x5f, 0xa5, 0x12, 0xa0, 0x4e, 0xba, 0x43, 0xab, 0x77, 0x0b, - 0x9f, 0xcb, 0x8f, 0x71, 0x27, 0xdd, 0x5b, 0xdc, 0x8a, 0x7c, 0x96, 0x54, 0x78, 0x96, 0x33, 0x28, - 0x48, 0xa7, 0x40, 0x3f, 0x08, 0xbb, 0xb8, 0xfc, 0xa1, 0x10, 0x0b, 0x03, 0x84, 0xfa, 0x90, 0x87, - 0x5f, 0x87, 0x0d, 0xcf, 0xea, 0xdb, 0xd8, 0xd4, 0x83, 0xb2, 0x88, 0xcd, 0x56, 0xd0, 0x2a, 0xfc, - 0xc5, 0xa1, 0xac, 0x89, 0xd4, 0xff, 0x26, 0xa1, 0x20, 0xcf, 0x1a, 0x7a, 0x31, 0xe4, 0x77, 0xe5, - 0x39, 0xbd, 0x28, 0xc9, 0x18, 0x74, 0x7f, 0xa3, 0xdf, 0x9a, 0xba, 0xf8, 0xb7, 0xc6, 0xb5, 0xf1, - 0xe5, 0xff, 0x94, 0xcc, 0x85, 0xff, 0xa7, 0x3c, 0x0f, 0x88, 0x38, 0xc4, 0x18, 0xea, 0x67, 0x0e, - 0xb1, 0xec, 0xbe, 0xce, 0x8d, 0xcd, 0xd1, 0x60, 0x95, 0xbd, 0xb9, 0xc3, 0x5e, 0x1c, 0x33, 0xbb, - 0xff, 0x32, 0x09, 0x05, 0x3f, 0xaf, 0x5f, 0xb4, 0x99, 0xbb, 0x09, 0x39, 0x91, 0xba, 0x78, 0x37, - 0x57, 0x8c, 0xfc, 0x9e, 0x6a, 0x26, 0xd4, 0x53, 0x55, 0xa0, 0x30, 0xc2, 0xc4, 0x60, 0x61, 0x95, - 0x57, 0xa6, 0xfe, 0xf8, 0xfa, 0xab, 0xb0, 0x16, 0xea, 0xab, 0xd3, 0x93, 0x77, 0xd4, 0x7c, 0xaf, - 0x9a, 0x50, 0xf2, 0x9f, 0x7c, 0x76, 0x35, 0x7d, 0x84, 0xef, 0x53, 0x9f, 0xd5, 0x9a, 0x8d, 0x56, - 0xb3, 0x71, 0xab, 0x9a, 0x54, 0xd6, 0x3e, 0xf9, 0xec, 0x6a, 0x5e, 0xc3, 0xac, 0x85, 0x75, 0xbd, - 0x05, 0xeb, 0xe1, 0x5d, 0x89, 0x66, 0x3f, 0x04, 0xe5, 0xb7, 0x6f, 0x1f, 0x1f, 0x1e, 0x34, 0xf6, - 0x3b, 0x4d, 0xfd, 0x4e, 0xbb, 0xd3, 0xac, 0x26, 0xd1, 0xa3, 0x70, 0xe9, 0xf0, 0xe0, 0x87, 0xad, - 0x8e, 0xde, 0x38, 0x3c, 0x68, 0x1e, 0x75, 0xf4, 0xfd, 0x4e, 0x67, 0xbf, 0x71, 0xab, 0x9a, 0xda, - 0xfb, 0xdb, 0x1a, 0x54, 0xf6, 0xeb, 0x8d, 0x03, 0x9a, 0xb9, 0xad, 0x9e, 0x21, 0x5a, 0x84, 0x19, - 0xd6, 0x18, 0x58, 0x78, 0xeb, 0x40, 0x59, 0xdc, 0x21, 0x45, 0x37, 0x21, 0xcb, 0x7a, 0x06, 0x68, - 0xf1, 0x35, 0x04, 0x65, 0x49, 0xcb, 0x94, 0x7e, 0x0c, 0x3b, 0x1e, 0x0b, 0xef, 0x25, 0x28, 0x8b, - 0x3b, 0xa8, 0x48, 0x83, 0x62, 0x50, 0xf4, 0x2f, 0xbf, 0xa7, 0xa0, 0xac, 0xd0, 0x55, 0xa5, 0x3a, - 0x83, 0x92, 0x66, 0xf9, 0x7f, 0x7b, 0x65, 0x85, 0x00, 0x86, 0x0e, 0x21, 0x2f, 0x8b, 0xc5, 0x65, - 0x37, 0x09, 0x94, 0xa5, 0x1d, 0x4f, 0xba, 0x05, 0xbc, 0xa8, 0x5f, 0x7c, 0x2d, 0x42, 0x59, 0xd2, - 0xbe, 0x45, 0x07, 0x90, 0x13, 0x38, 0x7d, 0xc9, 0xed, 0x00, 0x65, 0x59, 0x07, 0x93, 0x1a, 0x2d, - 0xe8, 0x96, 0x2c, 0xbf, 0xec, 0xa1, 0xac, 0xd0, 0x99, 0x46, 0xb7, 0x01, 0x42, 0x25, 0xfc, 0x0a, - 0xb7, 0x38, 0x94, 0x55, 0x3a, 0xce, 0xa8, 0x0d, 0x05, 0xbf, 0x54, 0x5b, 0x7a, 0xa7, 0x42, 0x59, - 0xde, 0xfa, 0x45, 0x77, 0xa1, 0x14, 0xad, 0x51, 0x56, 0xbb, 0x29, 0xa1, 0xac, 0xd8, 0xd3, 0xa5, - 0xfa, 0xa3, 0x05, 0xcb, 0x6a, 0x37, 0x27, 0x94, 0x15, 0x5b, 0xbc, 0xe8, 0x43, 0xd8, 0x98, 0x2d, - 0x28, 0x56, 0xbf, 0x48, 0xa1, 0x5c, 0xa0, 0xe9, 0x8b, 0x46, 0x80, 0xe6, 0x14, 0x22, 0x17, 0xb8, - 0x57, 0xa1, 0x5c, 0xa4, 0x07, 0x8c, 0x0c, 0x28, 0x4f, 0xa1, 0xfb, 0x15, 0xaf, 0x59, 0x28, 0xab, - 0x76, 0x83, 0xe9, 0xee, 0x44, 0xb1, 0xfd, 0x6a, 0xb7, 0x2e, 0x94, 0x15, 0x5b, 0xc3, 0xf5, 0xd6, - 0xe7, 0x5f, 0x6d, 0x25, 0xbf, 0xf8, 0x6a, 0x2b, 0xf9, 0xaf, 0xaf, 0xb6, 0x92, 0x9f, 0x7e, 0xbd, - 0x95, 0xf8, 0xe2, 0xeb, 0xad, 0xc4, 0x3f, 0xbe, 0xde, 0x4a, 0xfc, 0x74, 0xa7, 0x6f, 0x91, 0xc1, - 0xa4, 0xbb, 0xd3, 0x73, 0x46, 0xbb, 0xa6, 0xf3, 0xa1, 0x35, 0x32, 0x6c, 0x4c, 0xee, 0x3b, 0xe3, - 0x7b, 0x62, 0x34, 0x75, 0x9d, 0xae, 0x9b, 0x63, 0xe9, 0xf6, 0xc6, 0xff, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xd0, 0x27, 0x91, 0x7b, 0x6e, 0x27, 0x00, 0x00, + // 3000 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xd5, + 0xb5, 0xd7, 0xf7, 0xc7, 0xb1, 0x25, 0xb5, 0xef, 0x0c, 0x46, 0x34, 0x83, 0x3d, 0x34, 0xc5, 0x00, + 0xf3, 0xc0, 0x7e, 0x78, 0x1e, 0x3c, 0x78, 0xf0, 0x02, 0x96, 0xd0, 0x44, 0xc6, 0xc6, 0x72, 0x5a, + 0x9a, 0x21, 0x24, 0x61, 0x9a, 0x96, 0xfa, 0x5a, 0x6a, 0x2c, 0x75, 0x37, 0xea, 0x2b, 0x8f, 0xcd, + 0x2a, 0x95, 0x8f, 0x0d, 0xc9, 0x82, 0x25, 0x1b, 0xfe, 0x87, 0xac, 0x52, 0x59, 0x65, 0x93, 0xaa, + 0x14, 0x55, 0xd9, 0xb0, 0xcc, 0x8a, 0xa4, 0x60, 0x97, 0x7f, 0x20, 0xab, 0x54, 0xa5, 0xee, 0x47, + 0x7f, 0x49, 0x6a, 0x49, 0x06, 0x76, 0xd9, 0xdd, 0x7b, 0xfa, 0x9c, 0xd3, 0x7d, 0xcf, 0x3d, 0xf7, + 0x9c, 0xdf, 0x39, 0x7d, 0xe1, 0x71, 0x82, 0x2d, 0x03, 0x8f, 0x47, 0xa6, 0x45, 0x76, 0xf5, 0x6e, + 0xcf, 0xdc, 0x25, 0x97, 0x0e, 0x76, 0x77, 0x9c, 0xb1, 0x4d, 0x6c, 0x54, 0x09, 0x1e, 0xee, 0xd0, + 0x87, 0xf2, 0x13, 0x21, 0xee, 0xde, 0xf8, 0xd2, 0x21, 0xf6, 0xae, 0x33, 0xb6, 0xed, 0x53, 0xce, + 0x2f, 0xdf, 0x08, 0x3d, 0x66, 0x7a, 0xc2, 0xda, 0x22, 0x4f, 0x85, 0xf0, 0x19, 0xbe, 0xf4, 0x9e, + 0x3e, 0x31, 0x23, 0xeb, 0xe8, 0x63, 0x7d, 0xe4, 0x3d, 0xde, 0xee, 0xdb, 0x76, 0x7f, 0x88, 0x77, + 0xd9, 0xac, 0x3b, 0x39, 0xdd, 0x25, 0xe6, 0x08, 0xbb, 0x44, 0x1f, 0x39, 0x82, 0xe1, 0x7a, 0xdf, + 0xee, 0xdb, 0x6c, 0xb8, 0x4b, 0x47, 0x9c, 0xaa, 0xfc, 0xbe, 0x08, 0x79, 0x15, 0x7f, 0x34, 0xc1, + 0x2e, 0x41, 0x7b, 0x90, 0xc1, 0xbd, 0x81, 0x5d, 0x4d, 0xde, 0x4c, 0x3e, 0xbb, 0xb6, 0x77, 0x63, + 0x67, 0x6a, 0x71, 0x3b, 0x82, 0xaf, 0xd1, 0x1b, 0xd8, 0xcd, 0x84, 0xca, 0x78, 0xd1, 0x4b, 0x90, + 0x3d, 0x1d, 0x4e, 0xdc, 0x41, 0x35, 0xc5, 0x84, 0x9e, 0x88, 0x13, 0xba, 0x4b, 0x99, 0x9a, 0x09, + 0x95, 0x73, 0xd3, 0x57, 0x99, 0xd6, 0xa9, 0x5d, 0x4d, 0x2f, 0x7e, 0xd5, 0x81, 0x75, 0xca, 0x5e, + 0x45, 0x79, 0x51, 0x0d, 0xc0, 0xc5, 0x44, 0xb3, 0x1d, 0x62, 0xda, 0x56, 0x35, 0xc3, 0x24, 0x9f, + 0x8c, 0x93, 0x6c, 0x63, 0xd2, 0x62, 0x8c, 0xcd, 0x84, 0x5a, 0x74, 0xbd, 0x09, 0xd5, 0x61, 0x5a, + 0x26, 0xd1, 0x7a, 0x03, 0xdd, 0xb4, 0xaa, 0xd9, 0xc5, 0x3a, 0x0e, 0x2c, 0x93, 0xd4, 0x29, 0x23, + 0xd5, 0x61, 0x7a, 0x13, 0xba, 0xe4, 0x8f, 0x26, 0x78, 0x7c, 0x59, 0xcd, 0x2d, 0x5e, 0xf2, 0x8f, + 0x28, 0x13, 0x5d, 0x32, 0xe3, 0x46, 0x0d, 0x58, 0xeb, 0xe2, 0xbe, 0x69, 0x69, 0xdd, 0xa1, 0xdd, + 0x3b, 0xab, 0xe6, 0x99, 0xb0, 0x12, 0x27, 0x5c, 0xa3, 0xac, 0x35, 0xca, 0xd9, 0x4c, 0xa8, 0xd0, + 0xf5, 0x67, 0xe8, 0x75, 0x28, 0xf4, 0x06, 0xb8, 0x77, 0xa6, 0x91, 0x8b, 0x6a, 0x81, 0xe9, 0xd8, + 0x8e, 0xd3, 0x51, 0xa7, 0x7c, 0x9d, 0x8b, 0x66, 0x42, 0xcd, 0xf7, 0xf8, 0x90, 0xae, 0xdf, 0xc0, + 0x43, 0xf3, 0x1c, 0x8f, 0xa9, 0x7c, 0x71, 0xf1, 0xfa, 0xdf, 0xe2, 0x9c, 0x4c, 0x43, 0xd1, 0xf0, + 0x26, 0xe8, 0x0d, 0x28, 0x62, 0xcb, 0x10, 0xcb, 0x00, 0xa6, 0xe2, 0x66, 0xac, 0xaf, 0x58, 0x86, + 0xb7, 0x88, 0x02, 0x16, 0x63, 0xf4, 0x0a, 0xe4, 0x7a, 0xf6, 0x68, 0x64, 0x92, 0xea, 0x1a, 0x93, + 0xde, 0x8a, 0x5d, 0x00, 0xe3, 0x6a, 0x26, 0x54, 0xc1, 0x8f, 0x8e, 0xa1, 0x3c, 0x34, 0x5d, 0xa2, + 0xb9, 0x96, 0xee, 0xb8, 0x03, 0x9b, 0xb8, 0xd5, 0x75, 0xa6, 0xe1, 0xe9, 0x38, 0x0d, 0x47, 0xa6, + 0x4b, 0xda, 0x1e, 0x73, 0x33, 0xa1, 0x96, 0x86, 0x61, 0x02, 0xd5, 0x67, 0x9f, 0x9e, 0xe2, 0xb1, + 0xaf, 0xb0, 0x5a, 0x5a, 0xac, 0xaf, 0x45, 0xb9, 0x3d, 0x79, 0xaa, 0xcf, 0x0e, 0x13, 0xd0, 0x4f, + 0xe1, 0xda, 0xd0, 0xd6, 0x0d, 0x5f, 0x9d, 0xd6, 0x1b, 0x4c, 0xac, 0xb3, 0x6a, 0x99, 0x29, 0x7d, + 0x2e, 0xf6, 0x23, 0x6d, 0xdd, 0xf0, 0x54, 0xd4, 0xa9, 0x40, 0x33, 0xa1, 0x6e, 0x0c, 0xa7, 0x89, + 0xe8, 0x01, 0x5c, 0xd7, 0x1d, 0x67, 0x78, 0x39, 0xad, 0xbd, 0xc2, 0xb4, 0xdf, 0x8e, 0xd3, 0xbe, + 0x4f, 0x65, 0xa6, 0xd5, 0x23, 0x7d, 0x86, 0x8a, 0x54, 0x90, 0xb8, 0x83, 0xba, 0xa6, 0x81, 0xc5, + 0xf6, 0x3e, 0xc2, 0x74, 0xdf, 0x5a, 0xe8, 0xa5, 0x6d, 0xd3, 0xc0, 0xde, 0x26, 0x97, 0xbb, 0x11, + 0x0a, 0x6a, 0x41, 0xc5, 0xf3, 0x37, 0xa6, 0x95, 0x5c, 0x54, 0x37, 0x17, 0x5b, 0x58, 0x38, 0x1d, + 0x55, 0xc1, 0x1c, 0xaf, 0x64, 0x84, 0x09, 0xb5, 0x3c, 0x64, 0xcf, 0xf5, 0xe1, 0x04, 0x2b, 0xcf, + 0xc0, 0x5a, 0x28, 0x1e, 0xa1, 0x2a, 0xe4, 0x47, 0xd8, 0x75, 0xf5, 0x3e, 0x66, 0xe1, 0xab, 0xa8, + 0x7a, 0x53, 0xa5, 0x0c, 0xeb, 0xe1, 0x18, 0xa4, 0x8c, 0x7c, 0x41, 0x1a, 0x5d, 0xa8, 0xe0, 0x39, + 0x1e, 0xbb, 0x34, 0xa4, 0x08, 0x41, 0x31, 0x45, 0x4f, 0x41, 0x89, 0x19, 0x41, 0xf3, 0x9e, 0xd3, + 0x10, 0x97, 0x51, 0xd7, 0x19, 0xf1, 0xbe, 0x60, 0xda, 0x86, 0x35, 0x67, 0xcf, 0xf1, 0x59, 0xd2, + 0x8c, 0x05, 0x9c, 0x3d, 0x47, 0x30, 0x28, 0xff, 0x07, 0xd2, 0x74, 0x48, 0x42, 0x12, 0xa4, 0xcf, + 0xf0, 0xa5, 0x78, 0x1f, 0x1d, 0xa2, 0xeb, 0x62, 0x59, 0xec, 0x1d, 0x45, 0x55, 0xac, 0xf1, 0x2f, + 0x29, 0x5f, 0xd8, 0x8f, 0x45, 0xe8, 0x15, 0xc8, 0xd0, 0xd0, 0x2e, 0xa2, 0xb4, 0xbc, 0xc3, 0xe3, + 0xfe, 0x8e, 0x17, 0xf7, 0x77, 0x3a, 0x5e, 0xdc, 0xaf, 0x15, 0xbe, 0xf8, 0x6a, 0x3b, 0xf1, 0xe9, + 0xdf, 0xb6, 0x93, 0x2a, 0x93, 0x40, 0x8f, 0xd1, 0xd0, 0xa1, 0x9b, 0x96, 0x66, 0x1a, 0xe2, 0x3d, + 0x79, 0x36, 0x3f, 0x30, 0xd0, 0x21, 0x48, 0x3d, 0xdb, 0x72, 0xb1, 0xe5, 0x4e, 0x5c, 0x8d, 0xe7, + 0x15, 0x11, 0x9b, 0x67, 0x8f, 0x76, 0xdd, 0x63, 0x3c, 0x61, 0x7c, 0x6a, 0xa5, 0x17, 0x25, 0xa0, + 0xbb, 0x00, 0xe7, 0xfa, 0xd0, 0x34, 0x74, 0x62, 0x8f, 0xdd, 0x6a, 0xe6, 0x66, 0x7a, 0xae, 0x9a, + 0xfb, 0x1e, 0xcb, 0x3d, 0xc7, 0xd0, 0x09, 0xae, 0x65, 0xe8, 0xd7, 0xaa, 0x21, 0x49, 0x74, 0x0b, + 0x2a, 0xba, 0xe3, 0x68, 0x2e, 0xd1, 0x09, 0xd6, 0xba, 0x97, 0x04, 0xbb, 0x2c, 0x62, 0xaf, 0xab, + 0x25, 0xdd, 0x71, 0xda, 0x94, 0x5a, 0xa3, 0x44, 0xf4, 0x34, 0x94, 0x69, 0x74, 0x36, 0xf5, 0xa1, + 0x36, 0xc0, 0x66, 0x7f, 0x40, 0x58, 0x64, 0x4e, 0xab, 0x25, 0x41, 0x6d, 0x32, 0xa2, 0x62, 0xf8, + 0x8e, 0xc0, 0x22, 0x33, 0x42, 0x90, 0x31, 0x74, 0xa2, 0x33, 0x43, 0xae, 0xab, 0x6c, 0x4c, 0x69, + 0x8e, 0x4e, 0x06, 0xc2, 0x3c, 0x6c, 0x8c, 0x36, 0x21, 0x27, 0xd4, 0xa6, 0x99, 0x5a, 0x31, 0xa3, + 0x7b, 0xe6, 0x8c, 0xed, 0x73, 0xcc, 0x52, 0x51, 0x41, 0xe5, 0x13, 0xe5, 0x57, 0x29, 0xd8, 0x98, + 0x89, 0xe1, 0x54, 0xef, 0x40, 0x77, 0x07, 0xde, 0xbb, 0xe8, 0x18, 0xbd, 0x4c, 0xf5, 0xea, 0x06, + 0x1e, 0x8b, 0xdc, 0x59, 0x0d, 0x9b, 0x88, 0xe3, 0x82, 0x26, 0x7b, 0x2e, 0x4c, 0x23, 0xb8, 0x51, + 0x0b, 0xa4, 0xa1, 0xee, 0x12, 0x8d, 0xc7, 0x44, 0x2d, 0x94, 0x47, 0x67, 0x33, 0xc1, 0x91, 0xee, + 0x45, 0x51, 0xea, 0xec, 0x42, 0x51, 0x79, 0x18, 0xa1, 0x22, 0x15, 0xae, 0x77, 0x2f, 0x3f, 0xd6, + 0x2d, 0x62, 0x5a, 0x58, 0x9b, 0xd9, 0xb9, 0xc7, 0x66, 0x94, 0x36, 0xce, 0x4d, 0x03, 0x5b, 0x3d, + 0x6f, 0xcb, 0xae, 0xf9, 0xc2, 0xfe, 0x96, 0xba, 0x8a, 0x0a, 0xe5, 0x68, 0x16, 0x42, 0x65, 0x48, + 0x91, 0x0b, 0x61, 0x80, 0x14, 0xb9, 0x40, 0xff, 0x0d, 0x19, 0xba, 0x48, 0xb6, 0xf8, 0xf2, 0x1c, + 0x08, 0x20, 0xe4, 0x3a, 0x97, 0x0e, 0x56, 0x19, 0xa7, 0xa2, 0xf8, 0xa7, 0xc1, 0xcf, 0x4c, 0xd3, + 0x5a, 0x95, 0xe7, 0xa0, 0x32, 0x95, 0x7a, 0x42, 0xfb, 0x97, 0x0c, 0xef, 0x9f, 0x52, 0x81, 0x52, + 0x24, 0xcf, 0x28, 0x9b, 0x70, 0x7d, 0x5e, 0xda, 0x50, 0x06, 0x3e, 0x3d, 0x12, 0xfe, 0xd1, 0x4b, + 0x50, 0xf0, 0xf3, 0x06, 0x3f, 0x8d, 0xb3, 0xb6, 0xf2, 0x98, 0x55, 0x9f, 0x95, 0x1e, 0x43, 0xea, + 0xd6, 0xcc, 0x1f, 0x52, 0xec, 0xc3, 0xf3, 0xba, 0xe3, 0x34, 0x75, 0x77, 0xa0, 0x7c, 0x00, 0xd5, + 0xb8, 0x9c, 0x30, 0xb5, 0x8c, 0x8c, 0xef, 0x86, 0x9b, 0x90, 0x3b, 0xb5, 0xc7, 0x23, 0x9d, 0x30, + 0x65, 0x25, 0x55, 0xcc, 0xa8, 0x7b, 0xf2, 0xfc, 0x90, 0x66, 0x64, 0x3e, 0x51, 0x34, 0x78, 0x2c, + 0x36, 0x2f, 0x50, 0x11, 0xd3, 0x32, 0x30, 0xb7, 0x67, 0x49, 0xe5, 0x93, 0x40, 0x11, 0xff, 0x58, + 0x3e, 0xa1, 0xaf, 0x75, 0xd9, 0x5a, 0x99, 0xfe, 0xa2, 0x2a, 0x66, 0xca, 0xef, 0x92, 0xf0, 0xc8, + 0xdc, 0xec, 0xf0, 0xbd, 0x9e, 0x81, 0x43, 0xa8, 0x88, 0x7c, 0xa2, 0x8d, 0xb1, 0x3b, 0x19, 0x12, + 0x1a, 0xae, 0xd2, 0x73, 0xd1, 0x18, 0x4f, 0x1c, 0x2a, 0xe3, 0x12, 0x5a, 0x4a, 0x6e, 0x88, 0xe6, + 0x2a, 0xb7, 0xfc, 0xfd, 0x8d, 0x24, 0x9f, 0x19, 0xdf, 0xfa, 0x2d, 0x40, 0x41, 0xc5, 0xae, 0x43, + 0xc3, 0x1d, 0xaa, 0x41, 0x11, 0x5f, 0xf4, 0x30, 0x07, 0xa3, 0xc9, 0x58, 0x30, 0xc7, 0xb9, 0x1b, + 0x1e, 0x27, 0x45, 0x52, 0xbe, 0x18, 0xba, 0x23, 0x00, 0x77, 0x3c, 0x76, 0x16, 0xe2, 0x61, 0xc4, + 0xfd, 0xb2, 0x87, 0xb8, 0xd3, 0xb1, 0xe0, 0x89, 0x4b, 0x4d, 0x41, 0xee, 0x3b, 0x02, 0x72, 0x67, + 0x96, 0xbc, 0x2c, 0x82, 0xb9, 0xeb, 0x11, 0xcc, 0x9d, 0x5d, 0xb2, 0xcc, 0x18, 0xd0, 0x5d, 0x8f, + 0x80, 0xee, 0xdc, 0x12, 0x25, 0x31, 0xa8, 0xfb, 0x65, 0x0f, 0x75, 0xe7, 0x97, 0x2c, 0x7b, 0x0a, + 0x76, 0xdf, 0x8d, 0xc2, 0x6e, 0x0e, 0x99, 0x9f, 0x8a, 0x95, 0x8e, 0xc5, 0xdd, 0xff, 0x1f, 0xc2, + 0xdd, 0xc5, 0x58, 0xd0, 0xcb, 0x95, 0xcc, 0x01, 0xde, 0xf5, 0x08, 0xf0, 0x86, 0x25, 0x36, 0x88, + 0x41, 0xde, 0x6f, 0x86, 0x91, 0xf7, 0x5a, 0x2c, 0x78, 0x17, 0x4e, 0x33, 0x0f, 0x7a, 0xbf, 0xea, + 0x43, 0xef, 0xf5, 0xd8, 0xda, 0x41, 0xac, 0x61, 0x1a, 0x7b, 0xb7, 0x66, 0xb0, 0x77, 0x29, 0x16, + 0x1c, 0x72, 0x15, 0x4b, 0xc0, 0x77, 0x6b, 0x06, 0x7c, 0x97, 0x97, 0x28, 0x5c, 0x82, 0xbe, 0x7f, + 0x36, 0x1f, 0x7d, 0xc7, 0xe3, 0x63, 0xf1, 0x99, 0xab, 0xc1, 0x6f, 0x2d, 0x06, 0x7e, 0x4b, 0x4c, + 0xfd, 0x7f, 0xc5, 0xaa, 0x5f, 0x19, 0x7f, 0xb7, 0x63, 0xf1, 0xf7, 0x33, 0x8b, 0xdd, 0x75, 0x11, + 0x00, 0x3f, 0x89, 0x03, 0xe0, 0xb7, 0x96, 0x39, 0xdf, 0x52, 0x04, 0xfe, 0x1c, 0x05, 0x3a, 0x53, + 0xf1, 0x8d, 0x26, 0x0b, 0x3c, 0x1e, 0xdb, 0x63, 0x01, 0x6e, 0xf9, 0x44, 0x79, 0x96, 0x42, 0xaf, + 0x20, 0x96, 0x2d, 0x40, 0xeb, 0x2c, 0x29, 0x87, 0xe2, 0x97, 0xf2, 0x87, 0x64, 0x20, 0xcb, 0xd0, + 0x4a, 0x18, 0xb6, 0x15, 0x05, 0x6c, 0x0b, 0x81, 0xf8, 0x54, 0x14, 0xc4, 0x6f, 0xc3, 0x1a, 0x4d, + 0xb6, 0x53, 0xf8, 0x5c, 0x77, 0x3c, 0x7c, 0x8e, 0x6e, 0xc3, 0x06, 0x43, 0x53, 0x1c, 0xea, 0x8b, + 0x0c, 0x9b, 0x61, 0x40, 0xa1, 0x42, 0x1f, 0x70, 0xc3, 0xf2, 0x54, 0xfb, 0x02, 0x5c, 0x0b, 0xf1, + 0xfa, 0x49, 0x9c, 0x83, 0x52, 0xc9, 0xe7, 0xde, 0x17, 0xd9, 0xfc, 0x9d, 0xc0, 0x40, 0x01, 0xf6, + 0x47, 0x90, 0xe9, 0xd9, 0x06, 0x16, 0x29, 0x96, 0x8d, 0x69, 0x3d, 0x30, 0xb4, 0xfb, 0x22, 0x91, + 0xd2, 0x21, 0xe5, 0xf2, 0x83, 0x75, 0x91, 0xc7, 0x62, 0xe5, 0x4f, 0xc9, 0x40, 0x5f, 0x50, 0x0e, + 0xcc, 0x43, 0xee, 0xc9, 0xef, 0x07, 0xb9, 0xa7, 0xbe, 0x35, 0x72, 0x0f, 0x43, 0x9c, 0x74, 0x14, + 0xe2, 0xfc, 0x33, 0x19, 0xec, 0xb0, 0x8f, 0xc3, 0xbf, 0x9d, 0x45, 0x02, 0xbc, 0x92, 0x65, 0xfb, + 0x25, 0xf0, 0x8a, 0xa8, 0xae, 0x72, 0xec, 0xbd, 0xd1, 0xea, 0x2a, 0xcf, 0x11, 0x0c, 0x9b, 0xa0, + 0x57, 0xa0, 0xc8, 0x7a, 0x73, 0x9a, 0xed, 0xb8, 0x22, 0x2f, 0x3c, 0x1e, 0x5e, 0x2b, 0x6f, 0xc1, + 0xed, 0x9c, 0x50, 0x9e, 0x96, 0xe3, 0xaa, 0x05, 0x47, 0x8c, 0x42, 0x50, 0xac, 0x18, 0xa9, 0x08, + 0x6e, 0x40, 0x91, 0x7e, 0xbd, 0xeb, 0xe8, 0x3d, 0xcc, 0x62, 0x7c, 0x51, 0x0d, 0x08, 0xca, 0x03, + 0x40, 0xb3, 0x59, 0x06, 0x35, 0x21, 0x87, 0xcf, 0xb1, 0x45, 0xe8, 0xae, 0x51, 0x73, 0x6f, 0xce, + 0x81, 0xdb, 0xd8, 0x22, 0xb5, 0x2a, 0x35, 0xf2, 0x3f, 0xbe, 0xda, 0x96, 0x38, 0xf7, 0xf3, 0xf6, + 0xc8, 0x24, 0x78, 0xe4, 0x90, 0x4b, 0x55, 0xc8, 0x2b, 0xbf, 0x4c, 0x51, 0xec, 0x1b, 0xc9, 0x40, + 0x73, 0x6d, 0xeb, 0x1d, 0xa0, 0x54, 0xa8, 0xee, 0x59, 0xcd, 0xde, 0x5b, 0x00, 0x7d, 0xdd, 0xd5, + 0x1e, 0xea, 0x16, 0xc1, 0x86, 0x30, 0x7a, 0x88, 0x82, 0x64, 0x28, 0xd0, 0xd9, 0xc4, 0xc5, 0x86, + 0x28, 0xc1, 0xfc, 0x79, 0x68, 0x9d, 0xf9, 0xef, 0xb6, 0xce, 0xa8, 0x95, 0x0b, 0xd3, 0x56, 0xfe, + 0x75, 0x2a, 0x38, 0x25, 0x41, 0x99, 0xf0, 0x9f, 0x67, 0x87, 0xdf, 0xb0, 0xde, 0x41, 0x14, 0x0a, + 0xa0, 0x36, 0x6c, 0xf8, 0xa7, 0x54, 0x9b, 0xb0, 0xd3, 0xeb, 0xf9, 0xdd, 0xaa, 0xc7, 0x5c, 0x3a, + 0x8f, 0x92, 0x5d, 0xf4, 0x63, 0x78, 0x74, 0x2a, 0x02, 0xf9, 0xaa, 0x53, 0x2b, 0x06, 0xa2, 0x47, + 0xa2, 0x81, 0xc8, 0xd3, 0x1c, 0xd8, 0x2a, 0xfd, 0x1d, 0xcf, 0xc6, 0x01, 0x2d, 0x47, 0xc3, 0xc0, + 0x66, 0xee, 0xee, 0x3f, 0x05, 0xa5, 0x31, 0x26, 0xba, 0x69, 0x69, 0x91, 0x82, 0x7f, 0x9d, 0x13, + 0x45, 0x1b, 0xe1, 0x84, 0xd6, 0x37, 0x73, 0x00, 0x0e, 0xfa, 0x5f, 0x28, 0x06, 0xd8, 0x28, 0x19, + 0x53, 0x3b, 0xfb, 0xf5, 0x60, 0xc0, 0xab, 0xfc, 0x31, 0x19, 0xa8, 0x8c, 0x56, 0x98, 0x0d, 0xc8, + 0xf1, 0xf2, 0x86, 0x39, 0x6e, 0x79, 0xef, 0x85, 0xd5, 0xa0, 0xd1, 0x0e, 0xaf, 0x6c, 0x54, 0x21, + 0xac, 0x3c, 0x80, 0x1c, 0xa7, 0xa0, 0x35, 0xc8, 0xdf, 0x3b, 0x3e, 0x3c, 0x6e, 0xbd, 0x7b, 0x2c, + 0x25, 0x10, 0x40, 0x6e, 0xbf, 0x5e, 0x6f, 0x9c, 0x74, 0xa4, 0x24, 0x2a, 0x42, 0x76, 0xbf, 0xd6, + 0x52, 0x3b, 0x52, 0x8a, 0x92, 0xd5, 0xc6, 0xdb, 0x8d, 0x7a, 0x47, 0x4a, 0xa3, 0x0d, 0x28, 0xf1, + 0xb1, 0x76, 0xb7, 0xa5, 0xbe, 0xb3, 0xdf, 0x91, 0x32, 0x21, 0x52, 0xbb, 0x71, 0xfc, 0x56, 0x43, + 0x95, 0xb2, 0xca, 0x8b, 0xb4, 0xa8, 0x8c, 0x01, 0x53, 0x41, 0xf9, 0x98, 0x0c, 0x95, 0x8f, 0xca, + 0x67, 0x29, 0x90, 0xe3, 0x11, 0x12, 0x7a, 0x7b, 0x6a, 0xe1, 0x7b, 0x57, 0x80, 0x57, 0x53, 0xab, + 0x47, 0x4f, 0x43, 0x79, 0x8c, 0x4f, 0x31, 0xe9, 0x0d, 0x38, 0x62, 0xe3, 0x89, 0xad, 0xa4, 0x96, + 0x04, 0x95, 0x09, 0xb9, 0x9c, 0xed, 0x43, 0xdc, 0x23, 0x1a, 0xaf, 0x64, 0xb9, 0xd3, 0x15, 0x29, + 0x1b, 0xa5, 0xb6, 0x39, 0x51, 0xf9, 0xe0, 0x4a, 0xb6, 0x2c, 0x42, 0x56, 0x6d, 0x74, 0xd4, 0xf7, + 0xa4, 0x34, 0x42, 0x50, 0x66, 0x43, 0xad, 0x7d, 0xbc, 0x7f, 0xd2, 0x6e, 0xb6, 0xa8, 0x2d, 0xaf, + 0x41, 0xc5, 0xb3, 0xa5, 0x47, 0xcc, 0x2a, 0x5d, 0xd8, 0x9c, 0x0f, 0xef, 0xbe, 0xc7, 0x5c, 0xf1, + 0x59, 0xc8, 0xe5, 0xa2, 0x45, 0xef, 0xbc, 0x48, 0x19, 0x89, 0x34, 0xa9, 0xa9, 0x48, 0x43, 0x6b, + 0x0a, 0xb1, 0x57, 0x19, 0xb6, 0x57, 0x4f, 0x2e, 0x2c, 0xc1, 0x59, 0x3f, 0xc7, 0xdb, 0x1a, 0xef, + 0x10, 0xa6, 0x83, 0x43, 0xa8, 0xfc, 0x3c, 0x05, 0x95, 0xa9, 0xf8, 0x80, 0xee, 0x40, 0x96, 0xe3, + 0xe1, 0xe4, 0x6c, 0xf1, 0xca, 0xbb, 0x04, 0xcc, 0x40, 0x22, 0x9a, 0x70, 0x5e, 0xf4, 0x3a, 0x14, + 0xb0, 0xe8, 0x54, 0xcd, 0x0b, 0x44, 0x5c, 0xce, 0xeb, 0x65, 0x09, 0x51, 0x5f, 0x02, 0xbd, 0x01, + 0x45, 0x3f, 0xd2, 0x89, 0x52, 0xfb, 0xc9, 0x59, 0x71, 0x3f, 0x46, 0x0a, 0xf9, 0x40, 0x06, 0xbd, + 0x1a, 0x60, 0xd2, 0xcc, 0x6c, 0xad, 0x25, 0xc4, 0x39, 0x83, 0x10, 0xf6, 0xf8, 0x95, 0xf7, 0xa1, + 0x1c, 0x6d, 0xdc, 0xd1, 0x43, 0x34, 0xb6, 0x27, 0x96, 0xc1, 0x0c, 0x90, 0x55, 0xf9, 0x04, 0xbd, + 0x04, 0xd9, 0x73, 0x9b, 0xc7, 0xd9, 0xf9, 0xd1, 0xe6, 0xbe, 0x4d, 0x70, 0xa8, 0xf1, 0xc7, 0xb9, + 0x95, 0x8f, 0x21, 0xcb, 0xfc, 0x84, 0x9a, 0x9f, 0xb5, 0xe0, 0x04, 0x94, 0xa6, 0x63, 0xf4, 0x3e, + 0x80, 0x4e, 0xc8, 0xd8, 0xec, 0x4e, 0x02, 0xc5, 0xdb, 0xf3, 0xfd, 0x6c, 0xdf, 0xe3, 0xab, 0xdd, + 0x10, 0x0e, 0x77, 0x3d, 0x10, 0x0d, 0x39, 0x5d, 0x48, 0xa1, 0x72, 0x0c, 0xe5, 0xa8, 0x6c, 0xb8, + 0x19, 0xbe, 0x3e, 0xa7, 0x19, 0xee, 0xc3, 0x35, 0x1f, 0xec, 0xa5, 0x79, 0xbb, 0x95, 0x4d, 0x94, + 0x4f, 0x92, 0x50, 0xf0, 0x5c, 0x2b, 0xae, 0xd3, 0x17, 0x88, 0xa6, 0xc2, 0x7d, 0x2d, 0xde, 0xde, + 0x49, 0xfb, 0x0d, 0xc9, 0x37, 0x23, 0x7e, 0xbc, 0x52, 0x79, 0xee, 0x75, 0xa5, 0x44, 0x9c, 0x7d, + 0x0d, 0x8a, 0xbe, 0x43, 0xd0, 0x9a, 0x44, 0x37, 0x8c, 0x31, 0x76, 0x5d, 0xb1, 0x36, 0x6f, 0xca, + 0x1a, 0xc7, 0xf6, 0x43, 0xd1, 0x39, 0x4b, 0xab, 0x7c, 0xa2, 0x18, 0x50, 0x99, 0xca, 0xb8, 0xe8, + 0x35, 0xc8, 0x3b, 0x93, 0xae, 0xe6, 0x99, 0x67, 0xea, 0x47, 0xa9, 0x87, 0x4f, 0x27, 0xdd, 0xa1, + 0xd9, 0x3b, 0xc4, 0x97, 0xde, 0xc7, 0x38, 0x93, 0xee, 0x21, 0xb7, 0x22, 0x7f, 0x4b, 0x2a, 0xfc, + 0x96, 0x73, 0x28, 0x78, 0x4e, 0x81, 0x7e, 0x10, 0x76, 0x71, 0xef, 0x77, 0x42, 0x2c, 0x0a, 0x10, + 0xea, 0x43, 0x1e, 0x7e, 0x1b, 0x36, 0x5c, 0xb3, 0x6f, 0x61, 0x43, 0x0b, 0xaa, 0x22, 0xf6, 0xb6, + 0x82, 0x5a, 0xe1, 0x0f, 0x8e, 0xbc, 0x92, 0x48, 0xf9, 0x57, 0x12, 0x0a, 0xde, 0x59, 0x43, 0x2f, + 0x86, 0xfc, 0xae, 0x3c, 0xa7, 0x15, 0xe5, 0x31, 0x06, 0xbd, 0xdf, 0xe8, 0xb7, 0xa6, 0xae, 0xfe, + 0xad, 0x71, 0x4d, 0x7c, 0xef, 0x6f, 0x4a, 0xe6, 0xca, 0x7f, 0x53, 0x9e, 0x07, 0x44, 0x6c, 0xa2, + 0x0f, 0xb5, 0x73, 0x9b, 0x98, 0x56, 0x5f, 0xe3, 0xc6, 0xe6, 0x60, 0x50, 0x62, 0x4f, 0xee, 0xb3, + 0x07, 0x27, 0xcc, 0xee, 0x63, 0x28, 0xf2, 0x28, 0xd8, 0x36, 0xfb, 0xa1, 0x88, 0x99, 0xbc, 0x6a, + 0xc4, 0x94, 0x20, 0xed, 0x9a, 0x7d, 0x71, 0x32, 0xe8, 0x30, 0xec, 0x67, 0xe9, 0x88, 0x9f, 0x29, + 0xef, 0xc3, 0x7a, 0x58, 0x0f, 0x7a, 0x14, 0xf2, 0xe4, 0x42, 0x0b, 0xf5, 0x60, 0x73, 0xe4, 0x82, + 0xd6, 0x64, 0xe8, 0x7f, 0x20, 0xe3, 0x9a, 0x7d, 0xef, 0xb4, 0xcb, 0x31, 0x5f, 0xd3, 0x36, 0xfb, + 0xc2, 0xae, 0x8c, 0x5b, 0xf9, 0x45, 0x12, 0x0a, 0x3e, 0x52, 0xb9, 0x6a, 0x77, 0x7a, 0x13, 0x72, + 0x22, 0x19, 0xf3, 0xf6, 0xb4, 0x98, 0xf9, 0x4d, 0xe2, 0x4c, 0xa8, 0x49, 0x2c, 0x43, 0x61, 0x84, + 0x89, 0xce, 0x32, 0x05, 0xaf, 0xb5, 0xfd, 0xf9, 0xed, 0x57, 0x61, 0x2d, 0xf4, 0xa3, 0x80, 0x9a, + 0xe7, 0xb8, 0xf1, 0xae, 0x94, 0x90, 0xf3, 0x9f, 0x7c, 0x7e, 0x33, 0x7d, 0x8c, 0x1f, 0x52, 0xf3, + 0xa8, 0x8d, 0x7a, 0xb3, 0x51, 0x3f, 0x94, 0x92, 0xf2, 0xda, 0x27, 0x9f, 0xdf, 0xcc, 0xab, 0x98, + 0x35, 0xe5, 0x6e, 0x37, 0x61, 0x3d, 0xec, 0x68, 0xd1, 0x7c, 0x8e, 0xa0, 0xfc, 0xd6, 0xbd, 0x93, + 0xa3, 0x83, 0xfa, 0x7e, 0xa7, 0xa1, 0xdd, 0x6f, 0x75, 0x1a, 0x52, 0x12, 0x3d, 0x0a, 0xd7, 0x8e, + 0x0e, 0x7e, 0xd8, 0xec, 0x68, 0xf5, 0xa3, 0x83, 0xc6, 0x71, 0x47, 0xdb, 0xef, 0x74, 0xf6, 0xeb, + 0x87, 0x52, 0xea, 0xf6, 0x0b, 0x20, 0x4d, 0x6f, 0x18, 0x2a, 0x40, 0xa6, 0x7d, 0x66, 0x3a, 0x52, + 0x02, 0xe5, 0x21, 0xfd, 0x1e, 0x76, 0xa5, 0x24, 0xca, 0x41, 0xea, 0xd8, 0x96, 0x52, 0x7b, 0x7f, + 0x5e, 0x83, 0xca, 0x7e, 0xad, 0x7e, 0x40, 0xa1, 0x8b, 0xd9, 0xd3, 0x45, 0x8f, 0x34, 0xc3, 0x3a, + 0x23, 0x0b, 0x6f, 0x5d, 0xc8, 0x8b, 0x5b, 0xc4, 0xe8, 0x2e, 0x64, 0x59, 0xd3, 0x04, 0x2d, 0xbe, + 0x86, 0x21, 0x2f, 0xe9, 0x19, 0xd3, 0x8f, 0x61, 0x01, 0x62, 0xe1, 0xbd, 0x0c, 0x79, 0x71, 0x0b, + 0x19, 0xa9, 0x50, 0x0c, 0xba, 0x1e, 0xcb, 0xef, 0x69, 0xc8, 0x2b, 0xb4, 0x95, 0xa9, 0xce, 0xa0, + 0xa6, 0x5b, 0x7e, 0x6f, 0x41, 0x5e, 0x21, 0x84, 0xa3, 0x23, 0xc8, 0x7b, 0xd5, 0xf2, 0xb2, 0x9b, + 0x14, 0xf2, 0xd2, 0x96, 0x2f, 0xdd, 0x02, 0xde, 0xd5, 0x58, 0x7c, 0x2d, 0x44, 0x5e, 0xd2, 0xbf, + 0x46, 0x07, 0x90, 0x13, 0x85, 0xca, 0x92, 0xdb, 0x11, 0xf2, 0xb2, 0x16, 0x2e, 0x35, 0x5a, 0xd0, + 0x2e, 0x5a, 0x7e, 0xd9, 0x45, 0x5e, 0xa1, 0x35, 0x8f, 0xee, 0x01, 0x84, 0x7a, 0x18, 0x2b, 0xdc, + 0x62, 0x91, 0x57, 0x69, 0xb9, 0xa3, 0x16, 0x14, 0xfc, 0x5a, 0x75, 0xe9, 0x9d, 0x12, 0x79, 0x79, + 0xef, 0x1b, 0x3d, 0x80, 0x52, 0xb4, 0x48, 0x5b, 0xed, 0xa6, 0x88, 0xbc, 0x62, 0x53, 0x9b, 0xea, + 0x8f, 0x56, 0x6c, 0xab, 0xdd, 0x1c, 0x91, 0x57, 0xec, 0x71, 0xa3, 0x0f, 0x61, 0x63, 0xb6, 0xa2, + 0x5a, 0xfd, 0x22, 0x89, 0x7c, 0x85, 0xae, 0x37, 0x1a, 0x01, 0x9a, 0x53, 0x89, 0x5d, 0xe1, 0x5e, + 0x89, 0x7c, 0x95, 0x26, 0x38, 0xd2, 0xa1, 0x3c, 0x55, 0xde, 0xac, 0x78, 0xcd, 0x44, 0x5e, 0xb5, + 0x1d, 0x4e, 0x77, 0x27, 0x5a, 0xdc, 0xac, 0x76, 0xeb, 0x44, 0x5e, 0xb1, 0x37, 0x5e, 0x6b, 0x7e, + 0xf1, 0xf5, 0x56, 0xf2, 0xcb, 0xaf, 0xb7, 0x92, 0x7f, 0xff, 0x7a, 0x2b, 0xf9, 0xe9, 0x37, 0x5b, + 0x89, 0x2f, 0xbf, 0xd9, 0x4a, 0xfc, 0xf5, 0x9b, 0xad, 0xc4, 0x4f, 0x76, 0xfa, 0x26, 0x19, 0x4c, + 0xba, 0x3b, 0x3d, 0x7b, 0xb4, 0x6b, 0xd8, 0x1f, 0x9a, 0x23, 0xdd, 0xc2, 0xe4, 0xa1, 0x3d, 0x3e, + 0x13, 0xb3, 0xa9, 0xeb, 0x84, 0xdd, 0x1c, 0x03, 0x1c, 0x77, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, + 0xae, 0xda, 0x07, 0xcf, 0x6e, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -7009,6 +7161,92 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SideTxSig) 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 *SideTxSig) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SideTxSig) 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] = 0x1a + } + if len(m.Sig) > 0 { + i -= len(m.Sig) + copy(dAtA[i:], m.Sig) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Sig))) + i-- + dAtA[i] = 0x12 + } + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *SideTxResult) 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 *SideTxResult) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SideTxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Sigs) > 0 { + for iNdEx := len(m.Sigs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Sigs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Snapshot) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -8355,6 +8593,45 @@ func (m *Evidence) Size() (n int) { return n } +func (m *SideTxSig) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + l = len(m.Sig) + 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 *SideTxResult) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if len(m.Sigs) > 0 { + for _, e := range m.Sigs { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + return n +} + func (m *Snapshot) Size() (n int) { if m == nil { return 0 @@ -10866,7 +11143,7 @@ func (m *RequestBeginSideBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.SideTxResults = append(m.SideTxResults, types.SideTxResult{}) + m.SideTxResults = append(m.SideTxResults, SideTxResult{}) if err := m.SideTxResults[len(m.SideTxResults)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -14219,7 +14496,7 @@ func (m *ResponseDeliverSideTx) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Result |= types.SideTxResultType(b&0x7F) << shift + m.Result |= SideTxResultType(b&0x7F) << shift if b < 0x80 { break } @@ -15462,6 +15739,267 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } return nil } +func (m *SideTxSig) 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: SideTxSig: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SideTxSig: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= SideTxResultType(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sig", 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.Sig = append(m.Sig[:0], dAtA[iNdEx:postIndex]...) + if m.Sig == nil { + m.Sig = []byte{} + } + iNdEx = postIndex + case 3: + 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 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SideTxResult) 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: SideTxResult: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SideTxResult: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", 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.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) + if m.TxHash == nil { + m.TxHash = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sigs", 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.Sigs = append(m.Sigs, SideTxSig{}) + if err := m.Sigs[len(m.Sigs)-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 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Snapshot) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/consensus/state.go b/consensus/state.go index 5a79e2064c7..b7a2d21811f 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1150,7 +1150,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { // Make proposal propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} proposal := types.NewProposal(height, round, cs.ValidRound, propBlockID) - proposal.Data = block.DataHash // [peppermint] add data hash to proposal + proposal.Data = block.DataHash // [dojimamint] add data hash to proposal d := proposal.SignBytes(cs.state.ChainID) cs.Logger.Info("[dojimamint] New proposal", "signBytes", d) p := proposal.ToProto() diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index cd9cd203cbd..8982a51ff91 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -135,7 +135,7 @@ message RequestApplySnapshotChunk { message RequestBeginSideBlock { bytes hash = 1; tendermint.types.Header header = 2 [(gogoproto.nullable)=false]; - repeated tendermint.types.SideTxResult side_tx_results = 3 [(gogoproto.nullable)=false]; + repeated SideTxResult side_tx_results = 3 [(gogoproto.nullable)=false]; } message RequestDeliverSideTx { @@ -308,7 +308,7 @@ message ResponseBeginSideBlock { message ResponseDeliverSideTx { uint32 code = 1; string codespace = 2; - tendermint.types.SideTxResultType result = 4; + SideTxResultType result = 4; bytes data = 3; } @@ -400,6 +400,30 @@ message Evidence { int64 total_voting_power = 5; } +//---------------Side-Tx-Types----------- + +// Side-tx result type +enum SideTxResultType { + Skip = 0; + Yes = 1; + No = 2; +} + +// Side-tx sig +message SideTxSig { + SideTxResultType result = 1; + bytes sig = 2; + bytes address = 3; +} + +// Side tx results +message SideTxResult { + bytes tx_hash = 1; + repeated SideTxSig sigs = 2 [(gogoproto.nullable)=false]; +} + + + //---------------------------------------- // State Sync Types diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 43ad35ae46d..8dcd35dd704 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -140,6 +140,7 @@ type CanonicalProposal struct { BlockID *CanonicalBlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` ChainID string `protobuf:"bytes,7,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Data []byte `protobuf:"bytes,8,opt,name=data,proto3" json:"data,omitempty"` } func (m *CanonicalProposal) Reset() { *m = CanonicalProposal{} } @@ -224,6 +225,13 @@ func (m *CanonicalProposal) GetChainID() string { return "" } +func (m *CanonicalProposal) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + type CanonicalVote struct { Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` @@ -231,7 +239,8 @@ type CanonicalVote struct { BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - SideTxResults []*SideTxResult `protobuf:"bytes,7,rep,name=side_tx_results,json=sideTxResults,proto3" json:"side_tx_results,omitempty"` + Data []byte `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` + SideTxResults []*SideTxResult `protobuf:"bytes,8,rep,name=side_tx_results,json=sideTxResults,proto3" json:"side_tx_results,omitempty"` } func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } @@ -309,6 +318,13 @@ func (m *CanonicalVote) GetChainID() string { return "" } +func (m *CanonicalVote) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + func (m *CanonicalVote) GetSideTxResults() []*SideTxResult { if m != nil { return m.SideTxResults @@ -326,41 +342,42 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 533 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0xf3, 0x9f, 0x49, 0xf3, 0x35, 0xdf, 0xa8, 0xaa, 0xac, 0x08, 0xd9, 0x56, 0x16, 0xc8, - 0x6c, 0x6c, 0x29, 0xdd, 0xb1, 0x74, 0x11, 0x22, 0x08, 0x44, 0x35, 0x8d, 0xba, 0x60, 0x63, 0x4d, - 0x32, 0x83, 0x3d, 0xd4, 0xf6, 0x58, 0x9e, 0x89, 0x68, 0x37, 0x3c, 0x43, 0x1f, 0xab, 0xcb, 0x2e, - 0x61, 0x13, 0x90, 0xf3, 0x06, 0x3c, 0x01, 0xf2, 0xd8, 0xf9, 0x51, 0x5b, 0xd8, 0x80, 0xd8, 0x8c, - 0xee, 0xb9, 0xf7, 0xcc, 0xbd, 0x47, 0xe7, 0x4a, 0x17, 0x58, 0x92, 0x26, 0x84, 0x66, 0x31, 0x4b, - 0xa4, 0x2b, 0xaf, 0x53, 0x2a, 0xdc, 0x05, 0x4e, 0x78, 0xc2, 0x16, 0x38, 0x72, 0xd2, 0x8c, 0x4b, - 0x0e, 0x87, 0x3b, 0x86, 0xa3, 0x18, 0xa3, 0xa3, 0x80, 0x07, 0x5c, 0x15, 0xdd, 0x22, 0x2a, 0x79, - 0xa3, 0x27, 0x0f, 0x3a, 0xa9, 0xb7, 0xaa, 0x9a, 0x01, 0xe7, 0x41, 0x44, 0x5d, 0x85, 0xe6, 0xcb, - 0x0f, 0xae, 0x64, 0x31, 0x15, 0x12, 0xc7, 0x69, 0x49, 0x18, 0x7f, 0x06, 0xc3, 0xd3, 0xcd, 0x64, - 0x2f, 0xe2, 0x8b, 0xcb, 0xe9, 0x0b, 0x08, 0x41, 0x33, 0xc4, 0x22, 0xd4, 0x35, 0x4b, 0xb3, 0x0f, - 0x90, 0x8a, 0xe1, 0x05, 0x38, 0x4c, 0x71, 0x26, 0x7d, 0x41, 0xa5, 0x1f, 0x52, 0x4c, 0x68, 0xa6, - 0xd7, 0x2d, 0xcd, 0xee, 0x4f, 0x6c, 0xe7, 0xbe, 0x50, 0x67, 0xdb, 0xf0, 0x0c, 0x67, 0xf2, 0x9c, - 0xca, 0x57, 0x8a, 0xef, 0x35, 0x6f, 0x57, 0x66, 0x0d, 0x0d, 0xd2, 0xfd, 0xe4, 0xd8, 0x03, 0xc7, - 0x8f, 0xd3, 0xe1, 0x11, 0x68, 0x49, 0x2e, 0x71, 0xa4, 0x64, 0x0c, 0x50, 0x09, 0xb6, 0xda, 0xea, - 0x3b, 0x6d, 0xe3, 0xaf, 0x75, 0xf0, 0xff, 0xae, 0x49, 0xc6, 0x53, 0x2e, 0x70, 0x04, 0x4f, 0x40, - 0xb3, 0x90, 0xa3, 0xbe, 0xff, 0x37, 0x31, 0x1f, 0xca, 0x3c, 0x67, 0x41, 0x42, 0xc9, 0x5b, 0x11, - 0xcc, 0xae, 0x53, 0x8a, 0x14, 0x19, 0x1e, 0x83, 0x76, 0x48, 0x59, 0x10, 0x4a, 0x35, 0x60, 0x88, - 0x2a, 0x54, 0x88, 0xc9, 0xf8, 0x32, 0x21, 0x7a, 0x43, 0xa5, 0x4b, 0x00, 0x9f, 0x81, 0x5e, 0xca, - 0x23, 0xbf, 0xac, 0x34, 0x2d, 0xcd, 0x6e, 0x78, 0x07, 0xf9, 0xca, 0xec, 0x9e, 0xbd, 0x7b, 0x83, - 0x8a, 0x1c, 0xea, 0xa6, 0x3c, 0x52, 0x11, 0x7c, 0x0d, 0xba, 0xf3, 0xc2, 0x5e, 0x9f, 0x11, 0xbd, - 0xa5, 0x8c, 0x1b, 0xff, 0xc6, 0xb8, 0x6a, 0x13, 0x5e, 0x3f, 0x5f, 0x99, 0x9d, 0x0a, 0xa0, 0x8e, - 0x6a, 0x30, 0x25, 0xd0, 0x03, 0xbd, 0xed, 0x1a, 0xf5, 0xb6, 0x6a, 0x36, 0x72, 0xca, 0x45, 0x3b, - 0x9b, 0x45, 0x3b, 0xb3, 0x0d, 0xc3, 0xeb, 0x16, 0xbe, 0xdf, 0x7c, 0x33, 0x35, 0xb4, 0xfb, 0x06, - 0x9f, 0x82, 0xee, 0x22, 0xc4, 0x2c, 0x29, 0xf4, 0x74, 0x2c, 0xcd, 0xee, 0x95, 0xb3, 0x4e, 0x8b, - 0x5c, 0x31, 0x4b, 0x15, 0xa7, 0x64, 0xfc, 0xa3, 0x0e, 0x06, 0x5b, 0x59, 0x17, 0x5c, 0xd2, 0x7f, - 0xe1, 0xeb, 0xbe, 0x59, 0xcd, 0xbf, 0x69, 0x56, 0xeb, 0xcf, 0xcd, 0x6a, 0xff, 0xda, 0x2c, 0xf8, - 0x12, 0x1c, 0x0a, 0x46, 0xa8, 0x2f, 0xaf, 0xfc, 0x8c, 0x8a, 0x65, 0x24, 0x85, 0xde, 0xb1, 0x1a, - 0x76, 0x7f, 0x62, 0x3c, 0xe6, 0x12, 0xa1, 0xb3, 0x2b, 0xa4, 0x68, 0x68, 0x20, 0xf6, 0x90, 0xf0, - 0x66, 0xb7, 0xb9, 0xa1, 0xdd, 0xe5, 0x86, 0xf6, 0x3d, 0x37, 0xb4, 0x9b, 0xb5, 0x51, 0xbb, 0x5b, - 0x1b, 0xb5, 0x2f, 0x6b, 0xa3, 0xf6, 0xfe, 0x79, 0xc0, 0x64, 0xb8, 0x9c, 0x3b, 0x0b, 0x1e, 0xbb, - 0x84, 0x7f, 0x64, 0x31, 0x4e, 0xa8, 0xfc, 0xc4, 0xb3, 0xcb, 0x0a, 0xa9, 0x33, 0x50, 0xde, 0x88, - 0xfb, 0x77, 0x61, 0xde, 0x56, 0xf9, 0x93, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x00, 0x46, - 0x46, 0x7c, 0x04, 0x00, 0x00, + // 545 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xbd, 0x6b, 0xdb, 0x4e, + 0x18, 0xc7, 0x2d, 0xbf, 0xca, 0xe7, 0xf8, 0x17, 0xff, 0x8e, 0x10, 0x84, 0x29, 0x92, 0xf0, 0x50, + 0xd4, 0x45, 0x02, 0x67, 0xeb, 0xa8, 0x94, 0x52, 0x97, 0x96, 0x86, 0x8b, 0xc9, 0xd0, 0x45, 0x9c, + 0x7d, 0x57, 0xe9, 0x1a, 0x59, 0x27, 0x74, 0x67, 0x9a, 0x2c, 0x1d, 0x3b, 0xe7, 0xcf, 0xca, 0x98, + 0xb1, 0x93, 0x5b, 0xec, 0xb9, 0xff, 0x43, 0xb9, 0x93, 0xdf, 0x48, 0x42, 0x29, 0xb4, 0x74, 0x11, + 0xcf, 0xcb, 0x57, 0xcf, 0xf3, 0xe5, 0xf3, 0xc0, 0x01, 0x57, 0xd2, 0x8c, 0xd0, 0x62, 0xc6, 0x32, + 0x19, 0xc8, 0xeb, 0x9c, 0x8a, 0x60, 0x8a, 0x33, 0x9e, 0xb1, 0x29, 0x4e, 0xfd, 0xbc, 0xe0, 0x92, + 0xc3, 0xde, 0x4e, 0xe1, 0x6b, 0x45, 0xff, 0x28, 0xe6, 0x31, 0xd7, 0xcd, 0x40, 0x45, 0xa5, 0xae, + 0xff, 0xe4, 0xc1, 0x24, 0xfd, 0x5d, 0x77, 0x9d, 0x98, 0xf3, 0x38, 0xa5, 0x81, 0xce, 0x26, 0xf3, + 0x0f, 0x81, 0x64, 0x33, 0x2a, 0x24, 0x9e, 0xe5, 0xa5, 0x60, 0xf0, 0x19, 0xf4, 0x4e, 0x37, 0x9b, + 0xc3, 0x94, 0x4f, 0x2f, 0x47, 0x2f, 0x20, 0x04, 0xf5, 0x04, 0x8b, 0xc4, 0x32, 0x5c, 0xc3, 0x3b, + 0x40, 0x3a, 0x86, 0x17, 0xe0, 0x30, 0xc7, 0x85, 0x8c, 0x04, 0x95, 0x51, 0x42, 0x31, 0xa1, 0x85, + 0x55, 0x75, 0x0d, 0xaf, 0x33, 0xf4, 0xfc, 0xfb, 0x46, 0xfd, 0xed, 0xc0, 0x33, 0x5c, 0xc8, 0x73, + 0x2a, 0x5f, 0x69, 0x7d, 0x58, 0xbf, 0x5d, 0x38, 0x15, 0xd4, 0xcd, 0xf7, 0x8b, 0x83, 0x10, 0x1c, + 0x3f, 0x2e, 0x87, 0x47, 0xa0, 0x21, 0xb9, 0xc4, 0xa9, 0xb6, 0xd1, 0x45, 0x65, 0xb2, 0xf5, 0x56, + 0xdd, 0x79, 0x1b, 0xfc, 0xa8, 0x82, 0xff, 0x77, 0x43, 0x0a, 0x9e, 0x73, 0x81, 0x53, 0x78, 0x02, + 0xea, 0xca, 0x8e, 0xfe, 0xfd, 0xbf, 0xa1, 0xf3, 0xd0, 0xe6, 0x39, 0x8b, 0x33, 0x4a, 0xde, 0x8a, + 0x78, 0x7c, 0x9d, 0x53, 0xa4, 0xc5, 0xf0, 0x18, 0x34, 0x13, 0xca, 0xe2, 0x44, 0xea, 0x05, 0x3d, + 0xb4, 0xce, 0x94, 0x99, 0x82, 0xcf, 0x33, 0x62, 0xd5, 0x74, 0xb9, 0x4c, 0xe0, 0x33, 0xd0, 0xce, + 0x79, 0x1a, 0x95, 0x9d, 0xba, 0x6b, 0x78, 0xb5, 0xf0, 0x60, 0xb9, 0x70, 0xcc, 0xb3, 0x77, 0x6f, + 0x90, 0xaa, 0x21, 0x33, 0xe7, 0xa9, 0x8e, 0xe0, 0x6b, 0x60, 0x4e, 0x14, 0xde, 0x88, 0x11, 0xab, + 0xa1, 0xc1, 0x0d, 0x7e, 0x01, 0x6e, 0x7d, 0x89, 0xb0, 0xb3, 0x5c, 0x38, 0xad, 0x75, 0x82, 0x5a, + 0x7a, 0xc0, 0x88, 0xc0, 0x10, 0xb4, 0xb7, 0x67, 0xb4, 0x9a, 0x7a, 0x58, 0xdf, 0x2f, 0x0f, 0xed, + 0x6f, 0x0e, 0xed, 0x8f, 0x37, 0x8a, 0xd0, 0x54, 0xdc, 0x6f, 0xbe, 0x39, 0x06, 0xda, 0xfd, 0x06, + 0x9f, 0x02, 0x73, 0x9a, 0x60, 0x96, 0x29, 0x3f, 0x2d, 0xd7, 0xf0, 0xda, 0xe5, 0xae, 0x53, 0x55, + 0x53, 0xbb, 0x74, 0x73, 0x44, 0x14, 0x6f, 0x82, 0x25, 0xb6, 0xcc, 0x92, 0xb7, 0x8a, 0x07, 0x5f, + 0x6a, 0xa0, 0xbb, 0xb5, 0x7a, 0xc1, 0x25, 0xfd, 0x17, 0xac, 0xf7, 0x01, 0xd6, 0xff, 0x26, 0xc0, + 0xc6, 0x9f, 0x03, 0x6c, 0xfe, 0x06, 0xc0, 0xd6, 0x0e, 0x20, 0x7c, 0x09, 0x0e, 0x05, 0x23, 0x34, + 0x92, 0x57, 0x51, 0x41, 0xc5, 0x3c, 0x95, 0xc2, 0x32, 0xdd, 0x9a, 0xd7, 0x19, 0xda, 0x8f, 0x91, + 0x23, 0x74, 0x7c, 0x85, 0xb4, 0x0c, 0x75, 0xc5, 0x5e, 0x26, 0xc2, 0xf1, 0xed, 0xd2, 0x36, 0xee, + 0x96, 0xb6, 0xf1, 0x7d, 0x69, 0x1b, 0x37, 0x2b, 0xbb, 0x72, 0xb7, 0xb2, 0x2b, 0x5f, 0x57, 0x76, + 0xe5, 0xfd, 0xf3, 0x98, 0xc9, 0x64, 0x3e, 0xf1, 0xa7, 0x7c, 0x16, 0x10, 0xfe, 0x91, 0xcd, 0x70, + 0x46, 0xe5, 0x27, 0x5e, 0x5c, 0xae, 0x33, 0xfd, 0x5c, 0x94, 0x6f, 0xc9, 0xfd, 0xf7, 0x63, 0xd2, + 0xd4, 0xf5, 0x93, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0xac, 0x6c, 0x6a, 0xa4, 0x04, 0x00, + 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -458,6 +475,13 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintCanonical(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x42 + } if len(m.ChainID) > 0 { i -= len(m.ChainID) copy(dAtA[i:], m.ChainID) @@ -541,9 +565,16 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintCanonical(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } } + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintCanonical(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x3a + } if len(m.ChainID) > 0 { i -= len(m.ChainID) copy(dAtA[i:], m.ChainID) @@ -661,6 +692,10 @@ func (m *CanonicalProposal) Size() (n int) { if l > 0 { n += 1 + l + sovCanonical(uint64(l)) } + l = len(m.Data) + if l > 0 { + n += 1 + l + sovCanonical(uint64(l)) + } return n } @@ -689,6 +724,10 @@ func (m *CanonicalVote) Size() (n int) { if l > 0 { n += 1 + l + sovCanonical(uint64(l)) } + l = len(m.Data) + if l > 0 { + n += 1 + l + sovCanonical(uint64(l)) + } if len(m.SideTxResults) > 0 { for _, e := range m.SideTxResults { l = e.Size() @@ -1118,6 +1157,40 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { } m.ChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", 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.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCanonical(dAtA[iNdEx:]) @@ -1312,6 +1385,40 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { m.ChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", 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.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SideTxResults", wireType) } diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index caadba20b6a..6f560aa1771 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -25,6 +25,7 @@ message CanonicalProposal { CanonicalBlockID block_id = 5 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 7 [(gogoproto.customname) = "ChainID"]; + bytes data = 8; } message CanonicalVote { @@ -34,5 +35,6 @@ message CanonicalVote { CanonicalBlockID block_id = 4 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; - repeated tendermint.types.SideTxResult side_tx_results = 7; + bytes data = 7; + repeated tendermint.types.SideTxResult side_tx_results = 8; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index dbe5409f4f4..04b6cf92b2d 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -95,35 +95,6 @@ func (SignedMsgType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_d3a6e55e2345de56, []int{1} } -// Side-tx result type -type SideTxResultType int32 - -const ( - SideTxResultType_Skip SideTxResultType = 0 - SideTxResultType_Yes SideTxResultType = 1 - SideTxResultType_No SideTxResultType = 2 -) - -var SideTxResultType_name = map[int32]string{ - 0: "Skip", - 1: "Yes", - 2: "No", -} - -var SideTxResultType_value = map[string]int32{ - "Skip": 0, - "Yes": 1, - "No": 2, -} - -func (x SideTxResultType) String() string { - return proto.EnumName(SideTxResultType_name, int32(x)) -} - -func (SideTxResultType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{2} -} - // PartsetHeader type PartSetHeader struct { Total uint32 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"` @@ -617,6 +588,67 @@ func (m *Vote) GetSideTxResults() []*SideTxResult { return nil } +// Side-Tx-Result structure inside vote +type SideTxResult struct { + TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` + Result int32 `protobuf:"varint,2,opt,name=result,proto3" json:"result,omitempty"` + Sig []byte `protobuf:"bytes,3,opt,name=sig,proto3" json:"sig,omitempty"` +} + +func (m *SideTxResult) Reset() { *m = SideTxResult{} } +func (m *SideTxResult) String() string { return proto.CompactTextString(m) } +func (*SideTxResult) ProtoMessage() {} +func (*SideTxResult) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{6} +} +func (m *SideTxResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SideTxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SideTxResult.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 *SideTxResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_SideTxResult.Merge(m, src) +} +func (m *SideTxResult) XXX_Size() int { + return m.Size() +} +func (m *SideTxResult) XXX_DiscardUnknown() { + xxx_messageInfo_SideTxResult.DiscardUnknown(m) +} + +var xxx_messageInfo_SideTxResult proto.InternalMessageInfo + +func (m *SideTxResult) GetTxHash() []byte { + if m != nil { + return m.TxHash + } + return nil +} + +func (m *SideTxResult) GetResult() int32 { + if m != nil { + return m.Result + } + return 0 +} + +func (m *SideTxResult) GetSig() []byte { + if m != nil { + return m.Sig + } + return nil +} + // Commit contains the evidence that a block was committed by a set of validators. type Commit struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` @@ -629,7 +661,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{6} + return fileDescriptor_d3a6e55e2345de56, []int{7} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -699,7 +731,7 @@ func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{7} + return fileDescriptor_d3a6e55e2345de56, []int{8} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -778,7 +810,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{8} + return fileDescriptor_d3a6e55e2345de56, []int{9} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -872,7 +904,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{9} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -924,7 +956,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{10} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -978,7 +1010,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{11} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1046,7 +1078,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{12} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1096,130 +1128,16 @@ func (m *TxProof) GetProof() *crypto.Proof { return nil } -// Side-tx sig -type SideTxSig struct { - Result SideTxResultType `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.types.SideTxResultType" json:"result,omitempty"` - Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"` - Address []byte `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` -} - -func (m *SideTxSig) Reset() { *m = SideTxSig{} } -func (m *SideTxSig) String() string { return proto.CompactTextString(m) } -func (*SideTxSig) ProtoMessage() {} -func (*SideTxSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{13} -} -func (m *SideTxSig) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SideTxSig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SideTxSig.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 *SideTxSig) XXX_Merge(src proto.Message) { - xxx_messageInfo_SideTxSig.Merge(m, src) -} -func (m *SideTxSig) XXX_Size() int { - return m.Size() -} -func (m *SideTxSig) XXX_DiscardUnknown() { - xxx_messageInfo_SideTxSig.DiscardUnknown(m) -} - -var xxx_messageInfo_SideTxSig proto.InternalMessageInfo - -func (m *SideTxSig) GetResult() SideTxResultType { - if m != nil { - return m.Result - } - return SideTxResultType_Skip -} - -func (m *SideTxSig) GetSig() []byte { - if m != nil { - return m.Sig - } - return nil -} - -func (m *SideTxSig) GetAddress() []byte { - if m != nil { - return m.Address - } - return nil -} - -// Side tx results -type SideTxResult struct { - TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` - Sigs []SideTxSig `protobuf:"bytes,2,rep,name=sigs,proto3" json:"sigs"` -} - -func (m *SideTxResult) Reset() { *m = SideTxResult{} } -func (m *SideTxResult) String() string { return proto.CompactTextString(m) } -func (*SideTxResult) ProtoMessage() {} -func (*SideTxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{14} -} -func (m *SideTxResult) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SideTxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SideTxResult.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 *SideTxResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_SideTxResult.Merge(m, src) -} -func (m *SideTxResult) XXX_Size() int { - return m.Size() -} -func (m *SideTxResult) XXX_DiscardUnknown() { - xxx_messageInfo_SideTxResult.DiscardUnknown(m) -} - -var xxx_messageInfo_SideTxResult proto.InternalMessageInfo - -func (m *SideTxResult) GetTxHash() []byte { - if m != nil { - return m.TxHash - } - return nil -} - -func (m *SideTxResult) GetSigs() []SideTxSig { - if m != nil { - return m.Sigs - } - return nil -} - func init() { proto.RegisterEnum("tendermint.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value) proto.RegisterEnum("tendermint.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value) - proto.RegisterEnum("tendermint.types.SideTxResultType", SideTxResultType_name, SideTxResultType_value) proto.RegisterType((*PartSetHeader)(nil), "tendermint.types.PartSetHeader") proto.RegisterType((*Part)(nil), "tendermint.types.Part") proto.RegisterType((*BlockID)(nil), "tendermint.types.BlockID") proto.RegisterType((*Header)(nil), "tendermint.types.Header") proto.RegisterType((*Data)(nil), "tendermint.types.Data") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") + proto.RegisterType((*SideTxResult)(nil), "tendermint.types.SideTxResult") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") @@ -1227,108 +1145,101 @@ func init() { proto.RegisterType((*LightBlock)(nil), "tendermint.types.LightBlock") proto.RegisterType((*BlockMeta)(nil), "tendermint.types.BlockMeta") proto.RegisterType((*TxProof)(nil), "tendermint.types.TxProof") - proto.RegisterType((*SideTxSig)(nil), "tendermint.types.SideTxSig") - proto.RegisterType((*SideTxResult)(nil), "tendermint.types.SideTxResult") } func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1491 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdb, 0xca, - 0x11, 0x37, 0x25, 0x5a, 0x7f, 0x46, 0x92, 0x4d, 0x2f, 0x9c, 0x44, 0x91, 0x63, 0x59, 0x50, 0xd1, - 0xd6, 0x49, 0x5b, 0x39, 0x75, 0xda, 0xa2, 0x0d, 0xd0, 0x83, 0x65, 0x3b, 0x89, 0x10, 0x5b, 0x16, - 0x28, 0x25, 0x45, 0x7a, 0x28, 0x41, 0x9b, 0x1b, 0x89, 0xb1, 0x44, 0x12, 0xdc, 0x95, 0x23, 0xe7, - 0x13, 0x14, 0x3e, 0xe5, 0xd4, 0x53, 0x7d, 0x6a, 0x0f, 0x05, 0x7a, 0xe9, 0x47, 0x28, 0x7a, 0x69, - 0x8e, 0xb9, 0xb5, 0xa7, 0xbc, 0x07, 0xe7, 0x8b, 0x3c, 0xec, 0xec, 0x52, 0xa2, 0x2c, 0x3b, 0x2f, - 0x08, 0x82, 0x77, 0x11, 0xb8, 0x33, 0xbf, 0xd9, 0x9d, 0x3f, 0xbf, 0xd9, 0x59, 0xc1, 0x1d, 0x4e, - 0x3d, 0x87, 0x86, 0x03, 0xd7, 0xe3, 0x1b, 0xfc, 0x34, 0xa0, 0x4c, 0xfe, 0xd6, 0x82, 0xd0, 0xe7, - 0x3e, 0x31, 0x26, 0xda, 0x1a, 0xca, 0x4b, 0xcb, 0x5d, 0xbf, 0xeb, 0xa3, 0x72, 0x43, 0x7c, 0x49, - 0x5c, 0x69, 0xad, 0xeb, 0xfb, 0xdd, 0x3e, 0xdd, 0xc0, 0xd5, 0xe1, 0xf0, 0xe5, 0x06, 0x77, 0x07, - 0x94, 0x71, 0x7b, 0x10, 0x28, 0xc0, 0x6a, 0xec, 0x98, 0xa3, 0xf0, 0x34, 0xe0, 0xbe, 0xc0, 0xfa, - 0x2f, 0x95, 0xba, 0x1c, 0x53, 0x9f, 0xd0, 0x90, 0xb9, 0xbe, 0x17, 0xf7, 0xa3, 0x54, 0x99, 0xf1, - 0xf2, 0xc4, 0xee, 0xbb, 0x8e, 0xcd, 0xfd, 0x50, 0x22, 0xaa, 0xbf, 0x83, 0x42, 0xcb, 0x0e, 0x79, - 0x9b, 0xf2, 0x27, 0xd4, 0x76, 0x68, 0x48, 0x96, 0x61, 0x9e, 0xfb, 0xdc, 0xee, 0x17, 0xb5, 0x8a, - 0xb6, 0x5e, 0x30, 0xe5, 0x82, 0x10, 0xd0, 0x7b, 0x36, 0xeb, 0x15, 0x13, 0x15, 0x6d, 0x3d, 0x6f, - 0xe2, 0x77, 0xb5, 0x07, 0xba, 0x30, 0x15, 0x16, 0xae, 0xe7, 0xd0, 0x51, 0x64, 0x81, 0x0b, 0x21, - 0x3d, 0x3c, 0xe5, 0x94, 0x29, 0x13, 0xb9, 0x20, 0xbf, 0x82, 0x79, 0xf4, 0xbf, 0x98, 0xac, 0x68, - 0xeb, 0xb9, 0xcd, 0x62, 0x2d, 0x96, 0x28, 0x19, 0x5f, 0xad, 0x25, 0xf4, 0x75, 0xfd, 0xdd, 0x87, - 0xb5, 0x39, 0x53, 0x82, 0xab, 0x7d, 0x48, 0xd7, 0xfb, 0xfe, 0xd1, 0x71, 0x63, 0x67, 0xec, 0x88, - 0x36, 0x71, 0x84, 0xec, 0xc3, 0x62, 0x60, 0x87, 0xdc, 0x62, 0x94, 0x5b, 0x3d, 0x8c, 0x02, 0x0f, - 0xcd, 0x6d, 0xae, 0xd5, 0x2e, 0xd7, 0xa1, 0x36, 0x15, 0xac, 0x3a, 0xa5, 0x10, 0xc4, 0x85, 0xd5, - 0xbf, 0xce, 0x43, 0x4a, 0x25, 0xe3, 0xf7, 0x90, 0x56, 0x69, 0xc5, 0x03, 0x73, 0x9b, 0xab, 0xf1, - 0x1d, 0x95, 0xaa, 0xb6, 0xed, 0x7b, 0x8c, 0x7a, 0x6c, 0xc8, 0xd4, 0x7e, 0x91, 0x0d, 0xf9, 0x09, - 0x64, 0x8e, 0x7a, 0xb6, 0xeb, 0x59, 0xae, 0x83, 0x1e, 0x65, 0xeb, 0xb9, 0x8b, 0x0f, 0x6b, 0xe9, - 0x6d, 0x21, 0x6b, 0xec, 0x98, 0x69, 0x54, 0x36, 0x1c, 0x72, 0x13, 0x52, 0x3d, 0xea, 0x76, 0x7b, - 0x1c, 0xd3, 0x92, 0x34, 0xd5, 0x8a, 0xfc, 0x16, 0x74, 0x41, 0x88, 0xa2, 0x8e, 0x67, 0x97, 0x6a, - 0x92, 0x2d, 0xb5, 0x88, 0x2d, 0xb5, 0x4e, 0xc4, 0x96, 0x7a, 0x46, 0x1c, 0xfc, 0xf6, 0x9b, 0x35, - 0xcd, 0x44, 0x0b, 0x72, 0x0b, 0xd2, 0xde, 0x70, 0x60, 0xf1, 0x11, 0x2b, 0xce, 0xcb, 0x2d, 0xbd, - 0xe1, 0xa0, 0x33, 0x62, 0x64, 0x05, 0xb2, 0x58, 0x51, 0x54, 0xa5, 0x50, 0x95, 0x41, 0x81, 0x50, - 0x6e, 0x43, 0xa1, 0x6f, 0x33, 0x6e, 0x1d, 0x8a, 0x64, 0x0b, 0xa7, 0xd3, 0x78, 0xf0, 0xed, 0xd9, - 0x34, 0xaa, 0x72, 0xa8, 0x80, 0x73, 0xc2, 0x4a, 0x8a, 0x1c, 0xb2, 0x0e, 0x06, 0x6e, 0x72, 0xe4, - 0x0f, 0x06, 0x2e, 0xb7, 0xb0, 0x5a, 0x19, 0xac, 0xd6, 0x82, 0x90, 0x6f, 0xa3, 0xf8, 0x89, 0xa8, - 0xdb, 0x0a, 0x64, 0x1d, 0x9b, 0xdb, 0x12, 0x92, 0x45, 0x48, 0x46, 0x08, 0x50, 0xf9, 0x53, 0x58, - 0x1c, 0x73, 0x95, 0x49, 0x08, 0xc8, 0x5d, 0x26, 0x62, 0x04, 0xde, 0x87, 0x65, 0x8f, 0x8e, 0xb8, - 0x75, 0x19, 0x9d, 0x43, 0x34, 0x11, 0xba, 0xe7, 0xd3, 0x16, 0x3f, 0x86, 0x85, 0xa3, 0xa8, 0x64, - 0x12, 0x9b, 0x47, 0x6c, 0x61, 0x2c, 0x45, 0xd8, 0x6d, 0xc8, 0xd8, 0x41, 0x20, 0x01, 0x05, 0x04, - 0xa4, 0xed, 0x20, 0x40, 0xd5, 0x3d, 0x58, 0xc2, 0x18, 0x43, 0xca, 0x86, 0x7d, 0xae, 0x36, 0x59, - 0x40, 0xcc, 0xa2, 0x50, 0x98, 0x52, 0x8e, 0xd8, 0x1f, 0x41, 0x81, 0x9e, 0xb8, 0x0e, 0xf5, 0x8e, - 0xa8, 0xc4, 0x2d, 0x22, 0x2e, 0x1f, 0x09, 0x11, 0x74, 0x17, 0x8c, 0x20, 0xf4, 0x03, 0x9f, 0xd1, - 0xd0, 0xb2, 0x1d, 0x27, 0xa4, 0x8c, 0x15, 0x0d, 0xb9, 0x5f, 0x24, 0xdf, 0x92, 0xe2, 0x6a, 0x11, - 0xf4, 0x1d, 0x9b, 0xdb, 0xc4, 0x80, 0xa4, 0xa8, 0xa1, 0x56, 0x49, 0xae, 0xe7, 0x4d, 0xf1, 0x59, - 0xfd, 0x57, 0x12, 0xf4, 0xe7, 0x3e, 0xa7, 0xe4, 0x01, 0xe8, 0xa2, 0x4c, 0xc8, 0xd9, 0x85, 0xab, - 0xba, 0xa0, 0xed, 0x76, 0x3d, 0xea, 0xec, 0xb3, 0x6e, 0xe7, 0x34, 0xa0, 0x26, 0x82, 0x63, 0x24, - 0x4c, 0x4c, 0x91, 0x70, 0x19, 0xe6, 0x43, 0x7f, 0xe8, 0x39, 0xc8, 0xcd, 0x79, 0x53, 0x2e, 0xc8, - 0x2e, 0x64, 0xc6, 0x2c, 0xd1, 0xbf, 0x8f, 0x25, 0x8b, 0x82, 0x25, 0x82, 0xf9, 0x4a, 0x60, 0xa6, - 0x0f, 0x15, 0x59, 0xea, 0x90, 0x1d, 0x5f, 0x79, 0xc8, 0xd4, 0xcf, 0xa5, 0xf9, 0xc4, 0x8c, 0xfc, - 0x0c, 0x96, 0xc6, 0xb5, 0x1f, 0x27, 0x2f, 0x85, 0xc9, 0x33, 0xc6, 0x0a, 0x95, 0xbd, 0x29, 0x5a, - 0x59, 0xf2, 0xda, 0x4a, 0x63, 0x5c, 0x13, 0x5a, 0x35, 0xf0, 0xfe, 0xba, 0x03, 0x59, 0xe6, 0x76, - 0x3d, 0x9b, 0x0f, 0x43, 0xaa, 0xf8, 0x3b, 0x11, 0x90, 0x47, 0xb0, 0xc8, 0x5c, 0x87, 0x5a, 0x7c, - 0x14, 0x71, 0xa0, 0x98, 0xad, 0x24, 0xd7, 0x73, 0x9b, 0xe5, 0xab, 0x92, 0xed, 0xd0, 0xce, 0x48, - 0x52, 0xc2, 0x2c, 0xb0, 0xd8, 0x8a, 0x55, 0xff, 0xad, 0x41, 0x4a, 0x76, 0x44, 0x2c, 0xff, 0xda, - 0xd5, 0xf9, 0x4f, 0x5c, 0x97, 0xff, 0xe4, 0x97, 0xe7, 0x7f, 0x0b, 0x60, 0x1c, 0x14, 0x2b, 0xea, - 0x18, 0xc2, 0xca, 0xec, 0x46, 0xd2, 0xc5, 0xb6, 0xdb, 0x55, 0x0d, 0x1f, 0x33, 0xaa, 0xfe, 0x33, - 0x01, 0xd9, 0xb1, 0x9e, 0x6c, 0x41, 0x21, 0xf2, 0xcb, 0x7a, 0xd9, 0xb7, 0xbb, 0x8a, 0x83, 0xab, - 0xd7, 0x3a, 0xf7, 0xa8, 0x6f, 0x77, 0xcd, 0x9c, 0xf2, 0x47, 0x2c, 0xae, 0xae, 0x67, 0xe2, 0x9a, - 0x7a, 0x4e, 0x11, 0x28, 0xf9, 0x65, 0x04, 0x9a, 0x2a, 0xb5, 0x7e, 0xb9, 0xd4, 0x7b, 0xb3, 0xa5, - 0x4e, 0x7f, 0x4e, 0xa9, 0xa3, 0xe1, 0x32, 0x5d, 0xf0, 0xff, 0x26, 0x20, 0xd3, 0xc2, 0x8e, 0xb6, - 0xfb, 0x3f, 0x44, 0x9f, 0xae, 0x40, 0x36, 0xf0, 0xfb, 0x96, 0xd4, 0xe8, 0xa8, 0xc9, 0x04, 0x7e, - 0xdf, 0x9c, 0x21, 0xd1, 0xfc, 0x57, 0x6a, 0xe2, 0xd4, 0x57, 0xa8, 0x41, 0xfa, 0x72, 0x0d, 0x08, - 0xe8, 0x62, 0x30, 0xa8, 0x3e, 0xc4, 0xef, 0x6a, 0x08, 0x79, 0x99, 0x1e, 0x35, 0xab, 0xef, 0x8b, - 0xbc, 0xe0, 0xf0, 0xd7, 0x66, 0xdf, 0x16, 0x32, 0x14, 0x89, 0x34, 0x15, 0x4e, 0x58, 0xc8, 0x21, - 0xa5, 0x9e, 0x0b, 0xc5, 0xeb, 0x88, 0x6f, 0x2a, 0x5c, 0xf5, 0x2f, 0x1a, 0xc0, 0x9e, 0xc8, 0x36, - 0xe6, 0x40, 0xcc, 0x4b, 0x86, 0x2e, 0x58, 0x53, 0x27, 0x97, 0xaf, 0x2b, 0xa4, 0x3a, 0x3f, 0xcf, - 0xe2, 0x7e, 0x6f, 0x43, 0x61, 0x42, 0x77, 0x46, 0x23, 0x67, 0xae, 0xd8, 0x64, 0x3c, 0xc6, 0xda, - 0x94, 0x9b, 0xf9, 0x93, 0xd8, 0xaa, 0xfa, 0x1f, 0x0d, 0xb2, 0xe8, 0xd3, 0x3e, 0xe5, 0xf6, 0x54, - 0x5d, 0xb5, 0x2f, 0xaf, 0xeb, 0x2a, 0x80, 0xdc, 0x86, 0xb9, 0x6f, 0xa8, 0x62, 0x5b, 0x16, 0x25, - 0x6d, 0xf7, 0x0d, 0x25, 0xbf, 0x19, 0x27, 0x3c, 0xf9, 0xe9, 0x84, 0xab, 0x4e, 0x88, 0xd2, 0x1e, - 0x7b, 0x9b, 0xe8, 0xf1, 0xb7, 0x49, 0xf5, 0x15, 0xa4, 0x3b, 0x23, 0x7c, 0xfe, 0x09, 0xda, 0x86, - 0xbe, 0xaf, 0x5e, 0x0f, 0xf2, 0xad, 0x97, 0x11, 0x02, 0x1c, 0x96, 0x11, 0x1b, 0x12, 0x13, 0x36, - 0x90, 0xda, 0x67, 0x3e, 0x2c, 0xa3, 0x27, 0x25, 0x83, 0xac, 0x6c, 0x56, 0x71, 0x69, 0x3d, 0x84, - 0x94, 0x6c, 0x6d, 0xd5, 0x89, 0xd5, 0x4f, 0x77, 0x36, 0x36, 0xa3, 0xb2, 0x10, 0x63, 0x98, 0xb9, - 0x5d, 0xe5, 0x8b, 0xf8, 0x24, 0x45, 0x48, 0x47, 0xb7, 0x56, 0x52, 0x3d, 0x1b, 0xd4, 0xe8, 0xfe, - 0x93, 0xa0, 0xec, 0x64, 0x1f, 0x91, 0x09, 0x3e, 0x8a, 0xc7, 0x98, 0xe2, 0x23, 0x8c, 0xf0, 0xd7, - 0xa0, 0x33, 0xb7, 0x2b, 0x6e, 0xbd, 0x6b, 0x2e, 0xe4, 0xb1, 0xef, 0x2a, 0xb7, 0x08, 0xbf, 0xf7, - 0x3f, 0x0d, 0x72, 0xb1, 0x6b, 0x95, 0xfc, 0x12, 0x6e, 0xd4, 0xf7, 0x0e, 0xb6, 0x9f, 0x5a, 0x8d, - 0x1d, 0xeb, 0xd1, 0xde, 0xd6, 0x63, 0xeb, 0x59, 0xf3, 0x69, 0xf3, 0xe0, 0x0f, 0x4d, 0x63, 0xae, - 0x74, 0xf3, 0xec, 0xbc, 0x42, 0x62, 0xd8, 0x67, 0xde, 0xb1, 0xe7, 0xbf, 0xf6, 0xc8, 0x06, 0x2c, - 0x4f, 0x9b, 0x6c, 0xd5, 0xdb, 0xbb, 0xcd, 0x8e, 0xa1, 0x95, 0x6e, 0x9c, 0x9d, 0x57, 0x96, 0x62, - 0x16, 0x5b, 0x87, 0x8c, 0x7a, 0x7c, 0xd6, 0x60, 0xfb, 0x60, 0x7f, 0xbf, 0xd1, 0x31, 0x12, 0x33, - 0x06, 0x6a, 0xce, 0xdd, 0x85, 0xa5, 0x69, 0x83, 0x66, 0x63, 0xcf, 0x48, 0x96, 0xc8, 0xd9, 0x79, - 0x65, 0x21, 0x86, 0x6e, 0xba, 0xfd, 0x52, 0xe6, 0xcf, 0x7f, 0x2b, 0xcf, 0xfd, 0xe3, 0xef, 0x65, - 0x4d, 0x44, 0x56, 0x98, 0xba, 0x0c, 0xc9, 0xcf, 0xe1, 0x56, 0xbb, 0xf1, 0xb8, 0xb9, 0xbb, 0x63, - 0xed, 0xb7, 0x1f, 0x5b, 0x9d, 0x17, 0xad, 0xdd, 0x58, 0x74, 0x8b, 0x67, 0xe7, 0x95, 0x9c, 0x0a, - 0xe9, 0x3a, 0x74, 0xcb, 0xdc, 0x7d, 0x7e, 0xd0, 0xd9, 0x35, 0x34, 0x89, 0x6e, 0x85, 0xf4, 0xc4, - 0xe7, 0x14, 0xd1, 0xf7, 0xe1, 0xf6, 0x15, 0xe8, 0x71, 0x60, 0x4b, 0x67, 0xe7, 0x95, 0x42, 0x2b, - 0xa4, 0xf2, 0x52, 0x40, 0x8b, 0x1a, 0x14, 0x67, 0x2d, 0x0e, 0x5a, 0x07, 0xed, 0xad, 0x3d, 0xa3, - 0x52, 0x32, 0xce, 0xce, 0x2b, 0xf9, 0xe8, 0xd6, 0x17, 0xf8, 0x58, 0x64, 0xbf, 0x00, 0xe3, 0x32, - 0xb7, 0x48, 0x06, 0xf4, 0xf6, 0xb1, 0x1b, 0x18, 0x73, 0x24, 0x0d, 0xc9, 0x17, 0x94, 0x19, 0x1a, - 0x49, 0x41, 0xa2, 0xe9, 0x1b, 0x89, 0x7a, 0xe7, 0xdd, 0x45, 0x59, 0x7b, 0x7f, 0x51, 0xd6, 0xbe, - 0xbd, 0x28, 0x6b, 0x6f, 0x3f, 0x96, 0xe7, 0xde, 0x7f, 0x2c, 0xcf, 0xfd, 0xff, 0x63, 0x79, 0xee, - 0x8f, 0x0f, 0xbb, 0x2e, 0xef, 0x0d, 0x0f, 0x6b, 0x47, 0xfe, 0x60, 0xc3, 0xf1, 0x5f, 0xb9, 0x03, - 0xdb, 0xa3, 0xfc, 0xb5, 0x1f, 0x1e, 0xab, 0x15, 0xfe, 0x09, 0x94, 0xff, 0x40, 0x2f, 0xff, 0x2b, - 0x3c, 0x4c, 0xa1, 0xfc, 0xc1, 0x77, 0x01, 0x00, 0x00, 0xff, 0xff, 0x46, 0x24, 0x20, 0x9e, 0xd6, - 0x0e, 0x00, 0x00, + // 1424 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0xda, 0xeb, 0x7f, 0xcf, 0x76, 0xe2, 0xac, 0xd2, 0xd6, 0x75, 0x1a, 0xc7, 0x32, 0x02, + 0xd2, 0x82, 0x9c, 0x92, 0x22, 0x04, 0x48, 0x1c, 0x62, 0x27, 0x6d, 0xad, 0x26, 0x8e, 0x59, 0xbb, + 0x45, 0x70, 0x59, 0xad, 0xbd, 0x53, 0x7b, 0x5b, 0x7b, 0x77, 0xb5, 0x33, 0x4e, 0x9d, 0x7e, 0x02, + 0x94, 0x53, 0x4f, 0x9c, 0xc8, 0x09, 0x0e, 0x48, 0x5c, 0xf8, 0x08, 0x88, 0x0b, 0x3d, 0xf6, 0x06, + 0xa7, 0x82, 0xd2, 0x2f, 0x82, 0xe6, 0xcd, 0xac, 0xbd, 0x8e, 0x13, 0xa8, 0xaa, 0x8a, 0x8b, 0xb5, + 0xef, 0xbd, 0xdf, 0x9b, 0x79, 0x7f, 0x7e, 0xf3, 0x66, 0x0c, 0xd7, 0x18, 0x71, 0x2c, 0xe2, 0x0f, + 0x6d, 0x87, 0x6d, 0xb2, 0x23, 0x8f, 0x50, 0xf1, 0x5b, 0xf1, 0x7c, 0x97, 0xb9, 0x5a, 0x6e, 0x6a, + 0xad, 0xa0, 0xbe, 0xb0, 0xd2, 0x73, 0x7b, 0x2e, 0x1a, 0x37, 0xf9, 0x97, 0xc0, 0x15, 0xd6, 0x7b, + 0xae, 0xdb, 0x1b, 0x90, 0x4d, 0x94, 0x3a, 0xa3, 0x87, 0x9b, 0xcc, 0x1e, 0x12, 0xca, 0xcc, 0xa1, + 0x27, 0x01, 0x6b, 0xa1, 0x6d, 0xba, 0xfe, 0x91, 0xc7, 0x5c, 0x8e, 0x75, 0x1f, 0x4a, 0x73, 0x31, + 0x64, 0x3e, 0x24, 0x3e, 0xb5, 0x5d, 0x27, 0x1c, 0x47, 0xa1, 0x34, 0x17, 0xe5, 0xa1, 0x39, 0xb0, + 0x2d, 0x93, 0xb9, 0xbe, 0x40, 0x94, 0x3f, 0x83, 0x6c, 0xd3, 0xf4, 0x59, 0x8b, 0xb0, 0xbb, 0xc4, + 0xb4, 0x88, 0xaf, 0xad, 0x40, 0x8c, 0xb9, 0xcc, 0x1c, 0xe4, 0x95, 0x92, 0xb2, 0x91, 0xd5, 0x85, + 0xa0, 0x69, 0xa0, 0xf6, 0x4d, 0xda, 0xcf, 0x47, 0x4a, 0xca, 0x46, 0x46, 0xc7, 0xef, 0x72, 0x1f, + 0x54, 0xee, 0xca, 0x3d, 0x6c, 0xc7, 0x22, 0xe3, 0xc0, 0x03, 0x05, 0xae, 0xed, 0x1c, 0x31, 0x42, + 0xa5, 0x8b, 0x10, 0xb4, 0x8f, 0x21, 0x86, 0xf1, 0xe7, 0xa3, 0x25, 0x65, 0x23, 0xbd, 0x95, 0xaf, + 0x84, 0x0a, 0x25, 0xf2, 0xab, 0x34, 0xb9, 0xbd, 0xaa, 0x3e, 0x7f, 0xb9, 0xbe, 0xa0, 0x0b, 0x70, + 0x79, 0x00, 0x89, 0xea, 0xc0, 0xed, 0x3e, 0xae, 0xef, 0x4c, 0x02, 0x51, 0xa6, 0x81, 0x68, 0xfb, + 0xb0, 0xe4, 0x99, 0x3e, 0x33, 0x28, 0x61, 0x46, 0x1f, 0xb3, 0xc0, 0x4d, 0xd3, 0x5b, 0xeb, 0x95, + 0xb3, 0x7d, 0xa8, 0xcc, 0x24, 0x2b, 0x77, 0xc9, 0x7a, 0x61, 0x65, 0xf9, 0xfb, 0x18, 0xc4, 0x65, + 0x31, 0xbe, 0x80, 0x84, 0x2c, 0x2b, 0x6e, 0x98, 0xde, 0x5a, 0x0b, 0xaf, 0x28, 0x4d, 0x95, 0x9a, + 0xeb, 0x50, 0xe2, 0xd0, 0x11, 0x95, 0xeb, 0x05, 0x3e, 0xda, 0x7b, 0x90, 0xec, 0xf6, 0x4d, 0xdb, + 0x31, 0x6c, 0x0b, 0x23, 0x4a, 0x55, 0xd3, 0xa7, 0x2f, 0xd7, 0x13, 0x35, 0xae, 0xab, 0xef, 0xe8, + 0x09, 0x34, 0xd6, 0x2d, 0xed, 0x32, 0xc4, 0xfb, 0xc4, 0xee, 0xf5, 0x19, 0x96, 0x25, 0xaa, 0x4b, + 0x49, 0xfb, 0x14, 0x54, 0x4e, 0x88, 0xbc, 0x8a, 0x7b, 0x17, 0x2a, 0x82, 0x2d, 0x95, 0x80, 0x2d, + 0x95, 0x76, 0xc0, 0x96, 0x6a, 0x92, 0x6f, 0xfc, 0xec, 0xaf, 0x75, 0x45, 0x47, 0x0f, 0xed, 0x0a, + 0x24, 0x9c, 0xd1, 0xd0, 0x60, 0x63, 0x9a, 0x8f, 0x89, 0x25, 0x9d, 0xd1, 0xb0, 0x3d, 0xa6, 0xda, + 0x2a, 0xa4, 0xb0, 0xa3, 0x68, 0x8a, 0xa3, 0x29, 0x89, 0x0a, 0x6e, 0xac, 0x41, 0x76, 0x60, 0x52, + 0x66, 0x74, 0x78, 0xb1, 0x79, 0xd0, 0x09, 0xdc, 0xf8, 0xea, 0x7c, 0x19, 0x65, 0x3b, 0x64, 0xc2, + 0x69, 0xee, 0x25, 0x54, 0x96, 0xb6, 0x01, 0x39, 0x5c, 0xa4, 0xeb, 0x0e, 0x87, 0x36, 0x33, 0xb0, + 0x5b, 0x49, 0xec, 0xd6, 0x22, 0xd7, 0xd7, 0x50, 0x7d, 0x97, 0xf7, 0x6d, 0x15, 0x52, 0x96, 0xc9, + 0x4c, 0x01, 0x49, 0x21, 0x24, 0xc9, 0x15, 0x68, 0x7c, 0x1f, 0x96, 0x26, 0x5c, 0xa5, 0x02, 0x02, + 0x62, 0x95, 0xa9, 0x1a, 0x81, 0x37, 0x61, 0xc5, 0x21, 0x63, 0x66, 0x9c, 0x45, 0xa7, 0x11, 0xad, + 0x71, 0xdb, 0x83, 0x59, 0x8f, 0x77, 0x61, 0xb1, 0x1b, 0xb4, 0x4c, 0x60, 0x33, 0x88, 0xcd, 0x4e, + 0xb4, 0x08, 0xbb, 0x0a, 0x49, 0xd3, 0xf3, 0x04, 0x20, 0x8b, 0x80, 0x84, 0xe9, 0x79, 0x68, 0xba, + 0x01, 0xcb, 0x98, 0xa3, 0x4f, 0xe8, 0x68, 0xc0, 0xe4, 0x22, 0x8b, 0x88, 0x59, 0xe2, 0x06, 0x5d, + 0xe8, 0x11, 0xfb, 0x0e, 0x64, 0xc9, 0xa1, 0x6d, 0x11, 0xa7, 0x4b, 0x04, 0x6e, 0x09, 0x71, 0x99, + 0x40, 0x89, 0xa0, 0xeb, 0x90, 0xf3, 0x7c, 0xd7, 0x73, 0x29, 0xf1, 0x0d, 0xd3, 0xb2, 0x7c, 0x42, + 0x69, 0x3e, 0x27, 0xd6, 0x0b, 0xf4, 0xdb, 0x42, 0x5d, 0xce, 0x83, 0xba, 0x63, 0x32, 0x53, 0xcb, + 0x41, 0x94, 0xf7, 0x50, 0x29, 0x45, 0x37, 0x32, 0x3a, 0xff, 0x2c, 0xff, 0x12, 0x05, 0xf5, 0x81, + 0xcb, 0x88, 0x76, 0x0b, 0x54, 0xde, 0x26, 0xe4, 0xec, 0xe2, 0x79, 0xa7, 0xa0, 0x65, 0xf7, 0x1c, + 0x62, 0xed, 0xd3, 0x5e, 0xfb, 0xc8, 0x23, 0x3a, 0x82, 0x43, 0x24, 0x8c, 0xcc, 0x90, 0x70, 0x05, + 0x62, 0xbe, 0x3b, 0x72, 0x2c, 0xe4, 0x66, 0x4c, 0x17, 0x82, 0xb6, 0x0b, 0xc9, 0x09, 0x4b, 0xd4, + 0xff, 0x62, 0xc9, 0x12, 0x67, 0x09, 0x67, 0xbe, 0x54, 0xe8, 0x89, 0x8e, 0x24, 0x4b, 0x15, 0x52, + 0x93, 0x91, 0x87, 0x4c, 0x7d, 0x5d, 0x9a, 0x4f, 0xdd, 0xb4, 0x0f, 0x60, 0x79, 0xd2, 0xfb, 0x49, + 0xf1, 0xe2, 0x58, 0xbc, 0xdc, 0xc4, 0x20, 0xab, 0x37, 0x43, 0x2b, 0x43, 0x8c, 0xad, 0x04, 0xe6, + 0x35, 0xa5, 0x55, 0x1d, 0xe7, 0xd7, 0x35, 0x48, 0x51, 0xbb, 0xe7, 0x98, 0x6c, 0xe4, 0x13, 0xc9, + 0xdf, 0xa9, 0x42, 0xbb, 0x0d, 0x4b, 0xd4, 0xb6, 0x88, 0xc1, 0xc6, 0x01, 0x07, 0xf2, 0xa9, 0x52, + 0x74, 0x23, 0xbd, 0x55, 0x3c, 0xaf, 0xd8, 0x16, 0x69, 0x8f, 0x05, 0x25, 0xf4, 0x2c, 0x0d, 0x49, + 0xb4, 0xfc, 0x25, 0x64, 0xc2, 0x66, 0x7e, 0x6e, 0xd9, 0xd8, 0x08, 0x4d, 0xb8, 0x38, 0x1b, 0x23, + 0x41, 0x2e, 0x43, 0x5c, 0x6c, 0x84, 0xdd, 0x89, 0xe9, 0x52, 0xe2, 0x2c, 0xa0, 0x76, 0x0f, 0x7b, + 0x93, 0xd1, 0xf9, 0x67, 0xf9, 0x57, 0x05, 0xe2, 0xe2, 0x90, 0x85, 0x5a, 0xaa, 0x9c, 0xdf, 0xd2, + 0xc8, 0x45, 0x2d, 0x8d, 0xbe, 0x79, 0x4b, 0xb7, 0x01, 0x26, 0x75, 0xa2, 0x79, 0x15, 0xab, 0xb2, + 0x3a, 0xbf, 0x90, 0x08, 0xb1, 0x65, 0xf7, 0xe4, 0x0c, 0x09, 0x39, 0x95, 0x7f, 0x8e, 0x40, 0x6a, + 0x62, 0xd7, 0xb6, 0x21, 0x1b, 0xc4, 0x65, 0x3c, 0x1c, 0x98, 0x3d, 0x49, 0xeb, 0xb5, 0x0b, 0x83, + 0xbb, 0x3d, 0x30, 0x7b, 0x7a, 0x5a, 0xc6, 0xc3, 0x85, 0xf3, 0x29, 0x12, 0xb9, 0x80, 0x22, 0x33, + 0x9c, 0x8c, 0xbe, 0x19, 0x27, 0x67, 0xd8, 0xa3, 0x9e, 0x65, 0xcf, 0xde, 0x3c, 0x7b, 0x12, 0xaf, + 0xc3, 0x9e, 0xe0, 0xbe, 0x9a, 0xe5, 0xd0, 0xef, 0x11, 0x48, 0x36, 0x71, 0x48, 0x98, 0x83, 0xff, + 0xe3, 0xe8, 0xaf, 0x42, 0xca, 0x73, 0x07, 0x86, 0xb0, 0xa8, 0x68, 0x49, 0x7a, 0xee, 0x40, 0x9f, + 0x23, 0x51, 0xec, 0x2d, 0xcd, 0x85, 0xf8, 0x5b, 0xe8, 0x41, 0xe2, 0x6c, 0x0f, 0x34, 0x50, 0xf9, + 0x5d, 0x23, 0x8f, 0x36, 0x7e, 0x97, 0x7d, 0x7e, 0x1a, 0x79, 0x79, 0xe4, 0xf5, 0x7f, 0x93, 0xd7, + 0x05, 0xdf, 0x13, 0xca, 0xfc, 0x73, 0x45, 0xa4, 0x22, 0x90, 0xba, 0xc4, 0x71, 0x0f, 0x71, 0xef, + 0xc9, 0x17, 0x48, 0xfe, 0x22, 0xe2, 0xeb, 0x12, 0x57, 0xfe, 0x4e, 0x01, 0xd8, 0xe3, 0xd5, 0xc6, + 0x1a, 0xf0, 0x2b, 0x98, 0x62, 0x08, 0xc6, 0xcc, 0xce, 0xc5, 0x8b, 0x1a, 0x29, 0xf7, 0xcf, 0xd0, + 0x70, 0xdc, 0x35, 0xc8, 0x4e, 0xe9, 0x4e, 0x49, 0x10, 0xcc, 0x39, 0x8b, 0x4c, 0x6e, 0xc6, 0x16, + 0x61, 0x7a, 0xe6, 0x30, 0x24, 0x95, 0x7f, 0x53, 0x20, 0x85, 0x31, 0xed, 0x13, 0x66, 0xce, 0xf4, + 0x55, 0x79, 0xf3, 0xbe, 0xae, 0x01, 0x88, 0x65, 0xa8, 0xfd, 0x94, 0x48, 0xb6, 0xa5, 0x50, 0xd3, + 0xb2, 0x9f, 0x12, 0xed, 0x93, 0x49, 0xc1, 0xa3, 0xff, 0x5e, 0x70, 0x79, 0x12, 0x82, 0xb2, 0x87, + 0x9e, 0x3b, 0x6a, 0xf8, 0xb9, 0x53, 0x7e, 0x04, 0x89, 0xf6, 0x18, 0x5f, 0x94, 0x9c, 0xb6, 0xbe, + 0xeb, 0xb2, 0xf0, 0x70, 0x4d, 0x72, 0x05, 0x8e, 0xd7, 0x80, 0x0d, 0x91, 0x29, 0x1b, 0xb4, 0xca, + 0x6b, 0xbe, 0x55, 0xe5, 0x2b, 0xf5, 0xc6, 0x1f, 0x0a, 0xa4, 0x43, 0x13, 0x48, 0xfb, 0x08, 0x2e, + 0x55, 0xf7, 0x0e, 0x6a, 0xf7, 0x8c, 0xfa, 0x8e, 0x71, 0x7b, 0x6f, 0xfb, 0x8e, 0x71, 0xbf, 0x71, + 0xaf, 0x71, 0xf0, 0x55, 0x23, 0xb7, 0x50, 0xb8, 0x7c, 0x7c, 0x52, 0xd2, 0x42, 0xd8, 0xfb, 0xce, + 0x63, 0xc7, 0x7d, 0xe2, 0x68, 0x9b, 0xb0, 0x32, 0xeb, 0xb2, 0x5d, 0x6d, 0xed, 0x36, 0xda, 0x39, + 0xa5, 0x70, 0xe9, 0xf8, 0xa4, 0xb4, 0x1c, 0xf2, 0xd8, 0xee, 0x50, 0xe2, 0xb0, 0x79, 0x87, 0xda, + 0xc1, 0xfe, 0x7e, 0xbd, 0x9d, 0x8b, 0xcc, 0x39, 0xc8, 0x2b, 0xe1, 0x3a, 0x2c, 0xcf, 0x3a, 0x34, + 0xea, 0x7b, 0xb9, 0x68, 0x41, 0x3b, 0x3e, 0x29, 0x2d, 0x86, 0xd0, 0x0d, 0x7b, 0x50, 0x48, 0x7e, + 0xfb, 0x43, 0x71, 0xe1, 0xa7, 0x1f, 0x8b, 0x0a, 0xcf, 0x2c, 0x3b, 0x33, 0x37, 0xb4, 0x0f, 0xe1, + 0x4a, 0xab, 0x7e, 0xa7, 0xb1, 0xbb, 0x63, 0xec, 0xb7, 0xee, 0x18, 0xed, 0xaf, 0x9b, 0xbb, 0xa1, + 0xec, 0x96, 0x8e, 0x4f, 0x4a, 0x69, 0x99, 0xd2, 0x45, 0xe8, 0xa6, 0xbe, 0xfb, 0xe0, 0xa0, 0xbd, + 0x9b, 0x53, 0x04, 0xba, 0xe9, 0x93, 0x43, 0x97, 0x11, 0x44, 0xdf, 0x84, 0xab, 0xe7, 0xa0, 0x27, + 0x89, 0x2d, 0x1f, 0x9f, 0x94, 0xb2, 0x4d, 0x9f, 0x88, 0xf3, 0x83, 0x1e, 0x15, 0xc8, 0xcf, 0x7b, + 0x1c, 0x34, 0x0f, 0x5a, 0xdb, 0x7b, 0xb9, 0x52, 0x21, 0x77, 0x7c, 0x52, 0xca, 0x04, 0x03, 0x92, + 0xe3, 0xa7, 0x99, 0x55, 0xdb, 0xcf, 0x4f, 0x8b, 0xca, 0x8b, 0xd3, 0xa2, 0xf2, 0xf7, 0x69, 0x51, + 0x79, 0xf6, 0xaa, 0xb8, 0xf0, 0xe2, 0x55, 0x71, 0xe1, 0xcf, 0x57, 0xc5, 0x85, 0x6f, 0x3e, 0xef, + 0xd9, 0xac, 0x3f, 0xea, 0x54, 0xba, 0xee, 0x70, 0xd3, 0x72, 0x1f, 0xd9, 0x43, 0xd3, 0x21, 0xec, + 0x89, 0xeb, 0x3f, 0x96, 0x12, 0xfe, 0xa7, 0x12, 0x7f, 0xe8, 0xce, 0xfe, 0xc9, 0xea, 0xc4, 0x51, + 0x7f, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0x76, 0x48, 0x02, 0x25, 0x0e, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1710,6 +1621,48 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SideTxResult) 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 *SideTxResult) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SideTxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Sig) > 0 { + i -= len(m.Sig) + copy(dAtA[i:], m.Sig) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Sig))) + i-- + dAtA[i] = 0x1a + } + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x10 + } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Commit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2102,127 +2055,41 @@ func (m *TxProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SideTxSig) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err +func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { + offset -= sovTypes(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ } - return dAtA[:n], nil + dAtA[offset] = uint8(v) + return base } - -func (m *SideTxSig) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func (m *PartSetHeader) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Total != 0 { + n += 1 + sovTypes(uint64(m.Total)) + } + l = len(m.Hash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n } -func (m *SideTxSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i +func (m *Part) Size() (n int) { + if m == nil { + return 0 + } 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] = 0x1a - } - if len(m.Sig) > 0 { - i -= len(m.Sig) - copy(dAtA[i:], m.Sig) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Sig))) - i-- - dAtA[i] = 0x12 - } - if m.Result != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Result)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *SideTxResult) 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 *SideTxResult) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SideTxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Sigs) > 0 { - for iNdEx := len(m.Sigs) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Sigs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintTypes(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { - offset -= sovTypes(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *PartSetHeader) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Total != 0 { - n += 1 + sovTypes(uint64(m.Total)) - } - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - -func (m *Part) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Index != 0 { - n += 1 + sovTypes(uint64(m.Index)) + if m.Index != 0 { + n += 1 + sovTypes(uint64(m.Index)) } l = len(m.Bytes) if l > 0 { @@ -2366,6 +2233,26 @@ func (m *Vote) Size() (n int) { return n } +func (m *SideTxResult) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + l = len(m.Sig) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Commit) Size() (n int) { if m == nil { return 0 @@ -2524,45 +2411,6 @@ func (m *TxProof) Size() (n int) { return n } -func (m *SideTxSig) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Result != 0 { - n += 1 + sovTypes(uint64(m.Result)) - } - l = len(m.Sig) - 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 *SideTxResult) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - if len(m.Sigs) > 0 { - for _, e := range m.Sigs { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - return n -} - func sovTypes(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3863,7 +3711,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error { } return nil } -func (m *Commit) Unmarshal(dAtA []byte) error { +func (m *SideTxResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3886,17 +3734,17 @@ func (m *Commit) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Commit: wiretype end group for non-group") + return fmt.Errorf("proto: SideTxResult: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Commit: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SideTxResult: 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) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) } - m.Height = 0 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -3906,16 +3754,31 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= int64(b&0x7F) << shift + 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.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) + if m.TxHash == nil { + m.TxHash = []byte{} + } + iNdEx = postIndex case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) } - m.Round = 0 + m.Result = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -3925,49 +3788,16 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Round |= int32(b&0x7F) << shift + m.Result |= 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 Signatures", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Sig", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -3977,24 +3807,24 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Signatures = append(m.Signatures, CommitSig{}) - if err := m.Signatures[len(m.Signatures)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Sig = append(m.Sig[:0], dAtA[iNdEx:postIndex]...) + if m.Sig == nil { + m.Sig = []byte{} } iNdEx = postIndex default: @@ -4021,7 +3851,7 @@ func (m *Commit) Unmarshal(dAtA []byte) error { } return nil } -func (m *CommitSig) Unmarshal(dAtA []byte) error { +func (m *Commit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4044,17 +3874,17 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CommitSig: wiretype end group for non-group") + return fmt.Errorf("proto: Commit: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CommitSig: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Commit: 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) + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.BlockIdFlag = 0 + m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -4064,16 +3894,16 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.BlockIdFlag |= BlockIDFlag(b&0x7F) << shift + m.Height |= int64(b&0x7F) << shift if b < 0x80 { break } } case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType) } - var byteLen int + m.Round = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -4083,19 +3913,177 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + m.Round |= int32(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockID", wireType) } - if postIndex > l { + 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 Signatures", 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.Signatures = append(m.Signatures, CommitSig{}) + if err := m.Signatures[len(m.Signatures)-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 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *CommitSig) 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: CommitSig: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CommitSig: 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]...) @@ -5055,267 +5043,6 @@ func (m *TxProof) Unmarshal(dAtA []byte) error { } return nil } -func (m *SideTxSig) 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: SideTxSig: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SideTxSig: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) - } - m.Result = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Result |= SideTxResultType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sig", 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.Sig = append(m.Sig[:0], dAtA[iNdEx:postIndex]...) - if m.Sig == nil { - m.Sig = []byte{} - } - iNdEx = postIndex - case 3: - 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 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *SideTxResult) 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: SideTxResult: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SideTxResult: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", 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.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sigs", 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.Sigs = append(m.Sigs, SideTxSig{}) - if err := m.Sigs[len(m.Sigs)-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 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipTypes(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 30cb953c417..7c06da74377 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -108,6 +108,13 @@ message Vote { repeated SideTxResult side_tx_results = 9; } +//Side-Tx-Result structure inside vote +message SideTxResult { + bytes tx_hash = 1; // Corresponds to TxHash in Go + int32 result = 2; // Corresponds to Result in Go + bytes sig = 3; // Corresponds to Sig in Go +} + // Commit contains the evidence that a block was committed by a set of validators. message Commit { int64 height = 1; @@ -161,23 +168,3 @@ message TxProof { bytes data = 2; tendermint.crypto.Proof proof = 3; } - -// Side-tx result type -enum SideTxResultType { - Skip = 0; - Yes = 1; - No = 2; -} - -// Side-tx sig -message SideTxSig { - SideTxResultType result = 1; - bytes sig = 2; - bytes address = 3; -} - -// Side tx results -message SideTxResult { - bytes tx_hash = 1; - repeated SideTxSig sigs = 2 [(gogoproto.nullable)=false]; -} diff --git a/state/execution.go b/state/execution.go index d9492cef0b0..d3666666bba 100644 --- a/state/execution.go +++ b/state/execution.go @@ -42,7 +42,7 @@ type BlockExecutor struct { metrics *Metrics - // [peppermint] fast sync + // [dojimamint] fast sync fastSyncFunc func() bool } @@ -135,6 +135,7 @@ func (blockExec *BlockExecutor) ValidateBlock(state State, block *types.Block) e func (blockExec *BlockExecutor) ApplyBlock( state State, blockID types.BlockID, block *types.Block, ) (State, int64, error) { + blockExec.logger.Debug("[dojimamint] Applying block", "height", block.Height, "numTxs", block.Header.ToProto().NumTxs) if err := validateBlock(state, block); err != nil { return state, 0, ErrInvalidBlock(err) @@ -374,7 +375,7 @@ func execBlockOnProxyApp( txReq := vreq.DeliverSideTx txRes := vres.DeliverSideTx - if txRes.Code == abci.CodeTypeOK && txRes.Result != tmproto.SideTxResultType_Skip { + if txRes.Code == abci.CodeTypeOK && txRes.Result != abci.SideTxResultType_Skip { tx := types.Tx(txReq.Tx) // add into side tx responses sideTxResponses = append(sideTxResponses, &types.SideTxResultWithData{ @@ -622,7 +623,7 @@ func ExecCommitBlock( store Store, initialHeight int64, ) ([]byte, error) { - logger.Info("[Peppermint] Exec commit block", "height", block.Height) + logger.Info("[dojimamint] Exec commit block", "height", block.Height) _, _, err := execBlockOnProxyApp(logger, appConnConsensus, block, store, initialHeight, false) if err != nil { logger.Error("Error executing block on proxy app", "height", block.Height, "err", err) @@ -642,7 +643,7 @@ func ExecCommitBlock( // Side channel utils // -func getBeginSideBlockData(block *types.Block, store Store) []tmproto.SideTxResult { +func getBeginSideBlockData(block *types.Block, store Store) []abci.SideTxResult { // returns [ // { // txHash: txHash, @@ -658,11 +659,11 @@ func getBeginSideBlockData(block *types.Block, store Store) []tmproto.SideTxResu // ] // prepare result - result := make([]tmproto.SideTxResult, 0) + result := make([]abci.SideTxResult, 0) // return if prev block is empty result (mostly block 0) if block == nil || block.Height <= 2 { - return make([]tmproto.SideTxResult, 0) + return make([]abci.SideTxResult, 0) } // iterate all votes @@ -681,9 +682,9 @@ func getBeginSideBlockData(block *types.Block, store Store) []tmproto.SideTxResu // create tx-hash based object, if not found yet if resultIndex == -1 { - result = append(result, tmproto.SideTxResult{ + result = append(result, abci.SideTxResult{ TxHash: sideTxResult.TxHash, - Sigs: make([]tmproto.SideTxSig, 0), + Sigs: make([]abci.SideTxSig, 0), }) // set new result index resultIndex = len(result) - 1 @@ -692,8 +693,8 @@ func getBeginSideBlockData(block *types.Block, store Store) []tmproto.SideTxResu // if tx is not processed for current vote, add it into sigs for particular side-tx result if _, ok := txMapping[resultIndex]; !ok { // get result object from result index - result[resultIndex].Sigs = append(result[resultIndex].Sigs, tmproto.SideTxSig{ - Result: tmproto.SideTxResultType(sideTxResult.Result), + result[resultIndex].Sigs = append(result[resultIndex].Sigs, abci.SideTxSig{ + Result: abci.SideTxResultType(sideTxResult.Result), Sig: sideTxResult.Sig, Address: vote.ValidatorAddress, }) diff --git a/types/block.go b/types/block.go index 8ae8cde79fb..86eb3812527 100644 --- a/types/block.go +++ b/types/block.go @@ -8,7 +8,7 @@ import ( "strings" "time" - tenderTypes "github.com/dojimanetwork/dojimamint/proto/tendermint/types" + abciTypes "github.com/dojimanetwork/dojimamint/abci/types" "github.com/gogo/protobuf/proto" gogotypes "github.com/gogo/protobuf/types" @@ -701,7 +701,7 @@ func (cs CommitSig) ValidateBasic() error { return fmt.Errorf("Side-tx signature is invalid. Sig length: %v", len(s.Sig)) } - if _, ok := tenderTypes.SideTxResultType_name[s.Result]; !ok { + if _, ok := abciTypes.SideTxResultType_name[s.Result]; !ok { return fmt.Errorf("Invalid side-tx result. Result: %v", s.Result) } diff --git a/types/vote.go b/types/vote.go index 38df640ccb1..f4a32c0136d 100644 --- a/types/vote.go +++ b/types/vote.go @@ -7,10 +7,10 @@ import ( "fmt" "time" + abciTypes "github.com/dojimanetwork/dojimamint/abci/types" "github.com/dojimanetwork/dojimamint/crypto" tmbytes "github.com/dojimanetwork/dojimamint/libs/bytes" "github.com/dojimanetwork/dojimamint/libs/protoio" - tenderTypes "github.com/dojimanetwork/dojimamint/proto/tendermint/types" tmproto "github.com/dojimanetwork/dojimamint/proto/tendermint/types" ) @@ -109,9 +109,8 @@ func (vote *Vote) Copy() *Vote { return &voteCopy } - func (vote *Vote) SignBytes(chainID string) []byte { - // [peppermint] converted from amino to rlp + // [dojimamint] converted from amino to rlp bz, err := cdc.MarshalBinaryLengthPrefixed(CanonicalizeVote(chainID, vote.ToProto())) if err != nil { panic(err) @@ -229,7 +228,7 @@ func (vote *Vote) ValidateBasic() error { return fmt.Errorf("Side-tx signature is invalid. Sig length: %v", len(s.Sig)) } - if _, ok := tenderTypes.SideTxResultType_name[s.Result]; !ok { + if _, ok := abciTypes.SideTxResultType_name[s.Result]; !ok { return fmt.Errorf("Invalid side-tx result. Result: %v", s.Result) }