diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 06a25a86d..c1332924a 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -191,6 +191,38 @@ func (ResponseVerifyVoteExtension_Result) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{37, 0} } +// TxAction contains App-provided information on what to do with a transaction that is part of a raw proposal +type TxRecord_TxAction int32 + +const ( + TxRecord_UNKNOWN TxRecord_TxAction = 0 + TxRecord_UNMODIFIED TxRecord_TxAction = 1 + TxRecord_ADDED TxRecord_TxAction = 2 + TxRecord_REMOVED TxRecord_TxAction = 3 +) + +var TxRecord_TxAction_name = map[int32]string{ + 0: "UNKNOWN", + 1: "UNMODIFIED", + 2: "ADDED", + 3: "REMOVED", +} + +var TxRecord_TxAction_value = map[string]int32{ + "UNKNOWN": 0, + "UNMODIFIED": 1, + "ADDED": 2, + "REMOVED": 3, +} + +func (x TxRecord_TxAction) String() string { + return proto.EnumName(TxRecord_TxAction_name, int32(x)) +} + +func (TxRecord_TxAction) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{47, 0} +} + type Request struct { // Types that are valid to be assigned to Value: // *Request_Echo @@ -1347,15 +1379,15 @@ func (m *RequestVerifyVoteExtension) GetVote() *types1.Vote { } type RequestPrepareProposal struct { - // block_data is an array of transactions that will be included in a block, + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` + // txs is an array of transactions that will be included in a block, // sent to the app for possible modifications. - // applications can not exceed the size of the data passed to it. - BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` - // If an application decides to populate block_data with extra information, they can not exceed this value. - BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` - // votes includes all votes from the previous block. This contains vote extension data that can be used in proposal - // preparation. The votes here will then form the last commit that gets sent in the proposed block. - Votes []*types1.Vote `protobuf:"bytes,3,rep,name=votes,proto3" json:"votes,omitempty"` + Txs [][]byte `protobuf:"bytes,3,rep,name=txs,proto3" json:"txs,omitempty"` + LocalLastCommit ExtendedCommitInfo `protobuf:"bytes,4,opt,name=local_last_commit,json=localLastCommit,proto3" json:"local_last_commit"` + ByzantineValidators []Evidence `protobuf:"bytes,5,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` + // the modified transactions cannot exceed this size. + MaxTxBytes int64 `protobuf:"varint,6,opt,name=max_tx_bytes,json=maxTxBytes,proto3" json:"max_tx_bytes,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } @@ -1391,27 +1423,48 @@ func (m *RequestPrepareProposal) XXX_DiscardUnknown() { var xxx_messageInfo_RequestPrepareProposal proto.InternalMessageInfo -func (m *RequestPrepareProposal) GetBlockData() [][]byte { +func (m *RequestPrepareProposal) GetHash() []byte { if m != nil { - return m.BlockData + return m.Hash } return nil } -func (m *RequestPrepareProposal) GetBlockDataSize() int64 { +func (m *RequestPrepareProposal) GetHeader() types1.Header { if m != nil { - return m.BlockDataSize + return m.Header } - return 0 + return types1.Header{} } -func (m *RequestPrepareProposal) GetVotes() []*types1.Vote { +func (m *RequestPrepareProposal) GetTxs() [][]byte { if m != nil { - return m.Votes + return m.Txs + } + return nil +} + +func (m *RequestPrepareProposal) GetLocalLastCommit() ExtendedCommitInfo { + if m != nil { + return m.LocalLastCommit + } + return ExtendedCommitInfo{} +} + +func (m *RequestPrepareProposal) GetByzantineValidators() []Evidence { + if m != nil { + return m.ByzantineValidators } return nil } +func (m *RequestPrepareProposal) GetMaxTxBytes() int64 { + if m != nil { + return m.MaxTxBytes + } + return 0 +} + type RequestProcessProposal struct { Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` Header types1.Header `protobuf:"bytes,2,opt,name=header,proto3" json:"header"` @@ -2920,7 +2973,13 @@ func (m *ResponseVerifyVoteExtension) GetResult() ResponseVerifyVoteExtension_Re } type ResponsePrepareProposal struct { - BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + ModifiedTx bool `protobuf:"varint,1,opt,name=modified_tx,json=modifiedTx,proto3" json:"modified_tx,omitempty"` + TxRecords []*TxRecord `protobuf:"bytes,2,rep,name=tx_records,json=txRecords,proto3" json:"tx_records,omitempty"` + AppHash []byte `protobuf:"bytes,3,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + TxResults []*ExecTxResult `protobuf:"bytes,4,rep,name=tx_results,json=txResults,proto3" json:"tx_results,omitempty"` + ValidatorUpdates []*ValidatorUpdate `protobuf:"bytes,5,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates,omitempty"` + ConsensusParamUpdates *types1.ConsensusParams `protobuf:"bytes,6,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` + AppSignedUpdates [][]byte `protobuf:"bytes,7,rep,name=app_signed_updates,json=appSignedUpdates,proto3" json:"app_signed_updates,omitempty"` } func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal{} } @@ -2956,9 +3015,51 @@ func (m *ResponsePrepareProposal) XXX_DiscardUnknown() { var xxx_messageInfo_ResponsePrepareProposal proto.InternalMessageInfo -func (m *ResponsePrepareProposal) GetBlockData() [][]byte { +func (m *ResponsePrepareProposal) GetModifiedTx() bool { + if m != nil { + return m.ModifiedTx + } + return false +} + +func (m *ResponsePrepareProposal) GetTxRecords() []*TxRecord { + if m != nil { + return m.TxRecords + } + return nil +} + +func (m *ResponsePrepareProposal) GetAppHash() []byte { + if m != nil { + return m.AppHash + } + return nil +} + +func (m *ResponsePrepareProposal) GetTxResults() []*ExecTxResult { + if m != nil { + return m.TxResults + } + return nil +} + +func (m *ResponsePrepareProposal) GetValidatorUpdates() []*ValidatorUpdate { + if m != nil { + return m.ValidatorUpdates + } + return nil +} + +func (m *ResponsePrepareProposal) GetConsensusParamUpdates() *types1.ConsensusParams { + if m != nil { + return m.ConsensusParamUpdates + } + return nil +} + +func (m *ResponsePrepareProposal) GetAppSignedUpdates() [][]byte { if m != nil { - return m.BlockData + return m.AppSignedUpdates } return nil } @@ -3175,6 +3276,58 @@ func (m *CommitInfo) GetVotes() []VoteInfo { return nil } +type ExtendedCommitInfo struct { + Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` + Votes []ExtendedVoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` +} + +func (m *ExtendedCommitInfo) Reset() { *m = ExtendedCommitInfo{} } +func (m *ExtendedCommitInfo) String() string { return proto.CompactTextString(m) } +func (*ExtendedCommitInfo) ProtoMessage() {} +func (*ExtendedCommitInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{42} +} +func (m *ExtendedCommitInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ExtendedCommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ExtendedCommitInfo.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 *ExtendedCommitInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtendedCommitInfo.Merge(m, src) +} +func (m *ExtendedCommitInfo) XXX_Size() int { + return m.Size() +} +func (m *ExtendedCommitInfo) XXX_DiscardUnknown() { + xxx_messageInfo_ExtendedCommitInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_ExtendedCommitInfo proto.InternalMessageInfo + +func (m *ExtendedCommitInfo) GetRound() int32 { + if m != nil { + return m.Round + } + return 0 +} + +func (m *ExtendedCommitInfo) GetVotes() []ExtendedVoteInfo { + if m != nil { + return m.Votes + } + return nil +} + // Event allows application developers to attach additional information to // ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx and ResponseDeliverTx. // Later, transactions may be queried using these events. @@ -3187,7 +3340,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{42} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3241,7 +3394,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{43} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3309,7 +3462,7 @@ func (m *ExecTxResult) Reset() { *m = ExecTxResult{} } func (m *ExecTxResult) String() string { return proto.CompactTextString(m) } func (*ExecTxResult) ProtoMessage() {} func (*ExecTxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{44} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *ExecTxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3408,7 +3561,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{45} + return fileDescriptor_252557cfdd89a31a, []int{46} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3465,6 +3618,58 @@ func (m *TxResult) GetResult() ExecTxResult { return ExecTxResult{} } +type TxRecord struct { + Action TxRecord_TxAction `protobuf:"varint,1,opt,name=action,proto3,enum=tendermint.abci.TxRecord_TxAction" json:"action,omitempty"` + Tx []byte `protobuf:"bytes,2,opt,name=tx,proto3" json:"tx,omitempty"` +} + +func (m *TxRecord) Reset() { *m = TxRecord{} } +func (m *TxRecord) String() string { return proto.CompactTextString(m) } +func (*TxRecord) ProtoMessage() {} +func (*TxRecord) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{47} +} +func (m *TxRecord) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TxRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TxRecord.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 *TxRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_TxRecord.Merge(m, src) +} +func (m *TxRecord) XXX_Size() int { + return m.Size() +} +func (m *TxRecord) XXX_DiscardUnknown() { + xxx_messageInfo_TxRecord.DiscardUnknown(m) +} + +var xxx_messageInfo_TxRecord proto.InternalMessageInfo + +func (m *TxRecord) GetAction() TxRecord_TxAction { + if m != nil { + return m.Action + } + return TxRecord_UNKNOWN +} + +func (m *TxRecord) GetTx() []byte { + if m != nil { + return m.Tx + } + return nil +} + // Validator type Validator struct { Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -3476,7 +3681,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{46} + return fileDescriptor_252557cfdd89a31a, []int{48} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3529,7 +3734,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{47} + return fileDescriptor_252557cfdd89a31a, []int{49} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3582,7 +3787,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{48} + return fileDescriptor_252557cfdd89a31a, []int{50} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3625,6 +3830,67 @@ func (m *VoteInfo) GetSignedLastBlock() bool { return false } +// ExtendedVoteInfo +type ExtendedVoteInfo struct { + Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` + SignedLastBlock bool `protobuf:"varint,2,opt,name=signed_last_block,json=signedLastBlock,proto3" json:"signed_last_block,omitempty"` + VoteExtension []byte `protobuf:"bytes,3,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` +} + +func (m *ExtendedVoteInfo) Reset() { *m = ExtendedVoteInfo{} } +func (m *ExtendedVoteInfo) String() string { return proto.CompactTextString(m) } +func (*ExtendedVoteInfo) ProtoMessage() {} +func (*ExtendedVoteInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{51} +} +func (m *ExtendedVoteInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ExtendedVoteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ExtendedVoteInfo.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 *ExtendedVoteInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtendedVoteInfo.Merge(m, src) +} +func (m *ExtendedVoteInfo) XXX_Size() int { + return m.Size() +} +func (m *ExtendedVoteInfo) XXX_DiscardUnknown() { + xxx_messageInfo_ExtendedVoteInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_ExtendedVoteInfo proto.InternalMessageInfo + +func (m *ExtendedVoteInfo) GetValidator() Validator { + if m != nil { + return m.Validator + } + return Validator{} +} + +func (m *ExtendedVoteInfo) GetSignedLastBlock() bool { + if m != nil { + return m.SignedLastBlock + } + return false +} + +func (m *ExtendedVoteInfo) GetVoteExtension() []byte { + if m != nil { + return m.VoteExtension + } + return nil +} + type Evidence struct { Type EvidenceType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.EvidenceType" json:"type,omitempty"` // The offending validator @@ -3643,7 +3909,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{49} + return fileDescriptor_252557cfdd89a31a, []int{52} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3719,7 +3985,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{50} + return fileDescriptor_252557cfdd89a31a, []int{53} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3789,6 +4055,7 @@ func init() { 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.RegisterEnum("tendermint.abci.ResponseVerifyVoteExtension_Result", ResponseVerifyVoteExtension_Result_name, ResponseVerifyVoteExtension_Result_value) + proto.RegisterEnum("tendermint.abci.TxRecord_TxAction", TxRecord_TxAction_name, TxRecord_TxAction_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3831,13 +4098,16 @@ func init() { proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") proto.RegisterType((*ResponseFinalizeBlock)(nil), "tendermint.abci.ResponseFinalizeBlock") proto.RegisterType((*CommitInfo)(nil), "tendermint.abci.CommitInfo") + proto.RegisterType((*ExtendedCommitInfo)(nil), "tendermint.abci.ExtendedCommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") proto.RegisterType((*ExecTxResult)(nil), "tendermint.abci.ExecTxResult") proto.RegisterType((*TxResult)(nil), "tendermint.abci.TxResult") + proto.RegisterType((*TxRecord)(nil), "tendermint.abci.TxRecord") proto.RegisterType((*Validator)(nil), "tendermint.abci.Validator") proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") + proto.RegisterType((*ExtendedVoteInfo)(nil), "tendermint.abci.ExtendedVoteInfo") proto.RegisterType((*Evidence)(nil), "tendermint.abci.Evidence") proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") } @@ -3845,209 +4115,221 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3225 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0xdb, 0xd6, - 0x11, 0xe7, 0xb7, 0xc8, 0xe5, 0xa7, 0x9e, 0x14, 0x85, 0x66, 0x6c, 0xc9, 0x81, 0x27, 0x89, 0xe3, - 0x38, 0x52, 0x23, 0x4f, 0x52, 0x67, 0x92, 0xb6, 0x23, 0xd2, 0x54, 0x28, 0x4b, 0x91, 0x14, 0x88, - 0x72, 0x26, 0x6d, 0x6a, 0x04, 0x24, 0x9e, 0x48, 0xc4, 0x24, 0x80, 0x00, 0x20, 0x23, 0xf9, 0xd4, - 0xe9, 0x4c, 0x2e, 0x99, 0x76, 0x9a, 0x63, 0x67, 0x3a, 0x99, 0x5e, 0x7a, 0xe8, 0x1f, 0xd0, 0x43, - 0x4f, 0x3d, 0xf5, 0x90, 0x43, 0x0f, 0xb9, 0xb5, 0xd3, 0x43, 0xda, 0x49, 0x6e, 0xfd, 0x07, 0x7a, - 0xea, 0xc7, 0xbc, 0x0f, 0x7c, 0x91, 0x04, 0x3f, 0x62, 0xbb, 0x97, 0xde, 0xf0, 0x16, 0xbb, 0x8b, - 0xf7, 0x16, 0xef, 0xed, 0xee, 0x6f, 0xf7, 0xc1, 0x33, 0x36, 0xd6, 0x14, 0x6c, 0xf6, 0x55, 0xcd, - 0xde, 0x92, 0x5b, 0x6d, 0x75, 0xcb, 0xbe, 0x30, 0xb0, 0xb5, 0x69, 0x98, 0xba, 0xad, 0xa3, 0xa2, - 0xf7, 0x72, 0x93, 0xbc, 0xac, 0x5c, 0xf1, 0x71, 0xb7, 0xcd, 0x0b, 0xc3, 0xd6, 0xb7, 0x0c, 0x53, - 0xd7, 0xcf, 0x18, 0x7f, 0xe5, 0xb2, 0xef, 0x35, 0xd5, 0xe3, 0xd7, 0x16, 0x78, 0xcb, 0x85, 0x1f, - 0xe0, 0x0b, 0xe7, 0xed, 0x95, 0x31, 0x59, 0x43, 0x36, 0xe5, 0xbe, 0xf3, 0x7a, 0xa3, 0xa3, 0xeb, - 0x9d, 0x1e, 0xde, 0xa2, 0xa3, 0xd6, 0xe0, 0x6c, 0xcb, 0x56, 0xfb, 0xd8, 0xb2, 0xe5, 0xbe, 0xc1, - 0x19, 0x56, 0x3b, 0x7a, 0x47, 0xa7, 0x8f, 0x5b, 0xe4, 0x89, 0x51, 0x85, 0xff, 0x00, 0x2c, 0x89, - 0xf8, 0xa3, 0x01, 0xb6, 0x6c, 0xb4, 0x0d, 0x09, 0xdc, 0xee, 0xea, 0xe5, 0xe8, 0xd5, 0xe8, 0xf5, - 0xec, 0xf6, 0xe5, 0xcd, 0x91, 0xc5, 0x6d, 0x72, 0xbe, 0x7a, 0xbb, 0xab, 0x37, 0x22, 0x22, 0xe5, - 0x45, 0xaf, 0x42, 0xf2, 0xac, 0x37, 0xb0, 0xba, 0xe5, 0x18, 0x15, 0xba, 0x12, 0x26, 0xb4, 0x4b, - 0x98, 0x1a, 0x11, 0x91, 0x71, 0x93, 0x4f, 0xa9, 0xda, 0x99, 0x5e, 0x8e, 0x4f, 0xff, 0xd4, 0x9e, - 0x76, 0x46, 0x3f, 0x45, 0x78, 0x51, 0x15, 0x40, 0xd5, 0x54, 0x5b, 0x6a, 0x77, 0x65, 0x55, 0x2b, - 0x27, 0xa8, 0xe4, 0xb3, 0xe1, 0x92, 0xaa, 0x5d, 0x23, 0x8c, 0x8d, 0x88, 0x98, 0x51, 0x9d, 0x01, - 0x99, 0xee, 0x47, 0x03, 0x6c, 0x5e, 0x94, 0x93, 0xd3, 0xa7, 0xfb, 0x0e, 0x61, 0x22, 0xd3, 0xa5, - 0xdc, 0x68, 0x0f, 0xb2, 0x2d, 0xdc, 0x51, 0x35, 0xa9, 0xd5, 0xd3, 0xdb, 0x0f, 0xca, 0x29, 0x2a, - 0x2c, 0x84, 0x09, 0x57, 0x09, 0x6b, 0x95, 0x70, 0x56, 0x63, 0xe5, 0x68, 0x23, 0x22, 0x42, 0xcb, - 0xa5, 0xa0, 0x37, 0x21, 0xdd, 0xee, 0xe2, 0xf6, 0x03, 0xc9, 0x3e, 0x2f, 0x2f, 0x51, 0x3d, 0x1b, - 0x61, 0x7a, 0x6a, 0x84, 0xaf, 0x79, 0xde, 0x88, 0x88, 0x4b, 0x6d, 0xf6, 0x88, 0x76, 0x01, 0x14, - 0xdc, 0x53, 0x87, 0xd8, 0x24, 0xf2, 0xe9, 0xe9, 0x36, 0xb8, 0xc3, 0x38, 0x9b, 0xe7, 0x7c, 0x1a, - 0x19, 0xc5, 0x21, 0xa0, 0x1a, 0x64, 0xb0, 0xa6, 0xf0, 0xe5, 0x64, 0xa8, 0x9a, 0xab, 0xa1, 0xff, - 0x5b, 0x53, 0xfc, 0x8b, 0x49, 0x63, 0x3e, 0x46, 0xb7, 0x21, 0xd5, 0xd6, 0xfb, 0x7d, 0xd5, 0x2e, - 0x03, 0xd5, 0xb0, 0x1e, 0xba, 0x10, 0xca, 0xd5, 0x88, 0x88, 0x9c, 0x1f, 0x1d, 0x42, 0xa1, 0xa7, - 0x5a, 0xb6, 0x64, 0x69, 0xb2, 0x61, 0x75, 0x75, 0xdb, 0x2a, 0x67, 0xa9, 0x86, 0xe7, 0xc2, 0x34, - 0x1c, 0xa8, 0x96, 0x7d, 0xe2, 0x30, 0x37, 0x22, 0x62, 0xbe, 0xe7, 0x27, 0x10, 0x7d, 0xfa, 0xd9, - 0x19, 0x36, 0x5d, 0x85, 0xe5, 0xdc, 0x74, 0x7d, 0x47, 0x84, 0xdb, 0x91, 0x27, 0xfa, 0x74, 0x3f, - 0x01, 0xfd, 0x08, 0x56, 0x7a, 0xba, 0xac, 0xb8, 0xea, 0xa4, 0x76, 0x77, 0xa0, 0x3d, 0x28, 0xe7, - 0xa9, 0xd2, 0x17, 0x43, 0x27, 0xa9, 0xcb, 0x8a, 0xa3, 0xa2, 0x46, 0x04, 0x1a, 0x11, 0x71, 0xb9, - 0x37, 0x4a, 0x44, 0xf7, 0x61, 0x55, 0x36, 0x8c, 0xde, 0xc5, 0xa8, 0xf6, 0x02, 0xd5, 0x7e, 0x23, - 0x4c, 0xfb, 0x0e, 0x91, 0x19, 0x55, 0x8f, 0xe4, 0x31, 0x2a, 0x6a, 0x42, 0xc9, 0x30, 0xb1, 0x21, - 0x9b, 0x58, 0x32, 0x4c, 0xdd, 0xd0, 0x2d, 0xb9, 0x57, 0x2e, 0x52, 0xdd, 0x2f, 0x84, 0xe9, 0x3e, - 0x66, 0xfc, 0xc7, 0x9c, 0xbd, 0x11, 0x11, 0x8b, 0x46, 0x90, 0xc4, 0xb4, 0xea, 0x6d, 0x6c, 0x59, - 0x9e, 0xd6, 0xd2, 0x2c, 0xad, 0x94, 0x3f, 0xa8, 0x35, 0x40, 0x42, 0x75, 0xc8, 0xe2, 0x73, 0x22, - 0x2e, 0x0d, 0x75, 0x1b, 0x97, 0x97, 0xa7, 0x1f, 0xac, 0x3a, 0x65, 0xbd, 0xa7, 0xdb, 0x98, 0x1c, - 0x2a, 0xec, 0x8e, 0x90, 0x0c, 0x4f, 0x0d, 0xb1, 0xa9, 0x9e, 0x5d, 0x50, 0x35, 0x12, 0x7d, 0x63, - 0xa9, 0xba, 0x56, 0x46, 0x54, 0xe1, 0x4b, 0x61, 0x0a, 0xef, 0x51, 0x21, 0xa2, 0xa2, 0xee, 0x88, - 0x34, 0x22, 0xe2, 0xca, 0x70, 0x9c, 0x4c, 0xb6, 0xd8, 0x99, 0xaa, 0xc9, 0x3d, 0xf5, 0x21, 0xe6, - 0xc7, 0x66, 0x65, 0xfa, 0x16, 0xdb, 0xe5, 0xdc, 0xf4, 0xac, 0x90, 0x2d, 0x76, 0xe6, 0x27, 0x54, - 0x97, 0x20, 0x39, 0x94, 0x7b, 0x03, 0x2c, 0xbc, 0x00, 0x59, 0x9f, 0x63, 0x45, 0x65, 0x58, 0xea, - 0x63, 0xcb, 0x92, 0x3b, 0x98, 0xfa, 0xe1, 0x8c, 0xe8, 0x0c, 0x85, 0x02, 0xe4, 0xfc, 0xce, 0x54, - 0xf8, 0x2c, 0xea, 0x4a, 0x12, 0x3f, 0x49, 0x24, 0x87, 0xd8, 0xa4, 0xcb, 0xe6, 0x92, 0x7c, 0x88, - 0xae, 0x41, 0x9e, 0x4e, 0x59, 0x72, 0xde, 0x13, 0x67, 0x9d, 0x10, 0x73, 0x94, 0x78, 0x8f, 0x33, - 0x6d, 0x40, 0xd6, 0xd8, 0x36, 0x5c, 0x96, 0x38, 0x65, 0x01, 0x63, 0xdb, 0x70, 0x18, 0x9e, 0x85, - 0x1c, 0x59, 0x9f, 0xcb, 0x91, 0xa0, 0x1f, 0xc9, 0x12, 0x1a, 0x67, 0x11, 0xfe, 0x14, 0x83, 0xd2, - 0xa8, 0x03, 0x46, 0xb7, 0x21, 0x41, 0x62, 0x11, 0x0f, 0x2b, 0x95, 0x4d, 0x16, 0xa8, 0x36, 0x9d, - 0x40, 0xb5, 0xd9, 0x74, 0x02, 0x55, 0x35, 0xfd, 0xc5, 0x57, 0x1b, 0x91, 0xcf, 0xfe, 0xb6, 0x11, - 0x15, 0xa9, 0x04, 0xba, 0x44, 0x7c, 0xa5, 0xac, 0x6a, 0x92, 0xaa, 0xd0, 0x29, 0x67, 0x88, 0x23, - 0x94, 0x55, 0x6d, 0x4f, 0x41, 0x07, 0x50, 0x6a, 0xeb, 0x9a, 0x85, 0x35, 0x6b, 0x60, 0x49, 0x2c, - 0x10, 0xf2, 0x60, 0x12, 0x70, 0x87, 0x2c, 0xbc, 0xd6, 0x1c, 0xce, 0x63, 0xca, 0x28, 0x16, 0xdb, - 0x41, 0x02, 0x71, 0xab, 0x43, 0xb9, 0xa7, 0x2a, 0xb2, 0xad, 0x9b, 0x56, 0x39, 0x71, 0x35, 0x3e, - 0xd1, 0x1f, 0xde, 0x73, 0x58, 0x4e, 0x0d, 0x45, 0xb6, 0x71, 0x35, 0x41, 0xa6, 0x2b, 0xfa, 0x24, - 0xd1, 0xf3, 0x50, 0x94, 0x0d, 0x43, 0xb2, 0x6c, 0xd9, 0xc6, 0x52, 0xeb, 0xc2, 0xc6, 0x16, 0x0d, - 0x34, 0x39, 0x31, 0x2f, 0x1b, 0xc6, 0x09, 0xa1, 0x56, 0x09, 0x11, 0x3d, 0x07, 0x05, 0x12, 0x93, - 0x54, 0xb9, 0x27, 0x75, 0xb1, 0xda, 0xe9, 0xda, 0x34, 0xa4, 0xc4, 0xc5, 0x3c, 0xa7, 0x36, 0x28, - 0x51, 0x50, 0xdc, 0x3f, 0x4e, 0xe3, 0x11, 0x42, 0x90, 0x50, 0x64, 0x5b, 0xa6, 0x96, 0xcc, 0x89, - 0xf4, 0x99, 0xd0, 0x0c, 0xd9, 0xee, 0x72, 0xfb, 0xd0, 0x67, 0xb4, 0x06, 0x29, 0xae, 0x36, 0x4e, - 0xd5, 0xf2, 0x11, 0x5a, 0x85, 0xa4, 0x61, 0xea, 0x43, 0x4c, 0x7f, 0x5d, 0x5a, 0x64, 0x03, 0xe1, - 0x27, 0x31, 0x58, 0x1e, 0x8b, 0x5c, 0x44, 0x6f, 0x57, 0xb6, 0xba, 0xce, 0xb7, 0xc8, 0x33, 0x7a, - 0x8d, 0xe8, 0x95, 0x15, 0x6c, 0xf2, 0x68, 0x5f, 0x1e, 0x37, 0x75, 0x83, 0xbe, 0xe7, 0xa6, 0xe1, - 0xdc, 0x68, 0x1f, 0x4a, 0x3d, 0xd9, 0xb2, 0x25, 0xe6, 0xfd, 0x25, 0x5f, 0xe4, 0x7f, 0x66, 0xcc, - 0xc8, 0x2c, 0x56, 0x90, 0x0d, 0xcd, 0x95, 0x14, 0x88, 0xa8, 0x47, 0x45, 0x22, 0xac, 0xb6, 0x2e, - 0x1e, 0xca, 0x9a, 0xad, 0x6a, 0x58, 0x1a, 0xfb, 0x6b, 0x97, 0xc6, 0x14, 0xd6, 0x87, 0xaa, 0x82, - 0xb5, 0xb6, 0xf3, 0xbb, 0x56, 0x5c, 0x61, 0xf7, 0x77, 0x5a, 0x82, 0x08, 0x85, 0x60, 0xcc, 0x45, - 0x05, 0x88, 0xd9, 0xe7, 0x7c, 0xf1, 0x31, 0xfb, 0x1c, 0x7d, 0x07, 0x12, 0x64, 0x81, 0x74, 0xe1, - 0x85, 0x09, 0x09, 0x0b, 0x97, 0x6b, 0x5e, 0x18, 0x58, 0xa4, 0x9c, 0x82, 0xe0, 0x1e, 0x05, 0x37, - 0x0e, 0x8f, 0x6a, 0x15, 0x5e, 0x84, 0xe2, 0x48, 0x90, 0xf5, 0xfd, 0xbb, 0xa8, 0xff, 0xdf, 0x09, - 0x45, 0xc8, 0x07, 0xa2, 0xa9, 0xb0, 0x06, 0xab, 0x93, 0x82, 0xa3, 0xd0, 0x75, 0xe9, 0x81, 0x20, - 0x87, 0x5e, 0x85, 0xb4, 0x1b, 0x1d, 0xd9, 0x51, 0x1c, 0xb7, 0x95, 0xc3, 0x2c, 0xba, 0xac, 0xe4, - 0x0c, 0x92, 0x2d, 0x4d, 0xf7, 0x42, 0x8c, 0x4e, 0x7c, 0x49, 0x36, 0x8c, 0x86, 0x6c, 0x75, 0x85, - 0x0f, 0xa0, 0x1c, 0x16, 0xf9, 0x46, 0x96, 0x91, 0x70, 0xb7, 0xe0, 0x1a, 0xa4, 0xce, 0x74, 0xb3, - 0x2f, 0xdb, 0x54, 0x59, 0x5e, 0xe4, 0x23, 0xb2, 0x35, 0x59, 0x14, 0x8c, 0x53, 0x32, 0x1b, 0x08, - 0x12, 0x5c, 0x0a, 0x8d, 0x7e, 0x44, 0x44, 0xd5, 0x14, 0xcc, 0xec, 0x99, 0x17, 0xd9, 0xc0, 0x53, - 0xc4, 0x26, 0xcb, 0x06, 0xe4, 0xb3, 0x16, 0x5d, 0x2b, 0xd5, 0x9f, 0x11, 0xf9, 0x48, 0xf8, 0x81, - 0xbb, 0xf5, 0xbd, 0xd8, 0x82, 0x6e, 0x40, 0x82, 0x46, 0x23, 0x66, 0xa5, 0xb5, 0xf1, 0x4d, 0x4e, - 0xb8, 0x44, 0xca, 0x23, 0x34, 0xa0, 0x12, 0x1e, 0x4b, 0x16, 0xd2, 0xf4, 0xf3, 0x28, 0xac, 0x4d, - 0x0e, 0xc7, 0xe8, 0x0a, 0x00, 0xf3, 0xdf, 0xfc, 0xf4, 0xc7, 0xaf, 0xe7, 0xc4, 0x0c, 0xa5, 0xdc, - 0x21, 0x2e, 0xe0, 0x79, 0x28, 0x7a, 0xaf, 0x25, 0x4b, 0x7d, 0xc8, 0xb6, 0x69, 0x5c, 0xcc, 0xbb, - 0x3c, 0x27, 0xea, 0x43, 0x8c, 0x6e, 0x42, 0x92, 0x7c, 0x89, 0x38, 0xca, 0xf8, 0x94, 0xe9, 0x30, - 0x26, 0xe1, 0xd7, 0x31, 0xdf, 0x7c, 0x82, 0x51, 0xfb, 0x71, 0xfa, 0x86, 0x12, 0xc4, 0xed, 0x73, - 0x36, 0xa5, 0x9c, 0x48, 0x1e, 0xd1, 0x09, 0xac, 0xb2, 0x0c, 0x03, 0x2b, 0x92, 0xcf, 0x6d, 0xf0, - 0x8c, 0x7f, 0x0e, 0x8f, 0x81, 0x1c, 0xf1, 0x03, 0xd7, 0x73, 0x84, 0x7a, 0x8d, 0xe4, 0x23, 0x78, - 0x8d, 0x5f, 0xc5, 0xdc, 0xa3, 0x16, 0x08, 0xf6, 0x4f, 0xd8, 0x3e, 0xef, 0xc0, 0x8a, 0x82, 0xdb, - 0xaa, 0xf2, 0x6d, 0xcd, 0xb3, 0xcc, 0xa5, 0x9f, 0xb0, 0x75, 0xfe, 0x9c, 0x85, 0xb4, 0x88, 0x2d, - 0x83, 0x84, 0x5a, 0x54, 0x85, 0x0c, 0x3e, 0x6f, 0x63, 0xc3, 0x76, 0xb2, 0x93, 0xc9, 0x59, 0x1e, - 0xe3, 0xae, 0x3b, 0x9c, 0x04, 0xb3, 0xb8, 0x62, 0xe8, 0x16, 0x87, 0xa7, 0xe1, 0x48, 0x93, 0x8b, - 0xfb, 0xf1, 0xe9, 0x6b, 0x0e, 0x3e, 0x8d, 0x87, 0x42, 0x14, 0x26, 0x35, 0x02, 0x50, 0x6f, 0x71, - 0x80, 0x9a, 0x98, 0xf1, 0xb1, 0x00, 0x42, 0xad, 0x05, 0x10, 0x6a, 0x72, 0xc6, 0x32, 0x43, 0x20, - 0xea, 0x6b, 0x0e, 0x44, 0x4d, 0xcd, 0x98, 0xf1, 0x08, 0x46, 0xbd, 0x1b, 0xc4, 0xa8, 0x0c, 0x5b, - 0x5e, 0x0b, 0x95, 0x9e, 0x0a, 0x52, 0xbf, 0xe7, 0x03, 0xa9, 0xe9, 0x50, 0x74, 0xc8, 0x14, 0x4d, - 0x40, 0xa9, 0x6f, 0x05, 0x50, 0x6a, 0x66, 0x86, 0x1d, 0xa6, 0xc0, 0xd4, 0x3b, 0x7e, 0x98, 0x0a, - 0xa1, 0x68, 0x97, 0xff, 0xf7, 0x30, 0x9c, 0xfa, 0xba, 0x8b, 0x53, 0xb3, 0xa1, 0x80, 0x9b, 0xaf, - 0x65, 0x14, 0xa8, 0x1e, 0x8d, 0x01, 0x55, 0x06, 0x2c, 0x9f, 0x0f, 0x55, 0x31, 0x03, 0xa9, 0x1e, - 0x8d, 0x21, 0xd5, 0xfc, 0x0c, 0x85, 0x33, 0xa0, 0xea, 0xfb, 0x93, 0xa1, 0x6a, 0x38, 0x98, 0xe4, - 0xd3, 0x9c, 0x0f, 0xab, 0x4a, 0x21, 0x58, 0xb5, 0x18, 0x8a, 0xab, 0x98, 0xfa, 0xb9, 0xc1, 0xea, - 0xe9, 0x04, 0xb0, 0xca, 0x60, 0xe5, 0xf5, 0x50, 0xe5, 0x73, 0xa0, 0xd5, 0xd3, 0x09, 0x68, 0x75, - 0x79, 0xa6, 0xda, 0x99, 0x70, 0x75, 0x37, 0x08, 0x57, 0xd1, 0x8c, 0x33, 0x16, 0x8a, 0x57, 0x5b, - 0x61, 0x78, 0x95, 0x61, 0xca, 0x9b, 0xa1, 0x1a, 0x17, 0x00, 0xac, 0x47, 0x63, 0x80, 0x75, 0x75, - 0xc6, 0x4e, 0x9b, 0x17, 0xb1, 0xbe, 0x48, 0x92, 0xa6, 0x11, 0x57, 0x4d, 0xf2, 0x2e, 0x6c, 0x9a, - 0xba, 0xc9, 0xb1, 0x27, 0x1b, 0x08, 0xd7, 0x09, 0x82, 0xf1, 0xdc, 0xf2, 0x14, 0x74, 0x4b, 0xf3, - 0x5b, 0x9f, 0x2b, 0x16, 0x7e, 0x1f, 0xf5, 0x64, 0x69, 0xe2, 0xef, 0x47, 0x3f, 0x19, 0x8e, 0x7e, - 0x7c, 0x98, 0x37, 0x16, 0xc4, 0xbc, 0x1b, 0x90, 0x25, 0x79, 0xeb, 0x08, 0x9c, 0x95, 0x0d, 0x17, - 0xce, 0xde, 0x80, 0x65, 0x1a, 0x3e, 0x59, 0xea, 0xc4, 0x93, 0xd5, 0x04, 0xcd, 0x9b, 0x8a, 0xe4, - 0x05, 0xb3, 0x02, 0xcb, 0x5a, 0x5f, 0x86, 0x15, 0x1f, 0xaf, 0x9b, 0x0f, 0x33, 0x6c, 0x57, 0x72, - 0xb9, 0x77, 0x78, 0x62, 0xfc, 0xc7, 0xa8, 0x67, 0x21, 0x0f, 0x07, 0x4f, 0x82, 0xac, 0xd1, 0xc7, - 0x04, 0x59, 0x63, 0xdf, 0x1a, 0xb2, 0xfa, 0xf3, 0xfb, 0x78, 0x30, 0xbf, 0xff, 0x67, 0xd4, 0xfb, - 0x27, 0x2e, 0x00, 0x6d, 0xeb, 0x0a, 0xe6, 0x19, 0x37, 0x7d, 0x26, 0x09, 0x4a, 0x4f, 0xef, 0xf0, - 0xbc, 0x9a, 0x3c, 0x12, 0x2e, 0x37, 0x76, 0x66, 0x78, 0x68, 0x74, 0x93, 0xf5, 0x24, 0xb5, 0x30, - 0x4f, 0xd6, 0x4b, 0x10, 0x7f, 0x80, 0x59, 0xa4, 0xcb, 0x89, 0xe4, 0x91, 0xf0, 0xd1, 0x4d, 0x46, - 0xe3, 0x57, 0x4e, 0x64, 0x03, 0x74, 0x1b, 0x32, 0xb4, 0x8c, 0x2e, 0xe9, 0x86, 0xc5, 0x03, 0x52, - 0x20, 0xd1, 0x61, 0xd5, 0xf2, 0xcd, 0x63, 0xc2, 0x73, 0x64, 0x58, 0x62, 0xda, 0xe0, 0x4f, 0x3e, - 0x1c, 0x92, 0x09, 0x40, 0xe1, 0xcb, 0x90, 0x21, 0xb3, 0xb7, 0x0c, 0xb9, 0x8d, 0x69, 0x64, 0xc9, - 0x88, 0x1e, 0x41, 0xb8, 0x0f, 0x68, 0x3c, 0x4e, 0xa2, 0x06, 0xa4, 0xf0, 0x10, 0x6b, 0xb6, 0x45, - 0x53, 0xf0, 0x91, 0x04, 0x9a, 0xe7, 0x45, 0x58, 0xb3, 0xab, 0x65, 0x62, 0xe4, 0x7f, 0x7c, 0xb5, - 0x51, 0x62, 0xdc, 0x37, 0xf5, 0xbe, 0x6a, 0xe3, 0xbe, 0x61, 0x5f, 0x88, 0x5c, 0x5e, 0xf8, 0x6b, - 0x8c, 0x00, 0xbf, 0x40, 0xfc, 0x9c, 0x68, 0x5b, 0x67, 0xcb, 0xc7, 0x7c, 0x80, 0x7f, 0x3e, 0x7b, - 0x5f, 0x01, 0xe8, 0xc8, 0x96, 0xf4, 0xb1, 0xac, 0xd9, 0x58, 0xe1, 0x46, 0xcf, 0x74, 0x64, 0xeb, - 0x5d, 0x4a, 0x20, 0x7f, 0x9d, 0xbc, 0x1e, 0x58, 0x58, 0xe1, 0xa5, 0x87, 0xa5, 0x8e, 0x6c, 0x9d, - 0x5a, 0x58, 0xf1, 0xad, 0x72, 0xe9, 0xd1, 0x56, 0x19, 0xb4, 0x71, 0x7a, 0xc4, 0xc6, 0x3e, 0x48, - 0x96, 0xf1, 0x43, 0x32, 0x54, 0x81, 0xb4, 0x61, 0xaa, 0xba, 0xa9, 0xda, 0x17, 0xf4, 0xc7, 0xc4, - 0x45, 0x77, 0x8c, 0xae, 0x41, 0xbe, 0x8f, 0xfb, 0x86, 0xae, 0xf7, 0x24, 0xe6, 0x6c, 0xb2, 0x54, - 0x34, 0xc7, 0x89, 0x75, 0xea, 0x73, 0x3e, 0x89, 0x79, 0xa7, 0xcf, 0x83, 0xde, 0x8f, 0xd7, 0xbc, - 0xeb, 0x13, 0xcc, 0xeb, 0xa3, 0x90, 0x45, 0x8c, 0xd8, 0xd7, 0x1d, 0xff, 0xaf, 0x0c, 0x2c, 0xfc, - 0x8c, 0x16, 0xe3, 0x82, 0xb9, 0x11, 0x3a, 0x81, 0x65, 0xf7, 0xf0, 0x4b, 0x03, 0xea, 0x14, 0x9c, - 0xed, 0x3c, 0xaf, 0xf7, 0x28, 0x0d, 0x83, 0x64, 0x0b, 0xbd, 0x07, 0x4f, 0x8f, 0x78, 0x36, 0x57, - 0x75, 0x6c, 0x5e, 0x07, 0xf7, 0x54, 0xd0, 0xc1, 0x39, 0xaa, 0x3d, 0x63, 0xc5, 0x1f, 0xf1, 0xcc, - 0xed, 0x41, 0x21, 0x98, 0xe6, 0x4d, 0xfc, 0xfd, 0xd7, 0x20, 0x6f, 0x62, 0x5b, 0x56, 0x35, 0x29, - 0x50, 0x41, 0xcb, 0x31, 0x22, 0xaf, 0xcb, 0x1d, 0xc3, 0x53, 0x13, 0xd3, 0x3d, 0xf4, 0x5d, 0xc8, - 0x78, 0x99, 0x62, 0x34, 0x04, 0x3c, 0xb9, 0x45, 0x16, 0x8f, 0x57, 0xf8, 0x43, 0xd4, 0x53, 0x19, - 0x2c, 0xdb, 0xd4, 0x21, 0x65, 0x62, 0x6b, 0xd0, 0x63, 0x85, 0x94, 0xc2, 0xf6, 0xcb, 0xf3, 0x25, - 0x8a, 0x84, 0x3a, 0xe8, 0xd9, 0x22, 0x17, 0x16, 0xee, 0x43, 0x8a, 0x51, 0x50, 0x16, 0x96, 0x4e, - 0x0f, 0xf7, 0x0f, 0x8f, 0xde, 0x3d, 0x2c, 0x45, 0x10, 0x40, 0x6a, 0xa7, 0x56, 0xab, 0x1f, 0x37, - 0x4b, 0x51, 0x94, 0x81, 0xe4, 0x4e, 0xf5, 0x48, 0x6c, 0x96, 0x62, 0x84, 0x2c, 0xd6, 0xef, 0xd6, - 0x6b, 0xcd, 0x52, 0x1c, 0x2d, 0x43, 0x9e, 0x3d, 0x4b, 0xbb, 0x47, 0xe2, 0xdb, 0x3b, 0xcd, 0x52, - 0xc2, 0x47, 0x3a, 0xa9, 0x1f, 0xde, 0xa9, 0x8b, 0xa5, 0xa4, 0xf0, 0x0a, 0x5c, 0x0a, 0x4d, 0x2d, - 0xbd, 0x9a, 0x4c, 0xd4, 0x57, 0x93, 0x11, 0x7e, 0x19, 0x83, 0x4a, 0x78, 0xbe, 0x88, 0xee, 0x8e, - 0x2c, 0x7c, 0x7b, 0x81, 0x64, 0x73, 0x64, 0xf5, 0xe8, 0x39, 0x28, 0x98, 0xf8, 0x0c, 0xdb, 0xed, - 0x2e, 0xcb, 0x5f, 0x59, 0xc0, 0xcc, 0x8b, 0x79, 0x4e, 0xa5, 0x42, 0x16, 0x63, 0xfb, 0x10, 0xb7, - 0x6d, 0x89, 0xf9, 0x22, 0xb6, 0xe9, 0x32, 0x84, 0x8d, 0x50, 0x4f, 0x18, 0x51, 0xf8, 0x60, 0x21, - 0x5b, 0x66, 0x20, 0x29, 0xd6, 0x9b, 0xe2, 0x7b, 0xa5, 0x38, 0x42, 0x50, 0xa0, 0x8f, 0xd2, 0xc9, - 0xe1, 0xce, 0xf1, 0x49, 0xe3, 0x88, 0xd8, 0x72, 0x05, 0x8a, 0x8e, 0x2d, 0x1d, 0x62, 0x52, 0x78, - 0xdf, 0x8b, 0x3f, 0xbe, 0xba, 0xd4, 0x2e, 0x14, 0x46, 0xd2, 0xc5, 0xe8, 0x38, 0x9e, 0xf1, 0x0a, - 0x39, 0x6e, 0x2a, 0x28, 0xe6, 0x87, 0xfe, 0xa1, 0xf0, 0x9b, 0x28, 0x3c, 0x33, 0x25, 0xa1, 0x44, - 0xfb, 0x23, 0x96, 0xbf, 0xb5, 0x48, 0x3a, 0x3a, 0xba, 0xf1, 0x6e, 0xcf, 0x65, 0xac, 0x93, 0x83, - 0x9d, 0x93, 0x46, 0x70, 0xe3, 0x09, 0xb7, 0xe1, 0xe9, 0x90, 0x8c, 0x7f, 0x46, 0x41, 0x4c, 0xf8, - 0x5d, 0xcc, 0x2f, 0x1a, 0x4c, 0xe1, 0xd7, 0x20, 0x25, 0xb7, 0x49, 0xd2, 0x4a, 0x17, 0x97, 0x16, - 0xf9, 0x68, 0x4a, 0x9d, 0x13, 0xbd, 0x09, 0x60, 0x9f, 0x4b, 0x6c, 0x3d, 0x8e, 0x1f, 0x1a, 0xaf, - 0x08, 0xd4, 0xcf, 0x71, 0xbb, 0x79, 0xce, 0x57, 0x9f, 0xb1, 0xf9, 0x93, 0x85, 0xde, 0x9e, 0xe4, - 0x71, 0xe7, 0x6c, 0x31, 0x2c, 0xe6, 0x6b, 0x93, 0x8f, 0xe6, 0x6b, 0x85, 0x5f, 0xc4, 0x3d, 0x27, - 0x14, 0x2c, 0x68, 0x3d, 0xb6, 0xcc, 0x67, 0xc4, 0x96, 0xb1, 0x05, 0x6d, 0x39, 0x31, 0x7a, 0xc5, - 0x9f, 0x5c, 0xf4, 0x4a, 0x3c, 0x62, 0xf4, 0xf2, 0x6f, 0xaa, 0x64, 0x70, 0x53, 0x8d, 0x05, 0x9a, - 0xd4, 0x84, 0x40, 0xf3, 0x1e, 0x80, 0xaf, 0xf3, 0xb1, 0x0a, 0x49, 0x53, 0x1f, 0x68, 0x0a, 0xdd, - 0xb9, 0x49, 0x91, 0x0d, 0xd0, 0xab, 0x4e, 0x55, 0x37, 0x16, 0x12, 0x6f, 0xc8, 0xf1, 0xf4, 0x95, - 0xff, 0x78, 0x79, 0xf7, 0x21, 0x24, 0xe9, 0x3f, 0x23, 0x51, 0x90, 0x76, 0x36, 0x38, 0xac, 0x22, - 0xcf, 0xe8, 0xc7, 0x00, 0xb2, 0x6d, 0x9b, 0x6a, 0x6b, 0xe0, 0x29, 0xde, 0x98, 0xfc, 0xcf, 0x77, - 0x1c, 0xbe, 0xea, 0x65, 0xfe, 0xf3, 0x57, 0x3d, 0x51, 0xdf, 0x06, 0xf0, 0x29, 0x14, 0x0e, 0xa1, - 0x10, 0x94, 0x75, 0x80, 0x00, 0x9b, 0x43, 0x10, 0x08, 0x30, 0x5c, 0xc7, 0x81, 0x80, 0x0b, 0x23, - 0xe2, 0xac, 0x83, 0x45, 0x07, 0xc2, 0xbf, 0xa3, 0x90, 0xf3, 0x6f, 0x99, 0xff, 0xb7, 0x5c, 0x5a, - 0xf8, 0x24, 0x0a, 0x69, 0x77, 0xf1, 0x21, 0x1d, 0x24, 0xcf, 0x76, 0x31, 0x7f, 0xbf, 0x84, 0xb5, - 0xa4, 0xe2, 0x6e, 0xa3, 0xeb, 0x0d, 0xd7, 0xf9, 0x87, 0x95, 0x3e, 0xfd, 0x96, 0x76, 0x8a, 0xd5, - 0xdc, 0xd9, 0xbf, 0x01, 0x19, 0xf7, 0xd4, 0x11, 0x6c, 0x2e, 0x2b, 0x8a, 0x89, 0x2d, 0x8b, 0xc7, - 0x7d, 0x67, 0x48, 0xfb, 0x90, 0xfa, 0xc7, 0xbc, 0x19, 0x13, 0x17, 0xd9, 0x40, 0x50, 0xa0, 0x38, - 0x72, 0x64, 0xd1, 0x1b, 0xb0, 0x64, 0x0c, 0x5a, 0x92, 0xb3, 0x35, 0x46, 0x6e, 0x0a, 0x39, 0xa8, - 0x6f, 0xd0, 0xea, 0xa9, 0xed, 0x7d, 0x7c, 0xe1, 0x4c, 0xc6, 0x18, 0xb4, 0xf6, 0xd9, 0x0e, 0x62, - 0x5f, 0x89, 0xf9, 0xbf, 0xf2, 0xd3, 0x28, 0xa4, 0x9d, 0x13, 0x81, 0xbe, 0x0f, 0x19, 0xd7, 0x1d, - 0xb8, 0xfd, 0xe9, 0x50, 0x3f, 0xc2, 0xf5, 0x7b, 0x22, 0xe8, 0x06, 0x2c, 0x5b, 0x6a, 0x47, 0x73, - 0x2a, 0xf1, 0xac, 0xcc, 0x12, 0xa3, 0x5b, 0xb3, 0xc8, 0x5e, 0x1c, 0x38, 0xb5, 0x81, 0xbb, 0x89, - 0x74, 0xbc, 0x94, 0xb8, 0x9b, 0x48, 0x27, 0x4a, 0x49, 0xe1, 0x5f, 0x51, 0x48, 0x3b, 0x35, 0x74, - 0xf4, 0x8a, 0xef, 0x00, 0x16, 0x26, 0xd9, 0x9b, 0x33, 0x7a, 0xbd, 0xc5, 0xe0, 0xbc, 0x63, 0x8b, - 0xcf, 0x3b, 0xac, 0x41, 0xec, 0xb4, 0xea, 0x13, 0x0b, 0xb7, 0xea, 0x6f, 0x02, 0xb2, 0x75, 0x5b, - 0xee, 0x49, 0x43, 0xdd, 0x56, 0xb5, 0x8e, 0xc4, 0x2c, 0xcf, 0xce, 0x4a, 0x89, 0xbe, 0xb9, 0x47, - 0x5f, 0x1c, 0xbb, 0x3f, 0xc1, 0xcd, 0x70, 0x17, 0x6d, 0x15, 0xae, 0x41, 0x8a, 0x27, 0x71, 0xac, - 0x57, 0xc8, 0x47, 0x6e, 0xd7, 0x25, 0xe1, 0xeb, 0xba, 0x54, 0x20, 0xdd, 0xc7, 0xb6, 0x4c, 0x0f, - 0x3e, 0x73, 0xc0, 0xee, 0xf8, 0xc6, 0xeb, 0x90, 0xf5, 0x75, 0x6d, 0x89, 0x2f, 0x38, 0xac, 0xbf, - 0x5b, 0x8a, 0x54, 0x96, 0x3e, 0xfd, 0xfc, 0x6a, 0xfc, 0x10, 0x7f, 0x4c, 0x36, 0xb0, 0x58, 0xaf, - 0x35, 0xea, 0xb5, 0xfd, 0x52, 0xb4, 0x92, 0xfd, 0xf4, 0xf3, 0xab, 0x4b, 0x22, 0xa6, 0x25, 0xee, - 0x1b, 0x0d, 0xc8, 0xf9, 0xff, 0x4a, 0x30, 0xb5, 0x41, 0x50, 0xb8, 0x73, 0x7a, 0x7c, 0xb0, 0x57, - 0xdb, 0x69, 0xd6, 0xa5, 0x7b, 0x47, 0xcd, 0x7a, 0x29, 0x8a, 0x9e, 0x86, 0x95, 0x83, 0xbd, 0xb7, - 0x1a, 0x4d, 0xa9, 0x76, 0xb0, 0x57, 0x3f, 0x6c, 0x4a, 0x3b, 0xcd, 0xe6, 0x4e, 0x6d, 0xbf, 0x14, - 0xdb, 0xfe, 0x6d, 0x16, 0x8a, 0x3b, 0xd5, 0xda, 0x1e, 0xc9, 0x61, 0xd5, 0xb6, 0x4c, 0x4b, 0x69, - 0x35, 0x48, 0xd0, 0x62, 0xd9, 0xd4, 0x1b, 0x78, 0x95, 0xe9, 0x0d, 0x10, 0xb4, 0x0b, 0x49, 0x5a, - 0x47, 0x43, 0xd3, 0xaf, 0xe4, 0x55, 0x66, 0x74, 0x44, 0xc8, 0x64, 0xe8, 0x51, 0x99, 0x7a, 0x47, - 0xaf, 0x32, 0xbd, 0x41, 0x82, 0x0e, 0x60, 0xc9, 0x29, 0x73, 0xcc, 0xba, 0xed, 0x56, 0x99, 0xd9, - 0x69, 0x20, 0x4b, 0x63, 0xe5, 0xa8, 0xe9, 0xd7, 0xf7, 0x2a, 0x33, 0x5a, 0x27, 0x68, 0x0f, 0x52, - 0x1c, 0x09, 0xce, 0xb8, 0xb9, 0x56, 0x99, 0xd5, 0x31, 0x40, 0x22, 0x64, 0xbc, 0x42, 0xdf, 0xec, - 0x4b, 0x89, 0x95, 0x39, 0xba, 0x42, 0xe8, 0x3e, 0xe4, 0x83, 0xe8, 0x72, 0xbe, 0xdb, 0x71, 0x95, - 0x39, 0x7b, 0x13, 0x44, 0x7f, 0x10, 0x6a, 0xce, 0x77, 0x5b, 0xae, 0x32, 0x67, 0xab, 0x02, 0x7d, - 0x08, 0xcb, 0xe3, 0x50, 0x70, 0xfe, 0xcb, 0x73, 0x95, 0x05, 0x9a, 0x17, 0xa8, 0x0f, 0x68, 0x02, - 0x84, 0x5c, 0xe0, 0x2e, 0x5d, 0x65, 0x91, 0x5e, 0x06, 0x52, 0xa0, 0x38, 0x0a, 0x49, 0xe6, 0xbd, - 0x5b, 0x57, 0x99, 0xbb, 0xaf, 0xc1, 0xbe, 0x12, 0x44, 0x2f, 0xf3, 0xde, 0xb5, 0xab, 0xcc, 0xdd, - 0xe6, 0x40, 0xa7, 0x00, 0x3e, 0x8c, 0x39, 0xc7, 0xdd, 0xbb, 0xca, 0x3c, 0x0d, 0x0f, 0x64, 0xc0, - 0xca, 0x24, 0x6c, 0xb9, 0xc8, 0x55, 0xbc, 0xca, 0x42, 0x7d, 0x10, 0xb2, 0x9f, 0x83, 0xa8, 0x65, - 0xbe, 0xab, 0x79, 0x95, 0x39, 0x1b, 0x22, 0xd5, 0xfa, 0x17, 0x5f, 0xaf, 0x47, 0xbf, 0xfc, 0x7a, - 0x3d, 0xfa, 0xf7, 0xaf, 0xd7, 0xa3, 0x9f, 0x7d, 0xb3, 0x1e, 0xf9, 0xf2, 0x9b, 0xf5, 0xc8, 0x5f, - 0xbe, 0x59, 0x8f, 0xfc, 0xf0, 0xa5, 0x8e, 0x6a, 0x77, 0x07, 0xad, 0xcd, 0xb6, 0xde, 0xdf, 0xf2, - 0xdf, 0xd2, 0x9e, 0x74, 0x73, 0xbc, 0x95, 0xa2, 0xd1, 0xf4, 0xd6, 0x7f, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x8d, 0xc9, 0xd7, 0xa0, 0x59, 0x2e, 0x00, 0x00, + // 3416 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcb, 0x73, 0x1b, 0xc7, + 0xd1, 0xc7, 0xfb, 0xd1, 0x20, 0x1e, 0x1c, 0xd2, 0x32, 0x04, 0x4b, 0xa4, 0xbc, 0x2a, 0xdb, 0xb2, + 0x2c, 0x53, 0x9f, 0xa5, 0xb2, 0x3f, 0xf9, 0xb3, 0xfd, 0xb9, 0x48, 0x10, 0x34, 0x28, 0x51, 0x24, + 0x3d, 0x04, 0xe5, 0xf2, 0xf7, 0x39, 0x5a, 0x2f, 0xb1, 0x43, 0x62, 0x2d, 0x00, 0xbb, 0xde, 0x5d, + 0xd0, 0xa0, 0x4f, 0xa9, 0x54, 0xf9, 0xe2, 0x4a, 0x55, 0x7c, 0x4b, 0xaa, 0x52, 0xae, 0x5c, 0xe2, + 0xaa, 0xfc, 0x01, 0x39, 0xe4, 0x94, 0x4b, 0x72, 0xf0, 0x21, 0x07, 0xdf, 0x92, 0xca, 0xc1, 0x49, + 0xd9, 0xb7, 0xfc, 0x03, 0x39, 0xe5, 0x51, 0xf3, 0xd8, 0x27, 0xb0, 0x78, 0x58, 0x92, 0x2f, 0xb9, + 0x61, 0x7a, 0xbb, 0x7b, 0x67, 0x7a, 0x67, 0xba, 0xfb, 0xd7, 0x3d, 0x80, 0xa7, 0x6c, 0xd2, 0x57, + 0x89, 0xd9, 0xd3, 0xfa, 0xf6, 0x75, 0xe5, 0xa8, 0xad, 0x5d, 0xb7, 0xcf, 0x0c, 0x62, 0xad, 0x19, + 0xa6, 0x6e, 0xeb, 0xa8, 0xec, 0x3d, 0x5c, 0xa3, 0x0f, 0x6b, 0x17, 0x7d, 0xdc, 0x6d, 0xf3, 0xcc, + 0xb0, 0xf5, 0xeb, 0x86, 0xa9, 0xeb, 0xc7, 0x9c, 0xbf, 0x76, 0xc1, 0xf7, 0x98, 0xe9, 0xf1, 0x6b, + 0x0b, 0x3c, 0x15, 0xc2, 0x0f, 0xc8, 0x99, 0xf3, 0xf4, 0xe2, 0x88, 0xac, 0xa1, 0x98, 0x4a, 0xcf, + 0x79, 0xbc, 0x7a, 0xa2, 0xeb, 0x27, 0x5d, 0x72, 0x9d, 0x8d, 0x8e, 0x06, 0xc7, 0xd7, 0x6d, 0xad, + 0x47, 0x2c, 0x5b, 0xe9, 0x19, 0x82, 0x61, 0xf9, 0x44, 0x3f, 0xd1, 0xd9, 0xcf, 0xeb, 0xf4, 0x17, + 0xa7, 0x4a, 0xff, 0x02, 0xc8, 0x62, 0xf2, 0xe1, 0x80, 0x58, 0x36, 0xba, 0x01, 0x29, 0xd2, 0xee, + 0xe8, 0xd5, 0xf8, 0xa5, 0xf8, 0x95, 0xc2, 0x8d, 0x0b, 0x6b, 0xa1, 0xc5, 0xad, 0x09, 0xbe, 0x46, + 0xbb, 0xa3, 0x37, 0x63, 0x98, 0xf1, 0xa2, 0x97, 0x21, 0x7d, 0xdc, 0x1d, 0x58, 0x9d, 0x6a, 0x82, + 0x09, 0x5d, 0x8c, 0x12, 0xda, 0xa2, 0x4c, 0xcd, 0x18, 0xe6, 0xdc, 0xf4, 0x55, 0x5a, 0xff, 0x58, + 0xaf, 0x26, 0x27, 0xbf, 0x6a, 0xbb, 0x7f, 0xcc, 0x5e, 0x45, 0x79, 0xd1, 0x06, 0x80, 0xd6, 0xd7, + 0x6c, 0xb9, 0xdd, 0x51, 0xb4, 0x7e, 0x35, 0xc5, 0x24, 0x9f, 0x8e, 0x96, 0xd4, 0xec, 0x3a, 0x65, + 0x6c, 0xc6, 0x70, 0x5e, 0x73, 0x06, 0x74, 0xba, 0x1f, 0x0e, 0x88, 0x79, 0x56, 0x4d, 0x4f, 0x9e, + 0xee, 0xdb, 0x94, 0x89, 0x4e, 0x97, 0x71, 0xa3, 0x6d, 0x28, 0x1c, 0x91, 0x13, 0xad, 0x2f, 0x1f, + 0x75, 0xf5, 0xf6, 0x83, 0x6a, 0x86, 0x09, 0x4b, 0x51, 0xc2, 0x1b, 0x94, 0x75, 0x83, 0x72, 0x6e, + 0x24, 0xaa, 0xf1, 0x66, 0x0c, 0xc3, 0x91, 0x4b, 0x41, 0xaf, 0x43, 0xae, 0xdd, 0x21, 0xed, 0x07, + 0xb2, 0x3d, 0xac, 0x66, 0x99, 0x9e, 0xd5, 0x28, 0x3d, 0x75, 0xca, 0xd7, 0x1a, 0x36, 0x63, 0x38, + 0xdb, 0xe6, 0x3f, 0xd1, 0x16, 0x80, 0x4a, 0xba, 0xda, 0x29, 0x31, 0xa9, 0x7c, 0x6e, 0xb2, 0x0d, + 0x36, 0x39, 0x67, 0x6b, 0x28, 0xa6, 0x91, 0x57, 0x1d, 0x02, 0xaa, 0x43, 0x9e, 0xf4, 0x55, 0xb1, + 0x9c, 0x3c, 0x53, 0x73, 0x29, 0xf2, 0x7b, 0xf7, 0x55, 0xff, 0x62, 0x72, 0x44, 0x8c, 0xd1, 0x2d, + 0xc8, 0xb4, 0xf5, 0x5e, 0x4f, 0xb3, 0xab, 0xc0, 0x34, 0xac, 0x44, 0x2e, 0x84, 0x71, 0x35, 0x63, + 0x58, 0xf0, 0xa3, 0x5d, 0x28, 0x75, 0x35, 0xcb, 0x96, 0xad, 0xbe, 0x62, 0x58, 0x1d, 0xdd, 0xb6, + 0xaa, 0x05, 0xa6, 0xe1, 0x99, 0x28, 0x0d, 0x3b, 0x9a, 0x65, 0x1f, 0x38, 0xcc, 0xcd, 0x18, 0x2e, + 0x76, 0xfd, 0x04, 0xaa, 0x4f, 0x3f, 0x3e, 0x26, 0xa6, 0xab, 0xb0, 0xba, 0x30, 0x59, 0xdf, 0x1e, + 0xe5, 0x76, 0xe4, 0xa9, 0x3e, 0xdd, 0x4f, 0x40, 0xff, 0x0f, 0x4b, 0x5d, 0x5d, 0x51, 0x5d, 0x75, + 0x72, 0xbb, 0x33, 0xe8, 0x3f, 0xa8, 0x16, 0x99, 0xd2, 0xe7, 0x23, 0x27, 0xa9, 0x2b, 0xaa, 0xa3, + 0xa2, 0x4e, 0x05, 0x9a, 0x31, 0xbc, 0xd8, 0x0d, 0x13, 0xd1, 0x7d, 0x58, 0x56, 0x0c, 0xa3, 0x7b, + 0x16, 0xd6, 0x5e, 0x62, 0xda, 0xaf, 0x46, 0x69, 0x5f, 0xa7, 0x32, 0x61, 0xf5, 0x48, 0x19, 0xa1, + 0xa2, 0x16, 0x54, 0x0c, 0x93, 0x18, 0x8a, 0x49, 0x64, 0xc3, 0xd4, 0x0d, 0xdd, 0x52, 0xba, 0xd5, + 0x32, 0xd3, 0xfd, 0x5c, 0x94, 0xee, 0x7d, 0xce, 0xbf, 0x2f, 0xd8, 0x9b, 0x31, 0x5c, 0x36, 0x82, + 0x24, 0xae, 0x55, 0x6f, 0x13, 0xcb, 0xf2, 0xb4, 0x56, 0xa6, 0x69, 0x65, 0xfc, 0x41, 0xad, 0x01, + 0x12, 0x6a, 0x40, 0x81, 0x0c, 0xa9, 0xb8, 0x7c, 0xaa, 0xdb, 0xa4, 0xba, 0x38, 0xf9, 0x60, 0x35, + 0x18, 0xeb, 0x3d, 0xdd, 0x26, 0xf4, 0x50, 0x11, 0x77, 0x84, 0x14, 0x78, 0xe2, 0x94, 0x98, 0xda, + 0xf1, 0x19, 0x53, 0x23, 0xb3, 0x27, 0x96, 0xa6, 0xf7, 0xab, 0x88, 0x29, 0x7c, 0x21, 0x4a, 0xe1, + 0x3d, 0x26, 0x44, 0x55, 0x34, 0x1c, 0x91, 0x66, 0x0c, 0x2f, 0x9d, 0x8e, 0x92, 0xe9, 0x16, 0x3b, + 0xd6, 0xfa, 0x4a, 0x57, 0xfb, 0x98, 0x88, 0x63, 0xb3, 0x34, 0x79, 0x8b, 0x6d, 0x09, 0x6e, 0x76, + 0x56, 0xe8, 0x16, 0x3b, 0xf6, 0x13, 0x36, 0xb2, 0x90, 0x3e, 0x55, 0xba, 0x03, 0x22, 0x3d, 0x07, + 0x05, 0x9f, 0x63, 0x45, 0x55, 0xc8, 0xf6, 0x88, 0x65, 0x29, 0x27, 0x84, 0xf9, 0xe1, 0x3c, 0x76, + 0x86, 0x52, 0x09, 0x16, 0xfc, 0xce, 0x54, 0xfa, 0x2c, 0xee, 0x4a, 0x52, 0x3f, 0x49, 0x25, 0x4f, + 0x89, 0xc9, 0x96, 0x2d, 0x24, 0xc5, 0x10, 0x5d, 0x86, 0x22, 0x9b, 0xb2, 0xec, 0x3c, 0xa7, 0xce, + 0x3a, 0x85, 0x17, 0x18, 0xf1, 0x9e, 0x60, 0x5a, 0x85, 0x82, 0x71, 0xc3, 0x70, 0x59, 0x92, 0x8c, + 0x05, 0x8c, 0x1b, 0x86, 0xc3, 0xf0, 0x34, 0x2c, 0xd0, 0xf5, 0xb9, 0x1c, 0x29, 0xf6, 0x92, 0x02, + 0xa5, 0x09, 0x16, 0xe9, 0x0f, 0x09, 0xa8, 0x84, 0x1d, 0x30, 0xba, 0x05, 0x29, 0x1a, 0x8b, 0x44, + 0x58, 0xa9, 0xad, 0xf1, 0x40, 0xb5, 0xe6, 0x04, 0xaa, 0xb5, 0x96, 0x13, 0xa8, 0x36, 0x72, 0x5f, + 0x7e, 0xbd, 0x1a, 0xfb, 0xec, 0x2f, 0xab, 0x71, 0xcc, 0x24, 0xd0, 0x79, 0xea, 0x2b, 0x15, 0xad, + 0x2f, 0x6b, 0x2a, 0x9b, 0x72, 0x9e, 0x3a, 0x42, 0x45, 0xeb, 0x6f, 0xab, 0x68, 0x07, 0x2a, 0x6d, + 0xbd, 0x6f, 0x91, 0xbe, 0x35, 0xb0, 0x64, 0x1e, 0x08, 0x45, 0x30, 0x09, 0xb8, 0x43, 0x1e, 0x5e, + 0xeb, 0x0e, 0xe7, 0x3e, 0x63, 0xc4, 0xe5, 0x76, 0x90, 0x40, 0xdd, 0xea, 0xa9, 0xd2, 0xd5, 0x54, + 0xc5, 0xd6, 0x4d, 0xab, 0x9a, 0xba, 0x94, 0x1c, 0xeb, 0x0f, 0xef, 0x39, 0x2c, 0x87, 0x86, 0xaa, + 0xd8, 0x64, 0x23, 0x45, 0xa7, 0x8b, 0x7d, 0x92, 0xe8, 0x59, 0x28, 0x2b, 0x86, 0x21, 0x5b, 0xb6, + 0x62, 0x13, 0xf9, 0xe8, 0xcc, 0x26, 0x16, 0x0b, 0x34, 0x0b, 0xb8, 0xa8, 0x18, 0xc6, 0x01, 0xa5, + 0x6e, 0x50, 0x22, 0x7a, 0x06, 0x4a, 0x34, 0x26, 0x69, 0x4a, 0x57, 0xee, 0x10, 0xed, 0xa4, 0x63, + 0xb3, 0x90, 0x92, 0xc4, 0x45, 0x41, 0x6d, 0x32, 0xa2, 0xa4, 0xba, 0x5f, 0x9c, 0xc5, 0x23, 0x84, + 0x20, 0xa5, 0x2a, 0xb6, 0xc2, 0x2c, 0xb9, 0x80, 0xd9, 0x6f, 0x4a, 0x33, 0x14, 0xbb, 0x23, 0xec, + 0xc3, 0x7e, 0xa3, 0x73, 0x90, 0x11, 0x6a, 0x93, 0x4c, 0xad, 0x18, 0xa1, 0x65, 0x48, 0x1b, 0xa6, + 0x7e, 0x4a, 0xd8, 0xa7, 0xcb, 0x61, 0x3e, 0x90, 0x7e, 0x98, 0x80, 0xc5, 0x91, 0xc8, 0x45, 0xf5, + 0x76, 0x14, 0xab, 0xe3, 0xbc, 0x8b, 0xfe, 0x46, 0xaf, 0x50, 0xbd, 0x8a, 0x4a, 0x4c, 0x11, 0xed, + 0xab, 0xa3, 0xa6, 0x6e, 0xb2, 0xe7, 0xc2, 0x34, 0x82, 0x1b, 0xdd, 0x81, 0x4a, 0x57, 0xb1, 0x6c, + 0x99, 0x7b, 0x7f, 0xd9, 0x17, 0xf9, 0x9f, 0x1a, 0x31, 0x32, 0x8f, 0x15, 0x74, 0x43, 0x0b, 0x25, + 0x25, 0x2a, 0xea, 0x51, 0x11, 0x86, 0xe5, 0xa3, 0xb3, 0x8f, 0x95, 0xbe, 0xad, 0xf5, 0x89, 0x3c, + 0xf2, 0xd5, 0xce, 0x8f, 0x28, 0x6c, 0x9c, 0x6a, 0x2a, 0xe9, 0xb7, 0x9d, 0xcf, 0xb5, 0xe4, 0x0a, + 0xbb, 0x9f, 0xd3, 0x92, 0x30, 0x94, 0x82, 0x31, 0x17, 0x95, 0x20, 0x61, 0x0f, 0xc5, 0xe2, 0x13, + 0xf6, 0x10, 0xfd, 0x17, 0xa4, 0xe8, 0x02, 0xd9, 0xc2, 0x4b, 0x63, 0x12, 0x16, 0x21, 0xd7, 0x3a, + 0x33, 0x08, 0x66, 0x9c, 0x92, 0xe4, 0x1e, 0x05, 0x37, 0x0e, 0x87, 0xb5, 0x4a, 0xcf, 0x43, 0x39, + 0x14, 0x64, 0x7d, 0xdf, 0x2e, 0xee, 0xff, 0x76, 0x52, 0x19, 0x8a, 0x81, 0x68, 0x2a, 0x9d, 0x83, + 0xe5, 0x71, 0xc1, 0x51, 0xea, 0xb8, 0xf4, 0x40, 0x90, 0x43, 0x2f, 0x43, 0xce, 0x8d, 0x8e, 0xfc, + 0x28, 0x8e, 0xda, 0xca, 0x61, 0xc6, 0x2e, 0x2b, 0x3d, 0x83, 0x74, 0x4b, 0xb3, 0xbd, 0x90, 0x60, + 0x13, 0xcf, 0x2a, 0x86, 0xd1, 0x54, 0xac, 0x8e, 0xf4, 0x3e, 0x54, 0xa3, 0x22, 0x5f, 0x68, 0x19, + 0x29, 0x77, 0x0b, 0x9e, 0x83, 0xcc, 0xb1, 0x6e, 0xf6, 0x14, 0x9b, 0x29, 0x2b, 0x62, 0x31, 0xa2, + 0x5b, 0x93, 0x47, 0xc1, 0x24, 0x23, 0xf3, 0x81, 0x24, 0xc3, 0xf9, 0xc8, 0xe8, 0x47, 0x45, 0xb4, + 0xbe, 0x4a, 0xb8, 0x3d, 0x8b, 0x98, 0x0f, 0x3c, 0x45, 0x7c, 0xb2, 0x7c, 0x40, 0x5f, 0x6b, 0xb1, + 0xb5, 0x32, 0xfd, 0x79, 0x2c, 0x46, 0xd2, 0x9b, 0xee, 0xd6, 0xf7, 0x62, 0x0b, 0xba, 0x0a, 0x29, + 0x16, 0x8d, 0xb8, 0x95, 0xce, 0x8d, 0x6e, 0x72, 0xca, 0x85, 0x19, 0x8f, 0xd4, 0x84, 0x5a, 0x74, + 0x2c, 0x99, 0x4b, 0xd3, 0xef, 0x12, 0x70, 0x6e, 0x7c, 0x38, 0x7e, 0xa4, 0x67, 0xb1, 0x02, 0x49, + 0x7b, 0x48, 0x7d, 0x65, 0xf2, 0xca, 0x02, 0xa6, 0x3f, 0xd1, 0x21, 0x2c, 0x76, 0xf5, 0xb6, 0xd2, + 0x95, 0x7d, 0x67, 0x54, 0xa4, 0xd7, 0x97, 0x47, 0x4f, 0x13, 0x33, 0x13, 0x51, 0x47, 0x8e, 0x69, + 0x99, 0xe9, 0xd8, 0x71, 0xcf, 0x6a, 0xe4, 0x39, 0x4d, 0x7f, 0xf7, 0x73, 0x8a, 0x2e, 0xc1, 0x42, + 0x4f, 0x19, 0xca, 0xf6, 0x50, 0x38, 0x57, 0xee, 0x35, 0xa1, 0xa7, 0x0c, 0x5b, 0x43, 0xe6, 0x59, + 0xa5, 0x5f, 0xf8, 0xad, 0x18, 0xcc, 0x35, 0x1e, 0xaf, 0x15, 0x0f, 0x60, 0x99, 0xe7, 0x45, 0x44, + 0x1d, 0x63, 0xc8, 0x19, 0xfc, 0x1c, 0x72, 0xc4, 0x1f, 0xaf, 0x0d, 0xa5, 0x9f, 0x27, 0x5c, 0x07, + 0x11, 0x48, 0x51, 0x1e, 0xb3, 0x7d, 0xde, 0x86, 0x25, 0x95, 0xb4, 0x35, 0xf5, 0xbb, 0x9a, 0x67, + 0x51, 0x48, 0x3f, 0x66, 0xeb, 0xfc, 0xb1, 0x00, 0x39, 0x4c, 0x2c, 0x83, 0x26, 0x08, 0x68, 0x03, + 0xf2, 0x64, 0xd8, 0x26, 0x86, 0xed, 0xe4, 0x54, 0xe3, 0x73, 0x53, 0xce, 0xdd, 0x70, 0x38, 0x29, + 0xd2, 0x72, 0xc5, 0xd0, 0x4d, 0x01, 0xaa, 0xa3, 0xf1, 0xb1, 0x10, 0xf7, 0xa3, 0xea, 0x57, 0x1c, + 0x54, 0x9d, 0x8c, 0x04, 0x56, 0x5c, 0x2a, 0x04, 0xab, 0x6f, 0x0a, 0x58, 0x9d, 0x9a, 0xf2, 0xb2, + 0x00, 0xae, 0xae, 0x07, 0x70, 0x75, 0x7a, 0xca, 0x32, 0x23, 0x80, 0xf5, 0x2b, 0x0e, 0xb0, 0xce, + 0x4c, 0x99, 0x71, 0x08, 0x59, 0xdf, 0x0e, 0x22, 0xeb, 0x6c, 0x84, 0xdb, 0x71, 0xa4, 0x27, 0x42, + 0xeb, 0x37, 0x7c, 0xd0, 0x3a, 0x17, 0x89, 0x69, 0xb9, 0xa2, 0x31, 0xd8, 0xfa, 0xad, 0x00, 0xb6, + 0xce, 0x4f, 0xb1, 0xc3, 0x04, 0x70, 0xbd, 0xe9, 0x07, 0xd7, 0x10, 0x89, 0xd1, 0xc5, 0x77, 0x8f, + 0x42, 0xd7, 0xaf, 0xba, 0xe8, 0xba, 0x10, 0x59, 0x26, 0x10, 0x6b, 0x09, 0xc3, 0xeb, 0xbd, 0x11, + 0x78, 0xcd, 0xe1, 0xf0, 0xb3, 0x91, 0x2a, 0xa6, 0xe0, 0xeb, 0xbd, 0x11, 0x7c, 0x5d, 0x9c, 0xa2, + 0x70, 0x0a, 0xc0, 0x7e, 0x6f, 0x3c, 0xc0, 0x8e, 0x86, 0xc0, 0x62, 0x9a, 0xb3, 0x21, 0x6c, 0x39, + 0x02, 0x61, 0x97, 0x23, 0xd1, 0x20, 0x57, 0x3f, 0x33, 0xc4, 0x3e, 0x1c, 0x03, 0xb1, 0x39, 0x18, + 0xbe, 0x12, 0xa9, 0x7c, 0x06, 0x8c, 0x7d, 0x38, 0x06, 0x63, 0x2f, 0x4e, 0x55, 0x3b, 0x15, 0x64, + 0x6f, 0x05, 0x41, 0x36, 0x9a, 0x72, 0xc6, 0x22, 0x51, 0xf6, 0x51, 0x14, 0xca, 0xe6, 0x48, 0xf8, + 0x5a, 0xa4, 0xc6, 0x39, 0x60, 0xf6, 0xde, 0x08, 0xcc, 0x5e, 0x9e, 0xb2, 0xd3, 0x66, 0xc5, 0xd9, + 0xcf, 0xd3, 0x54, 0x2f, 0xe4, 0xaa, 0x69, 0xb6, 0x48, 0x4c, 0x53, 0x37, 0x05, 0x62, 0xe6, 0x03, + 0xe9, 0x0a, 0xc5, 0x5d, 0x9e, 0x5b, 0x9e, 0x80, 0xc9, 0x59, 0x56, 0xee, 0x73, 0xc5, 0xd2, 0x6f, + 0xe2, 0x9e, 0x2c, 0x83, 0x2b, 0x7e, 0xcc, 0x96, 0x17, 0x98, 0xcd, 0x87, 0xd4, 0x13, 0x41, 0xa4, + 0xbe, 0x0a, 0x05, 0x9a, 0x6d, 0x87, 0x40, 0xb8, 0x62, 0xb8, 0x20, 0xfc, 0x2a, 0x2c, 0xb2, 0xf0, + 0xc9, 0xf1, 0xbc, 0x48, 0xb1, 0x53, 0x2c, 0x0d, 0x2a, 0xd3, 0x07, 0xdc, 0x0a, 0x3c, 0xd7, 0x7e, + 0x11, 0x96, 0x7c, 0xbc, 0x6e, 0x16, 0xcf, 0x11, 0x69, 0xc5, 0xe5, 0x5e, 0x17, 0xe9, 0xfc, 0xef, + 0xe3, 0x9e, 0x85, 0x3c, 0xf4, 0x3e, 0x0e, 0x68, 0xc7, 0x1f, 0x11, 0xd0, 0x4e, 0x7c, 0x67, 0xa0, + 0xed, 0x47, 0x25, 0xc9, 0x20, 0x2a, 0xf9, 0x7b, 0xdc, 0xfb, 0x26, 0x2e, 0x6c, 0x6e, 0xeb, 0x2a, + 0x11, 0x38, 0x81, 0xfd, 0xa6, 0x09, 0x4a, 0x57, 0x3f, 0x11, 0x68, 0x80, 0xfe, 0xa4, 0x5c, 0x6e, + 0xec, 0xcc, 0x8b, 0xd0, 0xe8, 0x42, 0x8c, 0x34, 0xb3, 0xb0, 0x80, 0x18, 0x15, 0x48, 0x3e, 0x20, + 0x3c, 0xd2, 0x2d, 0x60, 0xfa, 0x93, 0xf2, 0xb1, 0x4d, 0xc6, 0xe2, 0xd7, 0x02, 0xe6, 0x03, 0x74, + 0x0b, 0xf2, 0xac, 0xf8, 0x2f, 0xeb, 0x86, 0x25, 0x02, 0x52, 0x20, 0xd1, 0xe1, 0x35, 0xfe, 0xb5, + 0x7d, 0xca, 0xb3, 0x67, 0x58, 0x38, 0x67, 0x88, 0x5f, 0x3e, 0xf4, 0x94, 0x0f, 0x00, 0xf8, 0x0b, + 0x90, 0xa7, 0xb3, 0xb7, 0x0c, 0xa5, 0x4d, 0x58, 0x64, 0xc9, 0x63, 0x8f, 0x20, 0xdd, 0x07, 0x34, + 0x1a, 0x27, 0x51, 0x13, 0x32, 0xe4, 0x94, 0xf4, 0x6d, 0xfa, 0xd9, 0x92, 0x61, 0x14, 0x22, 0xf2, + 0x22, 0xd2, 0xb7, 0x37, 0xaa, 0xd4, 0xc8, 0x7f, 0xfb, 0x7a, 0xb5, 0xc2, 0xb9, 0xaf, 0xe9, 0x3d, + 0xcd, 0x26, 0x3d, 0xc3, 0x3e, 0xc3, 0x42, 0x5e, 0xfa, 0x73, 0x82, 0xc2, 0xd5, 0x40, 0xfc, 0x1c, + 0x6b, 0x5b, 0x67, 0xcb, 0x27, 0x7c, 0x65, 0x8a, 0xd9, 0xec, 0x7d, 0x11, 0xe0, 0x44, 0xb1, 0xe4, + 0x8f, 0x94, 0xbe, 0x4d, 0x54, 0x61, 0xf4, 0xfc, 0x89, 0x62, 0xbd, 0xc3, 0x08, 0xf4, 0xab, 0xd3, + 0xc7, 0x03, 0x8b, 0xa8, 0x22, 0xf5, 0xcf, 0x9e, 0x28, 0xd6, 0xa1, 0x45, 0x54, 0xdf, 0x2a, 0xb3, + 0x0f, 0xb7, 0xca, 0xa0, 0x8d, 0x73, 0x21, 0x1b, 0xfb, 0x80, 0x64, 0xde, 0x0f, 0x24, 0x51, 0x0d, + 0x72, 0x86, 0xa9, 0xe9, 0xa6, 0x66, 0x9f, 0xb1, 0x0f, 0x93, 0xc4, 0xee, 0x18, 0x5d, 0x86, 0x62, + 0x8f, 0xf4, 0x0c, 0x5d, 0xef, 0xca, 0xdc, 0xd9, 0x14, 0x98, 0xe8, 0x82, 0x20, 0x36, 0x98, 0xcf, + 0xf9, 0x24, 0xe1, 0x9d, 0x3e, 0xaf, 0x60, 0xf0, 0x68, 0xcd, 0xbb, 0x32, 0xc6, 0xbc, 0x3e, 0x0a, + 0x5d, 0x44, 0xc8, 0xbe, 0xee, 0xf8, 0xfb, 0x32, 0xb0, 0xf4, 0x63, 0x56, 0x42, 0x0c, 0xe6, 0x46, + 0xe8, 0x00, 0x16, 0xdd, 0xc3, 0x2f, 0x0f, 0x98, 0x53, 0x70, 0xb6, 0xf3, 0xac, 0xde, 0xa3, 0x72, + 0x1a, 0x24, 0x5b, 0xe8, 0x5d, 0x78, 0x32, 0xe4, 0xd9, 0x5c, 0xd5, 0x89, 0x59, 0x1d, 0xdc, 0x13, + 0x41, 0x07, 0xe7, 0xa8, 0xf6, 0x8c, 0x95, 0x7c, 0xc8, 0x33, 0xb7, 0x0d, 0xa5, 0x60, 0x9a, 0x37, + 0xf6, 0xf3, 0x5f, 0x86, 0xa2, 0x49, 0x6c, 0x45, 0xeb, 0xcb, 0x81, 0xba, 0xdf, 0x02, 0x27, 0x8a, + 0x6a, 0xe2, 0x3e, 0x3c, 0x31, 0x36, 0xdd, 0x43, 0xff, 0x0d, 0x79, 0x2f, 0x53, 0x8c, 0x47, 0x80, + 0x27, 0xb7, 0x34, 0xe4, 0xf1, 0x4a, 0xbf, 0x8d, 0x7b, 0x2a, 0x83, 0xc5, 0xa6, 0x06, 0x64, 0x4c, + 0x62, 0x0d, 0xba, 0xbc, 0xfc, 0x53, 0xba, 0xf1, 0xe2, 0x6c, 0x89, 0x22, 0xa5, 0x0e, 0xba, 0x36, + 0x16, 0xc2, 0xd2, 0x7d, 0xc8, 0x70, 0x0a, 0x2a, 0x40, 0xf6, 0x70, 0xf7, 0xce, 0xee, 0xde, 0x3b, + 0xbb, 0x95, 0x18, 0x02, 0xc8, 0xac, 0xd7, 0xeb, 0x8d, 0xfd, 0x56, 0x25, 0x8e, 0xf2, 0x90, 0x5e, + 0xdf, 0xd8, 0xc3, 0xad, 0x4a, 0x82, 0x92, 0x71, 0xe3, 0x76, 0xa3, 0xde, 0xaa, 0x24, 0xd1, 0x22, + 0x14, 0xf9, 0x6f, 0x79, 0x6b, 0x0f, 0xdf, 0x5d, 0x6f, 0x55, 0x52, 0x3e, 0xd2, 0x41, 0x63, 0x77, + 0xb3, 0x81, 0x2b, 0x69, 0xe9, 0x25, 0x38, 0x1f, 0x99, 0x5a, 0x7a, 0x95, 0xa4, 0xb8, 0xaf, 0x92, + 0x24, 0xfd, 0x2c, 0x01, 0xb5, 0xe8, 0x7c, 0x11, 0xdd, 0x0e, 0x2d, 0xfc, 0xc6, 0x1c, 0xc9, 0x66, + 0x68, 0xf5, 0xe8, 0x19, 0x28, 0x99, 0xe4, 0x98, 0xd8, 0xed, 0x0e, 0xcf, 0x5f, 0x79, 0xc0, 0x2c, + 0xe2, 0xa2, 0xa0, 0x32, 0x21, 0x8b, 0xb3, 0x7d, 0x40, 0xda, 0xb6, 0xcc, 0x7d, 0x11, 0xdf, 0x74, + 0x79, 0xca, 0x46, 0xa9, 0x07, 0x9c, 0x28, 0xbd, 0x3f, 0x97, 0x2d, 0xf3, 0x90, 0xc6, 0x8d, 0x16, + 0x7e, 0xb7, 0x92, 0x44, 0x08, 0x4a, 0xec, 0xa7, 0x7c, 0xb0, 0xbb, 0xbe, 0x7f, 0xd0, 0xdc, 0xa3, + 0xb6, 0x5c, 0x82, 0xb2, 0x63, 0x4b, 0x87, 0x98, 0x96, 0xde, 0xf3, 0xe2, 0x8f, 0xaf, 0x9a, 0xb6, + 0x05, 0xa5, 0x50, 0xba, 0x18, 0x1f, 0xc5, 0x33, 0x5e, 0x35, 0xcc, 0x4d, 0x05, 0x71, 0xf1, 0xd4, + 0x3f, 0x94, 0x7e, 0x19, 0x87, 0xa7, 0x26, 0x24, 0x94, 0xe8, 0x4e, 0xc8, 0xf2, 0x37, 0xe7, 0x49, + 0x47, 0xc3, 0x1b, 0xef, 0xd6, 0x4c, 0xc6, 0x3a, 0xd8, 0x59, 0x3f, 0x68, 0x06, 0x37, 0x9e, 0xf4, + 0x45, 0x12, 0x9e, 0x8c, 0x48, 0xf9, 0x69, 0x76, 0xd7, 0xd3, 0x55, 0xed, 0x58, 0x23, 0xaa, 0x2c, + 0xea, 0xc0, 0x39, 0x0c, 0x0e, 0xa9, 0x35, 0x44, 0xb7, 0x00, 0xec, 0xa1, 0x6c, 0x92, 0xb6, 0x6e, + 0xaa, 0x4e, 0x7a, 0x34, 0x7a, 0x14, 0x5b, 0x43, 0xcc, 0x38, 0x70, 0xde, 0x16, 0xbf, 0x26, 0x25, + 0x44, 0xe8, 0x75, 0xa1, 0x94, 0x2e, 0xc7, 0x29, 0x93, 0x5f, 0x1c, 0x53, 0xd8, 0x23, 0x6d, 0xaa, + 0x98, 0x99, 0x81, 0x29, 0x66, 0xfc, 0xe8, 0xee, 0x38, 0xd7, 0x9b, 0x9e, 0xcd, 0xf5, 0xce, 0xe7, + 0x74, 0x33, 0x0f, 0xe9, 0x74, 0xaf, 0x01, 0x62, 0xcd, 0x17, 0xed, 0xa4, 0x4f, 0x54, 0x57, 0x6b, + 0x96, 0x95, 0xa0, 0x2a, 0x8a, 0x61, 0x1c, 0xb0, 0x07, 0x82, 0x5b, 0xfa, 0x75, 0xc2, 0xff, 0x9d, + 0x82, 0x80, 0xe9, 0x1c, 0x64, 0x94, 0x36, 0x85, 0x08, 0xe2, 0x13, 0x89, 0xd1, 0x84, 0x5a, 0x78, + 0xc8, 0xc8, 0xc9, 0x47, 0x61, 0xe4, 0xd4, 0xe3, 0x30, 0x72, 0xfa, 0xe1, 0x8c, 0x2c, 0xfd, 0x24, + 0xe9, 0xb9, 0xfc, 0x60, 0xf9, 0xf0, 0x91, 0xe5, 0x99, 0x21, 0x5b, 0x26, 0xe6, 0xb4, 0xe5, 0xd8, + 0x5c, 0x21, 0xf9, 0xf8, 0x72, 0x85, 0xd4, 0x43, 0x6e, 0x5b, 0xff, 0xa6, 0x4a, 0x07, 0x37, 0xd5, + 0x48, 0x58, 0xcf, 0x8c, 0x09, 0xeb, 0xef, 0x02, 0xf8, 0xba, 0x63, 0xcb, 0x90, 0x36, 0xf5, 0x41, + 0x5f, 0x65, 0x3b, 0x37, 0x8d, 0xf9, 0x00, 0xbd, 0x0c, 0x69, 0xea, 0x4c, 0xa3, 0x5d, 0x0a, 0x75, + 0x86, 0xbe, 0x62, 0x2b, 0xe7, 0x96, 0x34, 0x40, 0xa3, 0xf5, 0xfe, 0x88, 0x57, 0xbc, 0x11, 0x7c, + 0xc5, 0xd3, 0x91, 0x9d, 0x83, 0xf1, 0xaf, 0xfa, 0x18, 0xd2, 0x6c, 0x7b, 0xd0, 0xf4, 0x86, 0x35, + 0xda, 0x04, 0x5e, 0xa6, 0xbf, 0xd1, 0x0f, 0x00, 0x14, 0xdb, 0x36, 0xb5, 0xa3, 0x81, 0xf7, 0x82, + 0xd5, 0xf1, 0xdb, 0x6b, 0xdd, 0xe1, 0xdb, 0xb8, 0x20, 0xf6, 0xd9, 0xb2, 0x27, 0xea, 0xdb, 0x6b, + 0x3e, 0x85, 0xd2, 0x2e, 0x94, 0x82, 0xb2, 0x0e, 0xc2, 0xe3, 0x73, 0x08, 0x22, 0x3c, 0x0e, 0xd8, + 0x05, 0xc2, 0x73, 0xf1, 0x61, 0x92, 0x37, 0x54, 0xd9, 0x40, 0xfa, 0x67, 0x1c, 0x16, 0xfc, 0xbb, + 0xf3, 0x3f, 0x0d, 0x24, 0x49, 0x9f, 0xc4, 0x21, 0xe7, 0x2e, 0x3e, 0xa2, 0xa1, 0xe9, 0xd9, 0x2e, + 0xe1, 0x6f, 0xdf, 0xf1, 0x0e, 0x69, 0xd2, 0xed, 0xbb, 0xbe, 0xe6, 0x46, 0xf5, 0xa8, 0x9a, 0xb6, + 0xdf, 0xd2, 0x4e, 0x17, 0x42, 0x44, 0xf1, 0x9f, 0x8a, 0x79, 0xd0, 0x10, 0x89, 0xfe, 0x87, 0x3a, + 0x75, 0xb7, 0x92, 0x5f, 0x1a, 0x53, 0xda, 0x75, 0x58, 0xd7, 0x5a, 0xc3, 0x75, 0xc6, 0x89, 0x85, + 0x84, 0x98, 0x55, 0xc2, 0xed, 0xdb, 0xbe, 0x49, 0xf5, 0x72, 0x9e, 0x60, 0x82, 0x50, 0x02, 0x38, + 0xdc, 0xbd, 0xbb, 0xb7, 0xb9, 0xbd, 0xb5, 0xdd, 0xd8, 0x14, 0x19, 0xd5, 0xe6, 0x66, 0x63, 0xb3, + 0x92, 0xa0, 0x7c, 0xb8, 0x71, 0x77, 0xef, 0x5e, 0x63, 0xb3, 0x92, 0x94, 0x5e, 0x83, 0xbc, 0xeb, + 0x7a, 0x50, 0x15, 0xb2, 0x8a, 0xaa, 0x9a, 0xc4, 0xb2, 0x44, 0xaa, 0xe9, 0x0c, 0x59, 0xc3, 0x5e, + 0xff, 0x48, 0x74, 0x2d, 0x93, 0x98, 0x0f, 0x24, 0x15, 0xca, 0x21, 0xbf, 0x85, 0x5e, 0x83, 0xac, + 0x31, 0x38, 0x92, 0x9d, 0x4d, 0x1b, 0xba, 0x52, 0xe7, 0x14, 0x1a, 0x06, 0x47, 0x5d, 0xad, 0x7d, + 0x87, 0x9c, 0x39, 0x66, 0x32, 0x06, 0x47, 0x77, 0xf8, 0xde, 0xe6, 0x6f, 0x49, 0xf8, 0xdf, 0xf2, + 0xa3, 0x38, 0xe4, 0x9c, 0xb3, 0x8a, 0xfe, 0x17, 0xf2, 0xae, 0x4f, 0x74, 0x2f, 0x72, 0x44, 0x3a, + 0x53, 0xa1, 0xdf, 0x13, 0x41, 0x57, 0x61, 0x51, 0xc4, 0x65, 0xaf, 0x22, 0xc5, 0x5e, 0x97, 0xc3, + 0x65, 0xfe, 0x60, 0xc7, 0x29, 0x47, 0xdd, 0x4e, 0xe5, 0x92, 0x95, 0xd4, 0xed, 0x54, 0x2e, 0x55, + 0x49, 0x4b, 0x5f, 0xc4, 0xa1, 0x12, 0x76, 0x1c, 0xdf, 0xe7, 0x64, 0x68, 0x72, 0x1d, 0xca, 0x5e, + 0xf9, 0xde, 0x0c, 0x25, 0xa7, 0xff, 0x88, 0x43, 0xce, 0x69, 0x2f, 0xa1, 0x97, 0x7c, 0x2e, 0xac, + 0x34, 0x6e, 0xc7, 0x0a, 0x46, 0xef, 0xb2, 0x40, 0x70, 0x49, 0x89, 0xf9, 0x97, 0x14, 0x75, 0xe3, + 0xc3, 0xb9, 0x7b, 0x93, 0x9a, 0xfb, 0xee, 0xcd, 0x35, 0x40, 0xb6, 0x6e, 0x2b, 0x5d, 0xf9, 0x54, + 0xb7, 0xb5, 0xfe, 0x89, 0xcc, 0x77, 0x08, 0xf7, 0x36, 0x15, 0xf6, 0xe4, 0x1e, 0x7b, 0xb0, 0xef, + 0x6e, 0x16, 0x17, 0xfc, 0xcd, 0xdb, 0xfb, 0x3f, 0x07, 0x19, 0x81, 0x6f, 0x78, 0xf3, 0x5f, 0x8c, + 0xdc, 0x86, 0x64, 0xca, 0xd7, 0x90, 0xac, 0x41, 0xae, 0x47, 0x6c, 0x85, 0xb9, 0x4e, 0x1e, 0x2d, + 0xdd, 0xf1, 0xd5, 0x57, 0xa1, 0xe0, 0xbb, 0x86, 0x41, 0xbd, 0xe9, 0x6e, 0xe3, 0x9d, 0x4a, 0xac, + 0x96, 0xfd, 0xf4, 0xf3, 0x4b, 0xc9, 0x5d, 0xf2, 0x11, 0x3d, 0x68, 0xb8, 0x51, 0x6f, 0x36, 0xea, + 0x77, 0x2a, 0xf1, 0x5a, 0xe1, 0xd3, 0xcf, 0x2f, 0x65, 0x31, 0x61, 0xdd, 0x9f, 0xab, 0x4d, 0x58, + 0xf0, 0x7f, 0x95, 0xe0, 0xa1, 0x46, 0x50, 0xda, 0x3c, 0xdc, 0xdf, 0xd9, 0xae, 0xaf, 0xb7, 0x1a, + 0xf2, 0xbd, 0xbd, 0x56, 0xa3, 0x12, 0x47, 0x4f, 0xc2, 0xd2, 0xce, 0xf6, 0x5b, 0xcd, 0x96, 0x5c, + 0xdf, 0xd9, 0x6e, 0xec, 0xb6, 0xe4, 0xf5, 0x56, 0x6b, 0xbd, 0x7e, 0xa7, 0x92, 0xb8, 0xf1, 0xab, + 0x02, 0x94, 0xd7, 0x37, 0xea, 0xdb, 0x14, 0xde, 0x69, 0x6d, 0x85, 0xb9, 0x88, 0x3a, 0xa4, 0x58, + 0x1d, 0x79, 0xe2, 0x95, 0xda, 0xda, 0xe4, 0xde, 0x20, 0xda, 0x82, 0x34, 0x2b, 0x31, 0xa3, 0xc9, + 0x77, 0x6c, 0x6b, 0x53, 0x9a, 0x85, 0x74, 0x32, 0xec, 0x14, 0x4d, 0xbc, 0x74, 0x5b, 0x9b, 0xdc, + 0x3b, 0x44, 0x3b, 0x90, 0x75, 0x2a, 0x80, 0xd3, 0xae, 0xaf, 0xd6, 0xa6, 0x36, 0xe1, 0xe8, 0xd2, + 0x78, 0xa5, 0x76, 0xf2, 0x7d, 0xdc, 0xda, 0x94, 0xae, 0x22, 0xda, 0x86, 0x8c, 0x28, 0x92, 0x4c, + 0xb9, 0x8a, 0x5a, 0x9b, 0xd6, 0x4c, 0x43, 0x18, 0xf2, 0x5e, 0x0d, 0x7c, 0xfa, 0x2d, 0xe3, 0xda, + 0x0c, 0x0d, 0x53, 0x74, 0x1f, 0x8a, 0xc1, 0xc2, 0xcb, 0x6c, 0xd7, 0x5d, 0x6b, 0x33, 0xb6, 0xed, + 0xa8, 0xfe, 0x60, 0x15, 0x66, 0xb6, 0xeb, 0xaf, 0xb5, 0x19, 0xbb, 0x78, 0xe8, 0x03, 0x58, 0x1c, + 0xad, 0x92, 0xcc, 0x7e, 0x1b, 0xb6, 0x36, 0x47, 0x5f, 0x0f, 0xf5, 0x00, 0x8d, 0xa9, 0xae, 0xcc, + 0x71, 0x39, 0xb6, 0x36, 0x4f, 0x9b, 0x0f, 0xa9, 0x50, 0x0e, 0x83, 0xf5, 0x59, 0x2f, 0xcb, 0xd6, + 0x66, 0x6e, 0xf9, 0xf1, 0xb7, 0x04, 0xa1, 0xe6, 0xac, 0x97, 0x67, 0x6b, 0x33, 0x77, 0x00, 0xd1, + 0x21, 0x80, 0xaf, 0xfc, 0x32, 0xc3, 0x65, 0xda, 0xda, 0x2c, 0xbd, 0x40, 0x64, 0xc0, 0xd2, 0xb8, + 0xb2, 0xcb, 0x3c, 0x77, 0x6b, 0x6b, 0x73, 0xb5, 0x08, 0xe9, 0x7e, 0x0e, 0x42, 0xcc, 0xd9, 0xee, + 0xda, 0xd6, 0x66, 0xec, 0x15, 0x6e, 0x34, 0xbe, 0xfc, 0x66, 0x25, 0xfe, 0xd5, 0x37, 0x2b, 0xf1, + 0xbf, 0x7e, 0xb3, 0x12, 0xff, 0xec, 0xdb, 0x95, 0xd8, 0x57, 0xdf, 0xae, 0xc4, 0xfe, 0xf4, 0xed, + 0x4a, 0xec, 0xff, 0x5e, 0x38, 0xd1, 0xec, 0xce, 0xe0, 0x68, 0xad, 0xad, 0xf7, 0xae, 0xfb, 0xff, + 0x76, 0x31, 0xee, 0xaf, 0x20, 0x47, 0x19, 0x16, 0x4d, 0x6f, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, + 0x8c, 0x7e, 0x93, 0x10, 0x2a, 0x32, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5752,10 +6034,15 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.Votes) > 0 { - for iNdEx := len(m.Votes) - 1; iNdEx >= 0; iNdEx-- { + if m.MaxTxBytes != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.MaxTxBytes)) + i-- + dAtA[i] = 0x30 + } + if len(m.ByzantineValidators) > 0 { + for iNdEx := len(m.ByzantineValidators) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Votes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ByzantineValidators[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5763,22 +6050,44 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x2a } } - if m.BlockDataSize != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) - i-- - dAtA[i] = 0x10 + { + size, err := m.LocalLastCommit.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if len(m.BlockData) > 0 { - for iNdEx := len(m.BlockData) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.BlockData[iNdEx]) - copy(dAtA[i:], m.BlockData[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.BlockData[iNdEx]))) + i-- + dAtA[i] = 0x22 + if len(m.Txs) > 0 { + for iNdEx := len(m.Txs) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Txs[iNdEx]) + copy(dAtA[i:], m.Txs[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Txs[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x1a + } + } + { + size, err := m.Header.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Hash) > 0 { + i -= len(m.Hash) + copy(dAtA[i:], m.Hash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Hash))) + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -7108,20 +7417,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA55 := make([]byte, len(m.RefetchChunks)*10) - var j54 int + dAtA57 := make([]byte, len(m.RefetchChunks)*10) + var j56 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA55[j54] = uint8(uint64(num)&0x7f | 0x80) + dAtA57[j56] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j54++ + j56++ } - dAtA55[j54] = uint8(num) - j54++ + dAtA57[j56] = uint8(num) + j56++ } - i -= j54 - copy(dAtA[i:], dAtA55[:j54]) - i = encodeVarintTypes(dAtA, i, uint64(j54)) + i -= j56 + copy(dAtA[i:], dAtA57[:j56]) + i = encodeVarintTypes(dAtA, i, uint64(j56)) i-- dAtA[i] = 0x12 } @@ -7216,33 +7525,104 @@ func (m *ResponsePrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.BlockData) > 0 { - for iNdEx := len(m.BlockData) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.BlockData[iNdEx]) - copy(dAtA[i:], m.BlockData[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.BlockData[iNdEx]))) + if len(m.AppSignedUpdates) > 0 { + for iNdEx := len(m.AppSignedUpdates) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AppSignedUpdates[iNdEx]) + copy(dAtA[i:], m.AppSignedUpdates[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppSignedUpdates[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x3a } } - return len(dAtA) - i, nil -} - -func (m *ResponseProcessProposal) 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 *ResponseProcessProposal) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - + if m.ConsensusParamUpdates != nil { + { + size, err := m.ConsensusParamUpdates.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + if len(m.ValidatorUpdates) > 0 { + for iNdEx := len(m.ValidatorUpdates) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ValidatorUpdates[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if len(m.TxResults) > 0 { + for iNdEx := len(m.TxResults) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.TxResults[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + if len(m.AppHash) > 0 { + i -= len(m.AppHash) + copy(dAtA[i:], m.AppHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppHash))) + i-- + dAtA[i] = 0x1a + } + if len(m.TxRecords) > 0 { + for iNdEx := len(m.TxRecords) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.TxRecords[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if m.ModifiedTx { + i-- + if m.ModifiedTx { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *ResponseProcessProposal) 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 *ResponseProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + func (m *ResponseProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i @@ -7439,6 +7819,48 @@ func (m *CommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ExtendedCommitInfo) 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 *ExtendedCommitInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ExtendedCommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Votes) > 0 { + for iNdEx := len(m.Votes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Votes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if m.Round != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Round)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *Event) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7660,6 +8082,41 @@ func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *TxRecord) 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 *TxRecord) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TxRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Tx) > 0 { + i -= len(m.Tx) + copy(dAtA[i:], m.Tx) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Tx))) + i-- + dAtA[i] = 0x12 + } + if m.Action != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Action)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *Validator) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7776,6 +8233,56 @@ func (m *VoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ExtendedVoteInfo) 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 *ExtendedVoteInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ExtendedVoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.VoteExtension) > 0 { + i -= len(m.VoteExtension) + copy(dAtA[i:], m.VoteExtension) + i = encodeVarintTypes(dAtA, i, uint64(len(m.VoteExtension))) + i-- + dAtA[i] = 0x1a + } + if m.SignedLastBlock { + i-- + if m.SignedLastBlock { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } + { + size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *Evidence) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7801,12 +8308,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n62, err62 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err62 != nil { - return 0, err62 + n66, err66 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err66 != nil { + return 0, err66 } - i -= n62 - i = encodeVarintTypes(dAtA, i, uint64(n62)) + i -= n66 + i = encodeVarintTypes(dAtA, i, uint64(n66)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -8404,21 +8911,29 @@ func (m *RequestPrepareProposal) Size() (n int) { } var l int _ = l - if len(m.BlockData) > 0 { - for _, b := range m.BlockData { + l = len(m.Hash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = m.Header.Size() + n += 1 + l + sovTypes(uint64(l)) + if len(m.Txs) > 0 { + for _, b := range m.Txs { l = len(b) n += 1 + l + sovTypes(uint64(l)) } } - if m.BlockDataSize != 0 { - n += 1 + sovTypes(uint64(m.BlockDataSize)) - } - if len(m.Votes) > 0 { - for _, e := range m.Votes { + l = m.LocalLastCommit.Size() + n += 1 + l + sovTypes(uint64(l)) + if len(m.ByzantineValidators) > 0 { + for _, e := range m.ByzantineValidators { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } } + if m.MaxTxBytes != 0 { + n += 1 + sovTypes(uint64(m.MaxTxBytes)) + } return n } @@ -9102,8 +9617,37 @@ func (m *ResponsePrepareProposal) Size() (n int) { } var l int _ = l - if len(m.BlockData) > 0 { - for _, b := range m.BlockData { + if m.ModifiedTx { + n += 2 + } + if len(m.TxRecords) > 0 { + for _, e := range m.TxRecords { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + l = len(m.AppHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if len(m.TxResults) > 0 { + for _, e := range m.TxResults { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + if len(m.ValidatorUpdates) > 0 { + for _, e := range m.ValidatorUpdates { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + if m.ConsensusParamUpdates != nil { + l = m.ConsensusParamUpdates.Size() + n += 1 + l + sovTypes(uint64(l)) + } + if len(m.AppSignedUpdates) > 0 { + for _, b := range m.AppSignedUpdates { l = len(b) n += 1 + l + sovTypes(uint64(l)) } @@ -9199,6 +9743,24 @@ func (m *CommitInfo) Size() (n int) { return n } +func (m *ExtendedCommitInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Round != 0 { + n += 1 + sovTypes(uint64(m.Round)) + } + if len(m.Votes) > 0 { + for _, e := range m.Votes { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + return n +} + func (m *Event) Size() (n int) { if m == nil { return 0 @@ -9299,13 +9861,29 @@ func (m *TxResult) Size() (n int) { return n } -func (m *Validator) Size() (n int) { +func (m *TxRecord) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Address) + if m.Action != 0 { + n += 1 + sovTypes(uint64(m.Action)) + } + l = len(m.Tx) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *Validator) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -9343,6 +9921,24 @@ func (m *VoteInfo) Size() (n int) { return n } +func (m *ExtendedVoteInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Validator.Size() + n += 1 + l + sovTypes(uint64(l)) + if m.SignedLastBlock { + n += 2 + } + l = len(m.VoteExtension) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Evidence) Size() (n int) { if m == nil { return 0 @@ -11894,7 +12490,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11921,14 +12517,16 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) - copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) + m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", wireType) } - m.BlockDataSize = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11938,14 +12536,60 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.BlockDataSize |= int64(b&0x7F) << shift + 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.Header.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Votes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Txs", 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.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LocalLastCommit", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11972,11 +12616,63 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Votes = append(m.Votes, &types1.Vote{}) - if err := m.Votes[len(m.Votes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.LocalLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ByzantineValidators", 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.ByzantineValidators = append(m.ByzantineValidators, Evidence{}) + if err := m.ByzantineValidators[len(m.ByzantineValidators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxTxBytes", wireType) + } + m.MaxTxBytes = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MaxTxBytes |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -15606,10 +16302,10 @@ func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ModifiedTx", wireType) } - var byteLen int + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -15619,79 +16315,17 @@ func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + v |= 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.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) - copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) - 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 *ResponseProcessProposal) 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: ResponseProcessProposal: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ResponseProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Accept", wireType) + m.ModifiedTx = bool(v != 0) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxRecords", wireType) } - var v int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -15701,13 +16335,27 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - m.Accept = bool(v != 0) - case 2: + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxRecords = append(m.TxRecords, &TxRecord{}) + if err := m.TxRecords[len(m.TxRecords)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AppHash", wireType) } @@ -15741,7 +16389,7 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { m.AppHash = []byte{} } iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TxResults", wireType) } @@ -15775,7 +16423,7 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ValidatorUpdates", wireType) } @@ -15809,7 +16457,7 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ConsensusParamUpdates", wireType) } @@ -15845,24 +16493,264 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { 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 + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppSignedUpdates", wireType) } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF + 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.AppSignedUpdates = append(m.AppSignedUpdates, make([]byte, postIndex-iNdEx)) + copy(m.AppSignedUpdates[len(m.AppSignedUpdates)-1], dAtA[iNdEx:postIndex]) + 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 *ResponseProcessProposal) 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: ResponseProcessProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Accept", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Accept = bool(v != 0) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppHash", 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.AppHash = append(m.AppHash[:0], dAtA[iNdEx:postIndex]...) + if m.AppHash == nil { + m.AppHash = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxResults", 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.TxResults = append(m.TxResults, &ExecTxResult{}) + if err := m.TxResults[len(m.TxResults)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorUpdates", 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.ValidatorUpdates = append(m.ValidatorUpdates, &ValidatorUpdate{}) + if err := m.ValidatorUpdates[len(m.ValidatorUpdates)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusParamUpdates", 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.ConsensusParamUpdates == nil { + m.ConsensusParamUpdates = &types1.ConsensusParams{} + } + if err := m.ConsensusParamUpdates.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF } return nil } @@ -16071,7 +16959,95 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RetainHeight", wireType) } - m.RetainHeight = 0 + m.RetainHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.RetainHeight |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *CommitInfo) 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: CommitInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType) + } + m.Round = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Round |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Votes", wireType) + } + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -16081,11 +17057,26 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.RetainHeight |= int64(b&0x7F) << shift + 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.Votes = append(m.Votes, VoteInfo{}) + if err := m.Votes[len(m.Votes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -16107,7 +17098,7 @@ func (m *ResponseFinalizeBlock) Unmarshal(dAtA []byte) error { } return nil } -func (m *CommitInfo) Unmarshal(dAtA []byte) error { +func (m *ExtendedCommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -16130,10 +17121,10 @@ func (m *CommitInfo) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CommitInfo: wiretype end group for non-group") + return fmt.Errorf("proto: ExtendedCommitInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ExtendedCommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -16184,7 +17175,7 @@ func (m *CommitInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Votes = append(m.Votes, VoteInfo{}) + m.Votes = append(m.Votes, ExtendedVoteInfo{}) if err := m.Votes[len(m.Votes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -16886,6 +17877,109 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { } return nil } +func (m *TxRecord) 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: TxRecord: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TxRecord: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) + } + m.Action = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Action |= TxRecord_TxAction(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Tx", 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.Tx = append(m.Tx[:0], dAtA[iNdEx:postIndex]...) + if m.Tx == nil { + m.Tx = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Validator) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -17194,6 +18288,143 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { } return nil } +func (m *ExtendedVoteInfo) 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: ExtendedVoteInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ExtendedVoteInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Validator", 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.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SignedLastBlock", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.SignedLastBlock = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", 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.VoteExtension = append(m.VoteExtension[:0], dAtA[iNdEx:postIndex]...) + if m.VoteExtension == nil { + m.VoteExtension = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Evidence) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/proto/tendermint/abci/types.proto.intermediate b/proto/tendermint/abci/types.proto.intermediate index b84f4c910..c4ae93c2f 100644 --- a/proto/tendermint/abci/types.proto.intermediate +++ b/proto/tendermint/abci/types.proto.intermediate @@ -135,18 +135,17 @@ message RequestVerifyVoteExtension { } message RequestPrepareProposal { - // block_data is an array of transactions that will be included in a block, + bytes hash = 1; + tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; + // txs is an array of transactions that will be included in a block, // sent to the app for possible modifications. - // applications can not exceed the size of the data passed to it. - repeated bytes block_data = 1; - // If an application decides to populate block_data with extra information, they can not exceed this value. - int64 block_data_size = 2; - // votes includes all votes from the previous block. This contains vote extension data that can be used in proposal - // preparation. The votes here will then form the last commit that gets sent in the proposed block. - repeated tendermint.types.Vote votes = 3; + repeated bytes txs = 3; + ExtendedCommitInfo local_last_commit = 4 [(gogoproto.nullable) = false]; + repeated Evidence byzantine_validators = 5 [(gogoproto.nullable) = false]; + // the modified transactions cannot exceed this size. + int64 max_tx_bytes = 6; } - message RequestProcessProposal { bytes hash = 1; tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; @@ -330,7 +329,13 @@ message ResponseVerifyVoteExtension { } message ResponsePrepareProposal { - repeated bytes block_data = 1; + bool modified_tx = 1; + repeated TxRecord tx_records = 2; + bytes app_hash = 3; + repeated ExecTxResult tx_results = 4; + repeated ValidatorUpdate validator_updates = 5; + tendermint.types.ConsensusParams consensus_param_updates = 6; + repeated bytes app_signed_updates = 7; } message ResponseProcessProposal { @@ -359,6 +364,11 @@ message CommitInfo { repeated VoteInfo votes = 2 [(gogoproto.nullable) = false]; } +message ExtendedCommitInfo { + int32 round = 1; + repeated ExtendedVoteInfo votes = 2 [(gogoproto.nullable) = false]; +} + // Event allows application developers to attach additional information to // ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx and ResponseDeliverTx. // Later, transactions may be queried using these events. @@ -399,6 +409,19 @@ message TxResult { ExecTxResult result = 4 [(gogoproto.nullable) = false]; } +message TxRecord { + TxAction action = 1; + bytes tx = 2; + + // TxAction contains App-provided information on what to do with a transaction that is part of a raw proposal + enum TxAction { + UNKNOWN = 0; // Unknown action + UNMODIFIED = 1; // The Application did not modify this transaction. + ADDED = 2; // The Application added this transaction. + REMOVED = 3; // The Application wants this transaction removed from the proposal and the mempool. + } +} + //---------------------------------------- // Blockchain Types @@ -423,6 +446,13 @@ message VoteInfo { reserved 4; // Placeholder for app_signed_extension in v0.37 } +// ExtendedVoteInfo +message ExtendedVoteInfo { + Validator validator = 1 [(gogoproto.nullable) = false]; + bool signed_last_block = 2; + bytes vote_extension = 3; +} + enum EvidenceType { UNKNOWN = 0; DUPLICATE_VOTE = 1;