From 227db0267bcf93cc7911dd76c68c85edc8ae08cb Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 28 Jul 2022 15:17:13 +0200 Subject: [PATCH] follow #7961 and complete process proposal to spec --- abci/client/socket_client.go | 2 + abci/example/kvstore/kvstore.go | 8 +- abci/example/kvstore/persistent_kvstore.go | 4 +- abci/types/application.go | 4 +- abci/types/result.go | 2 +- abci/types/types.pb.go | 979 +++++++++++++-------- consensus/mempool_test.go | 5 + consensus/state.go | 4 +- proto/tendermint/abci/types.proto | 39 +- proto/tendermint/consensus/types.pb.go | 2 +- proto/tendermint/consensus/types.proto | 2 +- proto/tendermint/types/evidence.proto | 18 +- proto/tendermint/types/types.proto | 8 +- state/execution.go | 82 +- state/execution_test.go | 2 +- state/helpers_test.go | 4 +- test/e2e/app/app.go | 12 + types/evidence.go | 10 + 18 files changed, 747 insertions(+), 440 deletions(-) diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index d79dfdac4..1f3de7384 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -520,6 +520,8 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_OfferSnapshot) case *types.Request_PrepareProposal: _, ok = res.Value.(*types.Response_PrepareProposal) + case *types.Request_ProcessProposal: + _, ok = res.Value.(*types.Response_ProcessProposal) } return ok } diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 674c5b9be..29c000189 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -179,6 +179,10 @@ func (app *Application) PrepareProposal( func (app *Application) ProcessProposal( req types.RequestProcessProposal) types.ResponseProcessProposal { - return types.ResponseProcessProposal{ - Result: types.ResponseProcessProposal_ACCEPT} + for _, tx := range req.Txs { + if len(tx) == 0 { + return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT} + } + } + return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_ACCEPT} } diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 14a6c93e9..b93e5d9e4 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -183,10 +183,10 @@ func (app *PersistentKVStoreApplication) ProcessProposal( req types.RequestProcessProposal) types.ResponseProcessProposal { for _, tx := range req.Txs { if len(tx) == 0 { - return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_REJECT} + return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT} } } - return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_ACCEPT} + return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_ACCEPT} } //--------------------------------------------- diff --git a/abci/types/application.go b/abci/types/application.go index 0eb3edb59..78a8df474 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -4,6 +4,8 @@ import ( context "golang.org/x/net/context" ) +//go:generate ../../scripts/mockery_generate.sh Application + // Application is an interface that enables any finite, deterministic state machine // to be driven by a blockchain-based replication engine via the ABCI. // All methods take a RequestXxx argument and return a ResponseXxx argument, @@ -105,7 +107,7 @@ func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepa func (BaseApplication) ProcessProposal(req RequestProcessProposal) ResponseProcessProposal { return ResponseProcessProposal{ - Result: ResponseProcessProposal_ACCEPT} + Status: ResponseProcessProposal_ACCEPT} } //------------------------------------------------------- diff --git a/abci/types/result.go b/abci/types/result.go index b81c8c2d8..941678ab9 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -43,7 +43,7 @@ func (r ResponseQuery) IsErr() bool { // IsOK returns true if Code is OK func (r ResponseProcessProposal) IsOK() bool { - return r.Result == ResponseProcessProposal_ACCEPT + return r.Status == ResponseProcessProposal_ACCEPT } //--------------------------------------------------------------------------- diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 35303587c..5e5f95b38 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -160,31 +160,31 @@ func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{34, 0} } -type ResponseProcessProposal_Result int32 +type ResponseProcessProposal_ProposalStatus int32 const ( - ResponseProcessProposal_UNKNOWN ResponseProcessProposal_Result = 0 - ResponseProcessProposal_ACCEPT ResponseProcessProposal_Result = 1 - ResponseProcessProposal_REJECT ResponseProcessProposal_Result = 2 + ResponseProcessProposal_UNKNOWN ResponseProcessProposal_ProposalStatus = 0 + ResponseProcessProposal_ACCEPT ResponseProcessProposal_ProposalStatus = 1 + ResponseProcessProposal_REJECT ResponseProcessProposal_ProposalStatus = 2 ) -var ResponseProcessProposal_Result_name = map[int32]string{ +var ResponseProcessProposal_ProposalStatus_name = map[int32]string{ 0: "UNKNOWN", 1: "ACCEPT", 2: "REJECT", } -var ResponseProcessProposal_Result_value = map[string]int32{ +var ResponseProcessProposal_ProposalStatus_value = map[string]int32{ "UNKNOWN": 0, "ACCEPT": 1, "REJECT": 2, } -func (x ResponseProcessProposal_Result) String() string { - return proto.EnumName(ResponseProcessProposal_Result_name, int32(x)) +func (x ResponseProcessProposal_ProposalStatus) String() string { + return proto.EnumName(ResponseProcessProposal_ProposalStatus_name, int32(x)) } -func (ResponseProcessProposal_Result) EnumDescriptor() ([]byte, []int) { +func (ResponseProcessProposal_ProposalStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{36, 0} } @@ -814,10 +814,10 @@ func (m *RequestQuery) GetProve() bool { } 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 LastCommitInfo `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"` + 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"` } func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } @@ -867,11 +867,11 @@ func (m *RequestBeginBlock) GetHeader() types1.Header { return types1.Header{} } -func (m *RequestBeginBlock) GetLastCommitInfo() LastCommitInfo { +func (m *RequestBeginBlock) GetLastCommitInfo() CommitInfo { if m != nil { return m.LastCommitInfo } - return LastCommitInfo{} + return CommitInfo{} } func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { @@ -1326,8 +1326,16 @@ func (m *RequestPrepareProposal) GetBlockDataSize() int64 { } type RequestProcessProposal struct { - Header types1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` - Txs [][]byte `protobuf:"bytes,2,rep,name=txs,proto3" json:"txs,omitempty"` + 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"` + // 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"` + 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 original proposer of the block. + ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` } func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } @@ -1363,13 +1371,6 @@ func (m *RequestProcessProposal) XXX_DiscardUnknown() { var xxx_messageInfo_RequestProcessProposal proto.InternalMessageInfo -func (m *RequestProcessProposal) GetHeader() types1.Header { - if m != nil { - return m.Header - } - return types1.Header{} -} - func (m *RequestProcessProposal) GetTxs() [][]byte { if m != nil { return m.Txs @@ -1377,6 +1378,55 @@ func (m *RequestProcessProposal) GetTxs() [][]byte { return nil } +func (m *RequestProcessProposal) GetProposedLastCommit() CommitInfo { + if m != nil { + return m.ProposedLastCommit + } + return CommitInfo{} +} + +func (m *RequestProcessProposal) GetMisbehavior() []Evidence { + if m != nil { + return m.Misbehavior + } + return nil +} + +func (m *RequestProcessProposal) GetHash() []byte { + if m != nil { + return m.Hash + } + return nil +} + +func (m *RequestProcessProposal) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *RequestProcessProposal) GetTime() time.Time { + if m != nil { + return m.Time + } + return time.Time{} +} + +func (m *RequestProcessProposal) GetNextValidatorsHash() []byte { + if m != nil { + return m.NextValidatorsHash + } + return nil +} + +func (m *RequestProcessProposal) GetProposerAddress() []byte { + if m != nil { + return m.ProposerAddress + } + return nil +} + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -2722,8 +2772,7 @@ func (m *ResponsePrepareProposal) GetBlockData() [][]byte { } type ResponseProcessProposal struct { - Result ResponseProcessProposal_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseProcessProposal_Result" json:"result,omitempty"` - Evidence [][]byte `protobuf:"bytes,2,rep,name=evidence,proto3" json:"evidence,omitempty"` + Status ResponseProcessProposal_ProposalStatus `protobuf:"varint,1,opt,name=status,proto3,enum=tendermint.abci.ResponseProcessProposal_ProposalStatus" json:"status,omitempty"` } func (m *ResponseProcessProposal) Reset() { *m = ResponseProcessProposal{} } @@ -2759,20 +2808,13 @@ func (m *ResponseProcessProposal) XXX_DiscardUnknown() { var xxx_messageInfo_ResponseProcessProposal proto.InternalMessageInfo -func (m *ResponseProcessProposal) GetResult() ResponseProcessProposal_Result { +func (m *ResponseProcessProposal) GetStatus() ResponseProcessProposal_ProposalStatus { if m != nil { - return m.Result + return m.Status } return ResponseProcessProposal_UNKNOWN } -func (m *ResponseProcessProposal) GetEvidence() [][]byte { - if m != nil { - return m.Evidence - } - return nil -} - // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app type ConsensusParams struct { @@ -2898,23 +2940,23 @@ func (m *BlockParams) GetMaxGas() int64 { return 0 } -type LastCommitInfo struct { +type CommitInfo struct { Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` } -func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } -func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } -func (*LastCommitInfo) ProtoMessage() {} -func (*LastCommitInfo) Descriptor() ([]byte, []int) { +func (m *CommitInfo) Reset() { *m = CommitInfo{} } +func (m *CommitInfo) String() string { return proto.CompactTextString(m) } +func (*CommitInfo) ProtoMessage() {} +func (*CommitInfo) Descriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{39} } -func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { +func (m *CommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *LastCommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *CommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_LastCommitInfo.Marshal(b, m, deterministic) + return xxx_messageInfo_CommitInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2924,26 +2966,26 @@ func (m *LastCommitInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } -func (m *LastCommitInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_LastCommitInfo.Merge(m, src) +func (m *CommitInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitInfo.Merge(m, src) } -func (m *LastCommitInfo) XXX_Size() int { +func (m *CommitInfo) XXX_Size() int { return m.Size() } -func (m *LastCommitInfo) XXX_DiscardUnknown() { - xxx_messageInfo_LastCommitInfo.DiscardUnknown(m) +func (m *CommitInfo) XXX_DiscardUnknown() { + xxx_messageInfo_CommitInfo.DiscardUnknown(m) } -var xxx_messageInfo_LastCommitInfo proto.InternalMessageInfo +var xxx_messageInfo_CommitInfo proto.InternalMessageInfo -func (m *LastCommitInfo) GetRound() int32 { +func (m *CommitInfo) GetRound() int32 { if m != nil { return m.Round } return 0 } -func (m *LastCommitInfo) GetVotes() []VoteInfo { +func (m *CommitInfo) GetVotes() []VoteInfo { if m != nil { return m.Votes } @@ -3460,7 +3502,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_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_Result", ResponseProcessProposal_Result_name, ResponseProcessProposal_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseProcessProposal_ProposalStatus", ResponseProcessProposal_ProposalStatus_name, ResponseProcessProposal_ProposalStatus_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3500,7 +3542,7 @@ func init() { proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") - proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") + proto.RegisterType((*CommitInfo)(nil), "tendermint.abci.CommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") proto.RegisterType((*TxResult)(nil), "tendermint.abci.TxResult") @@ -3514,195 +3556,200 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2993 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0xf5, 0xd7, 0x5b, 0xea, 0x2b, 0xeb, 0xe1, 0x9a, 0x61, 0x46, 0x34, 0x33, 0xf6, 0xd0, 0x1c, 0x60, - 0x18, 0xc0, 0xfe, 0x63, 0x0e, 0xfc, 0x87, 0x40, 0x02, 0x96, 0x46, 0x83, 0xcc, 0x18, 0xdb, 0x69, - 0xcb, 0x43, 0x5e, 0x4c, 0xd3, 0x52, 0x97, 0xa5, 0x66, 0xa4, 0xee, 0xa6, 0xbb, 0x64, 0xec, 0x59, - 0xe6, 0x24, 0x1b, 0xb2, 0xe1, 0x9c, 0x6c, 0xb2, 0xe1, 0x23, 0x64, 0x9f, 0x4d, 0xb2, 0xc9, 0x86, - 0x73, 0xb2, 0x08, 0xcb, 0x2c, 0x72, 0x48, 0x0e, 0xb3, 0xcb, 0x17, 0xc8, 0x2a, 0x27, 0x39, 0xf5, - 0xe8, 0x97, 0xa4, 0xb6, 0x64, 0xc8, 0x2e, 0xbb, 0xaa, 0xdb, 0xf7, 0xfe, 0xaa, 0xab, 0xba, 0xea, - 0xde, 0xdf, 0xbd, 0x5d, 0xf0, 0x14, 0xc1, 0x96, 0x81, 0xdd, 0xb1, 0x69, 0x91, 0x4d, 0xbd, 0xd7, - 0x37, 0x37, 0xc9, 0x99, 0x83, 0xbd, 0x0d, 0xc7, 0xb5, 0x89, 0x8d, 0x6a, 0xe1, 0xc3, 0x0d, 0xfa, - 0x50, 0xbe, 0x1e, 0xd1, 0xee, 0xbb, 0x67, 0x0e, 0xb1, 0x37, 0x1d, 0xd7, 0xb6, 0x8f, 0xb9, 0xbe, - 0x7c, 0x2d, 0xf2, 0x98, 0xe1, 0x44, 0xd1, 0x62, 0x4f, 0x85, 0xf1, 0x43, 0x7c, 0xe6, 0x3f, 0xbd, - 0x3e, 0x63, 0xeb, 0xe8, 0xae, 0x3e, 0xf6, 0x1f, 0xaf, 0x0f, 0x6c, 0x7b, 0x30, 0xc2, 0x9b, 0xac, - 0xd7, 0x9b, 0x1c, 0x6f, 0x12, 0x73, 0x8c, 0x3d, 0xa2, 0x8f, 0x1d, 0xa1, 0x70, 0x79, 0x60, 0x0f, - 0x6c, 0xd6, 0xdc, 0xa4, 0x2d, 0x2e, 0x55, 0x7e, 0x2f, 0x41, 0x51, 0xc5, 0x9f, 0x4c, 0xb0, 0x47, - 0xd0, 0x16, 0xe4, 0x70, 0x7f, 0x68, 0x37, 0xd2, 0x37, 0xd2, 0x37, 0xcb, 0x5b, 0xd7, 0x36, 0xa6, - 0x26, 0xb7, 0x21, 0xf4, 0xda, 0xfd, 0xa1, 0xdd, 0x49, 0xa9, 0x4c, 0x17, 0xbd, 0x06, 0xf9, 0xe3, - 0xd1, 0xc4, 0x1b, 0x36, 0x32, 0xcc, 0xe8, 0x7a, 0x92, 0xd1, 0x5d, 0xaa, 0xd4, 0x49, 0xa9, 0x5c, - 0x9b, 0x0e, 0x65, 0x5a, 0xc7, 0x76, 0x23, 0x7b, 0xfe, 0x50, 0x3b, 0xd6, 0x31, 0x1b, 0x8a, 0xea, - 0xa2, 0x26, 0x80, 0x87, 0x89, 0x66, 0x3b, 0xc4, 0xb4, 0xad, 0x46, 0x8e, 0x59, 0x3e, 0x9d, 0x64, - 0x79, 0x88, 0xc9, 0x3e, 0x53, 0xec, 0xa4, 0x54, 0xc9, 0xf3, 0x3b, 0x14, 0xc3, 0xb4, 0x4c, 0xa2, - 0xf5, 0x87, 0xba, 0x69, 0x35, 0xf2, 0xe7, 0x63, 0xec, 0x58, 0x26, 0x69, 0x51, 0x45, 0x8a, 0x61, - 0xfa, 0x1d, 0x3a, 0xe5, 0x4f, 0x26, 0xd8, 0x3d, 0x6b, 0x14, 0xce, 0x9f, 0xf2, 0x0f, 0xa9, 0x12, - 0x9d, 0x32, 0xd3, 0x46, 0x6d, 0x28, 0xf7, 0xf0, 0xc0, 0xb4, 0xb4, 0xde, 0xc8, 0xee, 0x3f, 0x6c, - 0x14, 0x99, 0xb1, 0x92, 0x64, 0xdc, 0xa4, 0xaa, 0x4d, 0xaa, 0xd9, 0x49, 0xa9, 0xd0, 0x0b, 0x7a, - 0xe8, 0x2d, 0x28, 0xf5, 0x87, 0xb8, 0xff, 0x50, 0x23, 0xa7, 0x8d, 0x12, 0xc3, 0x58, 0x4f, 0xc2, - 0x68, 0x51, 0xbd, 0xee, 0x69, 0x27, 0xa5, 0x16, 0xfb, 0xbc, 0x49, 0xe7, 0x6f, 0xe0, 0x91, 0x79, - 0x82, 0x5d, 0x6a, 0x2f, 0x9d, 0x3f, 0xff, 0x3b, 0x5c, 0x93, 0x21, 0x48, 0x86, 0xdf, 0x41, 0x6f, - 0x83, 0x84, 0x2d, 0x43, 0x4c, 0x03, 0x18, 0xc4, 0x8d, 0xc4, 0xbd, 0x62, 0x19, 0xfe, 0x24, 0x4a, - 0x58, 0xb4, 0xd1, 0x6d, 0x28, 0xf4, 0xed, 0xf1, 0xd8, 0x24, 0x8d, 0x32, 0xb3, 0x5e, 0x4b, 0x9c, - 0x00, 0xd3, 0xea, 0xa4, 0x54, 0xa1, 0x8f, 0xf6, 0xa0, 0x3a, 0x32, 0x3d, 0xa2, 0x79, 0x96, 0xee, - 0x78, 0x43, 0x9b, 0x78, 0x8d, 0x15, 0x86, 0xf0, 0x6c, 0x12, 0xc2, 0xae, 0xe9, 0x91, 0x43, 0x5f, - 0xb9, 0x93, 0x52, 0x2b, 0xa3, 0xa8, 0x80, 0xe2, 0xd9, 0xc7, 0xc7, 0xd8, 0x0d, 0x00, 0x1b, 0x95, - 0xf3, 0xf1, 0xf6, 0xa9, 0xb6, 0x6f, 0x4f, 0xf1, 0xec, 0xa8, 0x00, 0xfd, 0x14, 0x2e, 0x8d, 0x6c, - 0xdd, 0x08, 0xe0, 0xb4, 0xfe, 0x70, 0x62, 0x3d, 0x6c, 0x54, 0x19, 0xe8, 0x0b, 0x89, 0x2f, 0x69, - 0xeb, 0x86, 0x0f, 0xd1, 0xa2, 0x06, 0x9d, 0x94, 0xba, 0x3a, 0x9a, 0x16, 0xa2, 0x07, 0x70, 0x59, - 0x77, 0x9c, 0xd1, 0xd9, 0x34, 0x7a, 0x8d, 0xa1, 0xdf, 0x4a, 0x42, 0xdf, 0xa6, 0x36, 0xd3, 0xf0, - 0x48, 0x9f, 0x91, 0xa2, 0x2e, 0xd4, 0x1d, 0x17, 0x3b, 0xba, 0x8b, 0x35, 0xc7, 0xb5, 0x1d, 0xdb, - 0xd3, 0x47, 0x8d, 0x3a, 0xc3, 0x7e, 0x3e, 0x09, 0xfb, 0x80, 0xeb, 0x1f, 0x08, 0xf5, 0x4e, 0x4a, - 0xad, 0x39, 0x71, 0x11, 0x47, 0xb5, 0xfb, 0xd8, 0xf3, 0x42, 0xd4, 0xd5, 0x45, 0xa8, 0x4c, 0x3f, - 0x8e, 0x1a, 0x13, 0x35, 0x8b, 0x90, 0x3f, 0xd1, 0x47, 0x13, 0xac, 0x3c, 0x0f, 0xe5, 0x88, 0x5b, - 0x42, 0x0d, 0x28, 0x8e, 0xb1, 0xe7, 0xe9, 0x03, 0xcc, 0xbc, 0x98, 0xa4, 0xfa, 0x5d, 0xa5, 0x0a, - 0x2b, 0x51, 0x57, 0xa4, 0x8c, 0x03, 0x43, 0xea, 0x64, 0xa8, 0xe1, 0x09, 0x76, 0x3d, 0xea, 0x59, - 0x84, 0xa1, 0xe8, 0xa2, 0x67, 0xa0, 0xc2, 0xb6, 0xba, 0xe6, 0x3f, 0xa7, 0x9e, 0x2e, 0xa7, 0xae, - 0x30, 0xe1, 0x7d, 0xa1, 0xb4, 0x0e, 0x65, 0x67, 0xcb, 0x09, 0x54, 0xb2, 0x4c, 0x05, 0x9c, 0x2d, - 0x47, 0x28, 0x28, 0xdf, 0x83, 0xfa, 0xb4, 0x67, 0x42, 0x75, 0xc8, 0x3e, 0xc4, 0x67, 0x62, 0x3c, - 0xda, 0x44, 0x97, 0xc5, 0xb4, 0xd8, 0x18, 0x92, 0x2a, 0xe6, 0xf8, 0xa7, 0x4c, 0x60, 0x1c, 0xb8, - 0x24, 0x74, 0x1b, 0x72, 0xd4, 0xc3, 0x0b, 0x67, 0x2d, 0x6f, 0x70, 0xf7, 0xbf, 0xe1, 0xbb, 0xff, - 0x8d, 0xae, 0xef, 0xfe, 0x9b, 0xa5, 0x2f, 0xbf, 0x5e, 0x4f, 0x7d, 0xfe, 0xb7, 0xf5, 0xb4, 0xca, - 0x2c, 0xd0, 0x93, 0xd4, 0x83, 0xe8, 0xa6, 0xa5, 0x99, 0x86, 0x18, 0xa7, 0xc8, 0xfa, 0x3b, 0x06, - 0xba, 0x07, 0xf5, 0xbe, 0x6d, 0x79, 0xd8, 0xf2, 0x26, 0x9e, 0xc6, 0xc3, 0x8b, 0x70, 0xd1, 0xb3, - 0x27, 0xbc, 0xe5, 0x2b, 0x1e, 0x30, 0x3d, 0xb5, 0xd6, 0x8f, 0x0b, 0xd0, 0x5d, 0x80, 0x13, 0x7d, - 0x64, 0x1a, 0x3a, 0xb1, 0x5d, 0xaf, 0x91, 0xbb, 0x91, 0x9d, 0x0b, 0x73, 0xdf, 0x57, 0x39, 0x72, - 0x0c, 0x9d, 0xe0, 0x66, 0x8e, 0xbe, 0xad, 0x1a, 0xb1, 0x44, 0xcf, 0x41, 0x4d, 0x77, 0x1c, 0xcd, - 0x23, 0x3a, 0xc1, 0x5a, 0xef, 0x8c, 0x60, 0x8f, 0x39, 0xee, 0x15, 0xb5, 0xa2, 0x3b, 0xce, 0x21, - 0x95, 0x36, 0xa9, 0x10, 0x3d, 0x0b, 0x55, 0xea, 0xa4, 0x4d, 0x7d, 0xa4, 0x0d, 0xb1, 0x39, 0x18, - 0x12, 0xe6, 0xa0, 0xb3, 0x6a, 0x45, 0x48, 0x3b, 0x4c, 0xa8, 0x18, 0xc1, 0x46, 0x60, 0x0e, 0x1a, - 0x21, 0xc8, 0x19, 0x3a, 0xd1, 0xd9, 0x42, 0xae, 0xa8, 0xac, 0x4d, 0x65, 0x8e, 0x4e, 0x86, 0x62, - 0x79, 0x58, 0x1b, 0x5d, 0x81, 0x82, 0x80, 0xcd, 0x32, 0x58, 0xd1, 0xa3, 0xdf, 0xcc, 0x71, 0xed, - 0x13, 0xcc, 0x22, 0x52, 0x49, 0xe5, 0x1d, 0xe5, 0x17, 0x19, 0x58, 0x9d, 0x71, 0xe5, 0x14, 0x77, - 0xa8, 0x7b, 0x43, 0x7f, 0x2c, 0xda, 0x46, 0xaf, 0x53, 0x5c, 0xdd, 0xc0, 0xae, 0x08, 0xa1, 0x8d, - 0xe8, 0x12, 0x71, 0x7a, 0xd0, 0x61, 0xcf, 0xc5, 0xd2, 0x08, 0x6d, 0xb4, 0x0f, 0xf5, 0x91, 0xee, - 0x11, 0x8d, 0xbb, 0x46, 0x2d, 0x12, 0x4e, 0x67, 0x03, 0xc2, 0xae, 0xee, 0x3b, 0x53, 0xba, 0xd9, - 0x05, 0x50, 0x75, 0x14, 0x93, 0x22, 0x15, 0x2e, 0xf7, 0xce, 0x1e, 0xe9, 0x16, 0x31, 0x2d, 0xac, - 0xcd, 0x7c, 0xb9, 0x27, 0x67, 0x40, 0xdb, 0x27, 0xa6, 0x81, 0xad, 0xbe, 0xff, 0xc9, 0x2e, 0x05, - 0xc6, 0xc1, 0x27, 0xf5, 0x14, 0x15, 0xaa, 0xf1, 0x60, 0x84, 0xaa, 0x90, 0x21, 0xa7, 0x62, 0x01, - 0x32, 0xe4, 0x14, 0xfd, 0x1f, 0xe4, 0xe8, 0x24, 0xd9, 0xe4, 0xab, 0x73, 0x98, 0x80, 0xb0, 0xeb, - 0x9e, 0x39, 0x58, 0x65, 0x9a, 0x8a, 0x12, 0x9c, 0x86, 0x20, 0x40, 0x4d, 0xa3, 0x2a, 0x2f, 0x40, - 0x6d, 0x2a, 0x02, 0x45, 0xbe, 0x5f, 0x3a, 0xfa, 0xfd, 0x94, 0x1a, 0x54, 0x62, 0xe1, 0x46, 0xb9, - 0x02, 0x97, 0xe7, 0x45, 0x0f, 0x65, 0x18, 0xc8, 0x63, 0x51, 0x00, 0xbd, 0x06, 0xa5, 0x20, 0x7c, - 0xf0, 0xd3, 0x38, 0xbb, 0x56, 0xbe, 0xb2, 0x1a, 0xa8, 0xd2, 0x63, 0x48, 0xb7, 0x35, 0xdb, 0x0f, - 0x19, 0xf6, 0xe2, 0x45, 0xdd, 0x71, 0x3a, 0xba, 0x37, 0x54, 0x3e, 0x82, 0x46, 0x52, 0x68, 0x98, - 0x9a, 0x46, 0x2e, 0xd8, 0x86, 0x57, 0xa0, 0x70, 0x6c, 0xbb, 0x63, 0x9d, 0x30, 0xb0, 0x8a, 0x2a, - 0x7a, 0x74, 0x7b, 0xf2, 0x30, 0x91, 0x65, 0x62, 0xde, 0x51, 0x34, 0x78, 0x32, 0x31, 0x3c, 0x50, - 0x13, 0xd3, 0x32, 0x30, 0x5f, 0xcf, 0x8a, 0xca, 0x3b, 0x21, 0x10, 0x7f, 0x59, 0xde, 0xa1, 0xc3, - 0x7a, 0x6c, 0xae, 0x0c, 0x5f, 0x52, 0x45, 0x4f, 0xd1, 0xe0, 0xca, 0xfc, 0x18, 0x81, 0xae, 0x03, - 0x70, 0x7f, 0x2a, 0x4e, 0x5d, 0xf6, 0xe6, 0x8a, 0x2a, 0x31, 0xc9, 0x1d, 0x7a, 0xf4, 0x9e, 0x83, - 0x5a, 0xf8, 0x58, 0xf3, 0xcc, 0x47, 0x7c, 0x6b, 0x64, 0xd5, 0x4a, 0xa0, 0x73, 0x68, 0x3e, 0xc2, - 0x4a, 0x2f, 0x32, 0x40, 0x2c, 0x36, 0x44, 0x0e, 0x54, 0xfa, 0x42, 0x07, 0xaa, 0x0e, 0x59, 0x72, - 0xea, 0x35, 0x32, 0xec, 0x8d, 0x68, 0x53, 0xf9, 0x35, 0x40, 0x49, 0xc5, 0x9e, 0x43, 0x1d, 0x1b, - 0x6a, 0x82, 0x84, 0x4f, 0xfb, 0x98, 0xb3, 0xcf, 0x74, 0x22, 0x7b, 0xe3, 0xda, 0x6d, 0x5f, 0x93, - 0x52, 0xa7, 0xc0, 0x0c, 0xbd, 0x2a, 0x18, 0x76, 0x32, 0x59, 0x16, 0xe6, 0x51, 0x8a, 0xfd, 0xba, - 0x4f, 0xb1, 0xb3, 0x89, 0x6c, 0x89, 0x5b, 0x4d, 0x71, 0xec, 0x57, 0x05, 0xc7, 0xce, 0x2d, 0x18, - 0x2c, 0x46, 0xb2, 0x5b, 0x31, 0x92, 0x9d, 0x5f, 0x30, 0xcd, 0x04, 0x96, 0xdd, 0x8a, 0xb1, 0xec, - 0xc2, 0x02, 0x90, 0x04, 0x9a, 0xfd, 0xba, 0x4f, 0xb3, 0x8b, 0x0b, 0xa6, 0x3d, 0xc5, 0xb3, 0xef, - 0xc6, 0x79, 0x36, 0xe7, 0xc8, 0xcf, 0x24, 0x5a, 0x27, 0x12, 0xed, 0xef, 0x47, 0x88, 0xb6, 0x94, - 0xc8, 0x72, 0x39, 0xc8, 0x1c, 0xa6, 0xdd, 0x8a, 0x31, 0x6d, 0x58, 0xb0, 0x06, 0x09, 0x54, 0xfb, - 0x9d, 0x28, 0xd5, 0x2e, 0x27, 0xb2, 0x75, 0xb1, 0x69, 0xe6, 0x71, 0xed, 0x37, 0x02, 0xae, 0xbd, - 0x92, 0x98, 0x2c, 0x88, 0x39, 0x4c, 0x93, 0xed, 0xfd, 0x19, 0xb2, 0xcd, 0xc9, 0xf1, 0x73, 0x89, - 0x10, 0x0b, 0xd8, 0xf6, 0xfe, 0x0c, 0xdb, 0xae, 0x2e, 0x00, 0x5c, 0x40, 0xb7, 0x7f, 0x36, 0x9f, - 0x6e, 0x27, 0x13, 0x62, 0xf1, 0x9a, 0xcb, 0xf1, 0x6d, 0x2d, 0x81, 0x6f, 0x73, 0x4e, 0xfc, 0x62, - 0x22, 0xfc, 0xd2, 0x84, 0xfb, 0x68, 0x0e, 0xe1, 0xe6, 0xd4, 0xf8, 0x66, 0x22, 0xf8, 0x12, 0x8c, - 0xfb, 0x68, 0x0e, 0xe3, 0x46, 0x0b, 0x61, 0x97, 0xa7, 0xdc, 0x2f, 0x50, 0x66, 0x33, 0xe5, 0xe6, - 0x68, 0x74, 0xc0, 0xae, 0x6b, 0xbb, 0x82, 0xcd, 0xf2, 0x8e, 0x72, 0x93, 0x72, 0xad, 0xd0, 0xa5, - 0x9d, 0x43, 0xcf, 0x59, 0x14, 0x8e, 0xb8, 0x31, 0xe5, 0x77, 0xe9, 0xd0, 0x96, 0xd1, 0x93, 0x28, - 0x4f, 0x93, 0x04, 0x4f, 0x8b, 0xb0, 0xf6, 0x4c, 0x9c, 0xb5, 0xaf, 0x43, 0x99, 0x46, 0xd7, 0x29, - 0x42, 0xae, 0x3b, 0x3e, 0x21, 0x47, 0xb7, 0x60, 0x95, 0xd1, 0x27, 0x1e, 0x6c, 0x44, 0x48, 0xcd, - 0xb1, 0x48, 0x53, 0xa3, 0x0f, 0xf8, 0x51, 0xe2, 0xb1, 0xf5, 0x65, 0xb8, 0x14, 0xd1, 0x0d, 0xa2, - 0x36, 0x67, 0xa1, 0xf5, 0x40, 0x7b, 0x5b, 0x84, 0xef, 0xf7, 0xc3, 0x05, 0x0a, 0xc9, 0x3e, 0x82, - 0x5c, 0xdf, 0x36, 0xb0, 0x88, 0xa9, 0xac, 0x4d, 0x23, 0xce, 0xc8, 0x1e, 0x88, 0xc8, 0x49, 0x9b, - 0x54, 0x2b, 0xf0, 0xd9, 0x12, 0x77, 0xc9, 0xca, 0x1f, 0xd3, 0x21, 0x5e, 0xc8, 0xff, 0xe7, 0x51, - 0xf5, 0xf4, 0x7f, 0x87, 0xaa, 0x67, 0xbe, 0x35, 0x55, 0x8f, 0x72, 0x9a, 0x6c, 0x9c, 0xd3, 0xfc, - 0x33, 0x1d, 0x7e, 0xe1, 0x80, 0x78, 0x7f, 0xbb, 0x15, 0x09, 0x09, 0x4a, 0x9e, 0x7d, 0x2f, 0x41, - 0x50, 0x44, 0x3a, 0x55, 0x60, 0xe3, 0xc6, 0xd3, 0xa9, 0x22, 0xa7, 0x2c, 0xac, 0x83, 0x6e, 0x83, - 0xc4, 0x6a, 0x72, 0x9a, 0xed, 0x78, 0x22, 0x3c, 0x3c, 0x15, 0x9d, 0x2b, 0x2f, 0xbd, 0x6d, 0x1c, - 0x50, 0x9d, 0x7d, 0xc7, 0x53, 0x4b, 0x8e, 0x68, 0x45, 0xb8, 0x97, 0x14, 0x4b, 0x01, 0xae, 0x81, - 0x44, 0xdf, 0xde, 0x73, 0xf4, 0x3e, 0x66, 0xae, 0x5e, 0x52, 0x43, 0x81, 0xf2, 0x00, 0xd0, 0x6c, - 0xb0, 0x41, 0x1d, 0x28, 0xe0, 0x13, 0x6c, 0x11, 0x8f, 0x51, 0xa0, 0xf2, 0xd6, 0x95, 0x39, 0xfc, - 0x1a, 0x5b, 0xa4, 0xd9, 0xa0, 0x8b, 0xfc, 0x8f, 0xaf, 0xd7, 0xeb, 0x5c, 0xfb, 0x25, 0x7b, 0x6c, - 0x12, 0x3c, 0x76, 0xc8, 0x99, 0x2a, 0xec, 0x95, 0xbf, 0x66, 0x28, 0xd9, 0x8d, 0x05, 0xa2, 0xb9, - 0x6b, 0xeb, 0x1f, 0xa0, 0x4c, 0x24, 0xd1, 0x59, 0x6e, 0xbd, 0xd7, 0x00, 0x06, 0xba, 0xa7, 0x7d, - 0xaa, 0x5b, 0x04, 0x1b, 0x62, 0xd1, 0x23, 0x12, 0x24, 0x43, 0x89, 0xf6, 0x26, 0x1e, 0x36, 0x44, - 0xce, 0x15, 0xf4, 0x23, 0xf3, 0x2c, 0x7e, 0xb7, 0x79, 0xc6, 0x57, 0xb9, 0x34, 0xb5, 0xca, 0x11, - 0x22, 0x2a, 0x45, 0x89, 0x28, 0x7d, 0x37, 0xc7, 0x35, 0x6d, 0xd7, 0x24, 0x67, 0xec, 0xd3, 0x64, - 0xd5, 0xa0, 0x4f, 0x53, 0xfb, 0x31, 0x1e, 0x3b, 0xb6, 0x3d, 0xd2, 0xb8, 0xf3, 0x2a, 0x33, 0xd3, - 0x15, 0x21, 0x6c, 0x33, 0x1f, 0xf6, 0xcb, 0x4c, 0x78, 0xfc, 0xc2, 0x84, 0xe3, 0x7f, 0x6e, 0x81, - 0x95, 0x5f, 0xb1, 0x2a, 0x44, 0x9c, 0x6a, 0xa0, 0x43, 0x58, 0x0d, 0x8e, 0xbf, 0x36, 0x61, 0x6e, - 0xc1, 0xdf, 0xd0, 0xcb, 0xfa, 0x8f, 0xfa, 0x49, 0x5c, 0xec, 0xa1, 0x1f, 0xc1, 0xd5, 0x29, 0xd7, - 0x16, 0x40, 0x67, 0x96, 0xf4, 0x70, 0x4f, 0xc4, 0x3d, 0x9c, 0x8f, 0x1c, 0xae, 0x55, 0xf6, 0x3b, - 0x1e, 0xba, 0x1d, 0x9a, 0xd8, 0x46, 0x89, 0xd3, 0xdc, 0xaf, 0xff, 0x0c, 0x54, 0x5c, 0x4c, 0x74, - 0xd3, 0xd2, 0x62, 0xa5, 0x83, 0x15, 0x2e, 0x14, 0x05, 0x89, 0x03, 0x78, 0x62, 0x2e, 0x81, 0x42, - 0xff, 0x0f, 0x52, 0xc8, 0xbd, 0xd2, 0x09, 0x59, 0x78, 0x90, 0x59, 0x86, 0xba, 0xca, 0x1f, 0xd2, - 0x21, 0x64, 0x3c, 0x57, 0x6d, 0x43, 0xc1, 0xc5, 0xde, 0x64, 0xc4, 0xb3, 0xc7, 0xea, 0xd6, 0xcb, - 0xcb, 0x51, 0x2f, 0x2a, 0x9d, 0x8c, 0x88, 0x2a, 0x8c, 0x95, 0x07, 0x50, 0xe0, 0x12, 0x54, 0x86, - 0xe2, 0xd1, 0xde, 0xbd, 0xbd, 0xfd, 0x0f, 0xf6, 0xea, 0x29, 0x04, 0x50, 0xd8, 0x6e, 0xb5, 0xda, - 0x07, 0xdd, 0x7a, 0x1a, 0x49, 0x90, 0xdf, 0x6e, 0xee, 0xab, 0xdd, 0x7a, 0x86, 0x8a, 0xd5, 0xf6, - 0x7b, 0xed, 0x56, 0xb7, 0x9e, 0x45, 0xab, 0x50, 0xe1, 0x6d, 0xed, 0xee, 0xbe, 0xfa, 0xfe, 0x76, - 0xb7, 0x9e, 0x8b, 0x88, 0x0e, 0xdb, 0x7b, 0x77, 0xda, 0x6a, 0x3d, 0xaf, 0xbc, 0x42, 0xd3, 0xd3, - 0x04, 0xb2, 0x16, 0x26, 0xa2, 0xe9, 0x48, 0x22, 0xaa, 0xfc, 0x26, 0x03, 0x72, 0x32, 0x03, 0x43, - 0xef, 0x4d, 0x4d, 0x7c, 0xeb, 0x02, 0xf4, 0x6d, 0x6a, 0xf6, 0xe8, 0x59, 0xa8, 0xba, 0xf8, 0x18, - 0x93, 0xfe, 0x90, 0x33, 0x42, 0x1e, 0x31, 0x2b, 0x6a, 0x45, 0x48, 0x99, 0x91, 0xc7, 0xd5, 0x3e, - 0xc6, 0x7d, 0xa2, 0x71, 0x57, 0xc4, 0x37, 0x9d, 0x44, 0xd5, 0xa8, 0xf4, 0x90, 0x0b, 0x95, 0x8f, - 0x2e, 0xb4, 0x96, 0x12, 0xe4, 0xd5, 0x76, 0x57, 0xfd, 0x71, 0x3d, 0x8b, 0x10, 0x54, 0x59, 0x53, - 0x3b, 0xdc, 0xdb, 0x3e, 0x38, 0xec, 0xec, 0xd3, 0xb5, 0xbc, 0x04, 0x35, 0x7f, 0x2d, 0x7d, 0x61, - 0x5e, 0xb9, 0x0d, 0x57, 0x13, 0xe8, 0xe3, 0x82, 0x64, 0x5c, 0xf9, 0x6d, 0x3a, 0x6a, 0x1a, 0x4f, - 0xb3, 0xdf, 0x9d, 0x5a, 0xd1, 0xcd, 0x65, 0xc9, 0xe5, 0xf4, 0x72, 0xca, 0x50, 0xc2, 0xa2, 0x94, - 0x24, 0x92, 0xef, 0xa0, 0xaf, 0xbc, 0xbc, 0x78, 0x71, 0xc2, 0xdd, 0x95, 0x51, 0xfe, 0x9d, 0x86, - 0xda, 0x94, 0x2b, 0x40, 0x5b, 0x90, 0xe7, 0xf9, 0x53, 0xd2, 0x6f, 0x2d, 0xe6, 0xc9, 0x84, 0xdf, - 0xe0, 0xaa, 0xe8, 0xad, 0xd8, 0x2b, 0xcd, 0xb8, 0x1c, 0x5e, 0x44, 0xf0, 0xeb, 0x5f, 0xc2, 0x34, - 0xb0, 0x40, 0x6f, 0x83, 0x14, 0xf8, 0x34, 0x91, 0xb4, 0x3f, 0x3d, 0x6b, 0x1e, 0x78, 0x43, 0x61, - 0x1f, 0xda, 0xa0, 0x37, 0x42, 0x5a, 0x9b, 0x9b, 0xcd, 0xda, 0x84, 0x39, 0x57, 0x10, 0xc6, 0xbe, - 0xbe, 0xd2, 0x82, 0x72, 0x64, 0x3e, 0xe8, 0x29, 0x90, 0xc6, 0xfa, 0xa9, 0xa8, 0x9a, 0xf2, 0xba, - 0x57, 0x69, 0xac, 0x9f, 0xf2, 0x82, 0xe9, 0x55, 0x28, 0xd2, 0x87, 0x03, 0xdd, 0x13, 0x25, 0x96, - 0xc2, 0x58, 0x3f, 0x7d, 0x57, 0xf7, 0x94, 0x0f, 0xa1, 0x1a, 0xaf, 0x18, 0xd2, 0x33, 0xe7, 0xda, - 0x13, 0xcb, 0x60, 0x18, 0x79, 0x95, 0x77, 0xd0, 0x6b, 0x90, 0x3f, 0xb1, 0xb9, 0x5b, 0x9e, 0xef, - 0x9c, 0xee, 0xdb, 0x04, 0x47, 0x2a, 0x8e, 0x5c, 0x5b, 0x79, 0x04, 0x79, 0xe6, 0x66, 0xa9, 0xcb, - 0x64, 0xb5, 0x3f, 0x41, 0xe9, 0x69, 0x1b, 0x7d, 0x08, 0xa0, 0x13, 0xe2, 0x9a, 0xbd, 0x49, 0x08, - 0xbc, 0x3e, 0xdf, 0x4d, 0x6f, 0xfb, 0x7a, 0xcd, 0x6b, 0xc2, 0x5f, 0x5f, 0x0e, 0x4d, 0x23, 0x3e, - 0x3b, 0x02, 0xa8, 0xec, 0x41, 0x35, 0x6e, 0x1b, 0xad, 0xc2, 0xaf, 0xcc, 0xa9, 0xc2, 0x07, 0xb4, - 0x31, 0x20, 0x9d, 0x59, 0x5e, 0xe7, 0x65, 0x1d, 0xe5, 0xb3, 0x34, 0x94, 0xba, 0xa7, 0x62, 0x8f, - 0x26, 0x94, 0x18, 0x43, 0xd3, 0x4c, 0xb4, 0xa0, 0xc6, 0x6b, 0x96, 0xd9, 0xa0, 0x12, 0xfa, 0x4e, - 0x70, 0xa0, 0x72, 0xcb, 0x56, 0x0b, 0xfc, 0x0a, 0x96, 0x70, 0xcb, 0x6f, 0x82, 0x14, 0xec, 0x2a, - 0x9a, 0x1b, 0xe9, 0x86, 0xe1, 0x62, 0xcf, 0x13, 0x73, 0xf3, 0xbb, 0xac, 0x62, 0x6d, 0x7f, 0x2a, - 0x4a, 0x76, 0x59, 0x95, 0x77, 0x14, 0x03, 0x6a, 0x53, 0x01, 0x1a, 0xbd, 0x09, 0x45, 0x67, 0xd2, - 0xd3, 0xfc, 0xe5, 0x99, 0x3a, 0x3c, 0x3e, 0x4f, 0x9e, 0xf4, 0x46, 0x66, 0xff, 0x1e, 0x3e, 0xf3, - 0x5f, 0xc6, 0x99, 0xf4, 0xee, 0xf1, 0x55, 0xe4, 0xa3, 0x64, 0xa2, 0xa3, 0x9c, 0x40, 0xc9, 0xdf, - 0x14, 0xe8, 0x07, 0xd1, 0x73, 0xe2, 0xff, 0xc7, 0x48, 0x24, 0x0d, 0x02, 0x3e, 0x72, 0x4c, 0x6e, - 0xc1, 0xaa, 0x67, 0x0e, 0x2c, 0x6c, 0x68, 0x61, 0x76, 0xc6, 0x46, 0x2b, 0xa9, 0x35, 0xfe, 0x60, - 0xd7, 0x4f, 0xcd, 0x94, 0x7f, 0xa5, 0xa1, 0xe4, 0x1f, 0x58, 0xf4, 0x4a, 0x64, 0xdf, 0x55, 0xe7, - 0x54, 0xc6, 0x7c, 0xc5, 0xb0, 0xe8, 0x1c, 0x7f, 0xd7, 0xcc, 0xc5, 0xdf, 0x35, 0xe9, 0xef, 0x81, - 0xff, 0x1b, 0x27, 0x77, 0xe1, 0xdf, 0x38, 0x2f, 0x01, 0x22, 0x36, 0xd1, 0x47, 0xda, 0x89, 0x4d, - 0x4c, 0x6b, 0xa0, 0xf1, 0xc5, 0xe6, 0xdc, 0xb1, 0xce, 0x9e, 0xdc, 0x67, 0x0f, 0x0e, 0xd8, 0xba, - 0xff, 0x3c, 0x0d, 0xa5, 0x80, 0x05, 0x5c, 0xb4, 0x86, 0x7c, 0x05, 0x0a, 0x22, 0xd0, 0xf1, 0x22, - 0xb2, 0xe8, 0x05, 0xbf, 0x33, 0x72, 0x91, 0xdf, 0x19, 0x32, 0x94, 0xc6, 0x98, 0xe8, 0x2c, 0x9e, - 0xf0, 0x04, 0x39, 0xe8, 0xdf, 0x7a, 0x03, 0xca, 0x91, 0x72, 0x3e, 0x3d, 0x79, 0x7b, 0xed, 0x0f, - 0xea, 0x29, 0xb9, 0xf8, 0xd9, 0x17, 0x37, 0xb2, 0x7b, 0xf8, 0x53, 0xba, 0x67, 0xd5, 0x76, 0xab, - 0xd3, 0x6e, 0xdd, 0xab, 0xa7, 0xe5, 0xf2, 0x67, 0x5f, 0xdc, 0x28, 0xaa, 0x98, 0x15, 0xd4, 0x6e, - 0x75, 0x60, 0x25, 0xfa, 0x55, 0xe2, 0xe1, 0x00, 0x41, 0xf5, 0xce, 0xd1, 0xc1, 0xee, 0x4e, 0x6b, - 0xbb, 0xdb, 0xd6, 0xee, 0xef, 0x77, 0xdb, 0xf5, 0x34, 0xba, 0x0a, 0x97, 0x76, 0x77, 0xde, 0xed, - 0x74, 0xb5, 0xd6, 0xee, 0x4e, 0x7b, 0xaf, 0xab, 0x6d, 0x77, 0xbb, 0xdb, 0xad, 0x7b, 0xf5, 0xcc, - 0xd6, 0x9f, 0xcb, 0x50, 0xdb, 0x6e, 0xb6, 0x76, 0x68, 0x9c, 0x37, 0xfb, 0xba, 0x28, 0x58, 0xe6, - 0x58, 0x7d, 0xe2, 0xdc, 0x3b, 0x0f, 0xf2, 0xf9, 0xf5, 0x5a, 0x74, 0x17, 0xf2, 0xac, 0x74, 0x81, - 0xce, 0xbf, 0x04, 0x21, 0x2f, 0x28, 0xe0, 0xd2, 0x97, 0x61, 0xc7, 0xe3, 0xdc, 0x5b, 0x11, 0xf2, - 0xf9, 0xf5, 0x5c, 0xa4, 0x82, 0x14, 0xd6, 0x1e, 0x16, 0xdf, 0x92, 0x90, 0x97, 0xa8, 0xf1, 0x52, - 0xcc, 0x30, 0x01, 0x5a, 0x7c, 0x6b, 0x40, 0x5e, 0xc2, 0x81, 0xa1, 0x5d, 0x28, 0xfa, 0x39, 0xeb, - 0xa2, 0x7b, 0x0c, 0xf2, 0xc2, 0xfa, 0x2b, 0xfd, 0x04, 0xbc, 0xb6, 0x70, 0xfe, 0xa5, 0x0c, 0x79, - 0x41, 0x31, 0x19, 0xed, 0x40, 0x41, 0xb0, 0xfa, 0x05, 0x77, 0x13, 0xe4, 0x45, 0xf5, 0x54, 0xba, - 0x68, 0x61, 0xd1, 0x66, 0xf1, 0x55, 0x13, 0x79, 0x89, 0x3a, 0x39, 0x3a, 0x02, 0x88, 0x54, 0x12, - 0x96, 0xb8, 0x43, 0x22, 0x2f, 0x53, 0xff, 0x46, 0xfb, 0x50, 0x0a, 0x12, 0xbb, 0x85, 0x37, 0x3a, - 0xe4, 0xc5, 0x85, 0x68, 0xf4, 0x00, 0x2a, 0xf1, 0x8c, 0x66, 0xb9, 0x7b, 0x1a, 0xf2, 0x92, 0x15, - 0x66, 0x8a, 0x1f, 0x4f, 0x6f, 0x96, 0xbb, 0xb7, 0x21, 0x2f, 0x59, 0x70, 0x46, 0x1f, 0xc3, 0xea, - 0x6c, 0xfa, 0xb1, 0xfc, 0x35, 0x0e, 0xf9, 0x02, 0x25, 0x68, 0x34, 0x06, 0x34, 0x27, 0x6d, 0xb9, - 0xc0, 0xad, 0x0e, 0xf9, 0x22, 0x15, 0x69, 0x64, 0x40, 0x6d, 0x3a, 0x17, 0x58, 0xf6, 0x96, 0x87, - 0xbc, 0x74, 0x75, 0x9a, 0x8f, 0x12, 0x4f, 0x1b, 0x96, 0xbd, 0xf5, 0x21, 0x2f, 0x5d, 0xac, 0x6e, - 0xb6, 0xbf, 0xfc, 0x66, 0x2d, 0xfd, 0xd5, 0x37, 0x6b, 0xe9, 0xbf, 0x7f, 0xb3, 0x96, 0xfe, 0xfc, - 0xf1, 0x5a, 0xea, 0xab, 0xc7, 0x6b, 0xa9, 0xbf, 0x3c, 0x5e, 0x4b, 0xfd, 0xe4, 0xc5, 0x81, 0x49, - 0x86, 0x93, 0xde, 0x46, 0xdf, 0x1e, 0x6f, 0x46, 0xaf, 0xcf, 0xcd, 0xbb, 0xd2, 0xd7, 0x2b, 0xb0, - 0xa0, 0xfb, 0xea, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x88, 0x9f, 0xf2, 0x5c, 0xf2, 0x27, 0x00, - 0x00, + // 3084 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x93, 0x1b, 0xc5, + 0x15, 0xd7, 0xb7, 0x34, 0x4f, 0xab, 0x8f, 0x6d, 0x2f, 0xb6, 0x10, 0xf6, 0xae, 0x19, 0x17, 0x60, + 0x1b, 0xd8, 0x85, 0xa5, 0x0c, 0x26, 0x90, 0x80, 0x24, 0xcb, 0x68, 0xf1, 0xb2, 0xbb, 0x99, 0x95, + 0x4d, 0xc8, 0x87, 0x87, 0x91, 0xd4, 0x2b, 0x0d, 0x96, 0x66, 0x86, 0x99, 0xd6, 0xb2, 0xeb, 0x53, + 0x2a, 0x55, 0x5c, 0xc8, 0x85, 0xaa, 0x5c, 0x72, 0xe1, 0x90, 0xff, 0x22, 0x97, 0xe4, 0x92, 0x0b, + 0x55, 0x39, 0x84, 0x63, 0x0e, 0x29, 0x92, 0x82, 0x5b, 0xfe, 0x81, 0x9c, 0x52, 0x49, 0xf5, 0xc7, + 0x7c, 0x49, 0x9a, 0xd5, 0x2c, 0xe4, 0x96, 0x5b, 0xf7, 0xeb, 0xf7, 0xde, 0x4c, 0xf7, 0x74, 0xbf, + 0xf7, 0x7e, 0xbf, 0x69, 0x78, 0x8a, 0x60, 0x63, 0x80, 0xed, 0x89, 0x6e, 0x90, 0x2d, 0xad, 0xd7, + 0xd7, 0xb7, 0xc8, 0xa9, 0x85, 0x9d, 0x4d, 0xcb, 0x36, 0x89, 0x89, 0x2a, 0xfe, 0xe0, 0x26, 0x1d, + 0xac, 0x5f, 0x09, 0x68, 0xf7, 0xed, 0x53, 0x8b, 0x98, 0x5b, 0x96, 0x6d, 0x9a, 0x47, 0x5c, 0xbf, + 0x7e, 0x39, 0x30, 0xcc, 0xfc, 0x04, 0xbd, 0x85, 0x46, 0x85, 0xf1, 0x23, 0x7c, 0xea, 0x8e, 0x5e, + 0x99, 0xb3, 0xb5, 0x34, 0x5b, 0x9b, 0xb8, 0xc3, 0x1b, 0x43, 0xd3, 0x1c, 0x8e, 0xf1, 0x16, 0xeb, + 0xf5, 0xa6, 0x47, 0x5b, 0x44, 0x9f, 0x60, 0x87, 0x68, 0x13, 0x4b, 0x28, 0xac, 0x0d, 0xcd, 0xa1, + 0xc9, 0x9a, 0x5b, 0xb4, 0xc5, 0xa5, 0xf2, 0x1f, 0x24, 0xc8, 0x2b, 0xf8, 0xe3, 0x29, 0x76, 0x08, + 0xda, 0x86, 0x0c, 0xee, 0x8f, 0xcc, 0x5a, 0xf2, 0x6a, 0xf2, 0x7a, 0x71, 0xfb, 0xf2, 0xe6, 0xcc, + 0xe4, 0x36, 0x85, 0x5e, 0xbb, 0x3f, 0x32, 0x3b, 0x09, 0x85, 0xe9, 0xa2, 0x5b, 0x90, 0x3d, 0x1a, + 0x4f, 0x9d, 0x51, 0x2d, 0xc5, 0x8c, 0xae, 0x44, 0x19, 0xdd, 0xa5, 0x4a, 0x9d, 0x84, 0xc2, 0xb5, + 0xe9, 0xa3, 0x74, 0xe3, 0xc8, 0xac, 0xa5, 0xcf, 0x7e, 0xd4, 0x8e, 0x71, 0xc4, 0x1e, 0x45, 0x75, + 0x51, 0x13, 0xc0, 0xc1, 0x44, 0x35, 0x2d, 0xa2, 0x9b, 0x46, 0x2d, 0xc3, 0x2c, 0x9f, 0x8e, 0xb2, + 0x3c, 0xc4, 0x64, 0x9f, 0x29, 0x76, 0x12, 0x8a, 0xe4, 0xb8, 0x1d, 0xea, 0x43, 0x37, 0x74, 0xa2, + 0xf6, 0x47, 0x9a, 0x6e, 0xd4, 0xb2, 0x67, 0xfb, 0xd8, 0x31, 0x74, 0xd2, 0xa2, 0x8a, 0xd4, 0x87, + 0xee, 0x76, 0xe8, 0x94, 0x3f, 0x9e, 0x62, 0xfb, 0xb4, 0x96, 0x3b, 0x7b, 0xca, 0x3f, 0xa6, 0x4a, + 0x74, 0xca, 0x4c, 0x1b, 0xb5, 0xa1, 0xd8, 0xc3, 0x43, 0xdd, 0x50, 0x7b, 0x63, 0xb3, 0xff, 0xa8, + 0x96, 0x67, 0xc6, 0x72, 0x94, 0x71, 0x93, 0xaa, 0x36, 0xa9, 0x66, 0x27, 0xa1, 0x40, 0xcf, 0xeb, + 0xa1, 0x37, 0xa1, 0xd0, 0x1f, 0xe1, 0xfe, 0x23, 0x95, 0x9c, 0xd4, 0x0a, 0xcc, 0xc7, 0x46, 0x94, + 0x8f, 0x16, 0xd5, 0xeb, 0x9e, 0x74, 0x12, 0x4a, 0xbe, 0xcf, 0x9b, 0x74, 0xfe, 0x03, 0x3c, 0xd6, + 0x8f, 0xb1, 0x4d, 0xed, 0xa5, 0xb3, 0xe7, 0x7f, 0x87, 0x6b, 0x32, 0x0f, 0xd2, 0xc0, 0xed, 0xa0, + 0xb7, 0x40, 0xc2, 0xc6, 0x40, 0x4c, 0x03, 0x98, 0x8b, 0xab, 0x91, 0x7b, 0xc5, 0x18, 0xb8, 0x93, + 0x28, 0x60, 0xd1, 0x46, 0xb7, 0x21, 0xd7, 0x37, 0x27, 0x13, 0x9d, 0xd4, 0x8a, 0xcc, 0x7a, 0x3d, + 0x72, 0x02, 0x4c, 0xab, 0x93, 0x50, 0x84, 0x3e, 0xda, 0x83, 0xf2, 0x58, 0x77, 0x88, 0xea, 0x18, + 0x9a, 0xe5, 0x8c, 0x4c, 0xe2, 0xd4, 0x56, 0x98, 0x87, 0x67, 0xa2, 0x3c, 0xec, 0xea, 0x0e, 0x39, + 0x74, 0x95, 0x3b, 0x09, 0xa5, 0x34, 0x0e, 0x0a, 0xa8, 0x3f, 0xf3, 0xe8, 0x08, 0xdb, 0x9e, 0xc3, + 0x5a, 0xe9, 0x6c, 0x7f, 0xfb, 0x54, 0xdb, 0xb5, 0xa7, 0xfe, 0xcc, 0xa0, 0x00, 0xfd, 0x0c, 0x2e, + 0x8c, 0x4d, 0x6d, 0xe0, 0xb9, 0x53, 0xfb, 0xa3, 0xa9, 0xf1, 0xa8, 0x56, 0x66, 0x4e, 0x6f, 0x44, + 0xbe, 0xa4, 0xa9, 0x0d, 0x5c, 0x17, 0x2d, 0x6a, 0xd0, 0x49, 0x28, 0xab, 0xe3, 0x59, 0x21, 0x7a, + 0x08, 0x6b, 0x9a, 0x65, 0x8d, 0x4f, 0x67, 0xbd, 0x57, 0x98, 0xf7, 0x9b, 0x51, 0xde, 0x1b, 0xd4, + 0x66, 0xd6, 0x3d, 0xd2, 0xe6, 0xa4, 0xa8, 0x0b, 0x55, 0xcb, 0xc6, 0x96, 0x66, 0x63, 0xd5, 0xb2, + 0x4d, 0xcb, 0x74, 0xb4, 0x71, 0xad, 0xca, 0x7c, 0x3f, 0x17, 0xe5, 0xfb, 0x80, 0xeb, 0x1f, 0x08, + 0xf5, 0x4e, 0x42, 0xa9, 0x58, 0x61, 0x11, 0xf7, 0x6a, 0xf6, 0xb1, 0xe3, 0xf8, 0x5e, 0x57, 0x97, + 0x79, 0x65, 0xfa, 0x61, 0xaf, 0x21, 0x51, 0x33, 0x0f, 0xd9, 0x63, 0x6d, 0x3c, 0xc5, 0xf2, 0x73, + 0x50, 0x0c, 0x84, 0x25, 0x54, 0x83, 0xfc, 0x04, 0x3b, 0x8e, 0x36, 0xc4, 0x2c, 0x8a, 0x49, 0x8a, + 0xdb, 0x95, 0xcb, 0xb0, 0x12, 0x0c, 0x45, 0xf2, 0xc4, 0x33, 0xa4, 0x41, 0x86, 0x1a, 0x1e, 0x63, + 0xdb, 0xa1, 0x91, 0x45, 0x18, 0x8a, 0x2e, 0xba, 0x06, 0x25, 0xb6, 0xd5, 0x55, 0x77, 0x9c, 0x46, + 0xba, 0x8c, 0xb2, 0xc2, 0x84, 0x0f, 0x84, 0xd2, 0x06, 0x14, 0xad, 0x6d, 0xcb, 0x53, 0x49, 0x33, + 0x15, 0xb0, 0xb6, 0x2d, 0xa1, 0x20, 0xff, 0x00, 0xaa, 0xb3, 0x91, 0x09, 0x55, 0x21, 0xfd, 0x08, + 0x9f, 0x8a, 0xe7, 0xd1, 0x26, 0x5a, 0x13, 0xd3, 0x62, 0xcf, 0x90, 0x14, 0x31, 0xc7, 0x3f, 0xa7, + 0x3c, 0x63, 0x2f, 0x24, 0xa1, 0xdb, 0x90, 0xa1, 0x11, 0x5e, 0x04, 0xeb, 0xfa, 0x26, 0x0f, 0xff, + 0x9b, 0x6e, 0xf8, 0xdf, 0xec, 0xba, 0xe1, 0xbf, 0x59, 0xf8, 0xf2, 0xeb, 0x8d, 0xc4, 0xe7, 0x7f, + 0xdf, 0x48, 0x2a, 0xcc, 0x02, 0x3d, 0x49, 0x23, 0x88, 0xa6, 0x1b, 0xaa, 0x3e, 0x10, 0xcf, 0xc9, + 0xb3, 0xfe, 0xce, 0x00, 0xdd, 0x83, 0x6a, 0xdf, 0x34, 0x1c, 0x6c, 0x38, 0x53, 0x47, 0xe5, 0xe9, + 0x45, 0x84, 0xe8, 0xf9, 0x13, 0xde, 0x72, 0x15, 0x0f, 0x98, 0x9e, 0x52, 0xe9, 0x87, 0x05, 0xe8, + 0x2e, 0xc0, 0xb1, 0x36, 0xd6, 0x07, 0x1a, 0x31, 0x6d, 0xa7, 0x96, 0xb9, 0x9a, 0x5e, 0xe8, 0xe6, + 0x81, 0xab, 0x72, 0xdf, 0x1a, 0x68, 0x04, 0x37, 0x33, 0xf4, 0x6d, 0x95, 0x80, 0x25, 0x7a, 0x16, + 0x2a, 0x9a, 0x65, 0xa9, 0x0e, 0xd1, 0x08, 0x56, 0x7b, 0xa7, 0x04, 0x3b, 0x2c, 0x70, 0xaf, 0x28, + 0x25, 0xcd, 0xb2, 0x0e, 0xa9, 0xb4, 0x49, 0x85, 0xe8, 0x19, 0x28, 0xd3, 0x20, 0xad, 0x6b, 0x63, + 0x75, 0x84, 0xf5, 0xe1, 0x88, 0xb0, 0x00, 0x9d, 0x56, 0x4a, 0x42, 0xda, 0x61, 0x42, 0x79, 0xe0, + 0x6d, 0x04, 0x16, 0xa0, 0x11, 0x82, 0xcc, 0x40, 0x23, 0x1a, 0x5b, 0xc8, 0x15, 0x85, 0xb5, 0xa9, + 0xcc, 0xd2, 0xc8, 0x48, 0x2c, 0x0f, 0x6b, 0xa3, 0x8b, 0x90, 0x13, 0x6e, 0xd3, 0xcc, 0xad, 0xe8, + 0xd1, 0x6f, 0x66, 0xd9, 0xe6, 0x31, 0x66, 0x19, 0xa9, 0xa0, 0xf0, 0x8e, 0xfc, 0xcb, 0x14, 0xac, + 0xce, 0x85, 0x72, 0xea, 0x77, 0xa4, 0x39, 0x23, 0xf7, 0x59, 0xb4, 0x8d, 0x5e, 0xa5, 0x7e, 0xb5, + 0x01, 0xb6, 0x45, 0x0a, 0xad, 0x05, 0x97, 0x88, 0x97, 0x07, 0x1d, 0x36, 0x2e, 0x96, 0x46, 0x68, + 0xd3, 0x6f, 0x35, 0xd6, 0x1c, 0xa2, 0xf2, 0xd0, 0xa8, 0x06, 0xd2, 0xe9, 0x53, 0x0b, 0xbe, 0x15, + 0xd5, 0xa1, 0x1b, 0x5d, 0x38, 0x29, 0x53, 0x53, 0x5f, 0x8a, 0x14, 0x58, 0xeb, 0x9d, 0x3e, 0xd6, + 0x0c, 0xa2, 0x1b, 0x58, 0x9d, 0xfb, 0x6a, 0x4f, 0xce, 0x39, 0x6c, 0x1f, 0xeb, 0x03, 0x6c, 0xf4, + 0xdd, 0xcf, 0x75, 0xc1, 0x33, 0xf6, 0x3e, 0xa7, 0x23, 0x2b, 0x50, 0x0e, 0x27, 0x22, 0x54, 0x86, + 0x14, 0x39, 0x11, 0x93, 0x4f, 0x91, 0x13, 0xf4, 0x12, 0x64, 0xe8, 0x04, 0xd9, 0xc4, 0xcb, 0x0b, + 0xaa, 0x00, 0x61, 0xd7, 0x3d, 0xb5, 0xb0, 0xc2, 0x34, 0x65, 0xd9, 0x3b, 0x09, 0x5e, 0x72, 0x9a, + 0xf5, 0x2a, 0xdf, 0x80, 0xca, 0x4c, 0xf6, 0x09, 0x7c, 0xbb, 0x64, 0xf0, 0xdb, 0xc9, 0x15, 0x28, + 0x85, 0x52, 0x8d, 0x7c, 0x11, 0xd6, 0x16, 0x65, 0x0e, 0x79, 0xe4, 0xc9, 0x43, 0x19, 0x00, 0xdd, + 0x82, 0x82, 0x97, 0x3a, 0xf8, 0x49, 0x9c, 0x5f, 0x2b, 0x57, 0x59, 0xf1, 0x54, 0xe9, 0x11, 0xa4, + 0x5b, 0x9a, 0xed, 0x85, 0x14, 0x7b, 0xf1, 0xbc, 0x66, 0x59, 0x1d, 0xcd, 0x19, 0xc9, 0x1f, 0x42, + 0x2d, 0x2a, 0x2d, 0xcc, 0x4c, 0x23, 0xe3, 0x6d, 0xc1, 0x8b, 0x90, 0x3b, 0x32, 0xed, 0x89, 0x46, + 0x98, 0xb3, 0x92, 0x22, 0x7a, 0x74, 0x6b, 0xf2, 0x14, 0x91, 0x66, 0x62, 0xde, 0x91, 0x55, 0x78, + 0x32, 0x32, 0x35, 0x50, 0x13, 0xdd, 0x18, 0x60, 0xbe, 0x9e, 0x25, 0x85, 0x77, 0x7c, 0x47, 0xfc, + 0x65, 0x79, 0x87, 0x3e, 0xd6, 0x61, 0x73, 0x65, 0xfe, 0x25, 0x45, 0xf4, 0x64, 0x15, 0x2e, 0x2e, + 0xce, 0x0f, 0xe8, 0x0a, 0x00, 0x8f, 0xa5, 0xe2, 0xc4, 0xa5, 0xaf, 0xaf, 0x28, 0x12, 0x93, 0xdc, + 0xa1, 0xc7, 0xee, 0x59, 0xa8, 0xf8, 0xc3, 0xaa, 0xa3, 0x3f, 0xe6, 0x5b, 0x23, 0xad, 0x94, 0x3c, + 0x9d, 0x43, 0xfd, 0x31, 0x96, 0x3f, 0x4d, 0x07, 0x9e, 0x10, 0x4a, 0x0c, 0x34, 0xa6, 0x92, 0x13, + 0x47, 0xb8, 0xa6, 0x4d, 0x74, 0x08, 0x6b, 0x3c, 0xf1, 0xe0, 0x81, 0x1a, 0x38, 0x30, 0xe2, 0xb4, + 0xc5, 0x38, 0x2b, 0xc8, 0x35, 0xdf, 0xf5, 0xce, 0x0c, 0x6a, 0x40, 0x71, 0xa2, 0x3b, 0x3d, 0x3c, + 0xd2, 0x8e, 0x75, 0x93, 0xce, 0x3f, 0xd6, 0x31, 0x09, 0xda, 0x78, 0xb1, 0x20, 0x13, 0x88, 0x05, + 0xfe, 0x07, 0xce, 0x86, 0x62, 0x8c, 0x1b, 0xec, 0x73, 0xe7, 0x0e, 0xf6, 0x2f, 0xc1, 0x9a, 0x81, + 0x4f, 0x48, 0xe0, 0x4c, 0xf3, 0x5d, 0x97, 0x67, 0x4f, 0x45, 0x74, 0xcc, 0x3f, 0xb2, 0x74, 0x03, + 0xa2, 0x1b, 0x2c, 0x61, 0xd3, 0x09, 0xdb, 0xaa, 0x36, 0x18, 0xd8, 0xd8, 0x71, 0x58, 0xa1, 0xb9, + 0xc2, 0xb2, 0x30, 0x93, 0x37, 0xb8, 0x58, 0xfe, 0x0d, 0x40, 0x41, 0xc1, 0x8e, 0x45, 0x03, 0x3f, + 0x6a, 0x82, 0x84, 0x4f, 0xfa, 0x98, 0x57, 0xe7, 0xc9, 0xc8, 0xea, 0x96, 0x6b, 0xb7, 0x5d, 0x4d, + 0x5a, 0x5a, 0x7a, 0x66, 0xe8, 0x15, 0x81, 0x40, 0xa2, 0xc1, 0x84, 0x30, 0x0f, 0x42, 0x90, 0x57, + 0x5d, 0x08, 0x92, 0x8e, 0xac, 0x26, 0xb9, 0xd5, 0x0c, 0x06, 0x79, 0x45, 0x60, 0x90, 0xcc, 0x92, + 0x87, 0x85, 0x40, 0x48, 0x2b, 0x04, 0x42, 0xb2, 0x4b, 0xa6, 0x19, 0x81, 0x42, 0x5a, 0x21, 0x14, + 0x92, 0x5b, 0xe2, 0x24, 0x02, 0x86, 0xbc, 0xea, 0xc2, 0x90, 0xfc, 0x92, 0x69, 0xcf, 0xe0, 0x90, + 0xbb, 0x61, 0x1c, 0xc2, 0x31, 0xc4, 0xb5, 0x48, 0xeb, 0x48, 0x20, 0xf2, 0xc3, 0x00, 0x10, 0x91, + 0x22, 0x51, 0x00, 0x77, 0xb2, 0x00, 0x89, 0xb4, 0x42, 0x48, 0x04, 0x96, 0xac, 0x41, 0x04, 0x14, + 0x79, 0x3b, 0x08, 0x45, 0x8a, 0x91, 0x68, 0x46, 0x6c, 0x9a, 0x45, 0x58, 0xe4, 0x75, 0x0f, 0x8b, + 0xac, 0x44, 0x82, 0x29, 0x31, 0x87, 0x59, 0x30, 0xb2, 0x3f, 0x07, 0x46, 0x38, 0x78, 0x78, 0x36, + 0xd2, 0xc5, 0x12, 0x34, 0xb2, 0x3f, 0x87, 0x46, 0xca, 0x4b, 0x1c, 0x2e, 0x81, 0x23, 0x3f, 0x5f, + 0x0c, 0x47, 0xa2, 0x01, 0x83, 0x78, 0xcd, 0x78, 0x78, 0x44, 0x8d, 0xc0, 0x23, 0x1c, 0x33, 0x3c, + 0x1f, 0xe9, 0x3e, 0x36, 0x20, 0xb9, 0xbf, 0x00, 0x90, 0x70, 0xe8, 0x70, 0x3d, 0xd2, 0x79, 0x0c, + 0x44, 0x72, 0x7f, 0x01, 0x22, 0x41, 0x4b, 0xdd, 0xc6, 0x87, 0x24, 0x37, 0x68, 0xe5, 0x37, 0x13, + 0xe6, 0x68, 0x06, 0xc5, 0xb6, 0x6d, 0xda, 0xa2, 0xda, 0xe7, 0x1d, 0xf9, 0x3a, 0xad, 0x45, 0xfd, + 0x90, 0x76, 0x06, 0x7c, 0x61, 0x95, 0x4a, 0x20, 0x8c, 0xc9, 0xbf, 0x4f, 0xfa, 0xb6, 0xac, 0x84, + 0x0b, 0xd6, 0xb1, 0x92, 0xa8, 0x63, 0x03, 0xa8, 0x26, 0x15, 0x46, 0x35, 0x1b, 0x50, 0xa4, 0x15, + 0xc8, 0x0c, 0x60, 0xd1, 0x2c, 0x17, 0xb0, 0xa0, 0x9b, 0xb0, 0xca, 0xb2, 0x25, 0x4f, 0xc8, 0x22, + 0x2b, 0x65, 0x58, 0x56, 0xaa, 0xd0, 0x01, 0x7e, 0x94, 0x78, 0x7a, 0x7a, 0x11, 0x2e, 0x04, 0x74, + 0xbd, 0xca, 0x86, 0x57, 0xe9, 0x55, 0x4f, 0xbb, 0x21, 0x4a, 0x9c, 0xf7, 0xfc, 0x05, 0xf2, 0xc1, + 0x10, 0x82, 0x4c, 0xdf, 0x1c, 0x60, 0x51, 0x77, 0xb0, 0x36, 0x4d, 0xe6, 0x63, 0x73, 0x28, 0xaa, + 0x0b, 0xda, 0xa4, 0x5a, 0x5e, 0xcc, 0x96, 0x78, 0x48, 0x96, 0xff, 0x94, 0xf4, 0xfd, 0xf9, 0xf8, + 0x68, 0x11, 0x94, 0x49, 0xfe, 0x6f, 0xa0, 0x4c, 0xea, 0x3b, 0x43, 0x99, 0x60, 0xdd, 0x97, 0x0e, + 0xd7, 0x7d, 0xff, 0x4a, 0xfa, 0x5f, 0xd8, 0x03, 0x26, 0xdf, 0x6d, 0x45, 0xfc, 0x22, 0x8e, 0x57, + 0x11, 0xa2, 0x88, 0x13, 0x70, 0x33, 0xc7, 0x9e, 0x1b, 0x86, 0x9b, 0xbc, 0x1a, 0xe0, 0x1d, 0x74, + 0x1b, 0x24, 0xc6, 0x59, 0xaa, 0xa6, 0xe5, 0x88, 0xf4, 0x10, 0xaa, 0x92, 0x38, 0x35, 0xb9, 0x79, + 0x40, 0x75, 0xf6, 0x2d, 0x47, 0x29, 0x58, 0xa2, 0x15, 0x28, 0x5f, 0xa4, 0x50, 0xf9, 0x72, 0x19, + 0x24, 0xfa, 0xf6, 0x8e, 0xa5, 0xf5, 0x31, 0x0b, 0xf5, 0x92, 0xe2, 0x0b, 0xe4, 0x87, 0x80, 0xe6, + 0x93, 0x0d, 0xea, 0x40, 0x0e, 0x1f, 0x63, 0x83, 0xf0, 0x5a, 0xae, 0xb8, 0x7d, 0x71, 0x41, 0x71, + 0x85, 0x0d, 0xd2, 0xac, 0xd1, 0x45, 0xfe, 0xe7, 0xd7, 0x1b, 0x55, 0xae, 0xfd, 0x82, 0x39, 0xd1, + 0x09, 0x9e, 0x58, 0xe4, 0x54, 0x11, 0xf6, 0xf2, 0xdf, 0x52, 0x14, 0x10, 0x84, 0x12, 0xd1, 0xc2, + 0xb5, 0x75, 0x0f, 0x50, 0x2a, 0x00, 0x04, 0xe3, 0xad, 0xf7, 0x3a, 0xc0, 0x50, 0x73, 0xd4, 0x4f, + 0x34, 0x83, 0xe0, 0x81, 0x58, 0xf4, 0x80, 0x04, 0xd5, 0xa1, 0x40, 0x7b, 0x53, 0x07, 0x0f, 0x04, + 0x26, 0xf5, 0xfa, 0x81, 0x79, 0xe6, 0xbf, 0xdf, 0x3c, 0xc3, 0xab, 0x5c, 0x98, 0x59, 0xe5, 0x40, + 0xb1, 0x2e, 0x05, 0x8b, 0x75, 0xfa, 0x6e, 0x96, 0xad, 0x9b, 0xb6, 0x4e, 0x4e, 0xd9, 0xa7, 0x49, + 0x2b, 0x5e, 0x1f, 0x5d, 0x83, 0xd2, 0x04, 0x4f, 0x2c, 0xd3, 0x1c, 0xab, 0x3c, 0x78, 0x15, 0x99, + 0xe9, 0x8a, 0x10, 0xb6, 0x59, 0x0c, 0xfb, 0x34, 0xe5, 0x1f, 0x3f, 0x1f, 0x94, 0xfd, 0xdf, 0x2d, + 0xb0, 0xfc, 0x6b, 0xc6, 0xd2, 0x84, 0x4b, 0x0d, 0x74, 0x08, 0xab, 0xde, 0xf1, 0x57, 0xa7, 0x2c, + 0x2c, 0xb8, 0x1b, 0x3a, 0x6e, 0xfc, 0xa8, 0x1e, 0x87, 0xc5, 0x0e, 0xfa, 0x09, 0x5c, 0x9a, 0x09, + 0x6d, 0x9e, 0xeb, 0x54, 0xcc, 0x08, 0xf7, 0x44, 0x38, 0xc2, 0xb9, 0x9e, 0xfd, 0xb5, 0x4a, 0x7f, + 0xcf, 0x43, 0xb7, 0x43, 0xc1, 0x7f, 0xb0, 0x70, 0x5a, 0xf8, 0xf5, 0xaf, 0x41, 0xc9, 0xc6, 0x44, + 0xd3, 0x0d, 0x35, 0x44, 0xad, 0xac, 0x70, 0xa1, 0x20, 0x6c, 0x0e, 0xe0, 0x89, 0x85, 0x05, 0x14, + 0x7a, 0x0d, 0x24, 0xbf, 0xf6, 0x4a, 0x46, 0x40, 0x30, 0x0f, 0x7d, 0xfb, 0xba, 0xf2, 0x1f, 0x93, + 0xbe, 0xcb, 0x30, 0x9e, 0x6f, 0x43, 0xce, 0xc6, 0xce, 0x74, 0xcc, 0x11, 0x76, 0x79, 0xfb, 0xc5, + 0x78, 0xa5, 0x17, 0x95, 0x4e, 0xc7, 0x44, 0x11, 0xc6, 0xf2, 0x43, 0xc8, 0x71, 0x09, 0x2a, 0x42, + 0xfe, 0xfe, 0xde, 0xbd, 0xbd, 0xfd, 0xf7, 0xf7, 0xaa, 0x09, 0x04, 0x90, 0x6b, 0xb4, 0x5a, 0xed, + 0x83, 0x6e, 0x35, 0x89, 0x24, 0xc8, 0x36, 0x9a, 0xfb, 0x4a, 0xb7, 0x9a, 0xa2, 0x62, 0xa5, 0xfd, + 0x6e, 0xbb, 0xd5, 0xad, 0xa6, 0xd1, 0x2a, 0x94, 0x78, 0x5b, 0xbd, 0xbb, 0xaf, 0xbc, 0xd7, 0xe8, + 0x56, 0x33, 0x01, 0xd1, 0x61, 0x7b, 0xef, 0x4e, 0x5b, 0xa9, 0x66, 0xe5, 0x97, 0x29, 0x84, 0x8f, + 0x28, 0xd6, 0x7c, 0xb0, 0x9e, 0x0c, 0x80, 0x75, 0xf9, 0xb7, 0x29, 0xa8, 0x47, 0x57, 0x60, 0xe8, + 0xdd, 0x99, 0x89, 0x6f, 0x9f, 0xa3, 0x7c, 0x9b, 0x99, 0x3d, 0x7a, 0x06, 0xca, 0x36, 0x3e, 0xc2, + 0xa4, 0x3f, 0xe2, 0x15, 0x21, 0xcf, 0x98, 0x25, 0xa5, 0x24, 0xa4, 0xcc, 0xc8, 0xe1, 0x6a, 0x1f, + 0xe1, 0x3e, 0x51, 0x79, 0x28, 0xe2, 0x9b, 0x4e, 0xa2, 0x6a, 0x54, 0x7a, 0xc8, 0x85, 0xf2, 0x87, + 0xe7, 0x5a, 0x4b, 0x09, 0xb2, 0x4a, 0xbb, 0xab, 0x7c, 0x50, 0x4d, 0x23, 0x04, 0x65, 0xd6, 0x54, + 0x0f, 0xf7, 0x1a, 0x07, 0x87, 0x9d, 0x7d, 0xba, 0x96, 0x17, 0xa0, 0xe2, 0xae, 0xa5, 0x2b, 0xcc, + 0xca, 0xb7, 0xe1, 0x52, 0x44, 0xf9, 0xb8, 0x84, 0xb0, 0x90, 0x7f, 0x97, 0x0c, 0x9a, 0x86, 0x99, + 0x88, 0x7d, 0xc8, 0x39, 0x44, 0x23, 0x53, 0x47, 0xac, 0xe8, 0x6b, 0x71, 0x8b, 0xcb, 0x4d, 0xb7, + 0x71, 0xc8, 0xcc, 0x15, 0xe1, 0x46, 0xbe, 0x05, 0xe5, 0xf0, 0x48, 0xf4, 0x82, 0xf8, 0x3b, 0x2a, + 0x25, 0xff, 0x27, 0x09, 0x95, 0x99, 0xe3, 0x8f, 0xb6, 0x21, 0xcb, 0x31, 0x53, 0xd4, 0xaf, 0x3e, + 0x16, 0xbd, 0x44, 0xac, 0xe0, 0xaa, 0xe8, 0x4d, 0x28, 0x60, 0x41, 0x67, 0x2c, 0x0a, 0x33, 0x9c, + 0xa9, 0x74, 0x09, 0x0f, 0x61, 0xea, 0x59, 0xa0, 0xb7, 0x40, 0xf2, 0xe2, 0x98, 0x00, 0xea, 0x4f, + 0xcf, 0x9b, 0x7b, 0x11, 0x50, 0xd8, 0xfb, 0x36, 0xe8, 0x75, 0xbf, 0x94, 0xcd, 0xcc, 0x23, 0x35, + 0x61, 0xce, 0x15, 0x84, 0xb1, 0xab, 0x2f, 0xb7, 0xa0, 0x18, 0x98, 0x0f, 0x7a, 0x0a, 0xa4, 0x89, + 0x76, 0x22, 0x98, 0x64, 0xce, 0x07, 0x16, 0x26, 0xda, 0x09, 0x27, 0x91, 0x2f, 0x41, 0x9e, 0x0e, + 0x0e, 0x35, 0x47, 0x50, 0x4f, 0xb9, 0x89, 0x76, 0xf2, 0x8e, 0xe6, 0xc8, 0x1f, 0x00, 0x04, 0xf8, + 0xd2, 0x35, 0xc8, 0xda, 0xe6, 0xd4, 0x18, 0x30, 0xfb, 0xac, 0xc2, 0x3b, 0xe8, 0x16, 0x64, 0x8f, + 0x4d, 0x1e, 0x86, 0x17, 0x07, 0xa3, 0x07, 0x26, 0xc1, 0x01, 0x66, 0x89, 0x6b, 0xcb, 0x8f, 0x21, + 0xcb, 0xc2, 0x2a, 0x0d, 0x91, 0x8c, 0x0f, 0x15, 0x25, 0x3c, 0x6d, 0xa3, 0x5f, 0x00, 0x68, 0x84, + 0xd8, 0x7a, 0x6f, 0xea, 0x3b, 0xde, 0x58, 0x1c, 0x96, 0x1b, 0xae, 0x5e, 0xf3, 0xb2, 0x88, 0xcf, + 0x6b, 0xbe, 0x69, 0x20, 0x46, 0x07, 0x1c, 0xca, 0x7b, 0x50, 0x0e, 0xdb, 0x06, 0xff, 0x4a, 0xac, + 0x2c, 0xf8, 0x2b, 0xe1, 0x95, 0x89, 0x5e, 0x91, 0x99, 0xe6, 0xbc, 0x37, 0xeb, 0xc8, 0x9f, 0x25, + 0xa1, 0xd0, 0x3d, 0x11, 0x07, 0x36, 0x82, 0x76, 0xf5, 0x4d, 0x53, 0x41, 0x92, 0x91, 0xf3, 0xb8, + 0x69, 0x8f, 0x1d, 0x7e, 0xdb, 0x0b, 0x49, 0x99, 0xb8, 0xec, 0x80, 0x4b, 0x91, 0x8b, 0x30, 0xfc, + 0x06, 0x48, 0xde, 0x8e, 0xa2, 0x58, 0xc8, 0xa5, 0xb3, 0x92, 0xa2, 0xf4, 0xe6, 0x5d, 0xc6, 0xe0, + 0x9b, 0x9f, 0x08, 0x1a, 0x33, 0xad, 0xf0, 0x8e, 0x3c, 0x80, 0xca, 0x4c, 0x42, 0x46, 0x6f, 0x40, + 0xde, 0x9a, 0xf6, 0x54, 0x77, 0x79, 0x66, 0x0e, 0x8e, 0x5b, 0x17, 0x4f, 0x7b, 0x63, 0xbd, 0x7f, + 0x0f, 0x9f, 0xba, 0x2f, 0x63, 0x4d, 0x7b, 0xf7, 0xf8, 0x2a, 0xf2, 0xa7, 0xa4, 0x82, 0x4f, 0x39, + 0x86, 0x82, 0xbb, 0x29, 0xd0, 0x8f, 0x82, 0x67, 0xc4, 0xfd, 0xaf, 0x13, 0x59, 0x24, 0x08, 0xf7, + 0x81, 0x23, 0x72, 0x13, 0x56, 0x1d, 0x7d, 0x68, 0xb8, 0x3c, 0x27, 0x3f, 0xe1, 0x29, 0xf6, 0x75, + 0x2a, 0x7c, 0x60, 0xd7, 0x85, 0x62, 0xf2, 0xbf, 0x93, 0x50, 0x70, 0x0f, 0x2b, 0x7a, 0x39, 0xb0, + 0xef, 0xca, 0x0b, 0x98, 0x30, 0x57, 0xd1, 0x27, 0xe2, 0xc3, 0xef, 0x9a, 0x3a, 0xff, 0xbb, 0x46, + 0xfd, 0x4d, 0x71, 0x99, 0xce, 0xcc, 0xb9, 0x99, 0xce, 0x17, 0x00, 0x11, 0x93, 0x68, 0x63, 0xf5, + 0xd8, 0x24, 0xba, 0x31, 0x54, 0xf9, 0x62, 0xf3, 0x5a, 0xb1, 0xca, 0x46, 0x1e, 0xb0, 0x81, 0x03, + 0xb6, 0xee, 0xbf, 0x4a, 0x42, 0xc1, 0xcb, 0xfa, 0xe7, 0xe5, 0xd5, 0x2f, 0x42, 0x4e, 0x24, 0x36, + 0x4e, 0xac, 0x8b, 0xde, 0x42, 0x4a, 0xb7, 0x0e, 0x85, 0x09, 0x26, 0x1a, 0xcb, 0x1f, 0x1c, 0x10, + 0x7b, 0xfd, 0x9b, 0xaf, 0x43, 0x31, 0xf0, 0x8b, 0x83, 0x9e, 0xbc, 0xbd, 0xf6, 0xfb, 0xd5, 0x44, + 0x3d, 0xff, 0xd9, 0x17, 0x57, 0xd3, 0x7b, 0xf8, 0x13, 0xba, 0x67, 0x95, 0x76, 0xab, 0xd3, 0x6e, + 0xdd, 0xab, 0x26, 0xeb, 0xc5, 0xcf, 0xbe, 0xb8, 0x9a, 0x57, 0x30, 0x23, 0xd0, 0x6e, 0x76, 0x60, + 0x25, 0xf8, 0x55, 0xc2, 0xa9, 0x00, 0x41, 0xf9, 0xce, 0xfd, 0x83, 0xdd, 0x9d, 0x56, 0xa3, 0xdb, + 0x56, 0x1f, 0xec, 0x77, 0xdb, 0xd5, 0x24, 0xba, 0x04, 0x17, 0x76, 0x77, 0xde, 0xe9, 0x74, 0xd5, + 0xd6, 0xee, 0x4e, 0x7b, 0xaf, 0xab, 0x36, 0xba, 0xdd, 0x46, 0xeb, 0x5e, 0x35, 0xb5, 0xfd, 0x97, + 0x22, 0x54, 0x1a, 0xcd, 0xd6, 0x0e, 0xcd, 0xeb, 0x7a, 0x5f, 0x13, 0x04, 0x65, 0x86, 0xf1, 0x11, + 0x67, 0xde, 0x01, 0xa9, 0x9f, 0xcd, 0xcf, 0xa2, 0xbb, 0x90, 0x65, 0x54, 0x05, 0x3a, 0xfb, 0x52, + 0x48, 0x7d, 0x09, 0x61, 0x4b, 0x5f, 0x86, 0x1d, 0x8f, 0x33, 0x6f, 0x89, 0xd4, 0xcf, 0xe6, 0x6f, + 0x91, 0x02, 0x92, 0xcf, 0x35, 0x2c, 0xbf, 0x35, 0x52, 0x8f, 0xc1, 0xe9, 0x52, 0x9f, 0x3e, 0xe0, + 0x59, 0x7e, 0x8b, 0xa2, 0x1e, 0x23, 0x80, 0xa1, 0x5d, 0xc8, 0xbb, 0x18, 0x75, 0xd9, 0xbd, 0x8e, + 0xfa, 0x52, 0xbe, 0x95, 0x7e, 0x02, 0xce, 0x25, 0x9c, 0x7d, 0x49, 0xa5, 0xbe, 0x84, 0x3c, 0x46, + 0x3b, 0x90, 0x13, 0x55, 0xfc, 0x92, 0xbb, 0x1a, 0xf5, 0x65, 0xfc, 0x29, 0x5d, 0x34, 0x9f, 0xa4, + 0x59, 0x7e, 0xf5, 0xa6, 0x1e, 0x83, 0x17, 0x47, 0xf7, 0x01, 0x02, 0xcc, 0x41, 0x8c, 0x3b, 0x35, + 0xf5, 0x38, 0x7c, 0x37, 0xda, 0x87, 0x82, 0x07, 0xe4, 0x96, 0xde, 0x70, 0xa9, 0x2f, 0x27, 0x9e, + 0xd1, 0x43, 0x28, 0x85, 0x11, 0x4c, 0xbc, 0x7b, 0x2b, 0xf5, 0x98, 0x8c, 0x32, 0xf5, 0x1f, 0x86, + 0x33, 0xf1, 0xee, 0xb1, 0xd4, 0x63, 0x12, 0xcc, 0xe8, 0x23, 0x58, 0x9d, 0x87, 0x1b, 0xf1, 0xaf, + 0xb5, 0xd4, 0xcf, 0x41, 0x39, 0xa3, 0x09, 0xa0, 0x05, 0x30, 0xe5, 0x1c, 0xb7, 0x5c, 0xea, 0xe7, + 0x61, 0xa0, 0xd1, 0x00, 0x2a, 0xb3, 0xb5, 0x7f, 0xdc, 0x5b, 0x2f, 0xf5, 0xd8, 0x6c, 0x34, 0x7f, + 0x4a, 0x18, 0x26, 0xc4, 0xbd, 0x05, 0x53, 0x8f, 0x4d, 0x4e, 0x37, 0xdb, 0x5f, 0x7e, 0xb3, 0x9e, + 0xfc, 0xea, 0x9b, 0xf5, 0xe4, 0x3f, 0xbe, 0x59, 0x4f, 0x7e, 0xfe, 0xed, 0x7a, 0xe2, 0xab, 0x6f, + 0xd7, 0x13, 0x7f, 0xfd, 0x76, 0x3d, 0xf1, 0xd3, 0xe7, 0x87, 0x3a, 0x19, 0x4d, 0x7b, 0x9b, 0x7d, + 0x73, 0xb2, 0x15, 0xbc, 0x4e, 0xb8, 0xe8, 0x8a, 0x63, 0x2f, 0xc7, 0x92, 0xee, 0x2b, 0xff, 0x0d, + 0x00, 0x00, 0xff, 0xff, 0xe7, 0x68, 0x0b, 0x00, 0x02, 0x29, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5394,17 +5441,56 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - 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]))) + 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] = 0x42 + } + 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.Hash) > 0 { + i -= len(m.Hash) + copy(dAtA[i:], m.Hash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Hash))) + i-- + dAtA[i] = 0x22 + } + if len(m.Misbehavior) > 0 { + for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a } } { - size, err := m.Header.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ProposedLastCommit.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5412,7 +5498,16 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + 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 + } + } return len(dAtA) - i, nil } @@ -6591,20 +6686,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA46 := make([]byte, len(m.RefetchChunks)*10) - var j45 int + dAtA47 := make([]byte, len(m.RefetchChunks)*10) + var j46 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA46[j45] = uint8(uint64(num)&0x7f | 0x80) + dAtA47[j46] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j45++ + j46++ } - dAtA46[j45] = uint8(num) - j45++ + dAtA47[j46] = uint8(num) + j46++ } - i -= j45 - copy(dAtA[i:], dAtA46[:j45]) - i = encodeVarintTypes(dAtA, i, uint64(j45)) + i -= j46 + copy(dAtA[i:], dAtA47[:j46]) + i = encodeVarintTypes(dAtA, i, uint64(j46)) i-- dAtA[i] = 0x12 } @@ -6668,17 +6763,8 @@ func (m *ResponseProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.Evidence) > 0 { - for iNdEx := len(m.Evidence) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Evidence[iNdEx]) - copy(dAtA[i:], m.Evidence[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Evidence[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if m.Result != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + if m.Status != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Status)) i-- dAtA[i] = 0x8 } @@ -6789,7 +6875,7 @@ func (m *BlockParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { +func (m *CommitInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -6799,12 +6885,12 @@ func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *LastCommitInfo) MarshalTo(dAtA []byte) (int, error) { +func (m *CommitInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *LastCommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *CommitInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -7113,12 +7199,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n54, err54 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err54 != nil { - return 0, err54 + n55, err55 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err55 != nil { + return 0, err55 } - i -= n54 - i = encodeVarintTypes(dAtA, i, uint64(n54)) + i -= n55 + i = encodeVarintTypes(dAtA, i, uint64(n55)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7697,14 +7783,37 @@ func (m *RequestProcessProposal) Size() (n int) { } var l int _ = 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)) } } + l = m.ProposedLastCommit.Size() + n += 1 + l + sovTypes(uint64(l)) + if len(m.Misbehavior) > 0 { + for _, e := range m.Misbehavior { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + l = len(m.Hash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + 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 } @@ -8316,14 +8425,8 @@ func (m *ResponseProcessProposal) Size() (n int) { } var l int _ = l - if m.Result != 0 { - n += 1 + sovTypes(uint64(m.Result)) - } - if len(m.Evidence) > 0 { - for _, b := range m.Evidence { - l = len(b) - n += 1 + l + sovTypes(uint64(l)) - } + if m.Status != 0 { + n += 1 + sovTypes(uint64(m.Status)) } return n } @@ -8368,7 +8471,7 @@ func (m *BlockParams) Size() (n int) { return n } -func (m *LastCommitInfo) Size() (n int) { +func (m *CommitInfo) Size() (n int) { if m == nil { return 0 } @@ -10981,39 +11084,6 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - 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 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) } @@ -11045,6 +11115,227 @@ func (m *RequestProcessProposal) 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 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", 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.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", 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.Misbehavior = append(m.Misbehavior, Evidence{}) + if err := m.Misbehavior[len(m.Misbehavior)-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 Hash", 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.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 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:]) @@ -14233,9 +14524,9 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } - m.Result = 0 + m.Status = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14245,43 +14536,11 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Result |= ResponseProcessProposal_Result(b&0x7F) << shift + m.Status |= ResponseProcessProposal_ProposalStatus(b&0x7F) << shift if b < 0x80 { break } } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Evidence", 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.Evidence = append(m.Evidence, make([]byte, postIndex-iNdEx)) - copy(m.Evidence[len(m.Evidence)-1], dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -14585,7 +14844,7 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { } return nil } -func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { +func (m *CommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -14608,10 +14867,10 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: LastCommitInfo: wiretype end group for non-group") + return fmt.Errorf("proto: CommitInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: LastCommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CommitInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index a0cdae1df..f99dcd248 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -261,3 +261,8 @@ func (app *CounterApplication) PrepareProposal( req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { return abci.ResponsePrepareProposal{BlockData: req.BlockData} } + +func (app *CounterApplication) ProcessProposal( + req abci.RequestProcessProposal) abci.ResponseProcessProposal { + return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT} +} diff --git a/consensus/state.go b/consensus/state.go index fb6b0217e..83e9de26e 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1286,7 +1286,7 @@ func (cs *State) defaultDoPrevote(height int64, round int32) { liveness properties. Please see `PrepareProosal`-`ProcessProposal` coherence and determinism properties in the ABCI++ specification. */ - stateMachineValidBlock, err := cs.blockExec.ProcessProposal(cs.ProposalBlock) + isAppValid, err := cs.blockExec.ProcessProposal(cs.ProposalBlock, cs.state) if err != nil { panic(fmt.Sprintf( "state machine returned an error (%v) when calling ProcessProposal", err, @@ -1294,7 +1294,7 @@ func (cs *State) defaultDoPrevote(height int64, round int32) { } // Vote nil if the Application rejected the block - if !stateMachineValidBlock { + if !isAppValid { logger.Error("prevote step: state machine rejected a proposed block; this should not happen:"+ "the proposer may be misbehaving; prevoting nil", "err", err) cs.signAddVote(tmproto.PrevoteType, nil, types.PartSetHeader{}) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index f501d3bb8..26cadcb3d 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -77,10 +77,10 @@ message RequestQuery { } message RequestBeginBlock { - bytes hash = 1; - tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; - LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; - repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; + 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]; } enum CheckTxType { @@ -136,11 +136,16 @@ message RequestPrepareProposal { } message RequestProcessProposal { - bytes hash = 1; - tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; - repeated bytes txs = 3; - LastCommitInfo last_commit_info = 4 [(gogoproto.nullable) = false]; - repeated Evidence byzantine_validators = 5 [(gogoproto.nullable) = false]; + repeated bytes txs = 1; + CommitInfo proposed_last_commit = 2 [(gogoproto.nullable) = false]; + repeated Evidence misbehavior = 3 [(gogoproto.nullable) = false]; + // hash is the merkle root hash of the fields of the proposed block. + bytes hash = 4; + 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 original proposer of the block. + bytes proposer_address = 8; } //---------------------------------------- @@ -255,7 +260,7 @@ message ResponseDeliverTx { } message ResponseEndBlock { - repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; + repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; ConsensusParams consensus_param_updates = 2; repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; @@ -308,11 +313,13 @@ message ResponsePrepareProposal { } message ResponseProcessProposal { - bool accept = 1; - bytes app_hash = 2; - repeated ExecTxResult tx_results = 3; - repeated ValidatorUpdate validator_updates = 4; - tendermint.types.ConsensusParams consensus_param_updates = 5; + ProposalStatus status = 1; + + enum ProposalStatus { + UNKNOWN = 0; + ACCEPT = 1; + REJECT = 2; + } } //---------------------------------------- @@ -335,7 +342,7 @@ message BlockParams { int64 max_gas = 2; } -message LastCommitInfo { +message CommitInfo { int32 round = 1; repeated VoteInfo votes = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index 6372a88d4..98550a3b2 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -104,7 +104,7 @@ func (m *NewRoundStep) GetLastCommitRound() int32 { } // NewValidBlock is sent when a validator observes a valid block B in some round r, -//i.e., there is a Proposal for block B and 2/3+ prevotes for the block B in the round r. +// i.e., there is a Proposal for block B and 2/3+ prevotes for the block B in the round r. // In case the block is also committed, then IsCommit flag is set to true. type NewValidBlock struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` diff --git a/proto/tendermint/consensus/types.proto b/proto/tendermint/consensus/types.proto index 6e1f41371..5048f8545 100644 --- a/proto/tendermint/consensus/types.proto +++ b/proto/tendermint/consensus/types.proto @@ -18,7 +18,7 @@ message NewRoundStep { } // NewValidBlock is sent when a validator observes a valid block B in some round r, -//i.e., there is a Proposal for block B and 2/3+ prevotes for the block B in the round r. +// i.e., there is a Proposal for block B and 2/3+ prevotes for the block B in the round r. // In case the block is also committed, then IsCommit flag is set to true. message NewValidBlock { int64 height = 1; diff --git a/proto/tendermint/types/evidence.proto b/proto/tendermint/types/evidence.proto index 3b234571b..451b8dca3 100644 --- a/proto/tendermint/types/evidence.proto +++ b/proto/tendermint/types/evidence.proto @@ -17,20 +17,20 @@ message Evidence { // DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes. message DuplicateVoteEvidence { - tendermint.types.Vote vote_a = 1; - tendermint.types.Vote vote_b = 2; - int64 total_voting_power = 3; - int64 validator_power = 4; - google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + tendermint.types.Vote vote_a = 1; + tendermint.types.Vote vote_b = 2; + int64 total_voting_power = 3; + int64 validator_power = 4; + google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; } // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client. message LightClientAttackEvidence { - tendermint.types.LightBlock conflicting_block = 1; - int64 common_height = 2; + tendermint.types.LightBlock conflicting_block = 1; + int64 common_height = 2; repeated tendermint.types.Validator byzantine_validators = 3; - int64 total_voting_power = 4; - google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + int64 total_voting_power = 4; + google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; } message EvidenceList { diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 7f7ea74ca..8d4f00972 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -106,10 +106,10 @@ message Vote { // Commit contains the evidence that a block was committed by a set of validators. message Commit { - int64 height = 1; - int32 round = 2; - BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; - repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; + int64 height = 1; + int32 round = 2; + BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; + repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; } // CommitSig is a part of the Vote included in a Commit. diff --git a/state/execution.go b/state/execution.go index 75ecb4047..f05edf953 100644 --- a/state/execution.go +++ b/state/execution.go @@ -140,13 +140,18 @@ func (blockExec *BlockExecutor) CreateProposalBlock( func (blockExec *BlockExecutor) ProcessProposal( block *types.Block, + state State, ) (bool, error) { - req := abci.RequestProcessProposal{ - Txs: block.Data.Txs.ToSliceOfBytes(), - Header: *block.Header.ToProto(), - } - - resp, err := blockExec.proxyApp.ProcessProposalSync(req) + resp, err := blockExec.proxyApp.ProcessProposalSync(abci.RequestProcessProposal{ + Hash: block.Header.Hash(), + Height: block.Header.Height, + Time: block.Header.Time, + Txs: block.Data.Txs.ToSliceOfBytes(), + ProposedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), + Misbehavior: block.Evidence.Evidence.ToABCI(), + ProposerAddress: block.ProposerAddress, + NextValidatorsHash: block.NextValidatorsHash, + }) if err != nil { return false, ErrInvalidBlock(err) } @@ -334,7 +339,7 @@ func execBlockOnProxyApp( } proxyAppConn.SetResponseCallback(proxyCb) - commitInfo := getBeginBlockValidatorInfo(block, store, initialHeight) + commitInfo := buildLastCommitInfo(block, store, initialHeight) byzVals := make([]abci.Evidence, 0) for _, evidence := range block.Evidence.Evidence { @@ -378,43 +383,44 @@ func execBlockOnProxyApp( return abciResponses, nil } -func getBeginBlockValidatorInfo(block *types.Block, store Store, - initialHeight int64) abci.LastCommitInfo { - voteInfos := make([]abci.VoteInfo, block.LastCommit.Size()) - // Initial block -> LastCommitInfo.Votes are empty. - // Remember that the first LastCommit is intentionally empty, so it makes - // sense for LastCommitInfo.Votes to also be empty. - if block.Height > initialHeight { - lastValSet, err := store.LoadValidators(block.Height - 1) - if err != nil { - panic(err) - } +func buildLastCommitInfo(block *types.Block, store Store, initialHeight int64) abci.CommitInfo { + if block.Height == initialHeight { + // there is no last commit for the initial height. + // return an empty value. + return abci.CommitInfo{} + } - // Sanity check that commit size matches validator set size - only applies - // after first block. - var ( - commitSize = block.LastCommit.Size() - valSetLen = len(lastValSet.Validators) - ) - if commitSize != valSetLen { - panic(fmt.Sprintf( - "commit size (%d) doesn't match valset length (%d) at height %d\n\n%v\n\n%v", - commitSize, valSetLen, block.Height, block.LastCommit.Signatures, lastValSet.Validators, - )) - } + lastValSet, err := store.LoadValidators(block.Height - 1) + if err != nil { + panic(fmt.Errorf("failed to load validator set at height %d: %w", block.Height-1, err)) + } - for i, val := range lastValSet.Validators { - commitSig := block.LastCommit.Signatures[i] - voteInfos[i] = abci.VoteInfo{ - Validator: types.TM2PB.Validator(val), - SignedLastBlock: !commitSig.Absent(), - } + var ( + commitSize = block.LastCommit.Size() + valSetLen = len(lastValSet.Validators) + ) + + // ensure that the size of the validator set in the last commit matches + // the size of the validator set in the state store. + if commitSize != valSetLen { + panic(fmt.Sprintf( + "commit size (%d) doesn't match validator set length (%d) at height %d\n\n%v\n\n%v", + commitSize, valSetLen, block.Height, block.LastCommit.Signatures, lastValSet.Validators, + )) + } + + votes := make([]abci.VoteInfo, block.LastCommit.Size()) + for i, val := range lastValSet.Validators { + commitSig := block.LastCommit.Signatures[i] + votes[i] = abci.VoteInfo{ + Validator: types.TM2PB.Validator(val), + SignedLastBlock: commitSig.BlockIDFlag != types.BlockIDFlagAbsent, } } - return abci.LastCommitInfo{ + return abci.CommitInfo{ Round: block.LastCommit.Round, - Votes: voteInfos, + Votes: votes, } } diff --git a/state/execution_test.go b/state/execution_test.go index fd9bb039e..cc1503380 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -233,7 +233,7 @@ func TestProcessProposal(t *testing.T) { block := sf.MakeBlock(state, int64(height), new(types.Commit)) block.Txs = txs - acceptBlock, err := blockExec.ProcessProposal(block) + acceptBlock, err := blockExec.ProcessProposal(block, state) require.NoError(t, err) require.Equal(t, expectAccept, acceptBlock) } diff --git a/state/helpers_test.go b/state/helpers_test.go index 471533769..806f1abd7 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -260,8 +260,8 @@ func (app *testApp) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQue func (app *testApp) ProcessProposal(req abci.RequestProcessProposal) abci.ResponseProcessProposal { for _, tx := range req.Txs { if len(tx) == 0 { - return abci.ResponseProcessProposal{Result: abci.ResponseProcessProposal_REJECT} + return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT} } } - return abci.ResponseProcessProposal{Result: abci.ResponseProcessProposal_ACCEPT} + return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT} } diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 4366f437c..6533e6406 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -262,6 +262,18 @@ func (app *Application) PrepareProposal( return abci.ResponsePrepareProposal{BlockData: req.BlockData} } +// ProcessProposal implements part of the Application interface. +// It accepts any proposal that does not contain a malformed transaction. +func (app *Application) ProcessProposal(req abci.RequestProcessProposal) abci.ResponseProcessProposal { + for _, tx := range req.Txs { + _, _, err := parseTx(tx) + if err != nil { + return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT} + } + } + return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT} +} + func (app *Application) Rollback() error { return app.state.Rollback() } diff --git a/types/evidence.go b/types/evidence.go index 35acaaed1..9e71d99c2 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -459,6 +459,16 @@ func (evl EvidenceList) Has(evidence Evidence) bool { return false } +// 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 + for _, e := range evl { + el = append(el, e.ABCI()...) + } + return el +} + //------------------------------------------ PROTO -------------------------------------- // EvidenceToProto is a generalized function for encoding evidence that conforms to the