diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index fbfd136ff..46b484720 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -121,7 +121,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32, 0} + return fileDescriptor_252557cfdd89a31a, []int{33, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -158,7 +158,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{34, 0} + return fileDescriptor_252557cfdd89a31a, []int{35, 0} } type ResponseProcessProposal_Result int32 @@ -186,7 +186,7 @@ func (x ResponseProcessProposal_Result) String() string { } func (ResponseProcessProposal_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36, 0} + return fileDescriptor_252557cfdd89a31a, []int{37, 0} } type Request struct { @@ -549,19 +549,70 @@ func (m *RequestFlush) XXX_DiscardUnknown() { var xxx_messageInfo_RequestFlush proto.InternalMessageInfo +type TimeoutsInfo struct { + TimeoutPropose time.Duration `protobuf:"bytes,1,opt,name=timeout_propose,json=timeoutPropose,proto3,stdduration" json:"timeout_propose"` + TimeoutCommit time.Duration `protobuf:"bytes,2,opt,name=timeout_commit,json=timeoutCommit,proto3,stdduration" json:"timeout_commit"` +} + +func (m *TimeoutsInfo) Reset() { *m = TimeoutsInfo{} } +func (m *TimeoutsInfo) String() string { return proto.CompactTextString(m) } +func (*TimeoutsInfo) ProtoMessage() {} +func (*TimeoutsInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{3} +} +func (m *TimeoutsInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TimeoutsInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TimeoutsInfo.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 *TimeoutsInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_TimeoutsInfo.Merge(m, src) +} +func (m *TimeoutsInfo) XXX_Size() int { + return m.Size() +} +func (m *TimeoutsInfo) XXX_DiscardUnknown() { + xxx_messageInfo_TimeoutsInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_TimeoutsInfo proto.InternalMessageInfo + +func (m *TimeoutsInfo) GetTimeoutPropose() time.Duration { + if m != nil { + return m.TimeoutPropose + } + return 0 +} + +func (m *TimeoutsInfo) GetTimeoutCommit() time.Duration { + if m != nil { + return m.TimeoutCommit + } + return 0 +} + type RequestInfo struct { - Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - BlockVersion uint64 `protobuf:"varint,2,opt,name=block_version,json=blockVersion,proto3" json:"block_version,omitempty"` - P2PVersion uint64 `protobuf:"varint,3,opt,name=p2p_version,json=p2pVersion,proto3" json:"p2p_version,omitempty"` - TimeoutPropose time.Duration `protobuf:"bytes,4,opt,name=timeout_propose,json=timeoutPropose,proto3,stdduration" json:"timeout_propose"` - TimeoutCommit time.Duration `protobuf:"bytes,5,opt,name=timeout_commit,json=timeoutCommit,proto3,stdduration" json:"timeout_commit"` + Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + BlockVersion uint64 `protobuf:"varint,2,opt,name=block_version,json=blockVersion,proto3" json:"block_version,omitempty"` + P2PVersion uint64 `protobuf:"varint,3,opt,name=p2p_version,json=p2pVersion,proto3" json:"p2p_version,omitempty"` + Timeouts *TimeoutsInfo `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"` } func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{3} + return fileDescriptor_252557cfdd89a31a, []int{4} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -611,18 +662,11 @@ func (m *RequestInfo) GetP2PVersion() uint64 { return 0 } -func (m *RequestInfo) GetTimeoutPropose() time.Duration { +func (m *RequestInfo) GetTimeouts() *TimeoutsInfo { if m != nil { - return m.TimeoutPropose + return m.Timeouts } - return 0 -} - -func (m *RequestInfo) GetTimeoutCommit() time.Duration { - if m != nil { - return m.TimeoutCommit - } - return 0 + return nil } // nondeterministic @@ -635,7 +679,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{4} + return fileDescriptor_252557cfdd89a31a, []int{5} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -691,7 +735,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{5} + return fileDescriptor_252557cfdd89a31a, []int{6} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -773,7 +817,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{6} + return fileDescriptor_252557cfdd89a31a, []int{7} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -841,7 +885,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{7} + return fileDescriptor_252557cfdd89a31a, []int{8} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -907,7 +951,7 @@ func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{8} + return fileDescriptor_252557cfdd89a31a, []int{9} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -958,7 +1002,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{9} + return fileDescriptor_252557cfdd89a31a, []int{10} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1002,7 +1046,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{10} + return fileDescriptor_252557cfdd89a31a, []int{11} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1045,7 +1089,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{11} + return fileDescriptor_252557cfdd89a31a, []int{12} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1082,7 +1126,7 @@ func (m *RequestListSnapshots) Reset() { *m = RequestListSnapshots{} } func (m *RequestListSnapshots) String() string { return proto.CompactTextString(m) } func (*RequestListSnapshots) ProtoMessage() {} func (*RequestListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{12} + return fileDescriptor_252557cfdd89a31a, []int{13} } func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1121,7 +1165,7 @@ func (m *RequestOfferSnapshot) Reset() { *m = RequestOfferSnapshot{} } func (m *RequestOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*RequestOfferSnapshot) ProtoMessage() {} func (*RequestOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{13} + return fileDescriptor_252557cfdd89a31a, []int{14} } func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1175,7 +1219,7 @@ func (m *RequestLoadSnapshotChunk) Reset() { *m = RequestLoadSnapshotChu func (m *RequestLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestLoadSnapshotChunk) ProtoMessage() {} func (*RequestLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{14} + return fileDescriptor_252557cfdd89a31a, []int{15} } func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1236,7 +1280,7 @@ func (m *RequestApplySnapshotChunk) Reset() { *m = RequestApplySnapshotC func (m *RequestApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestApplySnapshotChunk) ProtoMessage() {} func (*RequestApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{15} + return fileDescriptor_252557cfdd89a31a, []int{16} } func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1307,7 +1351,7 @@ func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} func (m *RequestPrepareProposal) String() string { return proto.CompactTextString(m) } func (*RequestPrepareProposal) ProtoMessage() {} func (*RequestPrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_252557cfdd89a31a, []int{17} } func (m *RequestPrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1380,7 +1424,7 @@ func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} func (m *RequestProcessProposal) String() string { return proto.CompactTextString(m) } func (*RequestProcessProposal) ProtoMessage() {} func (*RequestProcessProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *RequestProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1451,7 +1495,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1726,7 +1770,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1770,7 +1814,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1813,7 +1857,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1854,7 +1898,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1930,7 +1974,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{23} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1990,7 +2034,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{24} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2057,7 +2101,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{25} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2157,7 +2201,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2213,7 +2257,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2334,7 +2378,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{28} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2423,15 +2467,14 @@ type ResponseEndBlock struct { ValidatorUpdates []ValidatorUpdate `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates"` ConsensusParamUpdates *ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` Events []Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` - TimeoutPropose time.Duration `protobuf:"bytes,4,opt,name=timeout_propose,json=timeoutPropose,proto3,stdduration" json:"timeout_propose"` - TimeoutCommit time.Duration `protobuf:"bytes,5,opt,name=timeout_commit,json=timeoutCommit,proto3,stdduration" json:"timeout_commit"` + Timeouts *TimeoutsInfo `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"` } func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2481,18 +2524,11 @@ func (m *ResponseEndBlock) GetEvents() []Event { return nil } -func (m *ResponseEndBlock) GetTimeoutPropose() time.Duration { - if m != nil { - return m.TimeoutPropose - } - return 0 -} - -func (m *ResponseEndBlock) GetTimeoutCommit() time.Duration { +func (m *ResponseEndBlock) GetTimeouts() *TimeoutsInfo { if m != nil { - return m.TimeoutCommit + return m.Timeouts } - return 0 + return nil } type ResponseCommit struct { @@ -2505,7 +2541,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2556,7 +2592,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2600,7 +2636,7 @@ func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2644,7 +2680,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2690,7 +2726,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{34} + return fileDescriptor_252557cfdd89a31a, []int{35} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2748,7 +2784,7 @@ func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } func (*ResponsePrepareProposal) ProtoMessage() {} func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2793,7 +2829,7 @@ func (m *ResponseProcessProposal) Reset() { *m = ResponseProcessProposal func (m *ResponseProcessProposal) String() string { return proto.CompactTextString(m) } func (*ResponseProcessProposal) ProtoMessage() {} func (*ResponseProcessProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *ResponseProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2849,7 +2885,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{37} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2918,7 +2954,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{38} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2970,7 +3006,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{39} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3025,7 +3061,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{40} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3079,7 +3115,7 @@ func (m *EventAttribute) Reset() { *m = EventAttribute{} } func (m *EventAttribute) String() string { return proto.CompactTextString(m) } func (*EventAttribute) ProtoMessage() {} func (*EventAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{41} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3143,7 +3179,7 @@ func (m *TxResult) Reset() { *m = TxResult{} } func (m *TxResult) String() string { return proto.CompactTextString(m) } func (*TxResult) ProtoMessage() {} func (*TxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{42} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3211,7 +3247,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{43} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3264,7 +3300,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{44} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3317,7 +3353,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{45} + return fileDescriptor_252557cfdd89a31a, []int{46} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3378,7 +3414,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{46} + return fileDescriptor_252557cfdd89a31a, []int{47} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3454,7 +3490,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{47} + return fileDescriptor_252557cfdd89a31a, []int{48} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3527,6 +3563,7 @@ func init() { proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") + proto.RegisterType((*TimeoutsInfo)(nil), "tendermint.abci.TimeoutsInfo") proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.RequestInfo") proto.RegisterType((*RequestSetOption)(nil), "tendermint.abci.RequestSetOption") proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.RequestInitChain") @@ -3577,199 +3614,201 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3070 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0xe4, 0xd4, - 0x11, 0x1f, 0xcd, 0xb7, 0x7a, 0x3c, 0x1f, 0x7e, 0xbb, 0xec, 0xce, 0x8a, 0xc5, 0x5e, 0xb4, 0xc5, - 0xd7, 0x02, 0x76, 0x30, 0xb5, 0x04, 0x02, 0x09, 0xd8, 0xb3, 0xb3, 0x8c, 0x59, 0x63, 0x3b, 0xf2, - 0xec, 0x92, 0x2f, 0x56, 0xc8, 0xa3, 0xe7, 0x19, 0xb1, 0x33, 0x92, 0x90, 0x34, 0xc6, 0xde, 0x63, - 0x2a, 0x29, 0xaa, 0x38, 0x51, 0x95, 0x0b, 0x17, 0x8e, 0x39, 0xe6, 0x9e, 0x4b, 0x72, 0xc9, 0x85, - 0xaa, 0x1c, 0xc2, 0x31, 0x87, 0x14, 0x49, 0x41, 0x4e, 0xf9, 0x07, 0x72, 0x4a, 0x25, 0xf5, 0x3e, - 0xf4, 0x39, 0x23, 0x8f, 0x0c, 0x39, 0xa4, 0x2a, 0x37, 0xbd, 0x56, 0xf7, 0x4f, 0x7a, 0xad, 0xf7, - 0xba, 0xfb, 0xd7, 0x7a, 0xf0, 0xa8, 0x87, 0x4d, 0x1d, 0x3b, 0x13, 0xc3, 0xf4, 0xd6, 0xb5, 0xc3, - 0x81, 0xb1, 0xee, 0x9d, 0xda, 0xd8, 0x5d, 0xb3, 0x1d, 0xcb, 0xb3, 0x50, 0x33, 0xbc, 0xb9, 0x46, - 0x6e, 0x4a, 0x8f, 0x45, 0xb4, 0x07, 0xce, 0xa9, 0xed, 0x59, 0xeb, 0xb6, 0x63, 0x59, 0x47, 0x4c, - 0x5f, 0xba, 0x1a, 0xb9, 0x4d, 0x71, 0xa2, 0x68, 0xb1, 0xbb, 0xdc, 0xf8, 0x01, 0x3e, 0xf5, 0xef, - 0x3e, 0x36, 0x63, 0x6b, 0x6b, 0x8e, 0x36, 0xf1, 0x6f, 0xaf, 0x0e, 0x2d, 0x6b, 0x38, 0xc6, 0xeb, - 0x74, 0x74, 0x38, 0x3d, 0x5a, 0xf7, 0x8c, 0x09, 0x76, 0x3d, 0x6d, 0x62, 0x73, 0x85, 0x8b, 0x43, - 0x6b, 0x68, 0xd1, 0xcb, 0x75, 0x72, 0xc5, 0xa5, 0x2b, 0x49, 0x33, 0x7d, 0xea, 0x68, 0x9e, 0x61, - 0x99, 0xec, 0xbe, 0xfc, 0x3b, 0x11, 0x2a, 0x0a, 0xfe, 0x60, 0x8a, 0x5d, 0x0f, 0x6d, 0x40, 0x11, - 0x0f, 0x46, 0x56, 0x5b, 0xb8, 0x26, 0x3c, 0x5d, 0xdb, 0xb8, 0xba, 0x96, 0x98, 0xfc, 0x1a, 0xd7, - 0xeb, 0x0e, 0x46, 0x56, 0x2f, 0xa7, 0x50, 0x5d, 0x74, 0x13, 0x4a, 0x47, 0xe3, 0xa9, 0x3b, 0x6a, - 0xe7, 0xa9, 0xd1, 0x63, 0x69, 0x46, 0xb7, 0x89, 0x52, 0x2f, 0xa7, 0x30, 0x6d, 0xf2, 0x28, 0xc3, - 0x3c, 0xb2, 0xda, 0x85, 0xb3, 0x1f, 0xb5, 0x6d, 0x1e, 0xd1, 0x47, 0x11, 0x5d, 0xb4, 0x05, 0xe0, - 0x62, 0x4f, 0xb5, 0x6c, 0xf2, 0xfa, 0xed, 0x22, 0xb5, 0x7c, 0x3c, 0xcd, 0xf2, 0x00, 0x7b, 0x7b, - 0x54, 0xb1, 0x97, 0x53, 0x44, 0xd7, 0x1f, 0x10, 0x0c, 0xc3, 0x34, 0x3c, 0x75, 0x30, 0xd2, 0x0c, - 0xb3, 0x5d, 0x3a, 0x1b, 0x63, 0xdb, 0x34, 0xbc, 0x0e, 0x51, 0x24, 0x18, 0x86, 0x3f, 0x20, 0x53, - 0xfe, 0x60, 0x8a, 0x9d, 0xd3, 0x76, 0xf9, 0xec, 0x29, 0xff, 0x90, 0x28, 0x91, 0x29, 0x53, 0x6d, - 0xd4, 0x85, 0xda, 0x21, 0x1e, 0x1a, 0xa6, 0x7a, 0x38, 0xb6, 0x06, 0x0f, 0xda, 0x15, 0x6a, 0x2c, - 0xa7, 0x19, 0x6f, 0x11, 0xd5, 0x2d, 0xa2, 0xd9, 0xcb, 0x29, 0x70, 0x18, 0x8c, 0xd0, 0x6b, 0x50, - 0x1d, 0x8c, 0xf0, 0xe0, 0x81, 0xea, 0x9d, 0xb4, 0xab, 0x14, 0x63, 0x35, 0x0d, 0xa3, 0x43, 0xf4, - 0xfa, 0x27, 0xbd, 0x9c, 0x52, 0x19, 0xb0, 0x4b, 0x32, 0x7f, 0x1d, 0x8f, 0x8d, 0x63, 0xec, 0x10, - 0x7b, 0xf1, 0xec, 0xf9, 0xdf, 0x62, 0x9a, 0x14, 0x41, 0xd4, 0xfd, 0x01, 0x7a, 0x1d, 0x44, 0x6c, - 0xea, 0x7c, 0x1a, 0x40, 0x21, 0xae, 0xa5, 0xae, 0x15, 0x53, 0xf7, 0x27, 0x51, 0xc5, 0xfc, 0x1a, - 0xbd, 0x0c, 0xe5, 0x81, 0x35, 0x99, 0x18, 0x5e, 0xbb, 0x46, 0xad, 0x57, 0x52, 0x27, 0x40, 0xb5, - 0x7a, 0x39, 0x85, 0xeb, 0xa3, 0x5d, 0x68, 0x8c, 0x0d, 0xd7, 0x53, 0x5d, 0x53, 0xb3, 0xdd, 0x91, - 0xe5, 0xb9, 0xed, 0x25, 0x8a, 0xf0, 0x44, 0x1a, 0xc2, 0x8e, 0xe1, 0x7a, 0x07, 0xbe, 0x72, 0x2f, - 0xa7, 0xd4, 0xc7, 0x51, 0x01, 0xc1, 0xb3, 0x8e, 0x8e, 0xb0, 0x13, 0x00, 0xb6, 0xeb, 0x67, 0xe3, - 0xed, 0x11, 0x6d, 0xdf, 0x9e, 0xe0, 0x59, 0x51, 0x01, 0xfa, 0x29, 0x5c, 0x18, 0x5b, 0x9a, 0x1e, - 0xc0, 0xa9, 0x83, 0xd1, 0xd4, 0x7c, 0xd0, 0x6e, 0x50, 0xd0, 0x67, 0x52, 0x5f, 0xd2, 0xd2, 0x74, - 0x1f, 0xa2, 0x43, 0x0c, 0x7a, 0x39, 0x65, 0x79, 0x9c, 0x14, 0xa2, 0xfb, 0x70, 0x51, 0xb3, 0xed, - 0xf1, 0x69, 0x12, 0xbd, 0x49, 0xd1, 0x6f, 0xa4, 0xa1, 0x6f, 0x12, 0x9b, 0x24, 0x3c, 0xd2, 0x66, - 0xa4, 0xa8, 0x0f, 0x2d, 0xdb, 0xc1, 0xb6, 0xe6, 0x60, 0xd5, 0x76, 0x2c, 0xdb, 0x72, 0xb5, 0x71, - 0xbb, 0x45, 0xb1, 0x9f, 0x4a, 0xc3, 0xde, 0x67, 0xfa, 0xfb, 0x5c, 0xbd, 0x97, 0x53, 0x9a, 0x76, - 0x5c, 0xc4, 0x50, 0xad, 0x01, 0x76, 0xdd, 0x10, 0x75, 0x79, 0x11, 0x2a, 0xd5, 0x8f, 0xa3, 0xc6, - 0x44, 0x5b, 0x15, 0x28, 0x1d, 0x6b, 0xe3, 0x29, 0x96, 0x9f, 0x82, 0x5a, 0x24, 0x2c, 0xa1, 0x36, - 0x54, 0x26, 0xd8, 0x75, 0xb5, 0x21, 0xa6, 0x51, 0x4c, 0x54, 0xfc, 0xa1, 0xdc, 0x80, 0xa5, 0x68, - 0x28, 0x92, 0x3f, 0xca, 0x07, 0x96, 0x24, 0xca, 0x10, 0xcb, 0x63, 0xec, 0xb8, 0x24, 0xb4, 0x70, - 0x4b, 0x3e, 0x44, 0xd7, 0xa1, 0x4e, 0xd7, 0xba, 0xea, 0xdf, 0x27, 0xa1, 0xae, 0xa8, 0x2c, 0x51, - 0xe1, 0x3d, 0xae, 0xb4, 0x0a, 0x35, 0x7b, 0xc3, 0x0e, 0x54, 0x0a, 0x54, 0x05, 0xec, 0x0d, 0xdb, - 0x57, 0xd8, 0x81, 0x26, 0x89, 0xd8, 0xd6, 0xd4, 0xe3, 0x7e, 0xc0, 0x3c, 0x84, 0x5d, 0x59, 0x63, - 0x21, 0x7a, 0xcd, 0x0f, 0xd1, 0x6b, 0xb7, 0x78, 0x88, 0xde, 0xaa, 0x7e, 0xfe, 0xe5, 0x6a, 0xee, - 0xd3, 0xbf, 0xae, 0x0a, 0x4a, 0x83, 0xdb, 0x32, 0x07, 0x60, 0xf4, 0x16, 0xf8, 0x12, 0x95, 0x6f, - 0xa5, 0x52, 0x76, 0xb0, 0x3a, 0x37, 0x65, 0xdb, 0x4b, 0xfe, 0x1e, 0xb4, 0x92, 0x41, 0x13, 0xb5, - 0xa0, 0xf0, 0x00, 0x9f, 0x72, 0x4f, 0x90, 0x4b, 0x74, 0x91, 0x7b, 0x9c, 0xce, 0x5e, 0x54, 0xb8, - 0xfb, 0xff, 0x98, 0x0f, 0x8c, 0x83, 0x68, 0x89, 0x5e, 0x86, 0x22, 0x79, 0x02, 0xcf, 0x23, 0xd2, - 0xcc, 0x2b, 0xf5, 0xfd, 0xcc, 0xc5, 0xde, 0xe9, 0x13, 0xf2, 0x4e, 0xd4, 0x02, 0x5d, 0x21, 0xc1, - 0x4d, 0x33, 0x4c, 0xd5, 0xd0, 0xf9, 0x73, 0x2a, 0x74, 0xbc, 0xad, 0xa3, 0x3b, 0xd0, 0x1a, 0x58, - 0xa6, 0x8b, 0x4d, 0x77, 0xea, 0xaa, 0x2c, 0x33, 0xf2, 0xec, 0x31, 0x1b, 0x7c, 0x3a, 0xbe, 0xe2, - 0x3e, 0xd5, 0x53, 0x9a, 0x83, 0xb8, 0x00, 0xdd, 0x06, 0x38, 0xd6, 0xc6, 0x86, 0xae, 0x79, 0x96, - 0xe3, 0xb6, 0x8b, 0xd7, 0x0a, 0x73, 0x61, 0xee, 0xf9, 0x2a, 0x77, 0x6d, 0x5d, 0xf3, 0xf0, 0x56, - 0x91, 0xbc, 0xad, 0x12, 0xb1, 0x44, 0x4f, 0x42, 0x53, 0xb3, 0x6d, 0xd5, 0xf5, 0x34, 0x0f, 0xab, - 0x87, 0xa7, 0x1e, 0x76, 0xe9, 0x77, 0x58, 0x52, 0xea, 0x9a, 0x6d, 0x1f, 0x10, 0xe9, 0x16, 0x11, - 0xa2, 0x27, 0xa0, 0x41, 0xf2, 0x87, 0xa1, 0x8d, 0xd5, 0x11, 0x36, 0x86, 0x23, 0x8f, 0xe6, 0x8e, - 0x82, 0x52, 0xe7, 0xd2, 0x1e, 0x15, 0xca, 0x7a, 0xb0, 0x46, 0x69, 0xee, 0x40, 0x08, 0x8a, 0xba, - 0xe6, 0x69, 0xd4, 0x91, 0x4b, 0x0a, 0xbd, 0x26, 0x32, 0x5b, 0xf3, 0x46, 0xdc, 0x3d, 0xf4, 0x1a, - 0x5d, 0x82, 0x32, 0x87, 0x2d, 0x50, 0x58, 0x3e, 0x22, 0xdf, 0xcc, 0x76, 0xac, 0x63, 0xb6, 0xd2, - 0xaa, 0x0a, 0x1b, 0xc8, 0xbf, 0xc8, 0xc3, 0xf2, 0x4c, 0x96, 0x21, 0xb8, 0x23, 0xcd, 0x1d, 0xf9, - 0xcf, 0x22, 0xd7, 0xe8, 0x25, 0x82, 0xab, 0xe9, 0xd8, 0xe1, 0xd9, 0xbd, 0x1d, 0x75, 0x11, 0xab, - 0x6c, 0x7a, 0xf4, 0x3e, 0x77, 0x0d, 0xd7, 0x46, 0x7b, 0xd0, 0x1a, 0x6b, 0xae, 0xbf, 0x34, 0xd5, - 0x48, 0xa6, 0x9f, 0xcd, 0x55, 0x3b, 0x9a, 0x1f, 0xe7, 0xc9, 0x36, 0xe4, 0x40, 0x8d, 0x71, 0x4c, - 0x8a, 0x14, 0xb8, 0x78, 0x78, 0xfa, 0x50, 0x33, 0x3d, 0xc3, 0xc4, 0xea, 0xcc, 0x97, 0xbb, 0x32, - 0x03, 0xda, 0x3d, 0x36, 0x74, 0x6c, 0x0e, 0xfc, 0x4f, 0x76, 0x21, 0x30, 0x0e, 0x3e, 0xa9, 0x2b, - 0x2b, 0xd0, 0x88, 0xe7, 0x49, 0xd4, 0x80, 0xbc, 0x77, 0xc2, 0x1d, 0x90, 0xf7, 0x4e, 0xd0, 0x77, - 0xa0, 0x48, 0x26, 0x49, 0x27, 0xdf, 0x98, 0x53, 0xa4, 0x70, 0xbb, 0xfe, 0xa9, 0x8d, 0x15, 0xaa, - 0x29, 0xcb, 0xc1, 0x6e, 0x08, 0x72, 0x67, 0x12, 0x55, 0x7e, 0x06, 0x9a, 0x89, 0xe4, 0x18, 0xf9, - 0x7e, 0x42, 0xf4, 0xfb, 0xc9, 0x4d, 0xa8, 0xc7, 0x32, 0xa1, 0x7c, 0x09, 0x2e, 0xce, 0x4b, 0x6c, - 0xf2, 0x28, 0x90, 0xc7, 0x12, 0x14, 0xba, 0x09, 0xd5, 0x20, 0xb3, 0x09, 0x3c, 0x40, 0x24, 0x67, - 0xe1, 0x2b, 0x2b, 0x81, 0x2a, 0xd9, 0x86, 0x64, 0x59, 0xd3, 0xf5, 0x90, 0xa7, 0x2f, 0x5e, 0xd1, - 0x6c, 0xbb, 0xa7, 0xb9, 0x23, 0xf9, 0x3d, 0x68, 0xa7, 0x65, 0xad, 0xc4, 0x34, 0x8a, 0xc1, 0x32, - 0xbc, 0x04, 0xe5, 0x23, 0xcb, 0x99, 0x68, 0x1e, 0x05, 0xab, 0x2b, 0x7c, 0x44, 0x96, 0x27, 0xcb, - 0x60, 0x05, 0x2a, 0x66, 0x03, 0x59, 0x85, 0x2b, 0xa9, 0x99, 0x8b, 0x98, 0x18, 0xa6, 0x8e, 0x99, - 0x3f, 0xeb, 0x0a, 0x1b, 0x84, 0x40, 0xec, 0x65, 0xd9, 0x80, 0x3c, 0xd6, 0xa5, 0x73, 0xa5, 0xf8, - 0xa2, 0xc2, 0x47, 0xf2, 0xdf, 0x05, 0xb8, 0x34, 0x3f, 0x7f, 0xa1, 0x9b, 0x00, 0x2c, 0xd4, 0x07, - 0xdb, 0xae, 0xb6, 0x71, 0x69, 0x76, 0xd1, 0xdf, 0xd2, 0x3c, 0x4d, 0x11, 0xa9, 0x26, 0xb9, 0x24, - 0x61, 0x20, 0x34, 0x53, 0x5d, 0xe3, 0x21, 0x5b, 0x33, 0x05, 0xa5, 0x1e, 0xe8, 0x1c, 0x18, 0x0f, - 0xe3, 0xe1, 0xad, 0x10, 0x0f, 0x6f, 0xa1, 0xef, 0x8a, 0xb1, 0x2d, 0xec, 0xc7, 0xd2, 0xd2, 0x79, - 0x63, 0xa9, 0xfc, 0x51, 0x74, 0x9a, 0xb1, 0xec, 0x19, 0xd9, 0xd7, 0xc2, 0xb9, 0xf6, 0x75, 0xdc, - 0x3d, 0xf9, 0x8c, 0xee, 0x91, 0x7f, 0x05, 0x50, 0x55, 0xb0, 0x6b, 0x93, 0x20, 0x8c, 0xb6, 0x40, - 0xc4, 0x27, 0x03, 0xcc, 0x8a, 0x78, 0x21, 0xb5, 0x08, 0x66, 0xda, 0x5d, 0x5f, 0x93, 0x54, 0xa0, - 0x81, 0x19, 0x7a, 0x91, 0x13, 0x95, 0x74, 0xce, 0xc1, 0xcd, 0xa3, 0x4c, 0xe5, 0x25, 0x9f, 0xa9, - 0x14, 0x52, 0x8b, 0x4e, 0x66, 0x95, 0xa0, 0x2a, 0x2f, 0x72, 0xaa, 0x52, 0x5c, 0xf0, 0xb0, 0x18, - 0x57, 0xe9, 0xc4, 0xb8, 0x4a, 0x69, 0xc1, 0x34, 0x53, 0xc8, 0x4a, 0x27, 0x46, 0x56, 0xca, 0x0b, - 0x40, 0x52, 0xd8, 0xca, 0x4b, 0x3e, 0x5b, 0xa9, 0x2c, 0x98, 0x76, 0x82, 0xae, 0xdc, 0x8e, 0xd3, - 0x15, 0x46, 0x35, 0xae, 0xa7, 0x5a, 0xa7, 0xf2, 0x95, 0xef, 0x47, 0xf8, 0x8a, 0x98, 0x4a, 0x16, - 0x18, 0xc8, 0x1c, 0xc2, 0xd2, 0x89, 0x11, 0x16, 0x58, 0xe0, 0x83, 0x14, 0xc6, 0xf2, 0x46, 0x94, - 0xb1, 0xd4, 0x52, 0x49, 0x0f, 0x5f, 0x34, 0xf3, 0x28, 0xcb, 0x2b, 0x01, 0x65, 0x59, 0x4a, 0xe5, - 0x5c, 0x7c, 0x0e, 0x49, 0xce, 0xb2, 0x37, 0xc3, 0x59, 0x18, 0xc7, 0x78, 0x32, 0x15, 0x62, 0x01, - 0x69, 0xd9, 0x9b, 0x21, 0x2d, 0x8d, 0x05, 0x80, 0x0b, 0x58, 0xcb, 0xcf, 0xe6, 0xb3, 0x96, 0x74, - 0x5e, 0xc1, 0x5f, 0x33, 0x1b, 0x6d, 0x51, 0x53, 0x68, 0x0b, 0xa3, 0x16, 0xcf, 0xa6, 0xc2, 0x67, - 0xe6, 0x2d, 0x77, 0xe7, 0xf0, 0x16, 0xc6, 0x30, 0x9e, 0x4e, 0x05, 0xcf, 0x40, 0x5c, 0xee, 0xce, - 0x21, 0x2e, 0x68, 0x21, 0x6c, 0x76, 0xe6, 0xf2, 0x0c, 0xa9, 0xc2, 0x12, 0x61, 0x8e, 0x64, 0x32, - 0xec, 0x38, 0x96, 0xc3, 0x2b, 0x6f, 0x36, 0x90, 0x9f, 0x26, 0x75, 0x61, 0x18, 0xd2, 0xce, 0x60, - 0x39, 0xb4, 0x62, 0x88, 0x84, 0x31, 0xf9, 0xb7, 0x42, 0x68, 0x4b, 0x4b, 0xa9, 0x68, 0x4d, 0x29, - 0xf2, 0x9a, 0x32, 0xc2, 0x7d, 0xf2, 0x71, 0xee, 0xb3, 0x0a, 0x35, 0x52, 0x09, 0x24, 0x68, 0x8d, - 0x66, 0x07, 0xb4, 0xe6, 0x06, 0x2c, 0xd3, 0x52, 0x8f, 0xe5, 0x85, 0x58, 0x0a, 0x6b, 0x92, 0x1b, - 0x6c, 0x2b, 0xb1, 0x5c, 0xf6, 0x3c, 0x5c, 0x88, 0xe8, 0x06, 0x15, 0x06, 0xab, 0x98, 0x5b, 0x81, - 0xf6, 0x26, 0x2f, 0x35, 0xde, 0x0e, 0x1d, 0x14, 0x12, 0x13, 0x04, 0xc5, 0x81, 0xa5, 0x63, 0x9e, - 0xff, 0xe9, 0x35, 0x21, 0x2b, 0x63, 0x6b, 0xc8, 0x33, 0x2a, 0xb9, 0x24, 0x5a, 0x41, 0xcc, 0x16, - 0x59, 0x48, 0x96, 0xff, 0x20, 0x84, 0x78, 0x21, 0x57, 0x99, 0x47, 0x2b, 0x84, 0xff, 0x0e, 0xad, - 0xc8, 0x7f, 0x63, 0x5a, 0x11, 0xad, 0xbf, 0x0a, 0xf1, 0xfa, 0xeb, 0x9f, 0x42, 0xf8, 0x85, 0x03, - 0x92, 0xf0, 0xcd, 0x3c, 0x12, 0x16, 0x53, 0x25, 0xfa, 0xbd, 0x78, 0x31, 0xc5, 0xa9, 0x5f, 0x99, - 0x3e, 0x37, 0x4e, 0xfd, 0x2a, 0xac, 0xbc, 0xa2, 0x03, 0xf4, 0x32, 0x88, 0xb4, 0xf5, 0xa9, 0x5a, - 0xb6, 0xcb, 0xd3, 0xc3, 0xa3, 0xd1, 0xb9, 0xb2, 0x0e, 0xe7, 0xda, 0x3e, 0xd1, 0xd9, 0xb3, 0x5d, - 0xa5, 0x6a, 0xf3, 0xab, 0x48, 0xad, 0x23, 0xc6, 0x6a, 0x9d, 0xab, 0x20, 0x92, 0xb7, 0x77, 0x6d, - 0x6d, 0x80, 0x69, 0xa8, 0x17, 0x95, 0x50, 0x20, 0xdf, 0x07, 0x34, 0x9b, 0x6c, 0x50, 0x0f, 0xca, - 0xf8, 0x18, 0x9b, 0x1e, 0xf9, 0x6a, 0x85, 0x64, 0x39, 0xc2, 0xb9, 0x00, 0x36, 0xbd, 0xad, 0x36, - 0x71, 0xf2, 0x3f, 0xbe, 0x5c, 0x6d, 0x31, 0xed, 0xe7, 0xac, 0x89, 0xe1, 0xe1, 0x89, 0xed, 0x9d, - 0x2a, 0xdc, 0x5e, 0xfe, 0x4b, 0x9e, 0x14, 0xe6, 0xb1, 0x44, 0x34, 0xd7, 0xb7, 0xfe, 0x06, 0xca, - 0x47, 0x48, 0x59, 0x36, 0x7f, 0xaf, 0x00, 0x0c, 0x35, 0x57, 0xfd, 0x50, 0x33, 0x3d, 0xac, 0x73, - 0xa7, 0x47, 0x24, 0x48, 0x82, 0x2a, 0x19, 0x4d, 0x5d, 0xac, 0x73, 0x7e, 0x18, 0x8c, 0x23, 0xf3, - 0xac, 0x7c, 0xbb, 0x79, 0xc6, 0xbd, 0x5c, 0x4d, 0x78, 0x39, 0x52, 0x34, 0x8b, 0xd1, 0xa2, 0x99, - 0xbc, 0x9b, 0xed, 0x18, 0x96, 0x63, 0x78, 0xa7, 0xf4, 0xd3, 0x14, 0x94, 0x60, 0x8c, 0xae, 0x43, - 0x7d, 0x82, 0x27, 0xb6, 0x65, 0x8d, 0x55, 0x16, 0xbc, 0x6a, 0xd4, 0x74, 0x89, 0x0b, 0xbb, 0x34, - 0x86, 0xfd, 0x32, 0x1f, 0x6e, 0xbf, 0x90, 0x1c, 0xfd, 0xdf, 0x39, 0x58, 0xfe, 0x75, 0x81, 0x70, - 0xc4, 0x78, 0xa9, 0x81, 0x0e, 0x60, 0x39, 0xd8, 0xfe, 0xea, 0x94, 0x86, 0x05, 0x7f, 0x41, 0x67, - 0x8d, 0x1f, 0xad, 0xe3, 0xb8, 0xd8, 0x45, 0x3f, 0x82, 0xcb, 0x89, 0xd0, 0x16, 0x40, 0xe7, 0x33, - 0x46, 0xb8, 0x47, 0xe2, 0x11, 0xce, 0x47, 0x0e, 0x7d, 0x55, 0xf8, 0x96, 0xbe, 0xfa, 0xdf, 0xed, - 0x8a, 0x6d, 0x43, 0x23, 0x5e, 0xd2, 0xcd, 0x5d, 0x97, 0xd7, 0xa1, 0xee, 0x60, 0x8f, 0x50, 0xba, - 0x58, 0x03, 0x66, 0x89, 0x09, 0x79, 0x5b, 0x67, 0x1f, 0x1e, 0x99, 0x5b, 0xda, 0xa1, 0xef, 0x82, - 0x18, 0x56, 0x85, 0x42, 0x4a, 0x2f, 0x23, 0xe0, 0xe7, 0xa1, 0xae, 0xfc, 0x7b, 0x21, 0x84, 0x8c, - 0x33, 0xfe, 0x2e, 0x94, 0x1d, 0xec, 0x4e, 0xc7, 0x8c, 0x83, 0x37, 0x36, 0x9e, 0xcf, 0x56, 0x14, - 0x12, 0xe9, 0x74, 0xec, 0x29, 0xdc, 0x58, 0xbe, 0x0f, 0x65, 0x26, 0x41, 0x35, 0xa8, 0xdc, 0xdd, - 0xbd, 0xb3, 0xbb, 0xf7, 0xce, 0x6e, 0x2b, 0x87, 0x00, 0xca, 0x9b, 0x9d, 0x4e, 0x77, 0xbf, 0xdf, - 0x12, 0x90, 0x08, 0xa5, 0xcd, 0xad, 0x3d, 0xa5, 0xdf, 0xca, 0x13, 0xb1, 0xd2, 0x7d, 0xab, 0xdb, - 0xe9, 0xb7, 0x0a, 0x68, 0x19, 0xea, 0xec, 0x5a, 0xbd, 0xbd, 0xa7, 0xbc, 0xbd, 0xd9, 0x6f, 0x15, - 0x23, 0xa2, 0x83, 0xee, 0xee, 0xad, 0xae, 0xd2, 0x2a, 0xc9, 0x2f, 0x10, 0x92, 0x9f, 0x52, 0x46, - 0x86, 0x74, 0x5e, 0x88, 0xd0, 0x79, 0xf9, 0xd3, 0x3c, 0x48, 0xe9, 0xb5, 0x21, 0x7a, 0x2b, 0x31, - 0xf1, 0x8d, 0x73, 0x14, 0x96, 0x89, 0xd9, 0xa3, 0x27, 0xa0, 0xe1, 0xe0, 0x23, 0xec, 0x0d, 0x46, - 0xac, 0x56, 0x65, 0xb9, 0xbc, 0xae, 0xd4, 0xb9, 0x94, 0x1a, 0xb9, 0x4c, 0xed, 0x7d, 0x3c, 0xf0, - 0x54, 0x16, 0x24, 0xd9, 0x76, 0x10, 0x89, 0x1a, 0x91, 0x1e, 0x30, 0xa1, 0xfc, 0xde, 0xb9, 0x7c, - 0x29, 0x42, 0x49, 0xe9, 0xf6, 0x95, 0x1f, 0xb7, 0x0a, 0x08, 0x41, 0x83, 0x5e, 0xaa, 0x07, 0xbb, - 0x9b, 0xfb, 0x07, 0xbd, 0x3d, 0xe2, 0xcb, 0x0b, 0xd0, 0xf4, 0x7d, 0xe9, 0x0b, 0x4b, 0xf2, 0x3e, - 0x5c, 0x4e, 0x29, 0x6c, 0xbf, 0x61, 0x47, 0x43, 0xfe, 0x8d, 0x10, 0x85, 0x8c, 0x77, 0x0f, 0xde, - 0x4c, 0x78, 0x7a, 0x3d, 0x6b, 0x39, 0x9c, 0x74, 0xb3, 0x04, 0x55, 0xcc, 0x1b, 0x75, 0xd4, 0xc1, - 0x4b, 0x4a, 0x30, 0x96, 0x9f, 0x5f, 0xec, 0xb4, 0x70, 0xd5, 0xe5, 0xe5, 0x7f, 0x0b, 0xd0, 0x4c, - 0x04, 0x2f, 0xb4, 0x01, 0x25, 0xc6, 0xf8, 0xd2, 0xfe, 0x67, 0xd2, 0xd8, 0xcb, 0x23, 0x1d, 0x53, - 0x45, 0xaf, 0xc5, 0x5e, 0x69, 0x26, 0x48, 0x32, 0x67, 0xf9, 0xdd, 0x45, 0x6e, 0x1a, 0x58, 0xa0, - 0xd7, 0x41, 0x0c, 0xa2, 0x30, 0x6f, 0x33, 0x3c, 0x3e, 0x6b, 0x1e, 0xc4, 0x6f, 0x6e, 0x1f, 0xda, - 0xa0, 0x57, 0xc2, 0x42, 0xbc, 0x38, 0xcb, 0x33, 0xb9, 0x39, 0x53, 0xe0, 0xc6, 0xbe, 0xbe, 0xdc, - 0x81, 0x5a, 0x64, 0x3e, 0xe8, 0x51, 0x10, 0x27, 0xda, 0x09, 0xef, 0x49, 0xb3, 0xae, 0x62, 0x75, - 0xa2, 0x9d, 0xb0, 0x76, 0xf4, 0x65, 0xa8, 0x90, 0x9b, 0x43, 0xcd, 0xe5, 0x7d, 0xaa, 0xf2, 0x44, - 0x3b, 0x79, 0x53, 0x73, 0xe5, 0x77, 0xa1, 0x11, 0xef, 0xc7, 0x92, 0xbd, 0xe8, 0x58, 0x53, 0x53, - 0xa7, 0x18, 0x25, 0x85, 0x0d, 0xd0, 0x4d, 0x28, 0x1d, 0x5b, 0x2c, 0x91, 0xcc, 0x0f, 0x5a, 0xf7, - 0x2c, 0x0f, 0x47, 0xfa, 0xb9, 0x4c, 0x5b, 0x7e, 0x08, 0x25, 0x9a, 0x18, 0x48, 0x28, 0xa5, 0x9d, - 0x55, 0x4e, 0x42, 0xc8, 0x35, 0x7a, 0x17, 0x40, 0xf3, 0x3c, 0xc7, 0x38, 0x9c, 0x86, 0xc0, 0xab, - 0xf3, 0x13, 0xcb, 0xa6, 0xaf, 0xb7, 0x75, 0x95, 0x67, 0x98, 0x8b, 0xa1, 0x69, 0x24, 0xcb, 0x44, - 0x00, 0xe5, 0x5d, 0x68, 0xc4, 0x6d, 0xa3, 0xff, 0x38, 0x96, 0xe6, 0xfc, 0xe3, 0x08, 0x0a, 0xdd, - 0xa0, 0x4c, 0x2e, 0xb0, 0x2e, 0x3a, 0x1d, 0xc8, 0x1f, 0x0b, 0x50, 0xed, 0x9f, 0xf0, 0x35, 0x9a, - 0xd2, 0xc0, 0x0d, 0x4d, 0xf3, 0xd1, 0x76, 0x25, 0xeb, 0x08, 0x17, 0x82, 0x3e, 0xf3, 0x1b, 0xc1, - 0x86, 0x2a, 0x66, 0xed, 0x6f, 0xf8, 0x8d, 0x39, 0x1e, 0xae, 0x5f, 0x05, 0x31, 0x58, 0x55, 0x84, - 0xcd, 0x69, 0xba, 0xee, 0x60, 0xd7, 0xe5, 0x73, 0xf3, 0x87, 0xf4, 0x7f, 0x80, 0xf5, 0x21, 0x6f, - 0x88, 0x16, 0x14, 0x36, 0x90, 0x75, 0x68, 0x26, 0x4a, 0x0a, 0xf4, 0x2a, 0x54, 0xec, 0xe9, 0xa1, - 0xea, 0xbb, 0x27, 0xb1, 0x79, 0xfc, 0xca, 0x7e, 0x7a, 0x38, 0x36, 0x06, 0x77, 0xf0, 0xa9, 0xff, - 0x32, 0xf6, 0xf4, 0xf0, 0x0e, 0xf3, 0x22, 0x7b, 0x4a, 0x3e, 0xfa, 0x94, 0x63, 0xa8, 0xfa, 0x8b, - 0x02, 0xfd, 0x20, 0xba, 0x4f, 0xfc, 0xbf, 0x44, 0xa9, 0x65, 0x0e, 0x87, 0x8f, 0x6c, 0x93, 0x1b, - 0xb0, 0xec, 0x1a, 0x43, 0x13, 0xeb, 0x6a, 0xc8, 0x27, 0xe9, 0xd3, 0xaa, 0x4a, 0x93, 0xdd, 0xd8, - 0xf1, 0xc9, 0xa4, 0xfc, 0x2f, 0x01, 0xaa, 0xfe, 0x86, 0x45, 0x2f, 0x44, 0xd6, 0x5d, 0x63, 0x4e, - 0x2f, 0xcf, 0x57, 0x0c, 0x5b, 0xfa, 0xf1, 0x77, 0xcd, 0x9f, 0xff, 0x5d, 0xd3, 0xfe, 0xcd, 0xf8, - 0x8d, 0xdd, 0xe2, 0xb9, 0x7f, 0x92, 0x3d, 0x07, 0xc8, 0xb3, 0x3c, 0x6d, 0xac, 0x1e, 0x5b, 0x9e, - 0x61, 0x0e, 0x55, 0xe6, 0x6c, 0x56, 0xed, 0xb6, 0xe8, 0x9d, 0x7b, 0xf4, 0xc6, 0x3e, 0xf5, 0xfb, - 0xcf, 0x05, 0xa8, 0x06, 0xd5, 0xc1, 0x79, 0x3b, 0xf4, 0x97, 0xa0, 0xcc, 0x13, 0x20, 0x6b, 0xd1, - 0xf3, 0x51, 0xf0, 0xb3, 0xa8, 0x18, 0xf9, 0x59, 0x24, 0x41, 0x75, 0x82, 0x3d, 0x8d, 0xe6, 0x19, - 0x46, 0xe9, 0x83, 0xf1, 0x8d, 0x57, 0xa0, 0x16, 0xf9, 0x59, 0x42, 0x76, 0xde, 0x6e, 0xf7, 0x9d, - 0x56, 0x4e, 0xaa, 0x7c, 0xfc, 0xd9, 0xb5, 0xc2, 0x2e, 0xfe, 0x90, 0xac, 0x59, 0xa5, 0xdb, 0xe9, - 0x75, 0x3b, 0x77, 0x5a, 0x82, 0x54, 0xfb, 0xf8, 0xb3, 0x6b, 0x15, 0x05, 0xd3, 0x16, 0xe0, 0x8d, - 0x1e, 0x2c, 0x45, 0xbf, 0x4a, 0x3c, 0x1d, 0x20, 0x68, 0xdc, 0xba, 0xbb, 0xbf, 0xb3, 0xdd, 0xd9, - 0xec, 0x77, 0xd5, 0x7b, 0x7b, 0xfd, 0x6e, 0x4b, 0x40, 0x97, 0xe1, 0xc2, 0xce, 0xf6, 0x9b, 0xbd, - 0xbe, 0xda, 0xd9, 0xd9, 0xee, 0xee, 0xf6, 0xd5, 0xcd, 0x7e, 0x7f, 0xb3, 0x73, 0xa7, 0x95, 0xdf, - 0xf8, 0x53, 0x0d, 0x9a, 0x9b, 0x5b, 0x9d, 0x6d, 0x92, 0xff, 0x8d, 0x81, 0xc6, 0x5b, 0xac, 0x45, - 0xda, 0x51, 0x39, 0xf3, 0xb0, 0x8b, 0x74, 0x76, 0x87, 0x19, 0xdd, 0x86, 0x12, 0x6d, 0xb6, 0xa0, - 0xb3, 0x4f, 0xbf, 0x48, 0x0b, 0x5a, 0xce, 0xe4, 0x65, 0xe8, 0xf6, 0x38, 0xf3, 0x38, 0x8c, 0x74, - 0x76, 0x07, 0x1a, 0x29, 0x20, 0x86, 0xdd, 0x92, 0xc5, 0xc7, 0x63, 0xa4, 0x0c, 0x5d, 0x69, 0x82, - 0x19, 0x52, 0xb6, 0xc5, 0xc7, 0x45, 0xa4, 0x0c, 0x01, 0x0c, 0xed, 0x40, 0xc5, 0x67, 0xd9, 0x8b, - 0x0e, 0xb0, 0x48, 0x0b, 0x3b, 0xc6, 0xe4, 0x13, 0xb0, 0x6e, 0xc8, 0xd9, 0xa7, 0x71, 0xa4, 0x05, - 0xed, 0x6f, 0xb4, 0x0d, 0x65, 0x5e, 0xed, 0x2f, 0x38, 0x94, 0x22, 0x2d, 0xea, 0x00, 0x13, 0xa7, - 0x85, 0x6d, 0xa6, 0xc5, 0x67, 0x8c, 0xa4, 0x0c, 0x9d, 0x7d, 0x74, 0x17, 0x20, 0xd2, 0xfb, 0xc8, - 0x70, 0x78, 0x48, 0xca, 0xd2, 0xb1, 0x47, 0x7b, 0x50, 0x0d, 0xa8, 0xe8, 0xc2, 0xa3, 0x3c, 0xd2, - 0xe2, 0xd6, 0x39, 0xba, 0x0f, 0xf5, 0x38, 0xd3, 0xc9, 0x76, 0x40, 0x47, 0xca, 0xd8, 0x13, 0x27, - 0xf8, 0x71, 0xda, 0x93, 0xed, 0xc0, 0x8e, 0x94, 0xb1, 0x45, 0x8e, 0xde, 0x87, 0xe5, 0x59, 0x5a, - 0x92, 0xfd, 0xfc, 0x8e, 0x74, 0x8e, 0xa6, 0x39, 0x9a, 0x00, 0x9a, 0x43, 0x67, 0xce, 0x71, 0x9c, - 0x47, 0x3a, 0x4f, 0x0f, 0x1d, 0xe9, 0xd0, 0x4c, 0x72, 0x84, 0xac, 0xc7, 0x7b, 0xa4, 0xcc, 0xfd, - 0x74, 0xf6, 0x94, 0x38, 0x6d, 0xc8, 0x7a, 0xdc, 0x47, 0xca, 0xdc, 0x5e, 0xdf, 0xea, 0x7e, 0xfe, - 0xd5, 0x8a, 0xf0, 0xc5, 0x57, 0x2b, 0xc2, 0xdf, 0xbe, 0x5a, 0x11, 0x3e, 0xf9, 0x7a, 0x25, 0xf7, - 0xc5, 0xd7, 0x2b, 0xb9, 0x3f, 0x7f, 0xbd, 0x92, 0xfb, 0xc9, 0xb3, 0x43, 0xc3, 0x1b, 0x4d, 0x0f, - 0xd7, 0x06, 0xd6, 0x64, 0x3d, 0x7a, 0xae, 0x72, 0xde, 0x59, 0xcf, 0xc3, 0x32, 0x4d, 0xba, 0x2f, - 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x48, 0xa6, 0x8c, 0x1f, 0x0b, 0x2a, 0x00, 0x00, + // 3094 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcb, 0x73, 0xdc, 0xc6, + 0xd1, 0x5f, 0xec, 0x1b, 0xbd, 0xdc, 0x07, 0x47, 0xb2, 0xb4, 0x82, 0x65, 0x52, 0x86, 0xca, 0x2f, + 0xd9, 0x26, 0x3f, 0xd3, 0x25, 0x7f, 0x56, 0xec, 0xc4, 0x26, 0x57, 0x2b, 0x2f, 0x2d, 0x9a, 0x64, + 0xc0, 0x95, 0x9c, 0x97, 0x05, 0x83, 0x8b, 0xe1, 0x2e, 0xac, 0x5d, 0x00, 0x06, 0xb0, 0x34, 0xa9, + 0x63, 0x2a, 0xa9, 0x54, 0xf9, 0xe4, 0xaa, 0x5c, 0x7c, 0xf1, 0x3d, 0x97, 0xdc, 0x73, 0x49, 0x2e, + 0xa9, 0x4a, 0xb9, 0x2a, 0x87, 0xf8, 0x98, 0x43, 0xca, 0x49, 0xd9, 0x39, 0xe5, 0x1f, 0xc8, 0x29, + 0x95, 0xd4, 0x3c, 0xf0, 0xdc, 0x05, 0x17, 0xb4, 0x73, 0xcb, 0x6d, 0xa6, 0xa7, 0xbb, 0x31, 0xd3, + 0x33, 0xd3, 0xdd, 0xbf, 0xc6, 0xc0, 0xe3, 0x1e, 0x36, 0x75, 0xec, 0x4c, 0x0c, 0xd3, 0x5b, 0xd7, + 0x0e, 0x07, 0xc6, 0xba, 0x77, 0x6a, 0x63, 0x77, 0xcd, 0x76, 0x2c, 0xcf, 0x42, 0xcd, 0x70, 0x70, + 0x8d, 0x0c, 0x4a, 0x4f, 0x44, 0xb8, 0x07, 0xce, 0xa9, 0xed, 0x59, 0xeb, 0xb6, 0x63, 0x59, 0x47, + 0x8c, 0x5f, 0xba, 0x1a, 0x19, 0xa6, 0x7a, 0xa2, 0xda, 0x62, 0xa3, 0x5c, 0xf8, 0x21, 0x3e, 0xf5, + 0x47, 0x9f, 0x98, 0x91, 0xb5, 0x35, 0x47, 0x9b, 0xf8, 0xc3, 0xab, 0x43, 0xcb, 0x1a, 0x8e, 0xf1, + 0x3a, 0xed, 0x1d, 0x4e, 0x8f, 0xd6, 0x3d, 0x63, 0x82, 0x5d, 0x4f, 0x9b, 0xd8, 0x9c, 0xe1, 0xe2, + 0xd0, 0x1a, 0x5a, 0xb4, 0xb9, 0x4e, 0x5a, 0x9c, 0xba, 0x92, 0x14, 0xd3, 0xa7, 0x8e, 0xe6, 0x19, + 0x96, 0xc9, 0xc6, 0xe5, 0xdf, 0x8a, 0x50, 0x51, 0xf0, 0x87, 0x53, 0xec, 0x7a, 0x68, 0x03, 0x8a, + 0x78, 0x30, 0xb2, 0xda, 0xc2, 0x35, 0xe1, 0xd9, 0xda, 0xc6, 0xd5, 0xb5, 0xc4, 0xe2, 0xd7, 0x38, + 0x5f, 0x77, 0x30, 0xb2, 0x7a, 0x39, 0x85, 0xf2, 0xa2, 0x9b, 0x50, 0x3a, 0x1a, 0x4f, 0xdd, 0x51, + 0x3b, 0x4f, 0x85, 0x9e, 0x48, 0x13, 0xba, 0x43, 0x98, 0x7a, 0x39, 0x85, 0x71, 0x93, 0x4f, 0x19, + 0xe6, 0x91, 0xd5, 0x2e, 0x9c, 0xfd, 0xa9, 0x6d, 0xf3, 0x88, 0x7e, 0x8a, 0xf0, 0xa2, 0x2d, 0x00, + 0x17, 0x7b, 0xaa, 0x65, 0x93, 0xe9, 0xb7, 0x8b, 0x54, 0xf2, 0xc9, 0x34, 0xc9, 0x03, 0xec, 0xed, + 0x51, 0xc6, 0x5e, 0x4e, 0x11, 0x5d, 0xbf, 0x43, 0x74, 0x18, 0xa6, 0xe1, 0xa9, 0x83, 0x91, 0x66, + 0x98, 0xed, 0xd2, 0xd9, 0x3a, 0xb6, 0x4d, 0xc3, 0xeb, 0x10, 0x46, 0xa2, 0xc3, 0xf0, 0x3b, 0x64, + 0xc9, 0x1f, 0x4e, 0xb1, 0x73, 0xda, 0x2e, 0x9f, 0xbd, 0xe4, 0xef, 0x13, 0x26, 0xb2, 0x64, 0xca, + 0x8d, 0xba, 0x50, 0x3b, 0xc4, 0x43, 0xc3, 0x54, 0x0f, 0xc7, 0xd6, 0xe0, 0x61, 0xbb, 0x42, 0x85, + 0xe5, 0x34, 0xe1, 0x2d, 0xc2, 0xba, 0x45, 0x38, 0x7b, 0x39, 0x05, 0x0e, 0x83, 0x1e, 0x7a, 0x1d, + 0xaa, 0x83, 0x11, 0x1e, 0x3c, 0x54, 0xbd, 0x93, 0x76, 0x95, 0xea, 0x58, 0x4d, 0xd3, 0xd1, 0x21, + 0x7c, 0xfd, 0x93, 0x5e, 0x4e, 0xa9, 0x0c, 0x58, 0x93, 0xac, 0x5f, 0xc7, 0x63, 0xe3, 0x18, 0x3b, + 0x44, 0x5e, 0x3c, 0x7b, 0xfd, 0xb7, 0x19, 0x27, 0xd5, 0x20, 0xea, 0x7e, 0x07, 0xbd, 0x01, 0x22, + 0x36, 0x75, 0xbe, 0x0c, 0xa0, 0x2a, 0xae, 0xa5, 0x9e, 0x15, 0x53, 0xf7, 0x17, 0x51, 0xc5, 0xbc, + 0x8d, 0x5e, 0x85, 0xf2, 0xc0, 0x9a, 0x4c, 0x0c, 0xaf, 0x5d, 0xa3, 0xd2, 0x2b, 0xa9, 0x0b, 0xa0, + 0x5c, 0xbd, 0x9c, 0xc2, 0xf9, 0xd1, 0x2e, 0x34, 0xc6, 0x86, 0xeb, 0xa9, 0xae, 0xa9, 0xd9, 0xee, + 0xc8, 0xf2, 0xdc, 0xf6, 0x12, 0xd5, 0xf0, 0x54, 0x9a, 0x86, 0x1d, 0xc3, 0xf5, 0x0e, 0x7c, 0xe6, + 0x5e, 0x4e, 0xa9, 0x8f, 0xa3, 0x04, 0xa2, 0xcf, 0x3a, 0x3a, 0xc2, 0x4e, 0xa0, 0xb0, 0x5d, 0x3f, + 0x5b, 0xdf, 0x1e, 0xe1, 0xf6, 0xe5, 0x89, 0x3e, 0x2b, 0x4a, 0x40, 0x3f, 0x86, 0x0b, 0x63, 0x4b, + 0xd3, 0x03, 0x75, 0xea, 0x60, 0x34, 0x35, 0x1f, 0xb6, 0x1b, 0x54, 0xe9, 0x73, 0xa9, 0x93, 0xb4, + 0x34, 0xdd, 0x57, 0xd1, 0x21, 0x02, 0xbd, 0x9c, 0xb2, 0x3c, 0x4e, 0x12, 0xd1, 0x03, 0xb8, 0xa8, + 0xd9, 0xf6, 0xf8, 0x34, 0xa9, 0xbd, 0x49, 0xb5, 0xdf, 0x48, 0xd3, 0xbe, 0x49, 0x64, 0x92, 0xea, + 0x91, 0x36, 0x43, 0x45, 0x7d, 0x68, 0xd9, 0x0e, 0xb6, 0x35, 0x07, 0xab, 0xb6, 0x63, 0xd9, 0x96, + 0xab, 0x8d, 0xdb, 0x2d, 0xaa, 0xfb, 0x99, 0x34, 0xdd, 0xfb, 0x8c, 0x7f, 0x9f, 0xb3, 0xf7, 0x72, + 0x4a, 0xd3, 0x8e, 0x93, 0x98, 0x56, 0x6b, 0x80, 0x5d, 0x37, 0xd4, 0xba, 0xbc, 0x48, 0x2b, 0xe5, + 0x8f, 0x6b, 0x8d, 0x91, 0xb6, 0x2a, 0x50, 0x3a, 0xd6, 0xc6, 0x53, 0x2c, 0x3f, 0x03, 0xb5, 0x88, + 0x5b, 0x42, 0x6d, 0xa8, 0x4c, 0xb0, 0xeb, 0x6a, 0x43, 0x4c, 0xbd, 0x98, 0xa8, 0xf8, 0x5d, 0xb9, + 0x01, 0x4b, 0x51, 0x57, 0x24, 0xff, 0x4a, 0x80, 0xa5, 0xbe, 0x31, 0xc1, 0xd6, 0xd4, 0x73, 0x89, + 0x9b, 0x41, 0x3b, 0xd0, 0xf4, 0x58, 0x9f, 0x4f, 0x14, 0x73, 0x47, 0x78, 0x65, 0x8d, 0xf9, 0xd0, + 0x35, 0xdf, 0x87, 0xae, 0xdd, 0xe6, 0x3e, 0x74, 0xab, 0xfa, 0xf9, 0x97, 0xab, 0xb9, 0x4f, 0xff, + 0xba, 0x2a, 0x28, 0x0d, 0x2e, 0xcb, 0x66, 0x88, 0xd1, 0xdb, 0xe0, 0x53, 0x54, 0x7e, 0xd6, 0xf3, + 0xd9, 0x95, 0xd5, 0xb9, 0x28, 0x3b, 0xff, 0x64, 0xaa, 0xb5, 0x88, 0x43, 0x24, 0x8b, 0x3c, 0xc6, + 0x8e, 0x4b, 0xbc, 0x20, 0x5f, 0x24, 0xef, 0xa2, 0xeb, 0x50, 0xa7, 0xd7, 0x52, 0xf5, 0xc7, 0xc9, + 0x47, 0x8b, 0xca, 0x12, 0x25, 0xde, 0xe7, 0x4c, 0xab, 0x50, 0xb3, 0x37, 0xec, 0x80, 0xa5, 0x40, + 0x59, 0xc0, 0xde, 0xb0, 0x7d, 0x86, 0x5b, 0x50, 0xe5, 0x13, 0x70, 0xb9, 0x9b, 0x9d, 0xf5, 0x71, + 0x51, 0xd3, 0x29, 0x01, 0xbb, 0xfc, 0x1d, 0x68, 0x25, 0x1d, 0x30, 0x6a, 0x41, 0xe1, 0x21, 0x3e, + 0xe5, 0x53, 0x25, 0x4d, 0x74, 0x91, 0xef, 0x1e, 0x9d, 0x9e, 0xa8, 0xf0, 0xad, 0xfc, 0x63, 0x3e, + 0x10, 0x0e, 0x3c, 0x2f, 0x7a, 0x15, 0x8a, 0x44, 0x39, 0xdf, 0x0a, 0x69, 0xc6, 0x7a, 0x7d, 0x3f, + 0x0a, 0x32, 0xf3, 0x7d, 0x42, 0xcc, 0x47, 0x25, 0xd0, 0x15, 0xe2, 0x28, 0x35, 0xc3, 0x54, 0x0d, + 0x9d, 0x7f, 0xa7, 0x42, 0xfb, 0xdb, 0x3a, 0xba, 0x0b, 0xad, 0x81, 0x65, 0xba, 0xd8, 0x74, 0xa7, + 0xae, 0xca, 0xa2, 0x2c, 0x8f, 0x44, 0xb3, 0x8e, 0xac, 0xe3, 0x33, 0xee, 0x53, 0x3e, 0xa5, 0x39, + 0x88, 0x13, 0xd0, 0x1d, 0x80, 0x63, 0x6d, 0x6c, 0xe8, 0x9a, 0x67, 0x39, 0xc4, 0x5e, 0x85, 0xb9, + 0x6a, 0xee, 0xfb, 0x2c, 0xf7, 0x6c, 0x5d, 0xf3, 0xf0, 0x56, 0x91, 0xcc, 0x56, 0x89, 0x48, 0xa2, + 0xa7, 0xa1, 0xa9, 0xd9, 0xb6, 0xea, 0x7a, 0x9a, 0x87, 0xd5, 0xc3, 0x53, 0x0f, 0xbb, 0x34, 0x3e, + 0x2d, 0x29, 0x75, 0xcd, 0xb6, 0x0f, 0x08, 0x75, 0x8b, 0x10, 0xd1, 0x53, 0xd0, 0x20, 0xb1, 0xc8, + 0xd0, 0xc6, 0xea, 0x08, 0x1b, 0xc3, 0x91, 0x47, 0xe3, 0x50, 0x41, 0xa9, 0x73, 0x6a, 0x8f, 0x12, + 0x65, 0x3d, 0x38, 0xef, 0x34, 0x0e, 0x21, 0x04, 0x45, 0x5d, 0xf3, 0x34, 0x6a, 0xc8, 0x25, 0x85, + 0xb6, 0x09, 0xcd, 0xd6, 0xbc, 0x11, 0x37, 0x0f, 0x6d, 0xa3, 0x4b, 0x50, 0xe6, 0x6a, 0x0b, 0x54, + 0x2d, 0xef, 0x91, 0x3d, 0xb3, 0x1d, 0xeb, 0x18, 0xd3, 0x13, 0x51, 0x55, 0x58, 0x47, 0xfe, 0x59, + 0x1e, 0x96, 0x67, 0x22, 0x16, 0xd1, 0x3b, 0xd2, 0xdc, 0x91, 0xff, 0x2d, 0xd2, 0x46, 0xaf, 0x10, + 0xbd, 0x9a, 0x8e, 0x1d, 0x7e, 0x11, 0xda, 0x51, 0x13, 0xb1, 0x2c, 0xa9, 0x47, 0xc7, 0xb9, 0x69, + 0x38, 0x37, 0xda, 0x83, 0xd6, 0x58, 0x73, 0xfd, 0x5b, 0xa4, 0x46, 0xb2, 0x86, 0xd9, 0xb8, 0xb7, + 0xa3, 0xf9, 0x31, 0x83, 0x1c, 0x4b, 0xae, 0xa8, 0x31, 0x8e, 0x51, 0x91, 0x02, 0x17, 0x0f, 0x4f, + 0x1f, 0x69, 0xa6, 0x67, 0x98, 0x58, 0x9d, 0xd9, 0xb9, 0x2b, 0x33, 0x4a, 0xbb, 0xc7, 0x86, 0x8e, + 0xcd, 0x81, 0xbf, 0x65, 0x17, 0x02, 0xe1, 0x60, 0x4b, 0x5d, 0x59, 0x81, 0x46, 0x3c, 0xe6, 0xa2, + 0x06, 0xe4, 0xbd, 0x13, 0x6e, 0x80, 0xbc, 0x77, 0x82, 0xfe, 0x0f, 0x8a, 0x64, 0x91, 0x74, 0xf1, + 0x8d, 0x39, 0x09, 0x0f, 0x97, 0xeb, 0x9f, 0xda, 0x58, 0xa1, 0x9c, 0xb2, 0x1c, 0xdc, 0x86, 0x20, + 0x0e, 0x27, 0xb5, 0xca, 0xcf, 0x41, 0x33, 0x11, 0x68, 0x23, 0xfb, 0x27, 0x44, 0xf7, 0x4f, 0x6e, + 0x42, 0x3d, 0x16, 0x55, 0xe5, 0x4b, 0x70, 0x71, 0x5e, 0x90, 0x94, 0x47, 0x01, 0x3d, 0x16, 0xec, + 0xd0, 0x4d, 0xa8, 0x06, 0x51, 0xd2, 0x77, 0x8c, 0xc9, 0x55, 0xf8, 0xcc, 0x4a, 0xc0, 0x4a, 0xae, + 0x21, 0x39, 0xd6, 0xf4, 0x3c, 0xe4, 0xe9, 0xc4, 0x2b, 0x9a, 0x6d, 0xf7, 0x34, 0x77, 0x24, 0xbf, + 0x0f, 0xed, 0xb4, 0x08, 0x98, 0x58, 0x46, 0x31, 0x38, 0x86, 0x97, 0xa0, 0x7c, 0x64, 0x39, 0x13, + 0x8d, 0xf9, 0xd3, 0xba, 0xc2, 0x7b, 0xe4, 0x78, 0xb2, 0x68, 0x58, 0xa0, 0x64, 0xd6, 0x91, 0x55, + 0xb8, 0x92, 0x1a, 0x05, 0x89, 0x88, 0x61, 0xea, 0x98, 0xd9, 0xb3, 0xae, 0xb0, 0x4e, 0xa8, 0x88, + 0x4d, 0x96, 0x75, 0xc8, 0x67, 0x5d, 0xba, 0x56, 0xaa, 0x5f, 0x54, 0x78, 0x4f, 0xfe, 0xbb, 0x00, + 0x97, 0xe6, 0xc7, 0x42, 0x74, 0x13, 0x80, 0xf9, 0xe2, 0xe0, 0xda, 0xd5, 0x36, 0x2e, 0xcd, 0x1e, + 0xfa, 0xdb, 0x9a, 0xa7, 0x29, 0x22, 0xe5, 0x24, 0x4d, 0xe2, 0x06, 0x42, 0x31, 0xd5, 0x35, 0x1e, + 0xb1, 0x33, 0x53, 0x50, 0xea, 0x01, 0xcf, 0x81, 0xf1, 0x28, 0xee, 0xde, 0x0a, 0x71, 0xf7, 0x16, + 0xda, 0xae, 0x18, 0xbb, 0xc2, 0xbe, 0x2f, 0x2d, 0x9d, 0xd7, 0x97, 0xca, 0xbf, 0x88, 0x2e, 0x33, + 0x16, 0x89, 0x23, 0xf7, 0x5a, 0x38, 0xd7, 0xbd, 0x8e, 0x9b, 0x27, 0x9f, 0xd1, 0x3c, 0xf2, 0x2f, + 0x01, 0xaa, 0x0a, 0x76, 0x6d, 0xe2, 0x84, 0xd1, 0x16, 0x88, 0xf8, 0x64, 0x80, 0x19, 0x20, 0x10, + 0x52, 0x13, 0x6a, 0xc6, 0xdd, 0xf5, 0x39, 0x49, 0x36, 0x1b, 0x88, 0xa1, 0x97, 0x39, 0xe8, 0x49, + 0xc7, 0x2f, 0x5c, 0x3c, 0x8a, 0x7a, 0x5e, 0xf1, 0x51, 0x4f, 0x21, 0x35, 0x81, 0x65, 0x52, 0x09, + 0xd8, 0xf3, 0x32, 0x87, 0x3d, 0xc5, 0x05, 0x1f, 0x8b, 0xe1, 0x9e, 0x4e, 0x0c, 0xf7, 0x94, 0x16, + 0x2c, 0x33, 0x05, 0xf8, 0x74, 0x62, 0xc0, 0xa7, 0xbc, 0x40, 0x49, 0x0a, 0xf2, 0x79, 0xc5, 0x47, + 0x3e, 0x95, 0x05, 0xcb, 0x4e, 0x40, 0x9f, 0x3b, 0x71, 0xe8, 0xc3, 0x60, 0xcb, 0xf5, 0x54, 0xe9, + 0x54, 0xec, 0xf3, 0xdd, 0x08, 0xf6, 0x11, 0x53, 0x81, 0x07, 0x53, 0x32, 0x07, 0xfc, 0x74, 0x62, + 0xe0, 0x07, 0x16, 0xd8, 0x20, 0x05, 0xfd, 0xbc, 0x19, 0x45, 0x3f, 0xb5, 0x54, 0x00, 0xc5, 0x0f, + 0xcd, 0x3c, 0xf8, 0x73, 0x2b, 0x80, 0x3f, 0x4b, 0xa9, 0xf8, 0x8d, 0xaf, 0x21, 0x89, 0x7f, 0xf6, + 0x66, 0xf0, 0x0f, 0xc3, 0x2b, 0x4f, 0xa7, 0xaa, 0x58, 0x00, 0x80, 0xf6, 0x66, 0x00, 0x50, 0x63, + 0x81, 0xc2, 0x05, 0x08, 0xe8, 0x27, 0xf3, 0x11, 0x50, 0x3a, 0x46, 0xe1, 0xd3, 0xcc, 0x06, 0x81, + 0xd4, 0x14, 0x08, 0xc4, 0x60, 0xca, 0xf3, 0xa9, 0xea, 0x33, 0x63, 0xa0, 0x7b, 0x73, 0x30, 0x10, + 0x43, 0x2b, 0xcf, 0xa6, 0x2a, 0xcf, 0x00, 0x82, 0xee, 0xcd, 0x01, 0x41, 0x68, 0xa1, 0xda, 0xec, + 0x28, 0xe8, 0x39, 0x92, 0x85, 0x25, 0xdc, 0x1c, 0x89, 0x64, 0xd8, 0x71, 0x2c, 0x87, 0x67, 0xde, + 0xac, 0x23, 0x3f, 0x4b, 0xf2, 0xc2, 0xd0, 0xa5, 0x9d, 0x81, 0x98, 0x68, 0xc6, 0x10, 0x71, 0x63, + 0xf2, 0x6f, 0x84, 0x50, 0x96, 0xa6, 0x52, 0xd1, 0x9c, 0x52, 0xe4, 0x39, 0x65, 0x04, 0x9c, 0xe4, + 0xe3, 0xe0, 0x64, 0x15, 0x6a, 0x24, 0x13, 0x48, 0xe0, 0x0e, 0xcd, 0x0e, 0x70, 0xc7, 0x0d, 0x58, + 0xa6, 0xa9, 0x1e, 0x8b, 0x0b, 0xb1, 0x10, 0xd6, 0x24, 0x03, 0xec, 0x2a, 0xb1, 0x58, 0xf6, 0x22, + 0x5c, 0x88, 0xf0, 0x06, 0x19, 0x06, 0xcb, 0x98, 0x5b, 0x01, 0xf7, 0x26, 0x4f, 0x35, 0xde, 0x09, + 0x0d, 0x14, 0x02, 0x13, 0x04, 0xc5, 0x81, 0xa5, 0x63, 0x1e, 0xff, 0x69, 0x9b, 0x80, 0x95, 0xb1, + 0x35, 0xe4, 0x11, 0x95, 0x34, 0x09, 0x57, 0xe0, 0xb3, 0x45, 0xe6, 0x92, 0xe5, 0xdf, 0x0b, 0xa1, + 0xbe, 0x10, 0xab, 0xcc, 0x83, 0x15, 0xc2, 0x7f, 0x07, 0x56, 0xe4, 0xbf, 0x31, 0xac, 0x88, 0xe6, + 0x5f, 0x85, 0x78, 0xfe, 0xf5, 0x4f, 0x21, 0xdc, 0xe1, 0x00, 0x24, 0x7c, 0x33, 0x8b, 0x84, 0xc9, + 0x54, 0x89, 0xee, 0x17, 0x4f, 0xa6, 0x38, 0xf4, 0x2b, 0xd3, 0xef, 0xc6, 0xa1, 0x5f, 0x85, 0xa5, + 0x57, 0xb4, 0x83, 0x5e, 0x05, 0x91, 0x96, 0x51, 0x55, 0xcb, 0x76, 0x79, 0x78, 0x78, 0x3c, 0xba, + 0x56, 0x56, 0x2d, 0x5d, 0xdb, 0x27, 0x3c, 0x7b, 0xb6, 0xab, 0x54, 0x6d, 0xde, 0x8a, 0xe4, 0x3a, + 0x62, 0x2c, 0xd7, 0xb9, 0x0a, 0x22, 0x99, 0xbd, 0x6b, 0x6b, 0x03, 0x4c, 0x5d, 0xbd, 0xa8, 0x84, + 0x04, 0xf9, 0x01, 0xa0, 0xd9, 0x60, 0x83, 0x7a, 0x50, 0xc6, 0xc7, 0xd8, 0xf4, 0xc8, 0xae, 0x15, + 0x92, 0xe9, 0x08, 0xc7, 0x02, 0xd8, 0xf4, 0xb6, 0xda, 0xc4, 0xc8, 0xff, 0xf8, 0x72, 0xb5, 0xc5, + 0xb8, 0x5f, 0xb0, 0x26, 0x86, 0x87, 0x27, 0xb6, 0x77, 0xaa, 0x70, 0x79, 0xf9, 0x2f, 0x79, 0x92, + 0x98, 0xc7, 0x02, 0xd1, 0x5c, 0xdb, 0xfa, 0x17, 0x28, 0x1f, 0x01, 0x65, 0xd9, 0xec, 0xbd, 0x02, + 0x30, 0xd4, 0x5c, 0xf5, 0x23, 0xcd, 0xf4, 0xb0, 0xce, 0x8d, 0x1e, 0xa1, 0x20, 0x09, 0xaa, 0xa4, + 0x37, 0x75, 0xb1, 0xce, 0xf1, 0x61, 0xd0, 0x8f, 0xac, 0xb3, 0xf2, 0xed, 0xd6, 0x19, 0xb7, 0x72, + 0x35, 0x61, 0xe5, 0x48, 0xd2, 0x2c, 0x46, 0x93, 0x66, 0x32, 0x37, 0xdb, 0x31, 0x2c, 0xc7, 0xf0, + 0x4e, 0xe9, 0xd6, 0x14, 0x94, 0xa0, 0x8f, 0xae, 0x43, 0x7d, 0x82, 0x27, 0xb6, 0x65, 0x8d, 0x55, + 0xe6, 0xbc, 0x6a, 0x54, 0x74, 0x89, 0x13, 0xbb, 0xd4, 0x87, 0xfd, 0x3c, 0x1f, 0x5e, 0xbf, 0x10, + 0x1c, 0xfd, 0xcf, 0x19, 0x58, 0xfe, 0x03, 0xad, 0x98, 0xc4, 0x53, 0x0d, 0x74, 0x00, 0xcb, 0xc1, + 0xf5, 0x57, 0xa7, 0xd4, 0x2d, 0xf8, 0x07, 0x3a, 0xab, 0xff, 0x68, 0x1d, 0xc7, 0xc9, 0x2e, 0xfa, + 0x01, 0x5c, 0x4e, 0xb8, 0xb6, 0x40, 0x75, 0x3e, 0xa3, 0x87, 0x7b, 0x2c, 0xee, 0xe1, 0x7c, 0xcd, + 0xa1, 0xad, 0x0a, 0xdf, 0xd2, 0x56, 0xdf, 0xa2, 0x6c, 0xb5, 0x4d, 0xf0, 0x7b, 0x34, 0xe7, 0x9a, + 0x7b, 0x70, 0xae, 0x43, 0xdd, 0xc1, 0x1e, 0xc1, 0x5c, 0xb1, 0x0a, 0xc9, 0x12, 0x23, 0xf2, 0xba, + 0xcb, 0x3e, 0x3c, 0x36, 0x37, 0xf7, 0x42, 0xff, 0x0f, 0x62, 0x98, 0xb6, 0x09, 0x29, 0xc5, 0x86, + 0x00, 0x40, 0x87, 0xbc, 0xf2, 0xef, 0x84, 0x50, 0x65, 0x1c, 0x92, 0x77, 0xa1, 0xec, 0x60, 0x77, + 0x3a, 0x66, 0x20, 0xb9, 0xb1, 0xf1, 0x62, 0xb6, 0xac, 0x8d, 0x50, 0xa7, 0x63, 0x4f, 0xe1, 0xc2, + 0xf2, 0x03, 0x28, 0x33, 0x0a, 0xaa, 0x41, 0xe5, 0xde, 0xee, 0xdd, 0xdd, 0xbd, 0x77, 0x77, 0x5b, + 0x39, 0x04, 0x50, 0xde, 0xec, 0x74, 0xba, 0xfb, 0xfd, 0x96, 0x80, 0x44, 0x28, 0x6d, 0x6e, 0xed, + 0x29, 0xfd, 0x56, 0x9e, 0x90, 0x95, 0xee, 0xdb, 0xdd, 0x4e, 0xbf, 0x55, 0x40, 0xcb, 0x50, 0x67, + 0x6d, 0xf5, 0xce, 0x9e, 0xf2, 0xce, 0x66, 0xbf, 0x55, 0x8c, 0x90, 0x0e, 0xba, 0xbb, 0xb7, 0xbb, + 0x4a, 0xab, 0x24, 0xbf, 0x44, 0x50, 0x78, 0x4a, 0x9e, 0x17, 0xe2, 0x6d, 0x21, 0x82, 0xb7, 0xe5, + 0x4f, 0xf3, 0x20, 0xa5, 0x27, 0x6f, 0xe8, 0xed, 0xc4, 0xc2, 0x37, 0xce, 0x91, 0xf9, 0x25, 0x56, + 0x8f, 0x9e, 0x82, 0x86, 0x83, 0x8f, 0xb0, 0x37, 0x18, 0xb1, 0x64, 0x92, 0x05, 0xdb, 0xba, 0x52, + 0xe7, 0x54, 0x2a, 0xe4, 0x32, 0xb6, 0x0f, 0xf0, 0xc0, 0x53, 0x99, 0x17, 0x63, 0xe7, 0x55, 0x24, + 0x6c, 0x84, 0x7a, 0xc0, 0x88, 0xf2, 0xfb, 0xe7, 0xb2, 0xa5, 0x08, 0x25, 0xa5, 0xdb, 0x57, 0x7e, + 0xd8, 0x2a, 0x20, 0x04, 0x0d, 0xda, 0x54, 0x0f, 0x76, 0x37, 0xf7, 0x0f, 0x7a, 0x7b, 0xc4, 0x96, + 0x17, 0xa0, 0xe9, 0xdb, 0xd2, 0x27, 0x96, 0xe4, 0x7d, 0xb8, 0x9c, 0x92, 0x79, 0x7e, 0xc3, 0x92, + 0x83, 0xfc, 0x6b, 0x21, 0xaa, 0x32, 0x0e, 0xef, 0xdf, 0x4a, 0x58, 0x7a, 0x3d, 0x6b, 0xbe, 0x9a, + 0x34, 0xb3, 0x04, 0x55, 0xcc, 0x2b, 0x69, 0xd4, 0xc0, 0x4b, 0x4a, 0xd0, 0x97, 0x5f, 0x5c, 0x6c, + 0xb4, 0xf0, 0xd4, 0xe5, 0xe5, 0x7f, 0x0b, 0xd0, 0x4c, 0x78, 0x17, 0xb4, 0x01, 0x25, 0x06, 0xc9, + 0xd2, 0x7e, 0x5e, 0x52, 0xe7, 0xc8, 0x5d, 0x11, 0x63, 0x45, 0xaf, 0xc7, 0xa6, 0x34, 0xe3, 0xc5, + 0x98, 0xb1, 0xfc, 0xf2, 0x1f, 0x17, 0x0d, 0x24, 0xd0, 0x1b, 0x20, 0x06, 0x6e, 0x92, 0xd7, 0x01, + 0x9e, 0x9c, 0x15, 0x0f, 0x1c, 0x2c, 0x97, 0x0f, 0x65, 0xd0, 0xad, 0x30, 0x53, 0x2e, 0xce, 0x02, + 0x41, 0x2e, 0xce, 0x18, 0xb8, 0xb0, 0xcf, 0x2f, 0x77, 0xa0, 0x16, 0x59, 0x0f, 0x7a, 0x1c, 0xc4, + 0x89, 0x76, 0xc2, 0x8b, 0xc6, 0xac, 0xec, 0x57, 0x9d, 0x68, 0x27, 0xac, 0x5e, 0x7c, 0x19, 0x2a, + 0x64, 0x70, 0xa8, 0xb9, 0xbc, 0x90, 0x54, 0x9e, 0x68, 0x27, 0x6f, 0x69, 0xae, 0xfc, 0x1e, 0x34, + 0xe2, 0x05, 0x53, 0x72, 0x17, 0x1d, 0x6b, 0x6a, 0xea, 0x54, 0x47, 0x49, 0x61, 0x1d, 0x74, 0x13, + 0x4a, 0xc7, 0x16, 0xf3, 0xf4, 0xf3, 0x9d, 0xd6, 0x7d, 0xcb, 0xc3, 0x91, 0x82, 0x2b, 0xe3, 0x96, + 0x1f, 0x41, 0x89, 0x7a, 0x6e, 0xe2, 0x4a, 0x69, 0xe9, 0x93, 0xa3, 0x04, 0xd2, 0x46, 0xef, 0x01, + 0x68, 0x9e, 0xe7, 0x18, 0x87, 0xd3, 0x50, 0xf1, 0xea, 0x7c, 0xcf, 0xbf, 0xe9, 0xf3, 0x6d, 0x5d, + 0xe5, 0x21, 0xe0, 0x62, 0x28, 0x1a, 0x09, 0x03, 0x11, 0x85, 0xf2, 0x2e, 0x34, 0xe2, 0xb2, 0xd1, + 0x9f, 0x10, 0x4b, 0x73, 0x7e, 0x42, 0x04, 0x99, 0x68, 0x90, 0xc7, 0x16, 0x58, 0x99, 0x9b, 0x76, + 0xe4, 0x8f, 0x05, 0xa8, 0xf6, 0x4f, 0xf8, 0x19, 0x4d, 0xa9, 0xb0, 0x86, 0xa2, 0xf9, 0x68, 0x3d, + 0x91, 0x95, 0x6c, 0x0b, 0x41, 0x21, 0xf8, 0xcd, 0xe0, 0x42, 0x15, 0xb3, 0x16, 0x20, 0xfc, 0xca, + 0x19, 0x77, 0xd7, 0xaf, 0x81, 0x18, 0x9c, 0x2a, 0x02, 0xb7, 0x34, 0x5d, 0x77, 0xb0, 0xeb, 0xf2, + 0xb5, 0xf9, 0x5d, 0x5a, 0xb0, 0xb7, 0x3e, 0xe2, 0x15, 0xcb, 0x82, 0xc2, 0x3a, 0xb2, 0x0e, 0xcd, + 0x44, 0xcc, 0x47, 0xaf, 0x41, 0xc5, 0x9e, 0x1e, 0xaa, 0xbe, 0x79, 0x12, 0x97, 0xc7, 0x4f, 0xbd, + 0xa7, 0x87, 0x63, 0x63, 0x70, 0x17, 0x9f, 0xfa, 0x93, 0xb1, 0xa7, 0x87, 0x77, 0x99, 0x15, 0xd9, + 0x57, 0xf2, 0xd1, 0xaf, 0x1c, 0x43, 0xd5, 0x3f, 0x14, 0xe8, 0x7b, 0xd1, 0x7b, 0xe2, 0xff, 0xc6, + 0x49, 0xcd, 0x43, 0xb8, 0xfa, 0xc8, 0x35, 0xb9, 0x01, 0xcb, 0xae, 0x31, 0x34, 0xb1, 0xae, 0x86, + 0x80, 0x8f, 0x7e, 0xad, 0xaa, 0x34, 0xd9, 0xc0, 0x8e, 0x8f, 0xf6, 0xe4, 0x7f, 0x09, 0x50, 0xf5, + 0x2f, 0x2c, 0x7a, 0x29, 0x72, 0xee, 0x1a, 0x73, 0x72, 0x01, 0x9f, 0x31, 0xac, 0xb9, 0xc7, 0xe7, + 0x9a, 0x3f, 0xff, 0x5c, 0xd3, 0x7e, 0x9e, 0xf8, 0x95, 0xd7, 0xe2, 0xb9, 0xff, 0x62, 0xbd, 0x00, + 0xc8, 0xb3, 0x3c, 0x6d, 0xac, 0x1e, 0x5b, 0x9e, 0x61, 0x0e, 0x55, 0x66, 0x6c, 0x96, 0x8e, 0xb6, + 0xe8, 0xc8, 0x7d, 0x3a, 0xb0, 0x4f, 0xed, 0xfe, 0x53, 0x01, 0xaa, 0x41, 0x76, 0x70, 0xde, 0x12, + 0xfa, 0x25, 0x28, 0xf3, 0x00, 0xc8, 0x6a, 0xe8, 0xbc, 0x17, 0xfc, 0xcd, 0x29, 0x46, 0xfe, 0xe6, + 0x48, 0x50, 0x9d, 0x60, 0x4f, 0xa3, 0x71, 0x86, 0x61, 0xee, 0xa0, 0x7f, 0xe3, 0x16, 0xd4, 0x22, + 0x7f, 0x33, 0xc8, 0xcd, 0xdb, 0xed, 0xbe, 0xdb, 0xca, 0x49, 0x95, 0x8f, 0x3f, 0xbb, 0x56, 0xd8, + 0xc5, 0x1f, 0x91, 0x33, 0xab, 0x74, 0x3b, 0xbd, 0x6e, 0xe7, 0x6e, 0x4b, 0x90, 0x6a, 0x1f, 0x7f, + 0x76, 0xad, 0xa2, 0x60, 0x5a, 0xa3, 0xbb, 0xd1, 0x83, 0xa5, 0xe8, 0xae, 0xc4, 0xc3, 0x01, 0x82, + 0xc6, 0xed, 0x7b, 0xfb, 0x3b, 0xdb, 0x9d, 0xcd, 0x7e, 0x57, 0xbd, 0xbf, 0xd7, 0xef, 0xb6, 0x04, + 0x74, 0x19, 0x2e, 0xec, 0x6c, 0xbf, 0xd5, 0xeb, 0xab, 0x9d, 0x9d, 0xed, 0xee, 0x6e, 0x5f, 0xdd, + 0xec, 0xf7, 0x37, 0x3b, 0x77, 0x5b, 0xf9, 0x8d, 0x3f, 0xd5, 0xa0, 0xb9, 0xb9, 0xd5, 0xd9, 0x26, + 0xf1, 0xdf, 0x18, 0x68, 0xbc, 0x06, 0x5a, 0xa4, 0x25, 0x8f, 0x33, 0x5f, 0xb6, 0x48, 0x67, 0x97, + 0x80, 0xd1, 0x1d, 0x28, 0xd1, 0x6a, 0x08, 0x3a, 0xfb, 0xa9, 0x8b, 0xb4, 0xa0, 0x26, 0x4c, 0x26, + 0x43, 0xaf, 0xc7, 0x99, 0x6f, 0x5f, 0xa4, 0xb3, 0x4b, 0xc4, 0x48, 0x01, 0x31, 0x2c, 0x67, 0x2c, + 0x7e, 0x0b, 0x23, 0x65, 0x28, 0x1b, 0x13, 0x9d, 0x21, 0xa6, 0x5a, 0xfc, 0x36, 0x44, 0xca, 0xe0, + 0xc0, 0xd0, 0x0e, 0x54, 0x7c, 0x18, 0xbc, 0xe8, 0xb5, 0x8a, 0xb4, 0xb0, 0xa4, 0x4b, 0xb6, 0x80, + 0x95, 0x2b, 0xce, 0x7e, 0x7a, 0x23, 0x2d, 0xa8, 0x4f, 0xa3, 0x6d, 0x28, 0xf3, 0x6c, 0x7f, 0xc1, + 0x0b, 0x14, 0x69, 0x51, 0x89, 0x96, 0x18, 0x2d, 0xac, 0x03, 0x2d, 0x7e, 0x50, 0x24, 0x65, 0x28, + 0xbd, 0xa3, 0x7b, 0x00, 0x91, 0xe2, 0x44, 0x86, 0x97, 0x42, 0x52, 0x96, 0x92, 0x3a, 0xda, 0x83, + 0x6a, 0x80, 0x15, 0x17, 0xbe, 0xdb, 0x91, 0x16, 0xd7, 0xb6, 0xd1, 0x03, 0xa8, 0xc7, 0x91, 0x4e, + 0xb6, 0xd7, 0x38, 0x52, 0xc6, 0xa2, 0x35, 0xd1, 0x1f, 0x87, 0x3d, 0xd9, 0x5e, 0xe7, 0x48, 0x19, + 0x6b, 0xd8, 0xe8, 0x03, 0x58, 0x9e, 0x85, 0x25, 0xd9, 0x1f, 0xeb, 0x48, 0xe7, 0xa8, 0x6a, 0xa3, + 0x09, 0xa0, 0x39, 0x70, 0xe6, 0x1c, 0x6f, 0x77, 0xa4, 0xf3, 0x14, 0xb9, 0x91, 0x0e, 0xcd, 0x24, + 0x46, 0xc8, 0xfa, 0x96, 0x47, 0xca, 0x5c, 0xf0, 0x66, 0x5f, 0x89, 0xc3, 0x86, 0xac, 0x6f, 0x7b, + 0xa4, 0xcc, 0xf5, 0xef, 0xad, 0xee, 0xe7, 0x5f, 0xad, 0x08, 0x5f, 0x7c, 0xb5, 0x22, 0xfc, 0xed, + 0xab, 0x15, 0xe1, 0x93, 0xaf, 0x57, 0x72, 0x5f, 0x7c, 0xbd, 0x92, 0xfb, 0xf3, 0xd7, 0x2b, 0xb9, + 0x1f, 0x3d, 0x3f, 0x34, 0xbc, 0xd1, 0xf4, 0x70, 0x6d, 0x60, 0x4d, 0xd6, 0xa3, 0x8f, 0x28, 0xe7, + 0x3d, 0xec, 0x3c, 0x2c, 0xd3, 0xa0, 0xfb, 0xf2, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x2c, + 0x2a, 0x36, 0xf8, 0x29, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4874,7 +4913,7 @@ func (m *RequestFlush) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *RequestInfo) Marshal() (dAtA []byte, err error) { +func (m *TimeoutsInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4884,12 +4923,12 @@ func (m *RequestInfo) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RequestInfo) MarshalTo(dAtA []byte) (int, error) { +func (m *TimeoutsInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TimeoutsInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4901,7 +4940,7 @@ func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n18 i = encodeVarintTypes(dAtA, i, uint64(n18)) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x12 n19, err19 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.TimeoutPropose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutPropose):]) if err19 != nil { return 0, err19 @@ -4909,7 +4948,42 @@ func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n19 i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *RequestInfo) 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 *RequestInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Timeouts != nil { + { + size, err := m.Timeouts.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } if m.P2PVersion != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.P2PVersion)) i-- @@ -5032,12 +5106,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n21, err21 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err21 != nil { - return 0, err21 + n22, err22 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err22 != nil { + return 0, err22 } - i -= n21 - i = encodeVarintTypes(dAtA, i, uint64(n21)) + i -= n22 + i = encodeVarintTypes(dAtA, i, uint64(n22)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -5440,12 +5514,12 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - n25, err25 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err25 != nil { - return 0, err25 + n26, err26 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err26 != nil { + return 0, err26 } - i -= n25 - i = encodeVarintTypes(dAtA, i, uint64(n25)) + i -= n26 + i = encodeVarintTypes(dAtA, i, uint64(n26)) i-- dAtA[i] = 0x2a if m.Height != 0 { @@ -6497,22 +6571,18 @@ func (m *ResponseEndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n49, err49 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.TimeoutCommit, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutCommit):]) - if err49 != nil { - return 0, err49 - } - i -= n49 - i = encodeVarintTypes(dAtA, i, uint64(n49)) - i-- - dAtA[i] = 0x2a - n50, err50 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.TimeoutPropose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutPropose):]) - if err50 != nil { - return 0, err50 + if m.Timeouts != nil { + { + size, err := m.Timeouts.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i -= n50 - i = encodeVarintTypes(dAtA, i, uint64(n50)) - i-- - dAtA[i] = 0x22 if len(m.Events) > 0 { for iNdEx := len(m.Events) - 1; iNdEx >= 0; iNdEx-- { { @@ -7573,6 +7643,19 @@ func (m *RequestFlush) Size() (n int) { return n } +func (m *TimeoutsInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutPropose) + n += 1 + l + sovTypes(uint64(l)) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutCommit) + n += 1 + l + sovTypes(uint64(l)) + return n +} + func (m *RequestInfo) Size() (n int) { if m == nil { return 0 @@ -7589,10 +7672,10 @@ func (m *RequestInfo) Size() (n int) { if m.P2PVersion != 0 { n += 1 + sovTypes(uint64(m.P2PVersion)) } - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutPropose) - n += 1 + l + sovTypes(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutCommit) - n += 1 + l + sovTypes(uint64(l)) + if m.Timeouts != nil { + l = m.Timeouts.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -8348,10 +8431,10 @@ func (m *ResponseEndBlock) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutPropose) - n += 1 + l + sovTypes(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.TimeoutCommit) - n += 1 + l + sovTypes(uint64(l)) + if m.Timeouts != nil { + l = m.Timeouts.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -9460,6 +9543,122 @@ func (m *RequestFlush) Unmarshal(dAtA []byte) error { } return nil } +func (m *TimeoutsInfo) 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: TimeoutsInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TimeoutsInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutPropose", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutPropose, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutCommit", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutCommit, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *RequestInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9561,7 +9760,7 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { } case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutPropose", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Timeouts", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9588,40 +9787,10 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutPropose, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutCommit", 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 m.Timeouts == nil { + m.Timeouts = &TimeoutsInfo{} } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutCommit, dAtA[iNdEx:postIndex]); err != nil { + if err := m.Timeouts.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -13881,7 +14050,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutPropose", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Timeouts", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -13908,40 +14077,10 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutPropose, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutCommit", 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 m.Timeouts == nil { + m.Timeouts = &TimeoutsInfo{} } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.TimeoutCommit, dAtA[iNdEx:postIndex]); err != nil { + if err := m.Timeouts.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index a781ffc4a..27b7bf1c3 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -48,12 +48,16 @@ message RequestEcho { message RequestFlush {} +message TimeoutsInfo { + google.protobuf.Duration timeout_propose = 1 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; + google.protobuf.Duration timeout_commit = 2 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; +} + message RequestInfo { - string version = 1; - uint64 block_version = 2; - uint64 p2p_version = 3; - google.protobuf.Duration timeout_propose = 4 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; - google.protobuf.Duration timeout_commit = 5 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; + string version = 1; + uint64 block_version = 2; + uint64 p2p_version = 3; + TimeoutsInfo timeouts = 4; } // nondeterministic @@ -267,8 +271,7 @@ message ResponseEndBlock { ConsensusParams consensus_param_updates = 2; repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; - google.protobuf.Duration timeout_propose = 4 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; - google.protobuf.Duration timeout_commit = 5 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; + TimeoutsInfo timeouts = 4; } message ResponseCommit { diff --git a/state/execution.go b/state/execution.go index bf7f1e695..de77a88e1 100644 --- a/state/execution.go +++ b/state/execution.go @@ -568,8 +568,8 @@ func updateState( LastHeightConsensusParamsChanged: lastHeightParamsChanged, LastResultsHash: ABCIResponsesResultsHash(abciResponses), AppHash: nil, - timeoutCommit: abciResponses.EndBlock.TimeoutCommit, - timeoutPropose: abciResponses.EndBlock.TimeoutPropose, + timeoutCommit: abciResponses.EndBlock.Timeouts.TimeoutCommit, + timeoutPropose: abciResponses.EndBlock.Timeouts.TimeoutPropose, } return s, nil