From 25b0c7c78e6a2b1ab594932f94799d46909ca800 Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Thu, 11 Aug 2022 11:21:43 +0200 Subject: [PATCH] `PrepareProposal`/`ProcessProposal`: Dealing with block data exposed to App (#9219) * [cherrypicked] abci++: only include meaningful header fields in data passed-through to application (#8216) * make proto-gen * Fix kvstore tests * Small changes to abci protobufs taken from v0.36.x * make proto-gen (again) * [Partial cherrypick] Restore `Commit` to the ABCI++ spec, and other late modifications (backport #8796) (#8936) * Restore `Commit` to the ABCI++ spec, and other late modifications (#8796) * Added VoteExtensionsEnableHeight * Fix reference to `modified` * Removed old pseudo-code, now included in spec * Removed markdown warnings in abci++_basic_concepts_002_draft.md * Restored `Commit` in the Methods section * Addressed remaining markdown warnings * Revisited intro and basic concepts section * Extra pass at all spec sections to recover Commit, and other ABCI++ spec modifications * Fixed links * make proto-gen * Remove _primes_ from spec notation * Update proto/tendermint/abci/types.proto Co-authored-by: Callum Waters * Update spec/abci++/abci++_tmint_expected_behavior_002_draft.md Co-authored-by: Callum Waters * Addressed @cmwaters' comments * Addressed @angbrav's and @mpoke's comments on spec * make proto-gen * Fix MD anchor reference * Clarify throughout the spec when `ProcessProposal` and `VerifyVoteExtension` are called * Update spec/abci++/abci++_app_requirements_002_draft.md Co-authored-by: M. J. Fromberger * Update spec/abci++/abci++_app_requirements_002_draft.md Co-authored-by: M. J. Fromberger * Update spec/abci++/abci++_app_requirements_002_draft.md Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> * Update spec/abci++/abci++_basic_concepts_002_draft.md Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> * Update spec/abci++/abci++_basic_concepts_002_draft.md Co-authored-by: M. J. Fromberger * Update spec/abci++/abci++_basic_concepts_002_draft.md Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> * Update spec/abci++/abci++_methods_002_draft.md Co-authored-by: M. J. Fromberger * Update spec/abci++/abci++_tmint_expected_behavior_002_draft.md Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> * Addresed comments * Renamed 'draft' files * Adatped links to new filenames * Fixed links and minor cosmetic changes * Renamed 'byzantine_validators' to 'misbehavior' in ABCI++ spec and protobufs * make proto-gen * Renamed 'byzantine_validators' to 'misbehavior' in the code * Fixed link * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_basic_concepts.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Update spec/abci++/abci++_methods.md Co-authored-by: Daniel * Addressed @cason's comments * Clarified conditions for `ProcessProposal` call at proposer Co-authored-by: Callum Waters Co-authored-by: M. J. Fromberger Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> Co-authored-by: Daniel (cherry picked from commit 331860c2a8c406fa89575165322b963925fb38c5) * Fixed merge conflicts Co-authored-by: Sergio Mena * make proto-gen (and again) * make build * fix UTs Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- abci/example/kvstore/persistent_kvstore.go | 2 +- abci/types/types.pb.go | 827 ++++++++++++--------- proto/tendermint/abci/types.proto | 38 +- state/execution.go | 14 +- state/execution_test.go | 8 +- state/helpers_test.go | 8 +- state/validation_test.go | 2 +- types/evidence.go | 34 +- 8 files changed, 514 insertions(+), 419 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index b24c0d268..1876153a7 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -130,7 +130,7 @@ func (app *PersistentKVStoreApplication) BeginBlock(req types.RequestBeginBlock) // Punish validators who committed equivocation. for _, ev := range req.ByzantineValidators { - if ev.Type == types.EvidenceType_DUPLICATE_VOTE { + if ev.Type == types.MisbehaviorType_DUPLICATE_VOTE { addr := string(ev.Validator.Address) if pubKey, ok := app.valAddrToPubKeyMap[addr]; ok { app.updateValidator(types.ValidatorUpdate{ diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 696f15f33..108c1736c 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -58,31 +58,31 @@ func (CheckTxType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{0} } -type EvidenceType int32 +type MisbehaviorType int32 const ( - EvidenceType_UNKNOWN EvidenceType = 0 - EvidenceType_DUPLICATE_VOTE EvidenceType = 1 - EvidenceType_LIGHT_CLIENT_ATTACK EvidenceType = 2 + MisbehaviorType_UNKNOWN MisbehaviorType = 0 + MisbehaviorType_DUPLICATE_VOTE MisbehaviorType = 1 + MisbehaviorType_LIGHT_CLIENT_ATTACK MisbehaviorType = 2 ) -var EvidenceType_name = map[int32]string{ +var MisbehaviorType_name = map[int32]string{ 0: "UNKNOWN", 1: "DUPLICATE_VOTE", 2: "LIGHT_CLIENT_ATTACK", } -var EvidenceType_value = map[string]int32{ +var MisbehaviorType_value = map[string]int32{ "UNKNOWN": 0, "DUPLICATE_VOTE": 1, "LIGHT_CLIENT_ATTACK": 2, } -func (x EvidenceType) String() string { - return proto.EnumName(EvidenceType_name, int32(x)) +func (x MisbehaviorType) String() string { + return proto.EnumName(MisbehaviorType_name, int32(x)) } -func (EvidenceType) EnumDescriptor() ([]byte, []int) { +func (MisbehaviorType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{1} } @@ -849,7 +849,7 @@ type RequestBeginBlock 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"` LastCommitInfo CommitInfo `protobuf:"bytes,3,opt,name=last_commit_info,json=lastCommitInfo,proto3" json:"last_commit_info"` - ByzantineValidators []Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` + ByzantineValidators []Misbehavior `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators,proto3" json:"byzantine_validators"` } func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } @@ -906,7 +906,7 @@ func (m *RequestBeginBlock) GetLastCommitInfo() CommitInfo { return CommitInfo{} } -func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { +func (m *RequestBeginBlock) GetByzantineValidators() []Misbehavior { if m != nil { return m.ByzantineValidators } @@ -1302,15 +1302,18 @@ func (m *RequestApplySnapshotChunk) GetSender() string { } type RequestPrepareProposal 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"` + // the modified transactions cannot exceed this size. + MaxTxBytes int64 `protobuf:"varint,1,opt,name=max_tx_bytes,json=maxTxBytes,proto3" json:"max_tx_bytes,omitempty"` // txs is an array of transactions that will be included in a block, // sent to the app for possible modifications. - 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"` + Txs [][]byte `protobuf:"bytes,2,rep,name=txs,proto3" json:"txs,omitempty"` + LocalLastCommit ExtendedCommitInfo `protobuf:"bytes,3,opt,name=local_last_commit,json=localLastCommit,proto3" json:"local_last_commit"` + Misbehavior []Misbehavior `protobuf:"bytes,4,rep,name=misbehavior,proto3" json:"misbehavior"` + Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"` + Time time.Time `protobuf:"bytes,6,opt,name=time,proto3,stdtime" json:"time"` + NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` + // address of the public key of the validator proposing the block. + ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } @@ -1346,18 +1349,11 @@ func (m *RequestPrepareProposal) XXX_DiscardUnknown() { var xxx_messageInfo_RequestPrepareProposal proto.InternalMessageInfo -func (m *RequestPrepareProposal) GetHash() []byte { +func (m *RequestPrepareProposal) GetMaxTxBytes() int64 { if m != nil { - return m.Hash + return m.MaxTxBytes } - return nil -} - -func (m *RequestPrepareProposal) GetHeader() types1.Header { - if m != nil { - return m.Header - } - return types1.Header{} + return 0 } func (m *RequestPrepareProposal) GetTxs() [][]byte { @@ -1374,24 +1370,45 @@ func (m *RequestPrepareProposal) GetLocalLastCommit() ExtendedCommitInfo { return ExtendedCommitInfo{} } -func (m *RequestPrepareProposal) GetByzantineValidators() []Evidence { +func (m *RequestPrepareProposal) GetMisbehavior() []Misbehavior { if m != nil { - return m.ByzantineValidators + return m.Misbehavior } return nil } -func (m *RequestPrepareProposal) GetMaxTxBytes() int64 { +func (m *RequestPrepareProposal) GetHeight() int64 { if m != nil { - return m.MaxTxBytes + return m.Height } return 0 } +func (m *RequestPrepareProposal) GetTime() time.Time { + if m != nil { + return m.Time + } + return time.Time{} +} + +func (m *RequestPrepareProposal) GetNextValidatorsHash() []byte { + if m != nil { + return m.NextValidatorsHash + } + return nil +} + +func (m *RequestPrepareProposal) GetProposerAddress() []byte { + if m != nil { + return m.ProposerAddress + } + return nil +} + type RequestProcessProposal struct { - Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` - ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"` - Misbehavior []Evidence `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"` + Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` + ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"` + Misbehavior []Misbehavior `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"` // hash is the merkle root hash of the fields of the proposed block. Hash []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"` Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"` @@ -1448,7 +1465,7 @@ func (m *RequestProcessProposal) GetProposedLastCommit() CommitInfo { return CommitInfo{} } -func (m *RequestProcessProposal) GetMisbehavior() []Evidence { +func (m *RequestProcessProposal) GetMisbehavior() []Misbehavior { if m != nil { return m.Misbehavior } @@ -3056,7 +3073,10 @@ func (m *CommitInfo) GetVotes() []VoteInfo { } type ExtendedCommitInfo struct { - Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` + // The round at which the block proposer decided in the previous height. + Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` + // List of validators' addresses in the last validator set with their voting + // information, including vote extensions. Votes []ExtendedVoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` } @@ -3566,8 +3586,8 @@ func (m *ExtendedVoteInfo) GetVoteExtension() []byte { return nil } -type Evidence struct { - Type EvidenceType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.EvidenceType" json:"type,omitempty"` +type Misbehavior struct { + Type MisbehaviorType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.MisbehaviorType" json:"type,omitempty"` // The offending validator Validator Validator `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator"` // The height when the offense occurred @@ -3580,18 +3600,18 @@ type Evidence struct { TotalVotingPower int64 `protobuf:"varint,5,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` } -func (m *Evidence) Reset() { *m = Evidence{} } -func (m *Evidence) String() string { return proto.CompactTextString(m) } -func (*Evidence) ProtoMessage() {} -func (*Evidence) Descriptor() ([]byte, []int) { +func (m *Misbehavior) Reset() { *m = Misbehavior{} } +func (m *Misbehavior) String() string { return proto.CompactTextString(m) } +func (*Misbehavior) ProtoMessage() {} +func (*Misbehavior) Descriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{49} } -func (m *Evidence) XXX_Unmarshal(b []byte) error { +func (m *Misbehavior) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Evidence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *Misbehavior) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Evidence.Marshal(b, m, deterministic) + return xxx_messageInfo_Misbehavior.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -3601,47 +3621,47 @@ func (m *Evidence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Evidence) XXX_Merge(src proto.Message) { - xxx_messageInfo_Evidence.Merge(m, src) +func (m *Misbehavior) XXX_Merge(src proto.Message) { + xxx_messageInfo_Misbehavior.Merge(m, src) } -func (m *Evidence) XXX_Size() int { +func (m *Misbehavior) XXX_Size() int { return m.Size() } -func (m *Evidence) XXX_DiscardUnknown() { - xxx_messageInfo_Evidence.DiscardUnknown(m) +func (m *Misbehavior) XXX_DiscardUnknown() { + xxx_messageInfo_Misbehavior.DiscardUnknown(m) } -var xxx_messageInfo_Evidence proto.InternalMessageInfo +var xxx_messageInfo_Misbehavior proto.InternalMessageInfo -func (m *Evidence) GetType() EvidenceType { +func (m *Misbehavior) GetType() MisbehaviorType { if m != nil { return m.Type } - return EvidenceType_UNKNOWN + return MisbehaviorType_UNKNOWN } -func (m *Evidence) GetValidator() Validator { +func (m *Misbehavior) GetValidator() Validator { if m != nil { return m.Validator } return Validator{} } -func (m *Evidence) GetHeight() int64 { +func (m *Misbehavior) GetHeight() int64 { if m != nil { return m.Height } return 0 } -func (m *Evidence) GetTime() time.Time { +func (m *Misbehavior) GetTime() time.Time { if m != nil { return m.Time } return time.Time{} } -func (m *Evidence) GetTotalVotingPower() int64 { +func (m *Misbehavior) GetTotalVotingPower() int64 { if m != nil { return m.TotalVotingPower } @@ -3726,7 +3746,7 @@ func (m *Snapshot) GetMetadata() []byte { func init() { proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) - proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) + proto.RegisterEnum("tendermint.abci.MisbehaviorType", MisbehaviorType_name, MisbehaviorType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) proto.RegisterEnum("tendermint.abci.ResponseProcessProposal_ProposalStatus", ResponseProcessProposal_ProposalStatus_name, ResponseProcessProposal_ProposalStatus_value) @@ -3780,218 +3800,217 @@ func init() { proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") proto.RegisterType((*ExtendedVoteInfo)(nil), "tendermint.abci.ExtendedVoteInfo") - proto.RegisterType((*Evidence)(nil), "tendermint.abci.Evidence") + proto.RegisterType((*Misbehavior)(nil), "tendermint.abci.Misbehavior") proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") } func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3259 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x93, 0x23, 0xc5, - 0xf1, 0xd7, 0xfb, 0x91, 0x7a, 0x4e, 0xed, 0xb0, 0xab, 0x15, 0xcb, 0xcc, 0xd2, 0x1b, 0xc0, 0xee, - 0x02, 0xb3, 0x30, 0xc4, 0xc2, 0xf2, 0xfa, 0x83, 0x46, 0xa3, 0x45, 0xb3, 0x8f, 0xd1, 0xfc, 0x7b, - 0x34, 0x8b, 0xf1, 0x63, 0x9b, 0x96, 0xba, 0x66, 0xd4, 0xac, 0xd4, 0xdd, 0x74, 0x97, 0x06, 0x0d, - 0x27, 0x87, 0x23, 0xb8, 0xe0, 0x0b, 0x11, 0x3e, 0xd8, 0x17, 0x0e, 0x3e, 0xf8, 0x3b, 0xf8, 0x62, - 0x5f, 0xb8, 0x10, 0xe1, 0x83, 0x39, 0xfa, 0xe0, 0xc0, 0x0e, 0xb8, 0xf9, 0x0b, 0xf8, 0xe4, 0xb0, - 0xa3, 0x1e, 0xfd, 0x92, 0xd4, 0x23, 0x0d, 0x10, 0xbe, 0xf8, 0x56, 0x95, 0x9d, 0x99, 0xd5, 0x59, - 0x8f, 0xcc, 0xfc, 0x65, 0x15, 0x3c, 0x4e, 0xb0, 0xa1, 0x61, 0x7b, 0xa4, 0x1b, 0xe4, 0x86, 0xda, - 0xeb, 0xeb, 0x37, 0xc8, 0x89, 0x85, 0x9d, 0x0d, 0xcb, 0x36, 0x89, 0x89, 0x2a, 0xfe, 0xc7, 0x0d, - 0xfa, 0xb1, 0xfe, 0x44, 0x80, 0xbb, 0x6f, 0x9f, 0x58, 0xc4, 0xbc, 0x61, 0xd9, 0xa6, 0x79, 0xc8, - 0xf9, 0xeb, 0x97, 0x02, 0x9f, 0x99, 0x9e, 0xa0, 0xb6, 0xd0, 0x57, 0x21, 0xfc, 0x08, 0x9f, 0xb8, - 0x5f, 0x9f, 0x98, 0x91, 0xb5, 0x54, 0x5b, 0x1d, 0xb9, 0x9f, 0xd7, 0x8f, 0x4c, 0xf3, 0x68, 0x88, - 0x6f, 0xb0, 0x5e, 0x6f, 0x7c, 0x78, 0x83, 0xe8, 0x23, 0xec, 0x10, 0x75, 0x64, 0x09, 0x86, 0xd5, - 0x23, 0xf3, 0xc8, 0x64, 0xcd, 0x1b, 0xb4, 0xc5, 0xa9, 0xd2, 0x1f, 0xf2, 0x90, 0x95, 0xf1, 0x87, - 0x63, 0xec, 0x10, 0xb4, 0x09, 0x29, 0xdc, 0x1f, 0x98, 0xb5, 0xf8, 0xe5, 0xf8, 0xd5, 0xc2, 0xe6, - 0xa5, 0x8d, 0x29, 0xe3, 0x36, 0x04, 0x5f, 0xab, 0x3f, 0x30, 0xdb, 0x31, 0x99, 0xf1, 0xa2, 0x9b, - 0x90, 0x3e, 0x1c, 0x8e, 0x9d, 0x41, 0x2d, 0xc1, 0x84, 0x9e, 0x88, 0x12, 0xba, 0x4d, 0x99, 0xda, - 0x31, 0x99, 0x73, 0xd3, 0xa1, 0x74, 0xe3, 0xd0, 0xac, 0x25, 0x4f, 0x1f, 0x6a, 0xc7, 0x38, 0x64, - 0x43, 0x51, 0x5e, 0xb4, 0x05, 0xe0, 0x60, 0xa2, 0x98, 0x16, 0xd1, 0x4d, 0xa3, 0x96, 0x62, 0x92, - 0x4f, 0x46, 0x49, 0xee, 0x63, 0xd2, 0x61, 0x8c, 0xed, 0x98, 0x9c, 0x77, 0xdc, 0x0e, 0xd5, 0xa1, - 0x1b, 0x3a, 0x51, 0xfa, 0x03, 0x55, 0x37, 0x6a, 0xe9, 0xd3, 0x75, 0xec, 0x18, 0x3a, 0x69, 0x52, - 0x46, 0xaa, 0x43, 0x77, 0x3b, 0xd4, 0xe4, 0x0f, 0xc7, 0xd8, 0x3e, 0xa9, 0x65, 0x4e, 0x37, 0xf9, - 0xff, 0x29, 0x13, 0x35, 0x99, 0x71, 0xa3, 0x16, 0x14, 0x7a, 0xf8, 0x48, 0x37, 0x94, 0xde, 0xd0, - 0xec, 0x3f, 0xaa, 0x65, 0x99, 0xb0, 0x14, 0x25, 0xbc, 0x45, 0x59, 0xb7, 0x28, 0x67, 0x3b, 0x26, - 0x43, 0xcf, 0xeb, 0xa1, 0x37, 0x20, 0xd7, 0x1f, 0xe0, 0xfe, 0x23, 0x85, 0x4c, 0x6a, 0x39, 0xa6, - 0x63, 0x3d, 0x4a, 0x47, 0x93, 0xf2, 0x75, 0x27, 0xed, 0x98, 0x9c, 0xed, 0xf3, 0x26, 0xb5, 0x5f, - 0xc3, 0x43, 0xfd, 0x18, 0xdb, 0x54, 0x3e, 0x7f, 0xba, 0xfd, 0xdb, 0x9c, 0x93, 0x69, 0xc8, 0x6b, - 0x6e, 0x07, 0xbd, 0x05, 0x79, 0x6c, 0x68, 0xc2, 0x0c, 0x60, 0x2a, 0x2e, 0x47, 0xee, 0x15, 0x43, - 0x73, 0x8d, 0xc8, 0x61, 0xd1, 0x46, 0xb7, 0x20, 0xd3, 0x37, 0x47, 0x23, 0x9d, 0xd4, 0x0a, 0x4c, - 0x7a, 0x2d, 0xd2, 0x00, 0xc6, 0xd5, 0x8e, 0xc9, 0x82, 0x1f, 0xed, 0x42, 0x79, 0xa8, 0x3b, 0x44, - 0x71, 0x0c, 0xd5, 0x72, 0x06, 0x26, 0x71, 0x6a, 0x45, 0xa6, 0xe1, 0xa9, 0x28, 0x0d, 0xf7, 0x74, - 0x87, 0xec, 0xbb, 0xcc, 0xed, 0x98, 0x5c, 0x1a, 0x06, 0x09, 0x54, 0x9f, 0x79, 0x78, 0x88, 0x6d, - 0x4f, 0x61, 0xad, 0x74, 0xba, 0xbe, 0x0e, 0xe5, 0x76, 0xe5, 0xa9, 0x3e, 0x33, 0x48, 0x40, 0x3f, - 0x81, 0x73, 0x43, 0x53, 0xd5, 0x3c, 0x75, 0x4a, 0x7f, 0x30, 0x36, 0x1e, 0xd5, 0xca, 0x4c, 0xe9, - 0xb5, 0xc8, 0x9f, 0x34, 0x55, 0xcd, 0x55, 0xd1, 0xa4, 0x02, 0xed, 0x98, 0xbc, 0x32, 0x9c, 0x26, - 0xa2, 0x87, 0xb0, 0xaa, 0x5a, 0xd6, 0xf0, 0x64, 0x5a, 0x7b, 0x85, 0x69, 0xbf, 0x1e, 0xa5, 0xbd, - 0x41, 0x65, 0xa6, 0xd5, 0x23, 0x75, 0x86, 0x8a, 0xba, 0x50, 0xb5, 0x6c, 0x6c, 0xa9, 0x36, 0x56, - 0x2c, 0xdb, 0xb4, 0x4c, 0x47, 0x1d, 0xd6, 0xaa, 0x4c, 0xf7, 0x33, 0x51, 0xba, 0xf7, 0x38, 0xff, - 0x9e, 0x60, 0x6f, 0xc7, 0xe4, 0x8a, 0x15, 0x26, 0x71, 0xad, 0x66, 0x1f, 0x3b, 0x8e, 0xaf, 0x75, - 0x65, 0x91, 0x56, 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0x6d, 0x65, 0x21, 0x7d, 0xac, 0x0e, 0xc7, 0x58, - 0x7a, 0x06, 0x0a, 0x01, 0xb7, 0x84, 0x6a, 0x90, 0x1d, 0x61, 0xc7, 0x51, 0x8f, 0x30, 0xf3, 0x62, - 0x79, 0xd9, 0xed, 0x4a, 0x65, 0x28, 0x06, 0x5d, 0x91, 0x34, 0xf2, 0x04, 0xa9, 0x93, 0xa1, 0x82, - 0xc7, 0xd8, 0x76, 0xa8, 0x67, 0x11, 0x82, 0xa2, 0x8b, 0xae, 0x40, 0x89, 0x6d, 0x75, 0xc5, 0xfd, - 0x4e, 0x3d, 0x5d, 0x4a, 0x2e, 0x32, 0xe2, 0x03, 0xc1, 0xb4, 0x0e, 0x05, 0x6b, 0xd3, 0xf2, 0x58, - 0x92, 0x8c, 0x05, 0xac, 0x4d, 0x4b, 0x30, 0x48, 0xaf, 0x41, 0x75, 0xda, 0x33, 0xa1, 0x2a, 0x24, - 0x1f, 0xe1, 0x13, 0x31, 0x1e, 0x6d, 0xa2, 0x55, 0x61, 0x16, 0x1b, 0x23, 0x2f, 0x0b, 0x1b, 0xff, - 0x94, 0xf0, 0x84, 0x3d, 0x97, 0x84, 0x6e, 0x41, 0x8a, 0x7a, 0x78, 0xe1, 0xac, 0xeb, 0x1b, 0xdc, - 0xfd, 0x6f, 0xb8, 0xee, 0x7f, 0xa3, 0xeb, 0xba, 0xff, 0xad, 0xdc, 0x97, 0x5f, 0xaf, 0xc7, 0x3e, - 0xfb, 0xdb, 0x7a, 0x5c, 0x66, 0x12, 0xe8, 0x22, 0xf5, 0x20, 0xaa, 0x6e, 0x28, 0xba, 0x26, 0xc6, - 0xc9, 0xb2, 0xfe, 0x8e, 0x86, 0xee, 0x42, 0xb5, 0x6f, 0x1a, 0x0e, 0x36, 0x9c, 0xb1, 0xa3, 0xf0, - 0xf0, 0x22, 0x5c, 0xf4, 0xec, 0x09, 0x6f, 0xba, 0x8c, 0x7b, 0x8c, 0x4f, 0xae, 0xf4, 0xc3, 0x04, - 0x74, 0x1b, 0xe0, 0x58, 0x1d, 0xea, 0x9a, 0x4a, 0x4c, 0xdb, 0xa9, 0xa5, 0x2e, 0x27, 0xe7, 0xaa, - 0x79, 0xe0, 0xb2, 0x1c, 0x58, 0x9a, 0x4a, 0xf0, 0x56, 0x8a, 0xfe, 0xad, 0x1c, 0x90, 0x44, 0x4f, - 0x43, 0x45, 0xb5, 0x2c, 0xc5, 0x21, 0x2a, 0xc1, 0x4a, 0xef, 0x84, 0x60, 0x87, 0x39, 0xee, 0xa2, - 0x5c, 0x52, 0x2d, 0x6b, 0x9f, 0x52, 0xb7, 0x28, 0x11, 0x3d, 0x05, 0x65, 0xea, 0xa4, 0x75, 0x75, - 0xa8, 0x0c, 0xb0, 0x7e, 0x34, 0x20, 0xcc, 0x41, 0x27, 0xe5, 0x92, 0xa0, 0xb6, 0x19, 0x51, 0xd2, - 0xbc, 0x8d, 0xc0, 0x1c, 0x34, 0x42, 0x90, 0xd2, 0x54, 0xa2, 0xb2, 0x89, 0x2c, 0xca, 0xac, 0x4d, - 0x69, 0x96, 0x4a, 0x06, 0x62, 0x7a, 0x58, 0x1b, 0x9d, 0x87, 0x8c, 0x50, 0x9b, 0x64, 0x6a, 0x45, - 0x8f, 0xae, 0x99, 0x65, 0x9b, 0xc7, 0x98, 0x45, 0xa4, 0x9c, 0xcc, 0x3b, 0xd2, 0xcf, 0x13, 0xb0, - 0x32, 0xe3, 0xca, 0xa9, 0xde, 0x81, 0xea, 0x0c, 0xdc, 0xb1, 0x68, 0x1b, 0xbd, 0x4c, 0xf5, 0xaa, - 0x1a, 0xb6, 0x45, 0x08, 0xad, 0x05, 0xa7, 0x88, 0xa7, 0x07, 0x6d, 0xf6, 0x5d, 0x4c, 0x8d, 0xe0, - 0xa6, 0x6b, 0x35, 0x54, 0x1d, 0xa2, 0x70, 0xd7, 0xa8, 0x04, 0xc2, 0xe9, 0xe3, 0x73, 0xd6, 0x8a, - 0xf2, 0xd0, 0x8d, 0x2e, 0x94, 0x94, 0xa9, 0xa8, 0x4f, 0x45, 0x32, 0xac, 0xf6, 0x4e, 0x3e, 0x56, - 0x0d, 0xa2, 0x1b, 0x58, 0x99, 0x59, 0xb5, 0x8b, 0x33, 0x0a, 0x5b, 0xc7, 0xba, 0x86, 0x8d, 0xbe, - 0xbb, 0x5c, 0xe7, 0x3c, 0x61, 0x6f, 0x39, 0x1d, 0x49, 0x86, 0x72, 0x38, 0x10, 0xa1, 0x32, 0x24, - 0xc8, 0x44, 0x18, 0x9f, 0x20, 0x13, 0xf4, 0x02, 0xa4, 0xa8, 0x81, 0xcc, 0xf0, 0xf2, 0x9c, 0x2c, - 0x40, 0xc8, 0x75, 0x4f, 0x2c, 0x2c, 0x33, 0x4e, 0x49, 0xf2, 0x4e, 0x82, 0x17, 0x9c, 0xa6, 0xb5, - 0x4a, 0xd7, 0xa0, 0x32, 0x15, 0x7d, 0x02, 0x6b, 0x17, 0x0f, 0xae, 0x9d, 0x54, 0x81, 0x52, 0x28, - 0xd4, 0x48, 0xe7, 0x61, 0x75, 0x5e, 0xe4, 0x90, 0x06, 0x1e, 0x3d, 0x14, 0x01, 0xd0, 0x4d, 0xc8, - 0x79, 0xa1, 0x83, 0x9f, 0xc4, 0xd9, 0xb9, 0x72, 0x99, 0x65, 0x8f, 0x95, 0x1e, 0x41, 0xba, 0xa5, - 0xd9, 0x5e, 0x48, 0xb0, 0x1f, 0xcf, 0xaa, 0x96, 0xd5, 0x56, 0x9d, 0x81, 0xf4, 0x3e, 0xd4, 0xa2, - 0xc2, 0xc2, 0x94, 0x19, 0x29, 0x6f, 0x0b, 0x9e, 0x87, 0xcc, 0xa1, 0x69, 0x8f, 0x54, 0xc2, 0x94, - 0x95, 0x64, 0xd1, 0xa3, 0x5b, 0x93, 0x87, 0x88, 0x24, 0x23, 0xf3, 0x8e, 0xa4, 0xc0, 0xc5, 0xc8, - 0xd0, 0x40, 0x45, 0x74, 0x43, 0xc3, 0x7c, 0x3e, 0x4b, 0x32, 0xef, 0xf8, 0x8a, 0xf8, 0xcf, 0xf2, - 0x0e, 0x1d, 0xd6, 0x61, 0xb6, 0x32, 0xfd, 0x79, 0x59, 0xf4, 0xa4, 0x2f, 0x12, 0x70, 0x7e, 0x7e, - 0x80, 0xf8, 0x41, 0x0f, 0x40, 0x15, 0x92, 0x64, 0x42, 0xfd, 0x53, 0xf2, 0x6a, 0x51, 0xa6, 0x4d, - 0x74, 0x00, 0x2b, 0x43, 0xb3, 0xaf, 0x0e, 0x95, 0xc0, 0xc1, 0x10, 0x89, 0xe2, 0x95, 0xd9, 0x2d, - 0x3c, 0x61, 0x14, 0x6d, 0xe6, 0x6c, 0x54, 0x98, 0x8e, 0x7b, 0xde, 0x01, 0x89, 0x3c, 0x1c, 0xe9, - 0xef, 0x7e, 0x38, 0xd0, 0x65, 0x28, 0x8e, 0xd4, 0x89, 0x42, 0x26, 0xc2, 0xa3, 0x71, 0x57, 0x05, - 0x23, 0x75, 0xd2, 0x9d, 0x30, 0x77, 0x26, 0x7d, 0x92, 0x0c, 0xcc, 0x62, 0x28, 0xfa, 0xb9, 0x96, - 0xc7, 0x7d, 0xcb, 0xf7, 0x61, 0x95, 0x47, 0x57, 0xac, 0x85, 0x8c, 0x4f, 0x2c, 0xeb, 0x10, 0x90, - 0x2b, 0x1e, 0xb0, 0xbb, 0x01, 0x85, 0x91, 0xee, 0xf4, 0xf0, 0x40, 0x3d, 0xd6, 0x4d, 0x9b, 0x4d, - 0xf4, 0x12, 0xe6, 0x06, 0x65, 0xbc, 0xf5, 0x4e, 0x05, 0xd6, 0xdb, 0xdf, 0xc5, 0xe9, 0x90, 0x23, - 0x75, 0x23, 0x5a, 0xe6, 0xcc, 0x11, 0xed, 0x05, 0x58, 0x35, 0xf0, 0x84, 0x04, 0xd6, 0x86, 0x1f, - 0xad, 0x2c, 0x1b, 0x15, 0xd1, 0x6f, 0xfe, 0xd4, 0xd3, 0x53, 0x86, 0xae, 0xb1, 0xac, 0x84, 0x1a, - 0x6c, 0x2b, 0xaa, 0xa6, 0xd9, 0xd8, 0x71, 0x58, 0x36, 0x5d, 0x64, 0xa9, 0x06, 0xa3, 0x37, 0x38, - 0x59, 0xfa, 0x15, 0x40, 0x4e, 0xc6, 0x8e, 0x45, 0xa3, 0x1b, 0xda, 0x82, 0x3c, 0x9e, 0xf4, 0x31, - 0x87, 0x20, 0xf1, 0xc8, 0x14, 0x9e, 0x73, 0xb7, 0x5c, 0x4e, 0x9a, 0x3f, 0x7b, 0x62, 0xe8, 0x25, - 0x01, 0xb3, 0xa2, 0x11, 0x93, 0x10, 0x0f, 0xe2, 0xac, 0x97, 0x5d, 0x9c, 0x95, 0x8c, 0x4c, 0x99, - 0xb9, 0xd4, 0x14, 0xd0, 0x7a, 0x49, 0x00, 0xad, 0xd4, 0x82, 0xc1, 0x42, 0x48, 0xab, 0x19, 0x42, - 0x5a, 0xe9, 0x05, 0x66, 0x46, 0x40, 0xad, 0x66, 0x08, 0x6a, 0x65, 0x16, 0x28, 0x89, 0xc0, 0x5a, - 0x2f, 0xbb, 0x58, 0x2b, 0xbb, 0xc0, 0xec, 0x29, 0xb0, 0x75, 0x3b, 0x0c, 0xb6, 0x72, 0x11, 0x3e, - 0xc0, 0x95, 0x8e, 0x44, 0x5b, 0x6f, 0x06, 0xd0, 0x56, 0x3e, 0x12, 0xea, 0x70, 0x25, 0x73, 0xe0, - 0x56, 0x33, 0x04, 0xb7, 0x60, 0xc1, 0x1c, 0x44, 0xe0, 0xad, 0xb7, 0x83, 0x78, 0xab, 0x10, 0x09, - 0xd9, 0xc4, 0xa6, 0x99, 0x07, 0xb8, 0x5e, 0xf5, 0x00, 0x57, 0x31, 0x12, 0x31, 0x0a, 0x1b, 0xa6, - 0x11, 0x57, 0x67, 0x06, 0x71, 0x71, 0x84, 0xf4, 0x74, 0xa4, 0x8a, 0x05, 0x90, 0xab, 0x33, 0x03, - 0xb9, 0xca, 0x0b, 0x14, 0x2e, 0xc0, 0x5c, 0x3f, 0x9d, 0x8f, 0xb9, 0xa2, 0x51, 0x91, 0xf8, 0xcd, - 0xe5, 0x40, 0x97, 0x12, 0x01, 0xba, 0x38, 0x30, 0x7a, 0x36, 0x52, 0xfd, 0xd2, 0xa8, 0xeb, 0x60, - 0x0e, 0xea, 0xe2, 0xf8, 0xe8, 0x6a, 0xa4, 0xf2, 0x25, 0x60, 0xd7, 0xc1, 0x1c, 0xd8, 0x85, 0x16, - 0xaa, 0x5d, 0x1e, 0x77, 0x5d, 0xa3, 0xe9, 0xed, 0x94, 0x9b, 0xa3, 0x69, 0x02, 0xb6, 0x6d, 0xd3, - 0x16, 0x90, 0x86, 0x77, 0xa4, 0xab, 0x34, 0xe1, 0xf6, 0x5d, 0xda, 0x29, 0x18, 0x8d, 0xa5, 0x63, - 0x01, 0x37, 0x26, 0xfd, 0x3e, 0xee, 0xcb, 0xb2, 0x3c, 0x35, 0x98, 0xac, 0xe7, 0x45, 0xb2, 0x1e, - 0x80, 0x6e, 0x89, 0x30, 0x74, 0x5b, 0x87, 0x02, 0x4d, 0xb3, 0xa6, 0x50, 0x99, 0x6a, 0xb9, 0xa8, - 0x0c, 0x5d, 0x87, 0x15, 0x16, 0x2d, 0x39, 0xc0, 0x13, 0x51, 0x29, 0xc5, 0xa2, 0x52, 0x85, 0x7e, - 0xe0, 0x47, 0x89, 0x87, 0xa7, 0xe7, 0xe1, 0x5c, 0x80, 0xd7, 0x4b, 0xdf, 0x38, 0x14, 0xa9, 0x7a, - 0xdc, 0x0d, 0x91, 0xc7, 0xdd, 0xf7, 0x27, 0xc8, 0x47, 0x7c, 0x08, 0x52, 0x7d, 0x53, 0xc3, 0x22, - 0xb9, 0x62, 0x6d, 0x1a, 0xcc, 0x87, 0xe6, 0x91, 0x48, 0xa1, 0x68, 0x93, 0x72, 0x79, 0x3e, 0x3b, - 0xcf, 0x5d, 0xb2, 0xf4, 0x45, 0xdc, 0xd7, 0xe7, 0x83, 0xc0, 0x79, 0x78, 0x2d, 0xfe, 0xc3, 0xe0, - 0xb5, 0xc4, 0x77, 0xc6, 0x6b, 0xc1, 0xe4, 0x36, 0x19, 0x4e, 0x6e, 0xff, 0x19, 0xf7, 0x57, 0xd8, - 0x43, 0x5f, 0xdf, 0x6d, 0x46, 0xfc, 0x4c, 0x95, 0x67, 0x11, 0x22, 0x53, 0x15, 0x98, 0x3a, 0xc3, - 0xc6, 0x0d, 0x63, 0x6a, 0x9e, 0x0d, 0xf0, 0x0e, 0xba, 0x05, 0x79, 0x56, 0x98, 0x55, 0x4c, 0xcb, - 0x11, 0xe1, 0x21, 0x94, 0x25, 0xf1, 0xfa, 0xeb, 0xc6, 0x1e, 0xe5, 0xe9, 0x58, 0x8e, 0x9c, 0xb3, - 0x44, 0x2b, 0x90, 0xbe, 0xe4, 0x43, 0xe9, 0xcb, 0x25, 0xc8, 0xd3, 0xbf, 0x77, 0x2c, 0xb5, 0x8f, - 0x99, 0xab, 0xcf, 0xcb, 0x3e, 0x41, 0x7a, 0x08, 0x68, 0x36, 0xd8, 0xa0, 0x36, 0x64, 0xf0, 0x31, - 0x36, 0x08, 0xcf, 0xe5, 0x0a, 0x9b, 0xe7, 0xe7, 0x24, 0x57, 0xd8, 0x20, 0x5b, 0x35, 0x3a, 0xc9, - 0xff, 0xf8, 0x7a, 0xbd, 0xca, 0xb9, 0x9f, 0x33, 0x47, 0x3a, 0xc1, 0x23, 0x8b, 0x9c, 0xc8, 0x42, - 0x5e, 0xfa, 0x6b, 0x82, 0xa2, 0x9e, 0x50, 0x20, 0x9a, 0x3b, 0xb7, 0xee, 0x01, 0x4a, 0x04, 0xd0, - 0xee, 0x72, 0xf3, 0xbd, 0x06, 0x70, 0xa4, 0x3a, 0xca, 0x47, 0xaa, 0x41, 0xb0, 0x26, 0x26, 0x3d, - 0x40, 0x41, 0x75, 0xc8, 0xd1, 0xde, 0xd8, 0xc1, 0x9a, 0xc8, 0x66, 0xbd, 0x7e, 0xc0, 0xce, 0xec, - 0xf7, 0xb3, 0x33, 0x3c, 0xcb, 0xb9, 0xa9, 0x59, 0x0e, 0x20, 0x92, 0x7c, 0x10, 0x91, 0xd0, 0x7f, - 0xb3, 0x6c, 0xdd, 0xb4, 0x75, 0x72, 0xc2, 0x96, 0x26, 0x29, 0x7b, 0x7d, 0x74, 0x05, 0x4a, 0x23, - 0x3c, 0xb2, 0x4c, 0x73, 0xa8, 0x70, 0xe7, 0x55, 0x60, 0xa2, 0x45, 0x41, 0x6c, 0x31, 0x1f, 0xf6, - 0x49, 0xc2, 0x3f, 0x7e, 0x3e, 0xf2, 0xfc, 0x9f, 0x9b, 0x60, 0xe9, 0x97, 0xac, 0x14, 0x15, 0x4e, - 0x35, 0xd0, 0x3e, 0xac, 0x78, 0xc7, 0x5f, 0x19, 0x33, 0xb7, 0xe0, 0x6e, 0xe8, 0x65, 0xfd, 0x47, - 0xf5, 0x38, 0x4c, 0x76, 0xd0, 0x8f, 0xe0, 0xc2, 0x94, 0x6b, 0xf3, 0x54, 0x27, 0x96, 0xf4, 0x70, - 0x8f, 0x85, 0x3d, 0x9c, 0xab, 0xd9, 0x9f, 0xab, 0xe4, 0xf7, 0x3c, 0x74, 0x3b, 0x50, 0x0e, 0x27, - 0x4e, 0x73, 0x57, 0xff, 0x0a, 0x94, 0x6c, 0x4c, 0x54, 0xdd, 0x50, 0x42, 0xf5, 0xa3, 0x22, 0x27, - 0x8a, 0xaa, 0xd4, 0x1e, 0x3c, 0x36, 0x37, 0x81, 0x42, 0xaf, 0x40, 0xde, 0xcf, 0xbd, 0xe2, 0x11, - 0x10, 0xcc, 0x2b, 0x31, 0xf8, 0xbc, 0xd2, 0x1f, 0xe3, 0xbe, 0xca, 0x70, 0xd1, 0xa2, 0x05, 0x19, - 0x1b, 0x3b, 0xe3, 0x21, 0x2f, 0x23, 0x94, 0x37, 0x9f, 0x5f, 0x2e, 0xf5, 0xa2, 0xd4, 0xf1, 0x90, - 0xc8, 0x42, 0x58, 0x7a, 0x08, 0x19, 0x4e, 0x41, 0x05, 0xc8, 0x1e, 0xec, 0xde, 0xdd, 0xed, 0xbc, - 0xbb, 0x5b, 0x8d, 0x21, 0x80, 0x4c, 0xa3, 0xd9, 0x6c, 0xed, 0x75, 0xab, 0x71, 0x94, 0x87, 0x74, - 0x63, 0xab, 0x23, 0x77, 0xab, 0x09, 0x4a, 0x96, 0x5b, 0x77, 0x5a, 0xcd, 0x6e, 0x35, 0x89, 0x56, - 0xa0, 0xc4, 0xdb, 0xca, 0xed, 0x8e, 0x7c, 0xbf, 0xd1, 0xad, 0xa6, 0x02, 0xa4, 0xfd, 0xd6, 0xee, - 0x76, 0x4b, 0xae, 0xa6, 0xa5, 0x17, 0xe1, 0x62, 0x64, 0xb2, 0xe6, 0x57, 0x24, 0xe2, 0x81, 0x8a, - 0x84, 0xf4, 0x9b, 0x04, 0xd4, 0xa3, 0x33, 0x30, 0x74, 0x67, 0xca, 0xf0, 0xcd, 0x33, 0xa4, 0x6f, - 0x53, 0xd6, 0xa3, 0xa7, 0xa0, 0x6c, 0xe3, 0x43, 0x4c, 0xfa, 0x03, 0x9e, 0x11, 0xf2, 0x88, 0x59, - 0x92, 0x4b, 0x82, 0xca, 0x84, 0x1c, 0xce, 0xf6, 0x01, 0xee, 0x13, 0x85, 0xbb, 0x22, 0xbe, 0xe9, - 0xf2, 0x94, 0x8d, 0x52, 0xf7, 0x39, 0x51, 0x7a, 0xff, 0x4c, 0x73, 0x99, 0x87, 0xb4, 0xdc, 0xea, - 0xca, 0xef, 0x55, 0x93, 0x08, 0x41, 0x99, 0x35, 0x95, 0xfd, 0xdd, 0xc6, 0xde, 0x7e, 0xbb, 0x43, - 0xe7, 0xf2, 0x1c, 0x54, 0xdc, 0xb9, 0x74, 0x89, 0x69, 0x69, 0x1f, 0x2e, 0x44, 0xa4, 0x8f, 0xe8, - 0x16, 0x00, 0x99, 0x28, 0x36, 0xee, 0x9b, 0xb6, 0x16, 0xbd, 0xc7, 0xba, 0x13, 0x99, 0x71, 0xc8, - 0x79, 0x22, 0x5a, 0x8e, 0xf4, 0xdb, 0x78, 0x50, 0x6b, 0xb8, 0x48, 0xd1, 0x81, 0x8c, 0x43, 0x54, - 0x32, 0x76, 0xc4, 0x64, 0xbf, 0xb2, 0x6c, 0xde, 0xb9, 0xe1, 0x36, 0xf6, 0x99, 0xb8, 0x2c, 0xd4, - 0x48, 0x37, 0xa1, 0x1c, 0xfe, 0x12, 0x3d, 0x57, 0xfe, 0x66, 0x4b, 0x48, 0xff, 0x8e, 0x43, 0x65, - 0xca, 0x33, 0xa0, 0x4d, 0x48, 0x73, 0x38, 0x15, 0x75, 0xd5, 0xc9, 0x1c, 0x9b, 0x70, 0x23, 0x9c, - 0x15, 0xbd, 0x01, 0x39, 0x2c, 0x2a, 0x1d, 0xf3, 0x3c, 0x10, 0x2f, 0x54, 0xb9, 0xb5, 0x10, 0x21, - 0xea, 0x49, 0xa0, 0xb7, 0x20, 0xef, 0xb9, 0x38, 0x81, 0xe1, 0x9f, 0x9c, 0x15, 0xf7, 0x9c, 0xa3, - 0x90, 0xf7, 0x65, 0xd0, 0xab, 0x7e, 0x96, 0x9b, 0x9a, 0x05, 0x71, 0x42, 0x9c, 0x33, 0x08, 0x61, - 0x97, 0x5f, 0x6a, 0x42, 0x21, 0x60, 0x0f, 0x7a, 0x1c, 0xf2, 0x23, 0xd5, 0xad, 0x3b, 0xf1, 0x7a, - 0x68, 0x6e, 0xa4, 0xf2, 0xaa, 0x13, 0xba, 0x00, 0x59, 0xfa, 0xf1, 0x48, 0xe5, 0x6e, 0x36, 0x29, - 0x67, 0x46, 0xea, 0xe4, 0x1d, 0xd5, 0x91, 0xde, 0x03, 0x08, 0xd4, 0x8b, 0x57, 0x21, 0x6d, 0x9b, - 0x63, 0x43, 0x63, 0xf2, 0x69, 0x99, 0x77, 0xd0, 0x4d, 0x48, 0x1f, 0x9b, 0xdc, 0x43, 0xcf, 0xdf, - 0x43, 0x0f, 0x4c, 0x82, 0x03, 0x45, 0x27, 0xce, 0x2d, 0xe9, 0x80, 0x66, 0x8b, 0x71, 0x11, 0x43, - 0xbc, 0x19, 0x1e, 0xe2, 0xc9, 0xc8, 0xb2, 0xde, 0xfc, 0xa1, 0x3e, 0x86, 0x34, 0x73, 0xee, 0xd4, - 0x51, 0xb3, 0xd2, 0xb3, 0x00, 0x12, 0xb4, 0x8d, 0x7e, 0x06, 0xa0, 0x12, 0x62, 0xeb, 0xbd, 0xb1, - 0x3f, 0xc0, 0xfa, 0xfc, 0xe0, 0xd0, 0x70, 0xf9, 0xb6, 0x2e, 0x89, 0x28, 0xb1, 0xea, 0x8b, 0x06, - 0x22, 0x45, 0x40, 0xa1, 0xb4, 0x0b, 0xe5, 0xb0, 0x6c, 0xf0, 0x02, 0xa8, 0x38, 0xe7, 0x02, 0xc8, - 0x4b, 0x56, 0xbd, 0x54, 0x37, 0xc9, 0xaf, 0x18, 0x58, 0x47, 0xfa, 0x34, 0x0e, 0x39, 0x7a, 0x28, - 0x99, 0xdb, 0x88, 0xa8, 0x70, 0xfb, 0xa2, 0x89, 0x60, 0x3d, 0x97, 0x97, 0xcc, 0x93, 0x5e, 0x21, - 0xfe, 0x6d, 0xcf, 0x31, 0xa6, 0x96, 0xad, 0x51, 0xb8, 0xc5, 0x58, 0x11, 0x0c, 0x7e, 0x2d, 0x7e, - 0x86, 0xfa, 0x05, 0xf4, 0x1a, 0x64, 0xd4, 0xbe, 0x57, 0x22, 0x2b, 0xcf, 0x51, 0xe7, 0xb2, 0x6e, - 0x74, 0x27, 0x0d, 0xc6, 0x29, 0x0b, 0x09, 0xf1, 0x6b, 0x09, 0xaf, 0x9a, 0xff, 0x16, 0xd5, 0xcb, - 0x79, 0xc2, 0xe7, 0xbd, 0x0c, 0x70, 0xb0, 0x7b, 0xbf, 0xb3, 0xbd, 0x73, 0x7b, 0xa7, 0xb5, 0x2d, - 0xfc, 0xe3, 0xf6, 0x76, 0x6b, 0xbb, 0x9a, 0xa0, 0x7c, 0x72, 0xeb, 0x7e, 0xe7, 0x41, 0x6b, 0xbb, - 0x9a, 0x94, 0x5e, 0x87, 0xbc, 0x77, 0xac, 0x28, 0x56, 0x74, 0xcb, 0x7d, 0x71, 0x01, 0x4d, 0x78, - 0x97, 0x5d, 0xe3, 0x98, 0x1f, 0x89, 0x5a, 0x76, 0x52, 0xe6, 0x1d, 0x49, 0x83, 0xca, 0x54, 0xc2, - 0x82, 0x5e, 0x87, 0xac, 0x35, 0xee, 0x29, 0xee, 0xc2, 0x4d, 0x79, 0x0f, 0x17, 0x37, 0x8c, 0x7b, - 0x43, 0xbd, 0x7f, 0x17, 0x9f, 0xb8, 0xd3, 0x64, 0x8d, 0x7b, 0x77, 0xf9, 0xfa, 0xf2, 0x51, 0x12, - 0xc1, 0x51, 0x7e, 0x11, 0x87, 0x9c, 0xbb, 0x5f, 0xd1, 0xff, 0x05, 0x3d, 0x85, 0x7b, 0xbb, 0x17, - 0x99, 0x45, 0x09, 0xfd, 0x01, 0x47, 0x71, 0x1d, 0x56, 0x1c, 0xfd, 0xc8, 0x70, 0x0b, 0xc1, 0xdc, - 0xcf, 0x25, 0xd8, 0xc6, 0xa9, 0xf0, 0x0f, 0xf7, 0x5c, 0xac, 0x7a, 0x27, 0x95, 0x4b, 0x56, 0x53, - 0x77, 0x52, 0xb9, 0x54, 0x35, 0x2d, 0xfd, 0x2e, 0x0e, 0xd5, 0xe9, 0xc3, 0xf3, 0xdf, 0xfc, 0x19, - 0x1a, 0x2a, 0xe9, 0x21, 0x55, 0x30, 0xfd, 0x09, 0x0f, 0xb0, 0x17, 0xe5, 0x12, 0xa5, 0xb6, 0x5c, - 0xa2, 0xf4, 0xaf, 0x38, 0xe4, 0x5c, 0x37, 0x8b, 0x5e, 0x0c, 0x1c, 0xe3, 0xf2, 0x9c, 0xf2, 0xa6, - 0xcb, 0xe8, 0x5f, 0x21, 0x85, 0x4d, 0x4a, 0x9c, 0xdd, 0xa4, 0xa8, 0x7b, 0x40, 0xb7, 0x7c, 0x9d, - 0x3a, 0x73, 0xf9, 0xfa, 0x39, 0x40, 0xc4, 0x24, 0xea, 0x50, 0x39, 0x36, 0x89, 0x6e, 0x1c, 0x29, - 0x7c, 0x87, 0x70, 0x00, 0x50, 0x65, 0x5f, 0x1e, 0xb0, 0x0f, 0x7b, 0xde, 0x66, 0xf1, 0x52, 0xb9, - 0xb3, 0xde, 0x08, 0x9d, 0x87, 0x8c, 0xc8, 0x56, 0xf8, 0x95, 0x90, 0xe8, 0xcd, 0xad, 0xd3, 0xd7, - 0x21, 0x37, 0xc2, 0x44, 0x65, 0xf9, 0x2c, 0xaf, 0x72, 0x78, 0xfd, 0xeb, 0xaf, 0x42, 0x21, 0x70, - 0x39, 0x47, 0x1d, 0xd9, 0x6e, 0xeb, 0xdd, 0x6a, 0xac, 0x9e, 0xfd, 0xf4, 0xf3, 0xcb, 0xc9, 0x5d, - 0xfc, 0x11, 0x3d, 0x68, 0x72, 0xab, 0xd9, 0x6e, 0x35, 0xef, 0x56, 0xe3, 0xf5, 0xc2, 0xa7, 0x9f, - 0x5f, 0xce, 0xca, 0x98, 0x55, 0x45, 0xaf, 0xb7, 0xa1, 0x18, 0x5c, 0x95, 0xf0, 0xa1, 0x46, 0x50, - 0xde, 0x3e, 0xd8, 0xbb, 0xb7, 0xd3, 0x6c, 0x74, 0x5b, 0xca, 0x83, 0x4e, 0xb7, 0x55, 0x8d, 0xa3, - 0x0b, 0x70, 0xee, 0xde, 0xce, 0x3b, 0xed, 0xae, 0xd2, 0xbc, 0xb7, 0xd3, 0xda, 0xed, 0x2a, 0x8d, - 0x6e, 0xb7, 0xd1, 0xbc, 0x5b, 0x4d, 0x6c, 0xfe, 0xb9, 0x00, 0x95, 0xc6, 0x56, 0x73, 0x87, 0x26, - 0x6b, 0x7a, 0x5f, 0x15, 0x55, 0xe7, 0x14, 0x2b, 0x32, 0x9d, 0xfa, 0x7a, 0xa9, 0x7e, 0x7a, 0xd1, - 0x1d, 0xdd, 0x86, 0x34, 0xab, 0x3f, 0xa1, 0xd3, 0x9f, 0x33, 0xd5, 0x17, 0x54, 0xe1, 0xe9, 0xcf, - 0xb0, 0x53, 0x74, 0xea, 0xfb, 0xa6, 0xfa, 0xe9, 0x45, 0x79, 0x24, 0x43, 0xde, 0x2f, 0x20, 0x2d, - 0x7e, 0xef, 0x54, 0x5f, 0xa2, 0x50, 0x4f, 0x75, 0xfa, 0x28, 0x76, 0xf1, 0xfb, 0x9f, 0xfa, 0x12, - 0xf1, 0x00, 0xdd, 0x83, 0xac, 0x5b, 0x78, 0x58, 0xf4, 0x22, 0xa9, 0xbe, 0xb0, 0x88, 0x4e, 0x97, - 0x80, 0x17, 0x88, 0x4e, 0x7f, 0x5e, 0x55, 0x5f, 0x70, 0x23, 0x80, 0x76, 0x20, 0x23, 0xa0, 0xd9, - 0x82, 0x57, 0x46, 0xf5, 0x45, 0x45, 0x71, 0x3a, 0x69, 0x7e, 0xe5, 0x6d, 0xf1, 0xa3, 0xb1, 0xfa, - 0x12, 0x97, 0x1d, 0xe8, 0x00, 0x20, 0x50, 0x0e, 0x5a, 0xe2, 0x35, 0x58, 0x7d, 0x99, 0x4b, 0x0c, - 0xd4, 0x81, 0x9c, 0x87, 0xce, 0x17, 0xbe, 0xcd, 0xaa, 0x2f, 0xbe, 0x4d, 0x40, 0x0f, 0xa1, 0x14, - 0x86, 0xa5, 0xcb, 0xbd, 0xb8, 0xaa, 0x2f, 0x79, 0x4d, 0x40, 0xf5, 0x87, 0x31, 0xea, 0x72, 0x2f, - 0xb0, 0xea, 0x4b, 0xde, 0x1a, 0xa0, 0x0f, 0x60, 0x65, 0x16, 0x43, 0x2e, 0xff, 0x20, 0xab, 0x7e, - 0x86, 0x7b, 0x04, 0x34, 0x02, 0x34, 0x07, 0x7b, 0x9e, 0xe1, 0x7d, 0x56, 0xfd, 0x2c, 0xd7, 0x0a, - 0x48, 0x83, 0xca, 0x34, 0xa0, 0x5b, 0xf6, 0xbd, 0x56, 0x7d, 0xe9, 0x2b, 0x06, 0x3e, 0x4a, 0x18, - 0xe0, 0x2d, 0xfb, 0x7e, 0xab, 0xbe, 0xf4, 0x8d, 0xc3, 0x56, 0xeb, 0xcb, 0x6f, 0xd6, 0xe2, 0x5f, - 0x7d, 0xb3, 0x16, 0xff, 0xfb, 0x37, 0x6b, 0xf1, 0xcf, 0xbe, 0x5d, 0x8b, 0x7d, 0xf5, 0xed, 0x5a, - 0xec, 0x2f, 0xdf, 0xae, 0xc5, 0x7e, 0xfc, 0xec, 0x91, 0x4e, 0x06, 0xe3, 0xde, 0x46, 0xdf, 0x1c, - 0xdd, 0x08, 0x3e, 0x84, 0x9d, 0xf7, 0x38, 0xb7, 0x97, 0x61, 0x41, 0xf7, 0xa5, 0xff, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x9d, 0x12, 0x6d, 0x89, 0xbc, 0x2b, 0x00, 0x00, + // 3246 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7, + 0xf1, 0xc7, 0xfb, 0xd1, 0x20, 0x1e, 0x1c, 0xd1, 0x12, 0x04, 0xcb, 0x24, 0xbd, 0x2a, 0xdb, 0x92, + 0x6c, 0x93, 0xfe, 0xd3, 0x7f, 0xd9, 0xf2, 0x2b, 0x36, 0x09, 0x42, 0x06, 0x4d, 0x8a, 0x60, 0x96, + 0xa0, 0x1c, 0xe7, 0xa1, 0xf5, 0x02, 0x3b, 0x24, 0xd6, 0x02, 0x76, 0xd7, 0xbb, 0x03, 0x1a, 0xf4, + 0x31, 0xae, 0x54, 0xa5, 0x9c, 0x8b, 0xab, 0x72, 0x88, 0x2f, 0x3e, 0xe4, 0x90, 0xef, 0x90, 0x4b, + 0x72, 0xc9, 0xc5, 0x55, 0x39, 0xc4, 0xc7, 0x1c, 0x52, 0x4e, 0xca, 0xbe, 0xe5, 0x0b, 0xe4, 0x98, + 0xd4, 0x3c, 0xf6, 0x05, 0x60, 0x09, 0x50, 0x4e, 0xa5, 0x2a, 0x95, 0xdb, 0x4c, 0x6f, 0x77, 0xcf, + 0x4e, 0xcf, 0x4c, 0x77, 0xff, 0x7a, 0x06, 0x1e, 0x27, 0xd8, 0xd0, 0xb0, 0x3d, 0xd0, 0x0d, 0xb2, + 0xae, 0x76, 0xba, 0xfa, 0x3a, 0x39, 0xb3, 0xb0, 0xb3, 0x66, 0xd9, 0x26, 0x31, 0x51, 0xd9, 0xff, + 0xb8, 0x46, 0x3f, 0xd6, 0x9e, 0x08, 0x70, 0x77, 0xed, 0x33, 0x8b, 0x98, 0xeb, 0x96, 0x6d, 0x9a, + 0xc7, 0x9c, 0xbf, 0x76, 0x2d, 0xf0, 0x99, 0xe9, 0x09, 0x6a, 0x0b, 0x7d, 0x15, 0xc2, 0x0f, 0xf1, + 0x99, 0xfb, 0xf5, 0x89, 0x09, 0x59, 0x4b, 0xb5, 0xd5, 0x81, 0xfb, 0x79, 0xe5, 0xc4, 0x34, 0x4f, + 0xfa, 0x78, 0x9d, 0xf5, 0x3a, 0xc3, 0xe3, 0x75, 0xa2, 0x0f, 0xb0, 0x43, 0xd4, 0x81, 0x25, 0x18, + 0x96, 0x4e, 0xcc, 0x13, 0x93, 0x35, 0xd7, 0x69, 0x8b, 0x53, 0xa5, 0xdf, 0xe5, 0x21, 0x2b, 0xe3, + 0x0f, 0x87, 0xd8, 0x21, 0x68, 0x03, 0x52, 0xb8, 0xdb, 0x33, 0xab, 0xf1, 0xd5, 0xf8, 0x8d, 0xc2, + 0xc6, 0xb5, 0xb5, 0xb1, 0xc9, 0xad, 0x09, 0xbe, 0x46, 0xb7, 0x67, 0x36, 0x63, 0x32, 0xe3, 0x45, + 0xb7, 0x21, 0x7d, 0xdc, 0x1f, 0x3a, 0xbd, 0x6a, 0x82, 0x09, 0x3d, 0x11, 0x25, 0x74, 0x97, 0x32, + 0x35, 0x63, 0x32, 0xe7, 0xa6, 0x43, 0xe9, 0xc6, 0xb1, 0x59, 0x4d, 0x9e, 0x3f, 0xd4, 0x8e, 0x71, + 0xcc, 0x86, 0xa2, 0xbc, 0x68, 0x0b, 0xc0, 0xc1, 0x44, 0x31, 0x2d, 0xa2, 0x9b, 0x46, 0x35, 0xc5, + 0x24, 0x9f, 0x8c, 0x92, 0x3c, 0xc4, 0xa4, 0xc5, 0x18, 0x9b, 0x31, 0x39, 0xef, 0xb8, 0x1d, 0xaa, + 0x43, 0x37, 0x74, 0xa2, 0x74, 0x7b, 0xaa, 0x6e, 0x54, 0xd3, 0xe7, 0xeb, 0xd8, 0x31, 0x74, 0x52, + 0xa7, 0x8c, 0x54, 0x87, 0xee, 0x76, 0xe8, 0x94, 0x3f, 0x1c, 0x62, 0xfb, 0xac, 0x9a, 0x39, 0x7f, + 0xca, 0xdf, 0xa7, 0x4c, 0x74, 0xca, 0x8c, 0x1b, 0x35, 0xa0, 0xd0, 0xc1, 0x27, 0xba, 0xa1, 0x74, + 0xfa, 0x66, 0xf7, 0x61, 0x35, 0xcb, 0x84, 0xa5, 0x28, 0xe1, 0x2d, 0xca, 0xba, 0x45, 0x39, 0x9b, + 0x31, 0x19, 0x3a, 0x5e, 0x0f, 0xbd, 0x0e, 0xb9, 0x6e, 0x0f, 0x77, 0x1f, 0x2a, 0x64, 0x54, 0xcd, + 0x31, 0x1d, 0x2b, 0x51, 0x3a, 0xea, 0x94, 0xaf, 0x3d, 0x6a, 0xc6, 0xe4, 0x6c, 0x97, 0x37, 0xe9, + 0xfc, 0x35, 0xdc, 0xd7, 0x4f, 0xb1, 0x4d, 0xe5, 0xf3, 0xe7, 0xcf, 0x7f, 0x9b, 0x73, 0x32, 0x0d, + 0x79, 0xcd, 0xed, 0xa0, 0x37, 0x21, 0x8f, 0x0d, 0x4d, 0x4c, 0x03, 0x98, 0x8a, 0xd5, 0xc8, 0xbd, + 0x62, 0x68, 0xee, 0x24, 0x72, 0x58, 0xb4, 0xd1, 0x1d, 0xc8, 0x74, 0xcd, 0xc1, 0x40, 0x27, 0xd5, + 0x02, 0x93, 0x5e, 0x8e, 0x9c, 0x00, 0xe3, 0x6a, 0xc6, 0x64, 0xc1, 0x8f, 0xf6, 0xa1, 0xd4, 0xd7, + 0x1d, 0xa2, 0x38, 0x86, 0x6a, 0x39, 0x3d, 0x93, 0x38, 0xd5, 0x05, 0xa6, 0xe1, 0xa9, 0x28, 0x0d, + 0x7b, 0xba, 0x43, 0x0e, 0x5d, 0xe6, 0x66, 0x4c, 0x2e, 0xf6, 0x83, 0x04, 0xaa, 0xcf, 0x3c, 0x3e, + 0xc6, 0xb6, 0xa7, 0xb0, 0x5a, 0x3c, 0x5f, 0x5f, 0x8b, 0x72, 0xbb, 0xf2, 0x54, 0x9f, 0x19, 0x24, + 0xa0, 0x1f, 0xc1, 0xa5, 0xbe, 0xa9, 0x6a, 0x9e, 0x3a, 0xa5, 0xdb, 0x1b, 0x1a, 0x0f, 0xab, 0x25, + 0xa6, 0xf4, 0x66, 0xe4, 0x4f, 0x9a, 0xaa, 0xe6, 0xaa, 0xa8, 0x53, 0x81, 0x66, 0x4c, 0x5e, 0xec, + 0x8f, 0x13, 0xd1, 0x03, 0x58, 0x52, 0x2d, 0xab, 0x7f, 0x36, 0xae, 0xbd, 0xcc, 0xb4, 0xdf, 0x8a, + 0xd2, 0xbe, 0x49, 0x65, 0xc6, 0xd5, 0x23, 0x75, 0x82, 0x8a, 0xda, 0x50, 0xb1, 0x6c, 0x6c, 0xa9, + 0x36, 0x56, 0x2c, 0xdb, 0xb4, 0x4c, 0x47, 0xed, 0x57, 0x2b, 0x4c, 0xf7, 0x33, 0x51, 0xba, 0x0f, + 0x38, 0xff, 0x81, 0x60, 0x6f, 0xc6, 0xe4, 0xb2, 0x15, 0x26, 0x71, 0xad, 0x66, 0x17, 0x3b, 0x8e, + 0xaf, 0x75, 0x71, 0x96, 0x56, 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0x6d, 0x65, 0x21, 0x7d, 0xaa, 0xf6, + 0x87, 0x58, 0x7a, 0x06, 0x0a, 0x01, 0xb7, 0x84, 0xaa, 0x90, 0x1d, 0x60, 0xc7, 0x51, 0x4f, 0x30, + 0xf3, 0x62, 0x79, 0xd9, 0xed, 0x4a, 0x25, 0x58, 0x08, 0xba, 0x22, 0x69, 0xe0, 0x09, 0x52, 0x27, + 0x43, 0x05, 0x4f, 0xb1, 0xed, 0x50, 0xcf, 0x22, 0x04, 0x45, 0x17, 0x5d, 0x87, 0x22, 0xdb, 0xea, + 0x8a, 0xfb, 0x9d, 0x7a, 0xba, 0x94, 0xbc, 0xc0, 0x88, 0xf7, 0x05, 0xd3, 0x0a, 0x14, 0xac, 0x0d, + 0xcb, 0x63, 0x49, 0x32, 0x16, 0xb0, 0x36, 0x2c, 0xc1, 0x20, 0xbd, 0x0a, 0x95, 0x71, 0xcf, 0x84, + 0x2a, 0x90, 0x7c, 0x88, 0xcf, 0xc4, 0x78, 0xb4, 0x89, 0x96, 0xc4, 0xb4, 0xd8, 0x18, 0x79, 0x59, + 0xcc, 0xf1, 0x8f, 0x09, 0x4f, 0xd8, 0x73, 0x49, 0xe8, 0x0e, 0xa4, 0xa8, 0x87, 0x17, 0xce, 0xba, + 0xb6, 0xc6, 0xdd, 0xff, 0x9a, 0xeb, 0xfe, 0xd7, 0xda, 0xae, 0xfb, 0xdf, 0xca, 0x7d, 0xf9, 0xf5, + 0x4a, 0xec, 0xb3, 0xbf, 0xae, 0xc4, 0x65, 0x26, 0x81, 0xae, 0x52, 0x0f, 0xa2, 0xea, 0x86, 0xa2, + 0x6b, 0x62, 0x9c, 0x2c, 0xeb, 0xef, 0x68, 0x68, 0x17, 0x2a, 0x5d, 0xd3, 0x70, 0xb0, 0xe1, 0x0c, + 0x1d, 0x85, 0x87, 0x17, 0xe1, 0xa2, 0x27, 0x4f, 0x78, 0xdd, 0x65, 0x3c, 0x60, 0x7c, 0x72, 0xb9, + 0x1b, 0x26, 0xa0, 0xbb, 0x00, 0xa7, 0x6a, 0x5f, 0xd7, 0x54, 0x62, 0xda, 0x4e, 0x35, 0xb5, 0x9a, + 0x9c, 0xaa, 0xe6, 0xbe, 0xcb, 0x72, 0x64, 0x69, 0x2a, 0xc1, 0x5b, 0x29, 0xfa, 0xb7, 0x72, 0x40, + 0x12, 0x3d, 0x0d, 0x65, 0xd5, 0xb2, 0x14, 0x87, 0xa8, 0x04, 0x2b, 0x9d, 0x33, 0x82, 0x1d, 0xe6, + 0xb8, 0x17, 0xe4, 0xa2, 0x6a, 0x59, 0x87, 0x94, 0xba, 0x45, 0x89, 0xe8, 0x29, 0x28, 0x51, 0x27, + 0xad, 0xab, 0x7d, 0xa5, 0x87, 0xf5, 0x93, 0x1e, 0x61, 0x0e, 0x3a, 0x29, 0x17, 0x05, 0xb5, 0xc9, + 0x88, 0x92, 0xe6, 0x6d, 0x04, 0xe6, 0xa0, 0x11, 0x82, 0x94, 0xa6, 0x12, 0x95, 0x19, 0x72, 0x41, + 0x66, 0x6d, 0x4a, 0xb3, 0x54, 0xd2, 0x13, 0xe6, 0x61, 0x6d, 0x74, 0x19, 0x32, 0x42, 0x6d, 0x92, + 0xa9, 0x15, 0x3d, 0xba, 0x66, 0x96, 0x6d, 0x9e, 0x62, 0x16, 0x91, 0x72, 0x32, 0xef, 0x48, 0x9f, + 0x24, 0x60, 0x71, 0xc2, 0x95, 0x53, 0xbd, 0x3d, 0xd5, 0xe9, 0xb9, 0x63, 0xd1, 0x36, 0x7a, 0x89, + 0xea, 0x55, 0x35, 0x6c, 0x8b, 0x10, 0x5a, 0x0d, 0x9a, 0x88, 0xa7, 0x07, 0x4d, 0xf6, 0x5d, 0x98, + 0x46, 0x70, 0xd3, 0xb5, 0xea, 0xab, 0x0e, 0x51, 0xb8, 0x6b, 0x54, 0x02, 0xe1, 0xf4, 0xf1, 0x29, + 0x6b, 0x45, 0x79, 0xe8, 0x46, 0x17, 0x4a, 0x4a, 0x54, 0xd4, 0xa7, 0xa2, 0x23, 0x58, 0xea, 0x9c, + 0x7d, 0xac, 0x1a, 0x44, 0x37, 0xb0, 0x32, 0xb1, 0x6a, 0x93, 0xf1, 0xf9, 0x9e, 0xee, 0x74, 0x70, + 0x4f, 0x3d, 0xd5, 0x4d, 0xf7, 0xb7, 0x2e, 0x79, 0xf2, 0xde, 0x8a, 0x3a, 0x92, 0x0c, 0xa5, 0x70, + 0x2c, 0x42, 0x25, 0x48, 0x90, 0x91, 0x98, 0x7f, 0x82, 0x8c, 0xd0, 0x0b, 0x90, 0xa2, 0x73, 0x64, + 0x73, 0x2f, 0x4d, 0x19, 0x48, 0xc8, 0xb5, 0xcf, 0x2c, 0x2c, 0x33, 0x4e, 0x49, 0xf2, 0x0e, 0x83, + 0x17, 0x9f, 0xc6, 0xb5, 0x4a, 0x37, 0xa1, 0x3c, 0x16, 0x80, 0x02, 0xcb, 0x17, 0x0f, 0x2e, 0x9f, + 0x54, 0x86, 0x62, 0x28, 0xda, 0x48, 0x97, 0x61, 0x69, 0x5a, 0xf0, 0x90, 0x7a, 0x1e, 0x3d, 0x14, + 0x04, 0xd0, 0x6d, 0xc8, 0x79, 0xd1, 0x83, 0x1f, 0xc6, 0xab, 0x13, 0xb3, 0x70, 0x99, 0x65, 0x8f, + 0x95, 0x9e, 0x42, 0xba, 0xab, 0xd9, 0x76, 0x48, 0xb0, 0x1f, 0xcf, 0xaa, 0x96, 0xd5, 0x54, 0x9d, + 0x9e, 0xf4, 0x3e, 0x54, 0xa3, 0x22, 0xc3, 0xd8, 0x34, 0x52, 0xde, 0x2e, 0xbc, 0x0c, 0x99, 0x63, + 0xd3, 0x1e, 0xa8, 0x84, 0x29, 0x2b, 0xca, 0xa2, 0x47, 0x77, 0x27, 0x8f, 0x12, 0x49, 0x46, 0xe6, + 0x1d, 0x49, 0x81, 0xab, 0x91, 0xd1, 0x81, 0x8a, 0xe8, 0x86, 0x86, 0xb9, 0x3d, 0x8b, 0x32, 0xef, + 0xf8, 0x8a, 0xf8, 0xcf, 0xf2, 0x0e, 0x1d, 0xd6, 0x61, 0x73, 0x65, 0xfa, 0xf3, 0xb2, 0xe8, 0x49, + 0x9f, 0x27, 0xe1, 0xf2, 0xf4, 0x18, 0x81, 0x56, 0x61, 0x61, 0xa0, 0x8e, 0x14, 0x32, 0x12, 0x67, + 0x99, 0x2f, 0x07, 0x0c, 0xd4, 0x51, 0x7b, 0xc4, 0x0f, 0x72, 0x05, 0x92, 0x64, 0xe4, 0x54, 0x13, + 0xab, 0xc9, 0x1b, 0x0b, 0x32, 0x6d, 0xa2, 0x23, 0x58, 0xec, 0x9b, 0x5d, 0xb5, 0xaf, 0x04, 0x76, + 0xbc, 0xd8, 0xec, 0xd7, 0x27, 0x8c, 0xdd, 0x18, 0x31, 0x8a, 0x36, 0xb1, 0xe9, 0xcb, 0x4c, 0xc7, + 0x9e, 0xb7, 0xf3, 0xd1, 0x36, 0x14, 0x06, 0xfe, 0x46, 0xbe, 0xc0, 0x66, 0x0f, 0x8a, 0x05, 0x96, + 0x24, 0x1d, 0x72, 0x0c, 0xae, 0x87, 0xce, 0x5c, 0xd8, 0x43, 0xbf, 0x00, 0x4b, 0x06, 0x1e, 0x91, + 0xc0, 0x41, 0xe4, 0xfb, 0x24, 0xcb, 0x4c, 0x8f, 0xe8, 0x37, 0xff, 0x90, 0xd1, 0x2d, 0x83, 0x6e, + 0xb2, 0x28, 0x6b, 0x99, 0x0e, 0xb6, 0x15, 0x55, 0xd3, 0x6c, 0xec, 0x38, 0x2c, 0x3b, 0x5c, 0x60, + 0xa1, 0x93, 0xd1, 0x37, 0x39, 0x59, 0xfa, 0x79, 0x70, 0x69, 0x42, 0x51, 0xd5, 0x35, 0x7c, 0xdc, + 0x37, 0xfc, 0x21, 0x2c, 0x09, 0x79, 0x2d, 0x64, 0xfb, 0xc4, 0xbc, 0x8e, 0x06, 0xb9, 0xe2, 0xd1, + 0x66, 0x4f, 0x3e, 0x9a, 0xd9, 0x5d, 0x5f, 0x9a, 0x0a, 0xf8, 0xd2, 0xff, 0xb2, 0xa5, 0xf8, 0x25, + 0x40, 0x4e, 0xc6, 0x8e, 0x45, 0x03, 0x27, 0xda, 0x82, 0x3c, 0x1e, 0x75, 0x31, 0x47, 0x37, 0xf1, + 0x48, 0x74, 0xc0, 0xb9, 0x1b, 0x2e, 0x27, 0x4d, 0xcd, 0x3d, 0x31, 0xf4, 0xa2, 0x40, 0x70, 0xd1, + 0x60, 0x4c, 0x88, 0x07, 0x21, 0xdc, 0x4b, 0x2e, 0x84, 0x4b, 0x46, 0x66, 0xe3, 0x5c, 0x6a, 0x0c, + 0xc3, 0xbd, 0x28, 0x30, 0x5c, 0x6a, 0xc6, 0x60, 0x21, 0x10, 0x57, 0x0f, 0x81, 0xb8, 0xf4, 0x8c, + 0x69, 0x46, 0xa0, 0xb8, 0x7a, 0x08, 0xc5, 0x65, 0x66, 0x28, 0x89, 0x80, 0x71, 0x2f, 0xb9, 0x30, + 0x2e, 0x3b, 0x63, 0xda, 0x63, 0x38, 0xee, 0x6e, 0x18, 0xc7, 0xe5, 0x22, 0xbc, 0x90, 0x2b, 0x1d, + 0x09, 0xe4, 0xde, 0x08, 0x00, 0xb9, 0x7c, 0x24, 0x8a, 0xe2, 0x4a, 0xa6, 0x20, 0xb9, 0x7a, 0x08, + 0xc9, 0xc1, 0x0c, 0x1b, 0x44, 0x40, 0xb9, 0xb7, 0x82, 0x50, 0xae, 0x10, 0x89, 0x06, 0xc5, 0xa6, + 0x99, 0x86, 0xe5, 0x5e, 0xf1, 0xb0, 0xdc, 0x42, 0x24, 0x18, 0x15, 0x73, 0x18, 0x07, 0x73, 0xad, + 0x09, 0x30, 0xc7, 0xc1, 0xd7, 0xd3, 0x91, 0x2a, 0x66, 0xa0, 0xb9, 0xd6, 0x04, 0x9a, 0x2b, 0xcd, + 0x50, 0x38, 0x03, 0xce, 0xfd, 0x78, 0x3a, 0x9c, 0x8b, 0x06, 0x5c, 0xe2, 0x37, 0xe7, 0xc3, 0x73, + 0x4a, 0x04, 0x9e, 0xe3, 0x98, 0xeb, 0xd9, 0x48, 0xf5, 0x73, 0x03, 0xba, 0xa3, 0x29, 0x80, 0x8e, + 0x43, 0xaf, 0x1b, 0x91, 0xca, 0xe7, 0x40, 0x74, 0x47, 0x53, 0x10, 0x1d, 0x9a, 0xa9, 0x76, 0x7e, + 0x48, 0x77, 0x93, 0x66, 0xce, 0x63, 0x6e, 0x8e, 0xa6, 0x1f, 0xd8, 0xb6, 0x4d, 0x5b, 0xa0, 0x25, + 0xde, 0x91, 0x6e, 0xd0, 0x5c, 0xde, 0x77, 0x69, 0xe7, 0xc0, 0x3f, 0x96, 0xe6, 0x05, 0xdc, 0x98, + 0xf4, 0xdb, 0xb8, 0x2f, 0xcb, 0x52, 0xe0, 0x20, 0x0e, 0xc8, 0x0b, 0x1c, 0x10, 0x40, 0x85, 0x89, + 0x30, 0x2a, 0x5c, 0x81, 0x02, 0x4d, 0xdf, 0xc6, 0x00, 0x9f, 0x6a, 0xb9, 0x80, 0x0f, 0xdd, 0x82, + 0x45, 0x16, 0x30, 0x39, 0x76, 0x14, 0x51, 0x29, 0xc5, 0xa2, 0x52, 0x99, 0x7e, 0xe0, 0x47, 0x89, + 0x87, 0xa7, 0xe7, 0xe1, 0x52, 0x80, 0xd7, 0x4b, 0x0b, 0x39, 0xca, 0xa9, 0x78, 0xdc, 0x9b, 0x22, + 0x3f, 0xbc, 0xe7, 0x1b, 0xc8, 0x07, 0x93, 0x08, 0x52, 0x5d, 0x53, 0xc3, 0x22, 0x69, 0x63, 0x6d, + 0x1a, 0xcf, 0xfb, 0xe6, 0x89, 0x48, 0xcd, 0x68, 0x93, 0x72, 0x79, 0x3e, 0x3b, 0xcf, 0x5d, 0xb2, + 0xf4, 0x87, 0xb8, 0xaf, 0xcf, 0xc7, 0x97, 0xd3, 0xa0, 0x60, 0xfc, 0xdf, 0x03, 0x05, 0x13, 0x8f, + 0x0c, 0x05, 0x83, 0x49, 0x73, 0x32, 0x9c, 0x34, 0xff, 0x23, 0xee, 0xaf, 0xb0, 0x07, 0xec, 0x1e, + 0xcd, 0x22, 0x7e, 0x06, 0xcc, 0xb3, 0x08, 0x91, 0x01, 0x0b, 0xb8, 0x9e, 0x61, 0xe3, 0x86, 0xe1, + 0x3a, 0xcf, 0x06, 0x78, 0x07, 0xdd, 0x81, 0x3c, 0xab, 0xf9, 0x2a, 0xa6, 0xe5, 0x88, 0xf0, 0x10, + 0x4a, 0x94, 0x78, 0x69, 0x77, 0xed, 0x80, 0xf2, 0xb4, 0x2c, 0x47, 0xce, 0x59, 0xa2, 0x15, 0x48, + 0x5f, 0xf2, 0xa1, 0xf4, 0xe5, 0x1a, 0xe4, 0xe9, 0xdf, 0x3b, 0x96, 0xda, 0xc5, 0xcc, 0xd5, 0xe7, + 0x65, 0x9f, 0x20, 0x3d, 0x00, 0x34, 0x19, 0x6c, 0x50, 0x13, 0x32, 0xf8, 0x14, 0x1b, 0x84, 0xa7, + 0x73, 0x85, 0x8d, 0xcb, 0x93, 0x79, 0x32, 0xfd, 0xbc, 0x55, 0xa5, 0x46, 0xfe, 0xfb, 0xd7, 0x2b, + 0x15, 0xce, 0xfd, 0x9c, 0x39, 0xd0, 0x09, 0x1e, 0x58, 0xe4, 0x4c, 0x16, 0xf2, 0xd2, 0x5f, 0x12, + 0x14, 0x4d, 0x85, 0x02, 0xd1, 0x54, 0xdb, 0xba, 0x07, 0x28, 0x11, 0x00, 0xd2, 0xf3, 0xd9, 0x7b, + 0x19, 0xe0, 0x44, 0x75, 0x94, 0x8f, 0x54, 0x83, 0x60, 0x4d, 0x18, 0x3d, 0x40, 0x41, 0x35, 0xc8, + 0xd1, 0xde, 0xd0, 0xc1, 0x9a, 0xc0, 0xf4, 0x5e, 0x3f, 0x30, 0xcf, 0xec, 0x77, 0x9b, 0x67, 0xd8, + 0xca, 0xb9, 0x31, 0x2b, 0x07, 0x90, 0x4e, 0x3e, 0x88, 0x74, 0xe8, 0xbf, 0x59, 0xb6, 0x6e, 0xda, + 0x3a, 0x39, 0x63, 0x4b, 0x93, 0x94, 0xbd, 0x3e, 0xba, 0x0e, 0xc5, 0x01, 0x1e, 0x58, 0xa6, 0xd9, + 0x57, 0xb8, 0xf3, 0x2a, 0x30, 0xd1, 0x05, 0x41, 0x6c, 0x30, 0x1f, 0xf6, 0xb3, 0x84, 0x7f, 0xfc, + 0x7c, 0x44, 0xfb, 0x3f, 0x67, 0x60, 0xe9, 0x17, 0xac, 0xca, 0x15, 0x4e, 0x35, 0xd0, 0x21, 0x2c, + 0x7a, 0xc7, 0x5f, 0x19, 0x32, 0xb7, 0xe0, 0x6e, 0xe8, 0x79, 0xfd, 0x47, 0xe5, 0x34, 0x4c, 0x76, + 0xd0, 0x0f, 0xe0, 0xca, 0x98, 0x6b, 0xf3, 0x54, 0x27, 0xe6, 0xf4, 0x70, 0x8f, 0x85, 0x3d, 0x9c, + 0xab, 0xd9, 0xb7, 0x55, 0xf2, 0x3b, 0x1e, 0xba, 0x1d, 0x28, 0x85, 0x13, 0xa7, 0xa9, 0xab, 0x7f, + 0x1d, 0x8a, 0x36, 0x26, 0xaa, 0x6e, 0x28, 0xa1, 0xd2, 0xd4, 0x02, 0x27, 0x8a, 0x82, 0xd7, 0x01, + 0x3c, 0x36, 0x35, 0x81, 0x42, 0x2f, 0x43, 0xde, 0xcf, 0xbd, 0xb8, 0x51, 0xcf, 0x29, 0x5d, 0xf8, + 0xbc, 0xd2, 0xef, 0xe3, 0xbe, 0xca, 0x70, 0x31, 0xa4, 0x01, 0x19, 0x1b, 0x3b, 0xc3, 0x3e, 0x2f, + 0x4f, 0x94, 0x36, 0x9e, 0x9f, 0x2f, 0xf5, 0xa2, 0xd4, 0x61, 0x9f, 0xc8, 0x42, 0x58, 0x7a, 0x00, + 0x19, 0x4e, 0x41, 0x05, 0xc8, 0x1e, 0xed, 0xef, 0xee, 0xb7, 0xde, 0xdd, 0xaf, 0xc4, 0x10, 0x40, + 0x66, 0xb3, 0x5e, 0x6f, 0x1c, 0xb4, 0x2b, 0x71, 0x94, 0x87, 0xf4, 0xe6, 0x56, 0x4b, 0x6e, 0x57, + 0x12, 0x94, 0x2c, 0x37, 0xde, 0x69, 0xd4, 0xdb, 0x95, 0x24, 0x5a, 0x84, 0x22, 0x6f, 0x2b, 0x77, + 0x5b, 0xf2, 0xbd, 0xcd, 0x76, 0x25, 0x15, 0x20, 0x1d, 0x36, 0xf6, 0xb7, 0x1b, 0x72, 0x25, 0x2d, + 0xfd, 0x1f, 0x5c, 0x8d, 0x4c, 0xd6, 0xfc, 0x4a, 0x47, 0x3c, 0x50, 0xe9, 0x90, 0x3e, 0x4f, 0x40, + 0x2d, 0x3a, 0x03, 0x43, 0xef, 0x8c, 0x4d, 0x7c, 0xe3, 0x02, 0xe9, 0xdb, 0xd8, 0xec, 0xd1, 0x53, + 0x50, 0xb2, 0xf1, 0x31, 0x26, 0xdd, 0x1e, 0xcf, 0x08, 0x79, 0xc4, 0x2c, 0xca, 0x45, 0x41, 0x65, + 0x42, 0x0e, 0x67, 0xfb, 0x00, 0x77, 0x89, 0xc2, 0x5d, 0x11, 0xdf, 0x74, 0x79, 0xca, 0x46, 0xa9, + 0x87, 0x9c, 0x28, 0xbd, 0x7f, 0x21, 0x5b, 0xe6, 0x21, 0x2d, 0x37, 0xda, 0xf2, 0x7b, 0x95, 0x24, + 0x42, 0x50, 0x62, 0x4d, 0xe5, 0x70, 0x7f, 0xf3, 0xe0, 0xb0, 0xd9, 0xa2, 0xb6, 0xbc, 0x04, 0x65, + 0xd7, 0x96, 0x2e, 0x31, 0x2d, 0x1d, 0xc2, 0x95, 0x88, 0xf4, 0x11, 0xdd, 0x01, 0x20, 0x23, 0xc5, + 0xc6, 0x5d, 0xd3, 0xd6, 0xa2, 0xf7, 0x58, 0x7b, 0x24, 0x33, 0x0e, 0x39, 0x4f, 0x44, 0xcb, 0x91, + 0x7e, 0x1d, 0x0f, 0x6a, 0x0d, 0xd7, 0x29, 0x5a, 0x90, 0x71, 0x88, 0x4a, 0x86, 0x8e, 0x30, 0xf6, + 0xcb, 0xf3, 0xe6, 0x9d, 0x6b, 0x6e, 0xe3, 0x90, 0x89, 0xcb, 0x42, 0x8d, 0x74, 0x1b, 0x4a, 0xe1, + 0x2f, 0xd1, 0xb6, 0xf2, 0x37, 0x5b, 0x42, 0xfa, 0x67, 0x1c, 0xca, 0x63, 0x9e, 0x01, 0x6d, 0x40, + 0x9a, 0xc3, 0xa9, 0xa8, 0x5b, 0x54, 0xe6, 0xd8, 0x84, 0x1b, 0xe1, 0xac, 0xe8, 0x75, 0xc8, 0xe1, + 0x53, 0x5d, 0xc3, 0x46, 0x17, 0x4f, 0xf3, 0x40, 0xbc, 0x08, 0xdc, 0x10, 0x1c, 0x42, 0xd4, 0x93, + 0x40, 0x6f, 0x42, 0xde, 0x73, 0x71, 0x02, 0xc3, 0x3f, 0x39, 0x29, 0xee, 0x39, 0x47, 0x21, 0xef, + 0xcb, 0xa0, 0x57, 0xfc, 0x2c, 0x37, 0x35, 0x09, 0xe2, 0x84, 0x38, 0x67, 0x10, 0xc2, 0x2e, 0xbf, + 0x54, 0x87, 0x42, 0x60, 0x3e, 0xe8, 0x71, 0xc8, 0x0f, 0xd4, 0x70, 0x61, 0x2f, 0x37, 0x50, 0x45, + 0x59, 0xef, 0x0a, 0x64, 0xe9, 0xc7, 0x13, 0x95, 0xbb, 0xd9, 0xa4, 0x9c, 0x19, 0xa8, 0xa3, 0xb7, + 0x55, 0x47, 0x7a, 0x0f, 0x20, 0x50, 0x8a, 0x5e, 0x82, 0xb4, 0x6d, 0x0e, 0x0d, 0x8d, 0xc9, 0xa7, + 0x65, 0xde, 0x41, 0xb7, 0x21, 0x7d, 0x6a, 0x72, 0x0f, 0x3d, 0x7d, 0x0f, 0xdd, 0x37, 0x09, 0x0e, + 0xd4, 0x9d, 0x38, 0xb7, 0xa4, 0x03, 0x9a, 0x2c, 0x07, 0x46, 0x0c, 0xf1, 0x46, 0x78, 0x88, 0x27, + 0x23, 0x0b, 0x8b, 0xd3, 0x87, 0xfa, 0x18, 0xd2, 0xcc, 0xb9, 0x53, 0x47, 0xcd, 0x4a, 0xda, 0x02, + 0x48, 0xd0, 0x36, 0xfa, 0x09, 0x80, 0x4a, 0x88, 0xad, 0x77, 0x86, 0xfe, 0x00, 0x2b, 0xd3, 0x83, + 0xc3, 0xa6, 0xcb, 0xb7, 0x75, 0x4d, 0x44, 0x89, 0x25, 0x5f, 0x34, 0x10, 0x29, 0x02, 0x0a, 0xa5, + 0x7d, 0x28, 0x85, 0x65, 0x83, 0x77, 0x4b, 0x0b, 0x53, 0xee, 0x96, 0xbc, 0x64, 0xd5, 0x4b, 0x75, + 0x93, 0xfc, 0xf6, 0x82, 0x75, 0xa4, 0x4f, 0xe3, 0x90, 0xa3, 0x87, 0x92, 0xb9, 0x8d, 0x88, 0xca, + 0xb9, 0x2f, 0x9a, 0x08, 0xd6, 0x89, 0x79, 0x29, 0x3e, 0xe9, 0x15, 0xf8, 0xdf, 0xf2, 0x1c, 0x63, + 0x6a, 0xde, 0x1a, 0x85, 0x7b, 0xd1, 0x21, 0x82, 0xc1, 0xaf, 0xc4, 0xcf, 0x50, 0xbf, 0x80, 0x5e, + 0x85, 0x8c, 0xda, 0xf5, 0x4a, 0x64, 0xa5, 0x29, 0xea, 0x5c, 0xd6, 0xb5, 0xf6, 0x68, 0x93, 0x71, + 0xca, 0x42, 0x42, 0xfc, 0x5a, 0xc2, 0xbb, 0x25, 0x78, 0x93, 0xea, 0xe5, 0x3c, 0xe1, 0xf3, 0x5e, + 0x02, 0x38, 0xda, 0xbf, 0xd7, 0xda, 0xde, 0xb9, 0xbb, 0xd3, 0xd8, 0x16, 0xfe, 0x71, 0x7b, 0xbb, + 0xb1, 0x5d, 0x49, 0x50, 0x3e, 0xb9, 0x71, 0xaf, 0x75, 0xbf, 0xb1, 0x5d, 0x49, 0x4a, 0xaf, 0x41, + 0xde, 0x3b, 0x56, 0x14, 0x2b, 0xba, 0xe5, 0xbe, 0xb8, 0x80, 0x26, 0xbc, 0xcb, 0x6e, 0x88, 0xcc, + 0x8f, 0x44, 0x8d, 0x3c, 0x29, 0xf3, 0x8e, 0xa4, 0x41, 0x79, 0x2c, 0x61, 0x41, 0xaf, 0x41, 0xd6, + 0x1a, 0x76, 0x14, 0x77, 0xe1, 0xc6, 0xbc, 0x87, 0x8b, 0x1b, 0x86, 0x9d, 0xbe, 0xde, 0xdd, 0xc5, + 0x67, 0xae, 0x99, 0xac, 0x61, 0x67, 0x97, 0xaf, 0x2f, 0x1f, 0x25, 0x11, 0x1c, 0xe5, 0x14, 0x72, + 0xee, 0x76, 0x45, 0xdf, 0x0b, 0x3a, 0x0a, 0xf7, 0xde, 0x30, 0x32, 0x89, 0x12, 0xea, 0x03, 0x7e, + 0xe2, 0x16, 0x2c, 0x3a, 0xfa, 0x89, 0xe1, 0x96, 0x82, 0xb9, 0x9b, 0x4b, 0xb0, 0x7d, 0x53, 0xe6, + 0x1f, 0xf6, 0x5c, 0xa8, 0x2a, 0xfd, 0x26, 0x0e, 0x95, 0xf1, 0xf3, 0xf2, 0x9f, 0xfc, 0x01, 0x1a, + 0x1d, 0xe9, 0xb9, 0x54, 0x30, 0xfd, 0x09, 0x0f, 0xa3, 0x2f, 0xc8, 0x45, 0x4a, 0x6d, 0xb8, 0x44, + 0xe9, 0x93, 0x04, 0x14, 0x02, 0x85, 0x66, 0xf4, 0xff, 0x81, 0xc3, 0x5b, 0x9a, 0x92, 0x08, 0x06, + 0x78, 0xfd, 0x3b, 0xa9, 0xf0, 0xc4, 0x12, 0x17, 0x9f, 0x58, 0xd4, 0xdd, 0xa2, 0x5b, 0xb7, 0x4e, + 0x5d, 0xb8, 0x6e, 0xfd, 0x1c, 0x20, 0x62, 0x12, 0xb5, 0xaf, 0x9c, 0x9a, 0x44, 0x37, 0x4e, 0x14, + 0xbe, 0x35, 0x78, 0xe6, 0x5f, 0x61, 0x5f, 0xee, 0xb3, 0x0f, 0x07, 0x6c, 0x97, 0xfc, 0x34, 0x0e, + 0x39, 0x2f, 0x87, 0xbb, 0xe8, 0x15, 0xd3, 0x65, 0xc8, 0x88, 0x34, 0x85, 0xdf, 0x31, 0x89, 0xde, + 0xd4, 0x02, 0x7d, 0x0d, 0x72, 0x03, 0x4c, 0x54, 0x96, 0xc8, 0xf2, 0xf2, 0x86, 0xd7, 0xbf, 0xf5, + 0x0a, 0x14, 0x02, 0xb7, 0x7d, 0xd4, 0x83, 0xed, 0x37, 0xde, 0xad, 0xc4, 0x6a, 0xd9, 0x4f, 0xbf, + 0x58, 0x4d, 0xee, 0xe3, 0x8f, 0xe8, 0x09, 0x93, 0x1b, 0xf5, 0x66, 0xa3, 0xbe, 0x5b, 0x89, 0xd7, + 0x0a, 0x9f, 0x7e, 0xb1, 0x9a, 0x95, 0x31, 0x2b, 0x87, 0xde, 0xda, 0x85, 0xf2, 0xd8, 0xc2, 0x84, + 0x0f, 0x34, 0x82, 0xd2, 0xf6, 0xd1, 0xc1, 0xde, 0x4e, 0x7d, 0xb3, 0xdd, 0x50, 0xee, 0xb7, 0xda, + 0x8d, 0x4a, 0x1c, 0x5d, 0x81, 0x4b, 0x7b, 0x3b, 0x6f, 0x37, 0xdb, 0x4a, 0x7d, 0x6f, 0xa7, 0xb1, + 0xdf, 0x56, 0x36, 0xdb, 0xed, 0xcd, 0xfa, 0x6e, 0x25, 0xb1, 0xf1, 0xa7, 0x02, 0x94, 0x37, 0xb7, + 0xea, 0x3b, 0x34, 0x51, 0xd3, 0xbb, 0xaa, 0xa8, 0x38, 0xa7, 0x58, 0x81, 0xe9, 0xdc, 0x47, 0x51, + 0xb5, 0xf3, 0x0b, 0xee, 0xe8, 0x2e, 0xa4, 0x59, 0xed, 0x09, 0x9d, 0xff, 0x4a, 0xaa, 0x36, 0xa3, + 0x02, 0x4f, 0x7f, 0x86, 0x1d, 0xa7, 0x73, 0x9f, 0x4d, 0xd5, 0xce, 0x2f, 0xc8, 0x23, 0x19, 0xf2, + 0x7e, 0xf1, 0x68, 0xf6, 0x33, 0xaa, 0xda, 0x1c, 0x45, 0x7a, 0xaa, 0xd3, 0x47, 0xb0, 0xb3, 0x9f, + 0x15, 0xd5, 0xe6, 0x88, 0x05, 0x68, 0x0f, 0xb2, 0x6e, 0xd1, 0x61, 0xd6, 0x43, 0xa7, 0xda, 0xcc, + 0x02, 0x3a, 0x5d, 0x02, 0x5e, 0x1c, 0x3a, 0xff, 0xd5, 0x56, 0x6d, 0xc6, 0x6d, 0x00, 0xda, 0x81, + 0x8c, 0x80, 0x65, 0x33, 0x1e, 0x2f, 0xd5, 0x66, 0x15, 0xc4, 0xa9, 0xd1, 0xfc, 0xaa, 0xdb, 0xec, + 0xb7, 0x68, 0xb5, 0x39, 0x2e, 0x3a, 0xd0, 0x11, 0x40, 0xa0, 0x14, 0x34, 0xc7, 0x23, 0xb3, 0xda, + 0x3c, 0x17, 0x18, 0xa8, 0x05, 0x39, 0x0f, 0x99, 0xcf, 0x7c, 0xf2, 0x55, 0x9b, 0x7d, 0x93, 0x80, + 0x1e, 0x40, 0x31, 0x0c, 0x49, 0xe7, 0x7b, 0xc8, 0x55, 0x9b, 0xf3, 0x8a, 0x80, 0xea, 0x0f, 0xe3, + 0xd3, 0xf9, 0x1e, 0x76, 0xd5, 0xe6, 0xbc, 0x31, 0x40, 0x1f, 0xc0, 0xe2, 0x24, 0x7e, 0x9c, 0xff, + 0x9d, 0x57, 0xed, 0x02, 0x77, 0x08, 0x68, 0x00, 0x68, 0x0a, 0xee, 0xbc, 0xc0, 0xb3, 0xaf, 0xda, + 0x45, 0xae, 0x14, 0x90, 0x06, 0xe5, 0x71, 0x30, 0x37, 0xef, 0x33, 0xb0, 0xda, 0xdc, 0xd7, 0x0b, + 0x7c, 0x94, 0x30, 0xb8, 0x9b, 0xf7, 0x59, 0x58, 0x6d, 0xee, 0xdb, 0x86, 0xad, 0xc6, 0x97, 0xdf, + 0x2c, 0xc7, 0xbf, 0xfa, 0x66, 0x39, 0xfe, 0xb7, 0x6f, 0x96, 0xe3, 0x9f, 0x7d, 0xbb, 0x1c, 0xfb, + 0xea, 0xdb, 0xe5, 0xd8, 0x9f, 0xbf, 0x5d, 0x8e, 0xfd, 0xf0, 0xd9, 0x13, 0x9d, 0xf4, 0x86, 0x9d, + 0xb5, 0xae, 0x39, 0x58, 0x0f, 0xbe, 0xaf, 0x9d, 0xf6, 0xe6, 0xb7, 0x93, 0x61, 0x71, 0xf7, 0xc5, + 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x64, 0xe2, 0x69, 0x13, 0x2c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5646,15 +5665,37 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.MaxTxBytes != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.MaxTxBytes)) + if len(m.ProposerAddress) > 0 { + i -= len(m.ProposerAddress) + copy(dAtA[i:], m.ProposerAddress) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ProposerAddress))) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x42 } - if len(m.ByzantineValidators) > 0 { - for iNdEx := len(m.ByzantineValidators) - 1; iNdEx >= 0; iNdEx-- { + if len(m.NextValidatorsHash) > 0 { + i -= len(m.NextValidatorsHash) + copy(dAtA[i:], m.NextValidatorsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.NextValidatorsHash))) + i-- + dAtA[i] = 0x3a + } + n23, err23 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err23 != nil { + return 0, err23 + } + i -= n23 + i = encodeVarintTypes(dAtA, i, uint64(n23)) + i-- + dAtA[i] = 0x32 + if m.Height != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x28 + } + if len(m.Misbehavior) > 0 { + for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.ByzantineValidators[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5662,7 +5703,7 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } } { @@ -5674,32 +5715,20 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a 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] = 0x1a + dAtA[i] = 0x12 } } - { - 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))) + if m.MaxTxBytes != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.MaxTxBytes)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -7589,7 +7618,7 @@ func (m *ExtendedVoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Evidence) Marshal() (dAtA []byte, err error) { +func (m *Misbehavior) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7599,12 +7628,12 @@ func (m *Evidence) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Evidence) MarshalTo(dAtA []byte) (int, error) { +func (m *Misbehavior) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -8180,12 +8209,9 @@ func (m *RequestPrepareProposal) Size() (n int) { } var l int _ = l - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + if m.MaxTxBytes != 0 { + n += 1 + sovTypes(uint64(m.MaxTxBytes)) } - l = m.Header.Size() - n += 1 + l + sovTypes(uint64(l)) if len(m.Txs) > 0 { for _, b := range m.Txs { l = len(b) @@ -8194,14 +8220,24 @@ func (m *RequestPrepareProposal) Size() (n int) { } l = m.LocalLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) - if len(m.ByzantineValidators) > 0 { - for _, e := range m.ByzantineValidators { + if len(m.Misbehavior) > 0 { + for _, e := range m.Misbehavior { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } } - if m.MaxTxBytes != 0 { - n += 1 + sovTypes(uint64(m.MaxTxBytes)) + if m.Height != 0 { + n += 1 + sovTypes(uint64(m.Height)) + } + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) + n += 1 + l + sovTypes(uint64(l)) + l = len(m.NextValidatorsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ProposerAddress) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) } return n } @@ -9074,7 +9110,7 @@ func (m *ExtendedVoteInfo) Size() (n int) { return n } -func (m *Evidence) Size() (n int) { +func (m *Misbehavior) Size() (n int) { if m == nil { return 0 } @@ -10690,7 +10726,7 @@ func (m *RequestBeginBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ByzantineValidators = append(m.ByzantineValidators, Evidence{}) + m.ByzantineValidators = append(m.ByzantineValidators, Misbehavior{}) if err := m.ByzantineValidators[len(m.ByzantineValidators)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -11464,10 +11500,10 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxTxBytes", wireType) } - var byteLen int + m.MaxTxBytes = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11477,60 +11513,12 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + m.MaxTxBytes |= int64(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.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} - } - iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Header", 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.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 Txs", wireType) } @@ -11562,7 +11550,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LocalLastCommit", wireType) } @@ -11595,9 +11583,9 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ByzantineValidators", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11624,16 +11612,16 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { 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 { + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 6: + case 5: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxTxBytes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.MaxTxBytes = 0 + m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11643,11 +11631,112 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxTxBytes |= int64(b&0x7F) << shift + m.Height |= int64(b&0x7F) << shift if b < 0x80 { break } } + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", 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.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.NextValidatorsHash == nil { + m.NextValidatorsHash = []byte{} + } + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", 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.ProposerAddress = append(m.ProposerAddress[:0], dAtA[iNdEx:postIndex]...) + if m.ProposerAddress == nil { + m.ProposerAddress = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -11792,7 +11881,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehavior = append(m.Misbehavior, Evidence{}) + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -16624,7 +16713,7 @@ func (m *ExtendedVoteInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *Evidence) Unmarshal(dAtA []byte) error { +func (m *Misbehavior) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -16647,10 +16736,10 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Evidence: wiretype end group for non-group") + return fmt.Errorf("proto: Misbehavior: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Evidence: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Misbehavior: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -16667,7 +16756,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Type |= EvidenceType(b&0x7F) << shift + m.Type |= MisbehaviorType(b&0x7F) << shift if b < 0x80 { break } diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 53f26c952..0a4d17b8a 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -80,7 +80,7 @@ message RequestBeginBlock { bytes hash = 1; tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; CommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; - repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; + repeated Misbehavior byzantine_validators = 4 [(gogoproto.nullable) = false]; } enum CheckTxType { @@ -127,21 +127,24 @@ message RequestApplySnapshotChunk { } message RequestPrepareProposal { - bytes hash = 1; - tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; + // the modified transactions cannot exceed this size. + int64 max_tx_bytes = 1; // txs is an array of transactions that will be included in a block, // sent to the app for possible modifications. - 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; + repeated bytes txs = 2; + ExtendedCommitInfo local_last_commit = 3 [(gogoproto.nullable) = false]; + repeated Misbehavior misbehavior = 4 [(gogoproto.nullable) = false]; + int64 height = 5; + google.protobuf.Timestamp time = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + bytes next_validators_hash = 7; + // address of the public key of the validator proposing the block. + bytes proposer_address = 8; } message RequestProcessProposal { - repeated bytes txs = 1; - CommitInfo proposed_last_commit = 2 [(gogoproto.nullable) = false]; - repeated Evidence misbehavior = 3 [(gogoproto.nullable) = false]; + repeated bytes txs = 1; + CommitInfo proposed_last_commit = 2 [(gogoproto.nullable) = false]; + repeated Misbehavior misbehavior = 3 [(gogoproto.nullable) = false]; // hash is the merkle root hash of the fields of the proposed block. bytes hash = 4; int64 height = 5; @@ -351,7 +354,10 @@ message CommitInfo { } message ExtendedCommitInfo { - int32 round = 1; + // The round at which the block proposer decided in the previous height. + int32 round = 1; + // List of validators' addresses in the last validator set with their voting + // information, including vote extensions. repeated ExtendedVoteInfo votes = 2 [(gogoproto.nullable) = false]; } @@ -416,8 +422,6 @@ message ValidatorUpdate { message VoteInfo { Validator validator = 1 [(gogoproto.nullable) = false]; bool signed_last_block = 2; - reserved 3; // Placeholder for tendermint_signed_extension in v0.37 - reserved 4; // Placeholder for app_signed_extension in v0.37 } message ExtendedVoteInfo { @@ -426,14 +430,14 @@ message ExtendedVoteInfo { bytes vote_extension = 3; // Reserved for future use } -enum EvidenceType { +enum MisbehaviorType { UNKNOWN = 0; DUPLICATE_VOTE = 1; LIGHT_CLIENT_ATTACK = 2; } -message Evidence { - EvidenceType type = 1; +message Misbehavior { + MisbehaviorType type = 1; // The offending validator Validator validator = 2 [(gogoproto.nullable) = false]; // The height when the offense occurred diff --git a/state/execution.go b/state/execution.go index 0d8153e12..fc34f8364 100644 --- a/state/execution.go +++ b/state/execution.go @@ -115,12 +115,14 @@ func (blockExec *BlockExecutor) CreateProposalBlock( localLastCommit := buildLastCommitInfo(block, blockExec.store, state.InitialHeight) rpp, err := blockExec.proxyApp.PrepareProposalSync( abci.RequestPrepareProposal{ - Hash: block.Hash(), - Header: *block.Header.ToProto(), - Txs: block.Txs.ToSliceOfBytes(), - LocalLastCommit: extendedCommitInfo(localLastCommit, votes), - ByzantineValidators: block.Evidence.Evidence.ToABCI(), - MaxTxBytes: maxDataBytes, + MaxTxBytes: maxDataBytes, + Txs: block.Txs.ToSliceOfBytes(), + LocalLastCommit: extendedCommitInfo(localLastCommit, votes), + Misbehavior: block.Evidence.Evidence.ToABCI(), + Height: block.Height, + Time: block.Time, + NextValidatorsHash: block.NextValidatorsHash, + ProposerAddress: block.ProposerAddress, }, ) if err != nil { diff --git a/state/execution_test.go b/state/execution_test.go index 6a8809cc8..1bb09399e 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -193,16 +193,16 @@ func TestBeginBlockByzantineValidators(t *testing.T) { ev := []types.Evidence{dve, lcae} - abciEv := []abci.Evidence{ + abciMb := []abci.Misbehavior{ { - Type: abci.EvidenceType_DUPLICATE_VOTE, + Type: abci.MisbehaviorType_DUPLICATE_VOTE, Height: 3, Time: defaultEvidenceTime, Validator: types.TM2PB.Validator(state.Validators.Validators[0]), TotalVotingPower: 10, }, { - Type: abci.EvidenceType_LIGHT_CLIENT_ATTACK, + Type: abci.MisbehaviorType_LIGHT_CLIENT_ATTACK, Height: 8, Time: defaultEvidenceTime, Validator: types.TM2PB.Validator(state.Validators.Validators[0]), @@ -242,7 +242,7 @@ func TestBeginBlockByzantineValidators(t *testing.T) { assert.EqualValues(t, retainHeight, 1) // TODO check state and mempool - assert.Equal(t, abciEv, app.ByzantineValidators) + assert.Equal(t, abciMb, app.Misbehavior) } func TestProcessProposal(t *testing.T) { diff --git a/state/helpers_test.go b/state/helpers_test.go index 35d0c403c..48a862f6b 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -224,9 +224,9 @@ func randomGenesisDoc() *types.GenesisDoc { type testApp struct { abci.BaseApplication - CommitVotes []abci.VoteInfo - ByzantineValidators []abci.Evidence - ValidatorUpdates []abci.ValidatorUpdate + CommitVotes []abci.VoteInfo + Misbehavior []abci.Misbehavior + ValidatorUpdates []abci.ValidatorUpdate } var _ abci.Application = (*testApp)(nil) @@ -237,7 +237,7 @@ func (app *testApp) Info(req abci.RequestInfo) (resInfo abci.ResponseInfo) { func (app *testApp) BeginBlock(req abci.RequestBeginBlock) abci.ResponseBeginBlock { app.CommitVotes = req.LastCommitInfo.Votes - app.ByzantineValidators = req.ByzantineValidators + app.Misbehavior = req.ByzantineValidators return abci.ResponseBeginBlock{} } diff --git a/state/validation_test.go b/state/validation_test.go index 9bc2f3d6c..77918e9b1 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -246,7 +246,7 @@ func TestValidateBlockEvidence(t *testing.T) { evpool.On("CheckEvidence", mock.AnythingOfType("types.EvidenceList")).Return(nil) evpool.On("Update", mock.AnythingOfType("state.State"), mock.AnythingOfType("types.EvidenceList")).Return() evpool.On("ABCIEvidence", mock.AnythingOfType("int64"), mock.AnythingOfType("[]types.Evidence")).Return( - []abci.Evidence{}) + []abci.Misbehavior{}) mp := &mpmocks.Mempool{} mp.On("Lock").Return() diff --git a/types/evidence.go b/types/evidence.go index 9e71d99c2..bd61f51c3 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -20,13 +20,13 @@ import ( // Evidence represents any provable malicious activity by a validator. // Verification logic for each evidence is part of the evidence module. type Evidence interface { - ABCI() []abci.Evidence // forms individual evidence to be sent to the application - Bytes() []byte // bytes which comprise the evidence - Hash() []byte // hash of the evidence - Height() int64 // height of the infraction - String() string // string format of the evidence - Time() time.Time // time of the infraction - ValidateBasic() error // basic consistency check + ABCI() []abci.Misbehavior // forms individual evidence to be sent to the application + Bytes() []byte // bytes which comprise the evidence + Hash() []byte // hash of the evidence + Height() int64 // height of the infraction + String() string // string format of the evidence + Time() time.Time // time of the infraction + ValidateBasic() error // basic consistency check } //-------------------------------------------------------------------------------------- @@ -73,9 +73,9 @@ func NewDuplicateVoteEvidence(vote1, vote2 *Vote, blockTime time.Time, valSet *V } // ABCI returns the application relevant representation of the evidence -func (dve *DuplicateVoteEvidence) ABCI() []abci.Evidence { - return []abci.Evidence{{ - Type: abci.EvidenceType_DUPLICATE_VOTE, +func (dve *DuplicateVoteEvidence) ABCI() []abci.Misbehavior { + return []abci.Misbehavior{{ + Type: abci.MisbehaviorType_DUPLICATE_VOTE, Validator: abci.Validator{ Address: dve.VoteA.ValidatorAddress, Power: dve.ValidatorPower, @@ -199,12 +199,12 @@ type LightClientAttackEvidence struct { var _ Evidence = &LightClientAttackEvidence{} -// ABCI forms an array of abci evidence for each byzantine validator -func (l *LightClientAttackEvidence) ABCI() []abci.Evidence { - abciEv := make([]abci.Evidence, len(l.ByzantineValidators)) +// ABCI forms an array of abci.Misbehavior for each byzantine validator +func (l *LightClientAttackEvidence) ABCI() []abci.Misbehavior { + abciEv := make([]abci.Misbehavior, len(l.ByzantineValidators)) for idx, val := range l.ByzantineValidators { - abciEv[idx] = abci.Evidence{ - Type: abci.EvidenceType_LIGHT_CLIENT_ATTACK, + abciEv[idx] = abci.Misbehavior{ + Type: abci.MisbehaviorType_LIGHT_CLIENT_ATTACK, Validator: TM2PB.Validator(val), Height: l.Height(), Time: l.Timestamp, @@ -461,8 +461,8 @@ func (evl EvidenceList) Has(evidence Evidence) bool { // ToABCI converts the evidence list to a slice of the ABCI protobuf messages // for use when communicating the evidence to an application. -func (evl EvidenceList) ToABCI() []abci.Evidence { - var el []abci.Evidence +func (evl EvidenceList) ToABCI() []abci.Misbehavior { + var el []abci.Misbehavior for _, e := range evl { el = append(el, e.ABCI()...) }