From 60f09840ddea81c10a4cdb794f3fb18bced2a348 Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Tue, 15 Feb 2022 18:16:11 +0100 Subject: [PATCH] abci: PrepareProposal-VoteExtension integration [2nd try] (#7821) * PrepareProposal-VoteExtension integration (#6915) * make proto-gen * Fix protobuf crash in e2e nightly tests * Update types/vote.go Co-authored-by: M. J. Fromberger * Addressed @creachadair's comments Co-authored-by: mconcat Co-authored-by: M. J. Fromberger --- abci/types/types.pb.go | 435 +++++++++++++++------------ internal/consensus/byzantine_test.go | 4 +- internal/consensus/state.go | 4 +- internal/state/execution.go | 8 +- node/node_test.go | 3 + types/block.go | 3 +- types/vote.go | 16 + types/vote_set.go | 4 + 8 files changed, 287 insertions(+), 190 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index bff30eb9c..5f98a6ce5 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1093,6 +1093,9 @@ type RequestPrepareProposal struct { BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` // If an application decides to populate block_data with extra information, they can not exceed this value. BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` + // votes includes all votes from the previous block. This contains vote extension data that can be used in proposal + // preparation. The votes here will then form the last commit that gets sent in the proposed block. + Votes []*types1.Vote `protobuf:"bytes,3,rep,name=votes,proto3" json:"votes,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } @@ -1142,6 +1145,13 @@ func (m *RequestPrepareProposal) GetBlockDataSize() int64 { return 0 } +func (m *RequestPrepareProposal) GetVotes() []*types1.Vote { + if m != nil { + return m.Votes + } + return nil +} + // Extends a vote with application-side injection type RequestExtendVote struct { Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` @@ -3356,191 +3366,192 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2944 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x9a, 0xbd, 0x73, 0xe3, 0xc6, - 0x15, 0xc0, 0x09, 0x7e, 0x89, 0x7c, 0xfc, 0xd4, 0xea, 0x2c, 0xd3, 0xf0, 0x9d, 0x24, 0xc3, 0x63, - 0x5b, 0x3e, 0xdb, 0x52, 0xac, 0x8b, 0x9d, 0xf3, 0x38, 0x5f, 0x12, 0x8f, 0x32, 0xe5, 0x53, 0x24, - 0x65, 0xc5, 0x3b, 0x8f, 0x13, 0xdb, 0x30, 0x48, 0xae, 0x44, 0xf8, 0x48, 0x00, 0x06, 0x40, 0x5a, - 0xba, 0x32, 0x33, 0x69, 0x5c, 0xb9, 0x4c, 0xe3, 0x2e, 0x33, 0x49, 0x93, 0x22, 0x5d, 0xaa, 0x54, - 0x99, 0x89, 0x8b, 0x14, 0x2e, 0x53, 0x64, 0x9c, 0x8c, 0xdd, 0xe5, 0x1f, 0x48, 0x93, 0xcc, 0x64, - 0xf6, 0x03, 0x5f, 0x24, 0xc1, 0x8f, 0x24, 0x5d, 0x3a, 0xec, 0xc3, 0x7b, 0x0f, 0x8b, 0xc5, 0xee, - 0xdb, 0xdf, 0x7b, 0x58, 0x78, 0xda, 0x25, 0x46, 0x97, 0xd8, 0x03, 0xdd, 0x70, 0x77, 0xb5, 0x76, - 0x47, 0xdf, 0x75, 0xaf, 0x2d, 0xe2, 0xec, 0x58, 0xb6, 0xe9, 0x9a, 0xa8, 0x12, 0xdc, 0xdc, 0xa1, - 0x37, 0xe5, 0x5b, 0x21, 0xed, 0x8e, 0x7d, 0x6d, 0xb9, 0xe6, 0xae, 0x65, 0x9b, 0xe6, 0x05, 0xd7, - 0x97, 0x6f, 0x86, 0x6e, 0x33, 0x3f, 0x61, 0x6f, 0x91, 0xbb, 0xc2, 0xf8, 0x11, 0xb9, 0xf6, 0xee, - 0xde, 0x9a, 0xb0, 0xb5, 0x34, 0x5b, 0x1b, 0x78, 0xb7, 0x37, 0x2f, 0x4d, 0xf3, 0xb2, 0x4f, 0x76, - 0x59, 0xab, 0x3d, 0xbc, 0xd8, 0x75, 0xf5, 0x01, 0x71, 0x5c, 0x6d, 0x60, 0x09, 0x85, 0x1b, 0x97, - 0xe6, 0xa5, 0xc9, 0x2e, 0x77, 0xe9, 0x15, 0x97, 0x2a, 0xbf, 0xca, 0xc3, 0x0a, 0x26, 0x1f, 0x0f, - 0x89, 0xe3, 0xa2, 0x3d, 0x48, 0x93, 0x4e, 0xcf, 0xac, 0x49, 0x5b, 0xd2, 0x76, 0x61, 0xef, 0xe6, - 0xce, 0xd8, 0xcb, 0xed, 0x08, 0xbd, 0x46, 0xa7, 0x67, 0x36, 0x13, 0x98, 0xe9, 0xa2, 0xd7, 0x20, - 0x73, 0xd1, 0x1f, 0x3a, 0xbd, 0x5a, 0x92, 0x19, 0xdd, 0x8a, 0x33, 0x3a, 0xa4, 0x4a, 0xcd, 0x04, - 0xe6, 0xda, 0xf4, 0x51, 0xba, 0x71, 0x61, 0xd6, 0x52, 0xb3, 0x1f, 0x75, 0x64, 0x5c, 0xb0, 0x47, - 0x51, 0x5d, 0x74, 0x00, 0xa0, 0x1b, 0xba, 0xab, 0x76, 0x7a, 0x9a, 0x6e, 0xd4, 0xd2, 0xcc, 0xf2, - 0x99, 0x78, 0x4b, 0xdd, 0xad, 0x53, 0xc5, 0x66, 0x02, 0xe7, 0x75, 0xaf, 0x41, 0xbb, 0xfb, 0xf1, - 0x90, 0xd8, 0xd7, 0xb5, 0xcc, 0xec, 0xee, 0xfe, 0x98, 0x2a, 0xd1, 0xee, 0x32, 0x6d, 0xf4, 0x5d, - 0xc8, 0x75, 0x7a, 0xa4, 0xf3, 0x48, 0x75, 0xaf, 0x6a, 0x2b, 0xcc, 0x72, 0x33, 0xce, 0xb2, 0x4e, - 0xf5, 0x5a, 0x57, 0xcd, 0x04, 0x5e, 0xe9, 0xf0, 0x4b, 0x74, 0x17, 0xb2, 0x1d, 0x73, 0x30, 0xd0, - 0xdd, 0x1a, 0x30, 0xdb, 0x8d, 0x58, 0x5b, 0xa6, 0xd5, 0x4c, 0x60, 0xa1, 0x8f, 0x4e, 0xa0, 0xdc, - 0xd7, 0x1d, 0x57, 0x75, 0x0c, 0xcd, 0x72, 0x7a, 0xa6, 0xeb, 0xd4, 0x0a, 0xcc, 0xc3, 0x73, 0x71, - 0x1e, 0x8e, 0x75, 0xc7, 0x3d, 0xf7, 0x94, 0x9b, 0x09, 0x5c, 0xea, 0x87, 0x05, 0xd4, 0x9f, 0x79, - 0x71, 0x41, 0x6c, 0xdf, 0x61, 0xad, 0x38, 0xdb, 0xdf, 0x29, 0xd5, 0xf6, 0xec, 0xa9, 0x3f, 0x33, - 0x2c, 0x40, 0x3f, 0x85, 0xb5, 0xbe, 0xa9, 0x75, 0x7d, 0x77, 0x6a, 0xa7, 0x37, 0x34, 0x1e, 0xd5, - 0x4a, 0xcc, 0xe9, 0x8b, 0xb1, 0x9d, 0x34, 0xb5, 0xae, 0xe7, 0xa2, 0x4e, 0x0d, 0x9a, 0x09, 0xbc, - 0xda, 0x1f, 0x17, 0xa2, 0x0f, 0xe0, 0x86, 0x66, 0x59, 0xfd, 0xeb, 0x71, 0xef, 0x65, 0xe6, 0xfd, - 0x76, 0x9c, 0xf7, 0x7d, 0x6a, 0x33, 0xee, 0x1e, 0x69, 0x13, 0x52, 0xd4, 0x82, 0xaa, 0x65, 0x13, - 0x4b, 0xb3, 0x89, 0x6a, 0xd9, 0xa6, 0x65, 0x3a, 0x5a, 0xbf, 0x56, 0x61, 0xbe, 0x5f, 0x88, 0xf3, - 0x7d, 0xc6, 0xf5, 0xcf, 0x84, 0x7a, 0x33, 0x81, 0x2b, 0x56, 0x54, 0xc4, 0xbd, 0x9a, 0x1d, 0xe2, - 0x38, 0x81, 0xd7, 0xea, 0x3c, 0xaf, 0x4c, 0x3f, 0xea, 0x35, 0x22, 0x42, 0x0d, 0x28, 0x90, 0x2b, - 0x6a, 0xae, 0x8e, 0x4c, 0x97, 0xd4, 0x56, 0x99, 0x43, 0x25, 0x76, 0x85, 0x32, 0xd5, 0x87, 0xa6, - 0x4b, 0x9a, 0x09, 0x0c, 0xc4, 0x6f, 0x21, 0x0d, 0x9e, 0x18, 0x11, 0x5b, 0xbf, 0xb8, 0x66, 0x6e, - 0x54, 0x76, 0xc7, 0xd1, 0x4d, 0xa3, 0x86, 0x98, 0xc3, 0x97, 0xe2, 0x1c, 0x3e, 0x64, 0x46, 0xd4, - 0x45, 0xc3, 0x33, 0x69, 0x26, 0xf0, 0xda, 0x68, 0x52, 0x4c, 0xa7, 0xd8, 0x85, 0x6e, 0x68, 0x7d, - 0xfd, 0x31, 0x51, 0xdb, 0x7d, 0xb3, 0xf3, 0xa8, 0xb6, 0x36, 0x7b, 0x8a, 0x1d, 0x0a, 0xed, 0x03, - 0xaa, 0x4c, 0xa7, 0xd8, 0x45, 0x58, 0x70, 0xb0, 0x02, 0x99, 0x91, 0xd6, 0x1f, 0x12, 0xe5, 0x05, - 0x28, 0x84, 0x02, 0x10, 0xaa, 0xc1, 0xca, 0x80, 0x38, 0x8e, 0x76, 0x49, 0x58, 0xbc, 0xca, 0x63, - 0xaf, 0xa9, 0x94, 0xa1, 0x18, 0x0e, 0x3a, 0xca, 0x67, 0x92, 0x6f, 0x49, 0xe3, 0x09, 0xb5, 0x1c, - 0x11, 0x9b, 0xbd, 0xb6, 0xb0, 0x14, 0x4d, 0xf4, 0x2c, 0x94, 0x58, 0x97, 0x55, 0xef, 0x3e, 0x0d, - 0x6a, 0x69, 0x5c, 0x64, 0xc2, 0x87, 0x42, 0x69, 0x13, 0x0a, 0xd6, 0x9e, 0xe5, 0xab, 0xa4, 0x98, - 0x0a, 0x58, 0x7b, 0x96, 0xa7, 0xf0, 0x0c, 0x14, 0xe9, 0xfb, 0xf9, 0x1a, 0x69, 0xf6, 0x90, 0x02, - 0x95, 0x09, 0x15, 0xe5, 0x4f, 0x49, 0xa8, 0x8e, 0x07, 0x2a, 0x74, 0x17, 0xd2, 0x34, 0x66, 0x8b, - 0xf0, 0x2b, 0xef, 0xf0, 0x80, 0xbe, 0xe3, 0x05, 0xf4, 0x9d, 0x96, 0x17, 0xd0, 0x0f, 0x72, 0x5f, - 0x7c, 0xb5, 0x99, 0xf8, 0xec, 0xaf, 0x9b, 0x12, 0x66, 0x16, 0xe8, 0x29, 0x1a, 0x9e, 0x34, 0xdd, - 0x50, 0xf5, 0x2e, 0xeb, 0x72, 0x9e, 0xc6, 0x1e, 0x4d, 0x37, 0x8e, 0xba, 0xe8, 0x18, 0xaa, 0x1d, - 0xd3, 0x70, 0x88, 0xe1, 0x0c, 0x1d, 0x95, 0x6f, 0x18, 0x22, 0xe8, 0x46, 0x42, 0x27, 0xdf, 0x86, - 0xea, 0x9e, 0xe6, 0x19, 0x53, 0xc4, 0x95, 0x4e, 0x54, 0x80, 0x0e, 0x01, 0x46, 0x5a, 0x5f, 0xef, - 0x6a, 0xae, 0x69, 0x3b, 0xb5, 0xf4, 0x56, 0x6a, 0xbb, 0xb0, 0xb7, 0x35, 0xf1, 0x61, 0x1f, 0x7a, - 0x2a, 0x0f, 0xac, 0xae, 0xe6, 0x92, 0x83, 0x34, 0xed, 0x2e, 0x0e, 0x59, 0xa2, 0xe7, 0xa1, 0xa2, - 0x59, 0x96, 0xea, 0xb8, 0x9a, 0x4b, 0xd4, 0xf6, 0xb5, 0x4b, 0x1c, 0x16, 0x90, 0x8b, 0xb8, 0xa4, - 0x59, 0xd6, 0x39, 0x95, 0x1e, 0x50, 0x21, 0x7a, 0x0e, 0xca, 0x34, 0x76, 0xeb, 0x5a, 0x5f, 0xed, - 0x11, 0xfd, 0xb2, 0xe7, 0xd6, 0xb2, 0x5b, 0xd2, 0x76, 0x0a, 0x97, 0x84, 0xb4, 0xc9, 0x84, 0x4a, - 0xd7, 0xff, 0xe2, 0x2c, 0x6e, 0x23, 0x04, 0xe9, 0xae, 0xe6, 0x6a, 0x6c, 0x24, 0x8b, 0x98, 0x5d, - 0x53, 0x99, 0xa5, 0xb9, 0x3d, 0x31, 0x3e, 0xec, 0x1a, 0xad, 0x43, 0x56, 0xb8, 0x4d, 0x31, 0xb7, - 0xa2, 0x85, 0x6e, 0x40, 0xc6, 0xb2, 0xcd, 0x11, 0x61, 0x9f, 0x2e, 0x87, 0x79, 0x43, 0xc1, 0x50, - 0x8e, 0xc6, 0x78, 0x54, 0x86, 0xa4, 0x7b, 0x25, 0x9e, 0x92, 0x74, 0xaf, 0xd0, 0xb7, 0x20, 0x4d, - 0x07, 0x92, 0x3d, 0xa3, 0x3c, 0x65, 0x57, 0x13, 0x76, 0xad, 0x6b, 0x8b, 0x60, 0xa6, 0xa9, 0x54, - 0xa0, 0x14, 0x89, 0xfd, 0xca, 0x3a, 0xdc, 0x98, 0x16, 0xca, 0x95, 0x9e, 0x2f, 0x8f, 0x84, 0x64, - 0xf4, 0x1a, 0xe4, 0xfc, 0x58, 0xce, 0x27, 0xce, 0x53, 0x13, 0x8f, 0xf5, 0x94, 0xb1, 0xaf, 0x4a, - 0x67, 0x0c, 0xfd, 0x00, 0x3d, 0x4d, 0xec, 0xdc, 0x45, 0xbc, 0xa2, 0x59, 0x56, 0x53, 0x73, 0x7a, - 0xca, 0x87, 0x50, 0x8b, 0x8b, 0xd3, 0xa1, 0x01, 0x93, 0xd8, 0xb4, 0xf7, 0x06, 0x6c, 0x1d, 0xb2, - 0x17, 0xa6, 0x3d, 0xd0, 0x5c, 0xe6, 0xac, 0x84, 0x45, 0x8b, 0x0e, 0x24, 0x8f, 0xd9, 0x29, 0x26, - 0xe6, 0x0d, 0x45, 0x85, 0xa7, 0x62, 0x63, 0x35, 0x35, 0xd1, 0x8d, 0x2e, 0xe1, 0xc3, 0x5a, 0xc2, - 0xbc, 0x11, 0x38, 0xe2, 0x9d, 0xe5, 0x0d, 0xfa, 0x58, 0x87, 0xbd, 0x2b, 0xf3, 0x9f, 0xc7, 0xa2, - 0xa5, 0xa8, 0xb0, 0x3e, 0x3d, 0x60, 0xa3, 0x5b, 0x00, 0x7c, 0x85, 0x8b, 0xf9, 0x91, 0xda, 0x2e, - 0xe2, 0x3c, 0x93, 0xdc, 0xa3, 0x93, 0xe4, 0x79, 0xa8, 0x04, 0xb7, 0x55, 0x47, 0x7f, 0xcc, 0xbf, - 0x65, 0x0a, 0x97, 0x7c, 0x9d, 0x73, 0xfd, 0x31, 0x51, 0x7e, 0x00, 0xab, 0x13, 0xa1, 0x16, 0xdd, - 0x86, 0x34, 0x0b, 0xce, 0xfc, 0x33, 0xac, 0x4f, 0x2e, 0x2f, 0xaa, 0x85, 0x99, 0x8e, 0xd2, 0x04, - 0x39, 0x3e, 0xb4, 0x2e, 0xe5, 0xa9, 0x1d, 0x7a, 0xd7, 0xe8, 0x9e, 0xf1, 0x3a, 0xfd, 0x58, 0x1a, - 0x1d, 0x1d, 0xee, 0xa7, 0x36, 0xe9, 0xa7, 0xc9, 0xee, 0x8b, 0x05, 0x2a, 0xb4, 0x51, 0x15, 0x52, - 0xee, 0x95, 0x53, 0x4b, 0xb2, 0xc1, 0xa1, 0x97, 0xca, 0x6f, 0x93, 0xfe, 0xec, 0x8b, 0x44, 0x6b, - 0x4f, 0x55, 0xf2, 0x55, 0xe9, 0x32, 0x0b, 0x4d, 0x2a, 0x76, 0x1d, 0xbb, 0xcc, 0x82, 0x0e, 0xa6, - 0x97, 0xea, 0xe0, 0x29, 0x54, 0xfb, 0x9a, 0xe3, 0xaa, 0x1c, 0x92, 0x54, 0x06, 0x92, 0x99, 0x18, - 0x2a, 0x3b, 0xd6, 0xbc, 0xa5, 0x45, 0x63, 0xbf, 0x70, 0x54, 0xee, 0x47, 0xa4, 0x08, 0xc3, 0x8d, - 0xf6, 0xf5, 0x63, 0xcd, 0x70, 0x75, 0x83, 0xa8, 0xa1, 0x00, 0x97, 0x65, 0x01, 0x6e, 0x72, 0x41, - 0x35, 0x46, 0x7a, 0x97, 0x18, 0x1d, 0x2f, 0xb2, 0xad, 0xf9, 0xc6, 0x7e, 0xe4, 0x73, 0x94, 0x7f, - 0xe6, 0x21, 0x87, 0x89, 0x63, 0xd1, 0x08, 0x8a, 0x0e, 0x20, 0x4f, 0xae, 0x3a, 0xc4, 0x72, 0xbd, - 0x4d, 0x67, 0xfa, 0xe6, 0xcd, 0xb5, 0x1b, 0x9e, 0x26, 0x45, 0x57, 0xdf, 0x0c, 0xdd, 0x11, 0x74, - 0x1e, 0x0f, 0xda, 0xc2, 0x3c, 0x8c, 0xe7, 0xaf, 0x7b, 0x78, 0x9e, 0x8a, 0x25, 0x4f, 0x6e, 0x35, - 0xc6, 0xe7, 0x77, 0x04, 0x9f, 0xa7, 0xe7, 0x3c, 0x2c, 0x02, 0xe8, 0xf5, 0x08, 0xa0, 0x67, 0xe6, - 0xbc, 0x66, 0x0c, 0xa1, 0xbf, 0xee, 0x11, 0x7a, 0x76, 0x4e, 0x8f, 0xc7, 0x10, 0xfd, 0x7b, 0x21, - 0x44, 0xcf, 0x31, 0xd3, 0xad, 0x58, 0xd3, 0x29, 0x8c, 0xfe, 0x86, 0xcf, 0xe8, 0x85, 0x58, 0xbe, - 0x17, 0xc6, 0xe3, 0x90, 0x7e, 0x3a, 0x01, 0xe9, 0x1c, 0xaa, 0x9f, 0x8f, 0x75, 0x31, 0x87, 0xd2, - 0x4f, 0x27, 0x28, 0xbd, 0x34, 0xc7, 0xe1, 0x1c, 0x4c, 0x7f, 0x6f, 0x3a, 0xa6, 0xc7, 0x83, 0xb4, - 0xe8, 0xe6, 0x62, 0x9c, 0xae, 0xc6, 0x70, 0x7a, 0x25, 0x96, 0x29, 0xb9, 0xfb, 0x85, 0x41, 0xfd, - 0xc1, 0x14, 0x50, 0xe7, 0x48, 0xbd, 0x1d, 0xeb, 0x7c, 0x01, 0x52, 0x7f, 0x30, 0x85, 0xd4, 0x57, - 0xe7, 0xba, 0x9d, 0x8b, 0xea, 0x87, 0x51, 0x54, 0xe7, 0x64, 0xfd, 0xec, 0x8c, 0xd5, 0x1e, 0xc3, - 0xea, 0xed, 0x38, 0x56, 0xe7, 0x3c, 0xfd, 0x72, 0xac, 0xc7, 0x25, 0x60, 0xfd, 0x74, 0x02, 0xd6, - 0x6f, 0xcc, 0x99, 0x69, 0x8b, 0xd2, 0xfa, 0x8b, 0x74, 0x87, 0x1c, 0x8b, 0x67, 0x74, 0x17, 0x27, - 0xb6, 0x6d, 0xda, 0x82, 0xbb, 0x79, 0x43, 0xd9, 0xa6, 0xf4, 0x16, 0xc4, 0xae, 0x19, 0x64, 0xcf, - 0x68, 0x29, 0x14, 0xaf, 0x94, 0xdf, 0x49, 0x81, 0x2d, 0x8b, 0xe4, 0x61, 0xf2, 0xcb, 0x0b, 0xf2, - 0x0b, 0xf1, 0x7e, 0x32, 0xca, 0xfb, 0x9b, 0x50, 0xa0, 0x14, 0x34, 0x86, 0xf2, 0x9a, 0xe5, 0xa3, - 0xfc, 0x6d, 0x58, 0x65, 0x3b, 0x0d, 0x87, 0x02, 0xb1, 0x89, 0xa5, 0xd9, 0x26, 0x56, 0xa1, 0x37, - 0xf8, 0x28, 0xf0, 0xdd, 0xec, 0x15, 0x58, 0x0b, 0xe9, 0xfa, 0x74, 0xc5, 0xb9, 0xb6, 0xea, 0x6b, - 0xef, 0x0b, 0xcc, 0xfa, 0x83, 0x14, 0x8c, 0x50, 0x90, 0x03, 0x4c, 0xc3, 0x75, 0xe9, 0x7f, 0x84, - 0xeb, 0xc9, 0xff, 0x18, 0xd7, 0xc3, 0xb4, 0x98, 0x8a, 0xd2, 0xe2, 0x3f, 0xa4, 0xe0, 0x9b, 0xf8, - 0xf0, 0xdd, 0x31, 0xbb, 0x44, 0xf0, 0x1b, 0xbb, 0xa6, 0x9c, 0xd0, 0x37, 0x2f, 0x05, 0xa5, 0xd1, - 0x4b, 0xaa, 0xe5, 0x6f, 0x30, 0x79, 0xb1, 0x7f, 0xf8, 0xe8, 0x97, 0x61, 0x23, 0x2c, 0xd0, 0xaf, - 0x0a, 0xa9, 0x47, 0x84, 0x6f, 0x07, 0x45, 0x4c, 0x2f, 0xa9, 0x1e, 0x9b, 0x64, 0xac, 0x14, 0x53, - 0xc4, 0xbc, 0x81, 0xee, 0x42, 0x9e, 0x95, 0xda, 0x54, 0xd3, 0x72, 0xc4, 0x0e, 0xf0, 0x74, 0xf8, - 0x5d, 0x79, 0x45, 0x6d, 0xe7, 0x8c, 0xea, 0x9c, 0x5a, 0x0e, 0xce, 0x59, 0xe2, 0x2a, 0xc4, 0x27, - 0xf9, 0x08, 0x9f, 0xdc, 0x84, 0x3c, 0xed, 0xbd, 0x63, 0x69, 0x1d, 0xc2, 0x4a, 0x37, 0x79, 0x1c, - 0x08, 0x94, 0xbf, 0x24, 0xa1, 0x32, 0xb6, 0xa1, 0x4c, 0x7d, 0x77, 0x6f, 0x4a, 0x26, 0x43, 0xc9, - 0xc8, 0x62, 0xe3, 0xb1, 0x01, 0x70, 0xa9, 0x39, 0xea, 0x27, 0x9a, 0xe1, 0x92, 0xae, 0x18, 0x94, - 0x90, 0x04, 0xc9, 0x90, 0xa3, 0xad, 0xa1, 0x43, 0xba, 0x22, 0x2f, 0xf2, 0xdb, 0xa8, 0x09, 0x59, - 0x32, 0x22, 0x86, 0xeb, 0xd4, 0x56, 0xd8, 0x67, 0x5f, 0x9f, 0x02, 0x31, 0xc4, 0x70, 0x0f, 0x6a, - 0xf4, 0x63, 0xff, 0xfd, 0xab, 0xcd, 0x2a, 0xd7, 0x7e, 0xd9, 0x1c, 0xe8, 0x2e, 0x19, 0x58, 0xee, - 0x35, 0x16, 0xf6, 0xd1, 0x51, 0xc8, 0x8d, 0x8d, 0x42, 0x08, 0xc1, 0xf3, 0x61, 0x04, 0xa7, 0x7d, - 0xb3, 0x6c, 0xdd, 0xb4, 0x75, 0xf7, 0x9a, 0x0d, 0x5d, 0x0a, 0xfb, 0x6d, 0x9a, 0x66, 0x0f, 0xc8, - 0xc0, 0x32, 0xcd, 0xbe, 0xca, 0xc3, 0x41, 0x81, 0x99, 0x16, 0x85, 0xb0, 0xc1, 0xa2, 0xc2, 0xcf, - 0x93, 0xc1, 0xfa, 0xb8, 0x47, 0xfa, 0xfa, 0x88, 0xd8, 0xff, 0x8f, 0x03, 0xac, 0x1c, 0xd1, 0xac, - 0x33, 0x4c, 0x1e, 0x53, 0xdf, 0xf7, 0x59, 0x28, 0xd9, 0xc4, 0xd5, 0x74, 0x43, 0x8d, 0x90, 0x76, - 0x91, 0x0b, 0x45, 0x9a, 0x7c, 0x06, 0x4f, 0x4c, 0x25, 0x10, 0xf4, 0x1d, 0xc8, 0x07, 0xf0, 0x22, - 0xc5, 0x40, 0xaf, 0x9f, 0x45, 0x06, 0xba, 0xca, 0xef, 0xa5, 0xc0, 0x65, 0x34, 0x2f, 0x6d, 0x40, - 0xd6, 0x26, 0xce, 0xb0, 0xcf, 0x33, 0xc5, 0xf2, 0xde, 0x2b, 0x8b, 0xb1, 0x0b, 0x95, 0x0e, 0xfb, - 0x2e, 0x16, 0xc6, 0xca, 0x07, 0x90, 0xe5, 0x12, 0x54, 0x80, 0x95, 0x07, 0x27, 0xf7, 0x4f, 0x4e, - 0xdf, 0x39, 0xa9, 0x26, 0x10, 0x40, 0x76, 0xbf, 0x5e, 0x6f, 0x9c, 0xb5, 0xaa, 0x12, 0xca, 0x43, - 0x66, 0xff, 0xe0, 0x14, 0xb7, 0xaa, 0x49, 0x2a, 0xc6, 0x8d, 0xb7, 0x1b, 0xf5, 0x56, 0x35, 0x85, - 0x56, 0xa1, 0xc4, 0xaf, 0xd5, 0xc3, 0x53, 0xfc, 0xa3, 0xfd, 0x56, 0x35, 0x1d, 0x12, 0x9d, 0x37, - 0x4e, 0xee, 0x35, 0x70, 0x35, 0xa3, 0xbc, 0x4a, 0x53, 0xd1, 0x18, 0xda, 0x09, 0x92, 0x4e, 0x29, - 0x94, 0x74, 0x2a, 0xbf, 0x48, 0xd2, 0xdc, 0x2d, 0x0e, 0x61, 0xd0, 0xdb, 0x63, 0x2f, 0xbe, 0xb7, - 0x04, 0xff, 0x8c, 0xbd, 0x3d, 0x7a, 0x0e, 0xca, 0x36, 0xb9, 0x20, 0x6e, 0xa7, 0xc7, 0x91, 0x8a, - 0xc7, 0xf0, 0x12, 0x2e, 0x09, 0x29, 0x33, 0x72, 0xb8, 0xda, 0x47, 0xa4, 0xe3, 0xaa, 0x7c, 0xf1, - 0x39, 0xb5, 0xd4, 0x56, 0x6a, 0x3b, 0x4f, 0xd5, 0xa8, 0xf4, 0x9c, 0x0b, 0x95, 0x0f, 0x97, 0x1a, - 0xcb, 0x3c, 0x64, 0x70, 0xa3, 0x85, 0xdf, 0xad, 0xa6, 0x10, 0x82, 0x32, 0xbb, 0x54, 0xcf, 0x4f, - 0xf6, 0xcf, 0xce, 0x9b, 0xa7, 0x74, 0x2c, 0xd7, 0xa0, 0xe2, 0x8d, 0xa5, 0x27, 0xcc, 0x28, 0x77, - 0xe1, 0xc9, 0x18, 0xfe, 0x9a, 0x93, 0x78, 0x2b, 0xef, 0x01, 0x9a, 0x04, 0x22, 0x74, 0x08, 0xe5, - 0x31, 0xf6, 0x91, 0x26, 0xe1, 0x3c, 0xc8, 0x88, 0x7d, 0xae, 0xc1, 0xa5, 0x51, 0xb8, 0xa9, 0xfc, - 0x52, 0x82, 0xa7, 0x67, 0xd0, 0x11, 0xba, 0x3f, 0xf6, 0xcd, 0xee, 0x2c, 0xc3, 0x56, 0xe3, 0x53, - 0xf6, 0xee, 0x42, 0xc3, 0x7c, 0x7e, 0xbc, 0x7f, 0xde, 0x8c, 0x4e, 0x59, 0xe5, 0x37, 0x52, 0x78, - 0xfc, 0xa2, 0x54, 0xf9, 0xd6, 0x58, 0x17, 0x77, 0x17, 0x45, 0xd4, 0xf1, 0x39, 0x25, 0x43, 0x8e, - 0x88, 0xf4, 0x55, 0xa4, 0xf8, 0x7e, 0x5b, 0x79, 0x65, 0x7e, 0xd7, 0x83, 0xfe, 0x26, 0x95, 0x3f, - 0x26, 0x83, 0xd5, 0x1f, 0xad, 0x0b, 0x7c, 0x3b, 0xa8, 0x0b, 0xcc, 0x4a, 0x01, 0xfd, 0xb8, 0xce, - 0x6b, 0x07, 0xe7, 0xb0, 0xea, 0x43, 0x87, 0x3a, 0x64, 0x30, 0xb2, 0x2c, 0xb5, 0x54, 0x47, 0x51, - 0xb1, 0x83, 0xde, 0x85, 0x27, 0xc7, 0x88, 0xca, 0x77, 0xbd, 0x70, 0x1d, 0xf4, 0x89, 0x28, 0x58, - 0x79, 0xae, 0x83, 0x2d, 0x20, 0xfd, 0xdf, 0x6d, 0x01, 0xca, 0xfb, 0x50, 0x8e, 0x16, 0x2a, 0x68, - 0xec, 0xb1, 0xcd, 0xa1, 0xd1, 0x65, 0x9f, 0x3b, 0x83, 0x79, 0x03, 0xbd, 0x06, 0x19, 0x3a, 0xb3, - 0xbd, 0x51, 0x99, 0x0c, 0xd2, 0x74, 0x66, 0x86, 0x0a, 0x1d, 0x5c, 0x5b, 0x79, 0x0c, 0x19, 0xd6, - 0x13, 0xba, 0x75, 0xb0, 0x02, 0xa5, 0xc0, 0x63, 0x7a, 0x8d, 0xde, 0x07, 0xd0, 0x5c, 0xd7, 0xd6, - 0xdb, 0xc3, 0xc0, 0xf1, 0xe6, 0xf4, 0x37, 0xd9, 0xf7, 0xf4, 0x0e, 0x6e, 0x8a, 0x57, 0xba, 0x11, - 0x98, 0x86, 0x5e, 0x2b, 0xe4, 0x50, 0x39, 0x81, 0x72, 0xd4, 0xd6, 0x03, 0x3a, 0xde, 0x87, 0x28, - 0xd0, 0x71, 0x3e, 0x17, 0x40, 0xe7, 0xe3, 0x60, 0x8a, 0x57, 0x61, 0x59, 0x43, 0xf9, 0x54, 0x82, - 0x5c, 0xeb, 0x4a, 0x4c, 0xd3, 0x68, 0x3d, 0x32, 0x52, 0xc0, 0xe5, 0xa6, 0xc9, 0x70, 0x11, 0x91, - 0x97, 0x6b, 0x53, 0x7e, 0xb9, 0xf6, 0x87, 0xfe, 0x9a, 0x4a, 0xcf, 0xa9, 0x55, 0xf8, 0x13, 0xd5, - 0xab, 0x44, 0x89, 0xb5, 0xfe, 0x26, 0xe4, 0xfd, 0x79, 0x48, 0xf3, 0x0c, 0xad, 0xdb, 0xb5, 0x89, - 0xe3, 0x88, 0x0d, 0xc3, 0x6b, 0xb2, 0x7a, 0xb2, 0xf9, 0x89, 0x28, 0x53, 0xa6, 0x30, 0x6f, 0x28, - 0x5d, 0xa8, 0x8c, 0x4d, 0x62, 0xf4, 0x26, 0xac, 0x58, 0xc3, 0xb6, 0xea, 0x0d, 0xcf, 0xd8, 0x9f, - 0x51, 0x8f, 0x60, 0x87, 0xed, 0xbe, 0xde, 0xb9, 0x4f, 0xae, 0xbd, 0xce, 0x58, 0xc3, 0xf6, 0x7d, - 0x3e, 0x8a, 0xfc, 0x29, 0xc9, 0xf0, 0x53, 0x46, 0x90, 0xf3, 0x26, 0x05, 0xfa, 0x3e, 0xe4, 0xfd, - 0xf5, 0xe1, 0xff, 0x66, 0x88, 0x5d, 0x58, 0xc2, 0x7d, 0x60, 0x42, 0xd3, 0x21, 0x47, 0xbf, 0x34, - 0x48, 0x57, 0x0d, 0x32, 0x1d, 0xf6, 0xb4, 0x1c, 0xae, 0xf0, 0x1b, 0xc7, 0x5e, 0x9a, 0xa3, 0xfc, - 0x4b, 0x82, 0x9c, 0x57, 0x27, 0x43, 0xaf, 0x86, 0xe6, 0x5d, 0x79, 0x4a, 0x39, 0xc9, 0x53, 0x0c, - 0x2a, 0xe3, 0xd1, 0xbe, 0x26, 0x97, 0xef, 0x6b, 0x5c, 0xd1, 0xd1, 0xfb, 0xcb, 0x92, 0x5e, 0xfa, - 0x2f, 0xcb, 0xcb, 0x80, 0x5c, 0xd3, 0xd5, 0xfa, 0x34, 0x1f, 0xd7, 0x8d, 0x4b, 0x95, 0x0f, 0x36, - 0xa7, 0xc6, 0x2a, 0xbb, 0xf3, 0x90, 0xdd, 0x38, 0x63, 0xe3, 0xfe, 0x33, 0x09, 0x72, 0x3e, 0x0d, - 0x2d, 0x5b, 0x37, 0x5f, 0x87, 0xac, 0xd8, 0xf0, 0x79, 0xe1, 0x5c, 0xb4, 0xfc, 0xea, 0x6a, 0x3a, - 0x54, 0x5d, 0x95, 0x21, 0x37, 0x20, 0xae, 0xc6, 0xf6, 0x55, 0x9e, 0x6c, 0xfa, 0xed, 0xdb, 0x6f, - 0x40, 0x21, 0xf4, 0xcf, 0x81, 0xae, 0xbc, 0x93, 0xc6, 0x3b, 0xd5, 0x84, 0xbc, 0xf2, 0xe9, 0xe7, - 0x5b, 0xa9, 0x13, 0xf2, 0x09, 0x9d, 0xb3, 0xb8, 0x51, 0x6f, 0x36, 0xea, 0xf7, 0xab, 0x92, 0x5c, - 0xf8, 0xf4, 0xf3, 0xad, 0x15, 0x4c, 0x58, 0x49, 0xec, 0x76, 0x13, 0x8a, 0xe1, 0xaf, 0x12, 0xdd, - 0x11, 0x10, 0x94, 0xef, 0x3d, 0x38, 0x3b, 0x3e, 0xaa, 0xef, 0xb7, 0x1a, 0xea, 0xc3, 0xd3, 0x56, - 0xa3, 0x2a, 0xa1, 0x27, 0x61, 0xed, 0xf8, 0xe8, 0xad, 0x66, 0x4b, 0xad, 0x1f, 0x1f, 0x35, 0x4e, - 0x5a, 0xea, 0x7e, 0xab, 0xb5, 0x5f, 0xbf, 0x5f, 0x4d, 0xee, 0xfd, 0xba, 0x00, 0x95, 0xfd, 0x83, - 0xfa, 0x11, 0xe5, 0x1d, 0xbd, 0xa3, 0xb1, 0x4a, 0x40, 0x1d, 0xd2, 0x2c, 0xd7, 0x9f, 0x79, 0xc8, - 0x40, 0x9e, 0x5d, 0xe4, 0x44, 0x87, 0x90, 0x61, 0x65, 0x00, 0x34, 0xfb, 0xd4, 0x81, 0x3c, 0xa7, - 0xea, 0x49, 0x3b, 0xc3, 0x96, 0xc7, 0xcc, 0x63, 0x08, 0xf2, 0xec, 0x22, 0x28, 0x3a, 0x86, 0x15, - 0x2f, 0x0b, 0x9c, 0x77, 0x36, 0x40, 0x9e, 0x5b, 0x99, 0xa4, 0xaf, 0xc6, 0xb3, 0xe9, 0xd9, 0x27, - 0x14, 0xe4, 0x39, 0xe5, 0x51, 0x74, 0x04, 0x59, 0x91, 0x35, 0xcc, 0x39, 0x74, 0x20, 0xcf, 0x2b, - 0x78, 0x22, 0x0c, 0xf9, 0xa0, 0x4e, 0x31, 0xff, 0xdc, 0x85, 0xbc, 0x40, 0xe5, 0x17, 0x7d, 0x00, - 0xa5, 0x68, 0x26, 0xb2, 0xd8, 0xc1, 0x06, 0x79, 0xc1, 0xd2, 0x2a, 0xf5, 0x1f, 0x4d, 0x4b, 0x16, - 0x3b, 0xe8, 0x20, 0x2f, 0x58, 0x69, 0x45, 0x1f, 0xc1, 0xea, 0x64, 0xda, 0xb0, 0xf8, 0xb9, 0x07, - 0x79, 0x89, 0xda, 0x2b, 0x1a, 0x00, 0x9a, 0x92, 0x6e, 0x2c, 0x71, 0x0c, 0x42, 0x5e, 0xa6, 0x14, - 0x8b, 0xba, 0x50, 0x19, 0x67, 0xf8, 0x45, 0x8f, 0x45, 0xc8, 0x0b, 0x97, 0x65, 0xf9, 0x53, 0xa2, - 0xa4, 0xbb, 0xe8, 0x31, 0x09, 0x79, 0xe1, 0x2a, 0x2d, 0x7a, 0x00, 0x10, 0xca, 0x2a, 0x16, 0x38, - 0x36, 0x21, 0x2f, 0x52, 0xaf, 0x45, 0x16, 0xac, 0x4d, 0xcb, 0x26, 0x96, 0x39, 0x45, 0x21, 0x2f, - 0x55, 0xc6, 0xa5, 0xf3, 0x39, 0x0a, 0xda, 0x8b, 0x9d, 0xaa, 0x90, 0x17, 0xac, 0xe7, 0x1e, 0x34, - 0xbe, 0xf8, 0x7a, 0x43, 0xfa, 0xf2, 0xeb, 0x0d, 0xe9, 0x6f, 0x5f, 0x6f, 0x48, 0x9f, 0x7d, 0xb3, - 0x91, 0xf8, 0xf2, 0x9b, 0x8d, 0xc4, 0x9f, 0xbf, 0xd9, 0x48, 0xfc, 0xe4, 0xa5, 0x4b, 0xdd, 0xed, - 0x0d, 0xdb, 0x3b, 0x1d, 0x73, 0xb0, 0x1b, 0x3e, 0x88, 0x36, 0xed, 0x70, 0x5c, 0x3b, 0xcb, 0x76, - 0xd3, 0x3b, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x38, 0xc0, 0x71, 0xe9, 0x3c, 0x27, 0x00, 0x00, + // 2958 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x9a, 0xcb, 0x73, 0xe3, 0xc6, + 0xd1, 0xc0, 0x09, 0xbe, 0x44, 0x36, 0x9f, 0x1a, 0xc9, 0x6b, 0x1a, 0xde, 0x95, 0x64, 0xb8, 0x6c, + 0xaf, 0xd7, 0x6b, 0xe9, 0xb3, 0xf6, 0xb3, 0xb3, 0x2e, 0xe7, 0x25, 0x71, 0x29, 0x53, 0x5e, 0x45, + 0x52, 0x46, 0xdc, 0x75, 0x39, 0xb1, 0x0d, 0x83, 0xe4, 0x48, 0x84, 0x97, 0x04, 0x60, 0x00, 0xa4, + 0xa5, 0x3d, 0xa6, 0x2a, 0x17, 0x57, 0xa5, 0xca, 0xc7, 0x5c, 0x7c, 0x4b, 0x55, 0x72, 0xc9, 0x21, + 0xb7, 0x9c, 0x72, 0x4a, 0x55, 0x7c, 0xc8, 0xc1, 0xc7, 0x1c, 0x52, 0x4e, 0xca, 0x7b, 0xcb, 0x3f, + 0x90, 0x4b, 0x52, 0x95, 0x9a, 0x07, 0x5e, 0x24, 0xc1, 0x47, 0x92, 0x5b, 0x6e, 0x98, 0x46, 0x77, + 0x63, 0x30, 0x98, 0xe9, 0xf9, 0x75, 0x63, 0xe0, 0x59, 0x97, 0x18, 0x5d, 0x62, 0x0f, 0x74, 0xc3, + 0xdd, 0xd1, 0xda, 0x1d, 0x7d, 0xc7, 0xbd, 0xb2, 0x88, 0xb3, 0x6d, 0xd9, 0xa6, 0x6b, 0xa2, 0x4a, + 0x70, 0x73, 0x9b, 0xde, 0x94, 0x6f, 0x84, 0xb4, 0x3b, 0xf6, 0x95, 0xe5, 0x9a, 0x3b, 0x96, 0x6d, + 0x9a, 0xe7, 0x5c, 0x5f, 0xbe, 0x1e, 0xba, 0xcd, 0xfc, 0x84, 0xbd, 0x45, 0xee, 0x0a, 0xe3, 0x47, + 0xe4, 0xca, 0xbb, 0x7b, 0x63, 0xc2, 0xd6, 0xd2, 0x6c, 0x6d, 0xe0, 0xdd, 0xde, 0xbc, 0x30, 0xcd, + 0x8b, 0x3e, 0xd9, 0x61, 0xad, 0xf6, 0xf0, 0x7c, 0xc7, 0xd5, 0x07, 0xc4, 0x71, 0xb5, 0x81, 0x25, + 0x14, 0xd6, 0x2f, 0xcc, 0x0b, 0x93, 0x5d, 0xee, 0xd0, 0x2b, 0x2e, 0x55, 0x7e, 0x99, 0x87, 0x15, + 0x4c, 0x3e, 0x19, 0x12, 0xc7, 0x45, 0xbb, 0x90, 0x26, 0x9d, 0x9e, 0x59, 0x93, 0xb6, 0xa4, 0x9b, + 0x85, 0xdd, 0xeb, 0xdb, 0x63, 0x2f, 0xb7, 0x2d, 0xf4, 0x1a, 0x9d, 0x9e, 0xd9, 0x4c, 0x60, 0xa6, + 0x8b, 0x5e, 0x87, 0xcc, 0x79, 0x7f, 0xe8, 0xf4, 0x6a, 0x49, 0x66, 0x74, 0x23, 0xce, 0xe8, 0x80, + 0x2a, 0x35, 0x13, 0x98, 0x6b, 0xd3, 0x47, 0xe9, 0xc6, 0xb9, 0x59, 0x4b, 0xcd, 0x7e, 0xd4, 0xa1, + 0x71, 0xce, 0x1e, 0x45, 0x75, 0xd1, 0x3e, 0x80, 0x6e, 0xe8, 0xae, 0xda, 0xe9, 0x69, 0xba, 0x51, + 0x4b, 0x33, 0xcb, 0xe7, 0xe2, 0x2d, 0x75, 0xb7, 0x4e, 0x15, 0x9b, 0x09, 0x9c, 0xd7, 0xbd, 0x06, + 0xed, 0xee, 0x27, 0x43, 0x62, 0x5f, 0xd5, 0x32, 0xb3, 0xbb, 0xfb, 0x43, 0xaa, 0x44, 0xbb, 0xcb, + 0xb4, 0xd1, 0xb7, 0x21, 0xd7, 0xe9, 0x91, 0xce, 0x23, 0xd5, 0xbd, 0xac, 0xad, 0x30, 0xcb, 0xcd, + 0x38, 0xcb, 0x3a, 0xd5, 0x6b, 0x5d, 0x36, 0x13, 0x78, 0xa5, 0xc3, 0x2f, 0xd1, 0x5d, 0xc8, 0x76, + 0xcc, 0xc1, 0x40, 0x77, 0x6b, 0xc0, 0x6c, 0x37, 0x62, 0x6d, 0x99, 0x56, 0x33, 0x81, 0x85, 0x3e, + 0x3a, 0x86, 0x72, 0x5f, 0x77, 0x5c, 0xd5, 0x31, 0x34, 0xcb, 0xe9, 0x99, 0xae, 0x53, 0x2b, 0x30, + 0x0f, 0x2f, 0xc4, 0x79, 0x38, 0xd2, 0x1d, 0xf7, 0xcc, 0x53, 0x6e, 0x26, 0x70, 0xa9, 0x1f, 0x16, + 0x50, 0x7f, 0xe6, 0xf9, 0x39, 0xb1, 0x7d, 0x87, 0xb5, 0xe2, 0x6c, 0x7f, 0x27, 0x54, 0xdb, 0xb3, + 0xa7, 0xfe, 0xcc, 0xb0, 0x00, 0xfd, 0x18, 0xd6, 0xfa, 0xa6, 0xd6, 0xf5, 0xdd, 0xa9, 0x9d, 0xde, + 0xd0, 0x78, 0x54, 0x2b, 0x31, 0xa7, 0x2f, 0xc7, 0x76, 0xd2, 0xd4, 0xba, 0x9e, 0x8b, 0x3a, 0x35, + 0x68, 0x26, 0xf0, 0x6a, 0x7f, 0x5c, 0x88, 0x3e, 0x84, 0x75, 0xcd, 0xb2, 0xfa, 0x57, 0xe3, 0xde, + 0xcb, 0xcc, 0xfb, 0xad, 0x38, 0xef, 0x7b, 0xd4, 0x66, 0xdc, 0x3d, 0xd2, 0x26, 0xa4, 0xa8, 0x05, + 0x55, 0xcb, 0x26, 0x96, 0x66, 0x13, 0xd5, 0xb2, 0x4d, 0xcb, 0x74, 0xb4, 0x7e, 0xad, 0xc2, 0x7c, + 0xbf, 0x14, 0xe7, 0xfb, 0x94, 0xeb, 0x9f, 0x0a, 0xf5, 0x66, 0x02, 0x57, 0xac, 0xa8, 0x88, 0x7b, + 0x35, 0x3b, 0xc4, 0x71, 0x02, 0xaf, 0xd5, 0x79, 0x5e, 0x99, 0x7e, 0xd4, 0x6b, 0x44, 0x84, 0x1a, + 0x50, 0x20, 0x97, 0xd4, 0x5c, 0x1d, 0x99, 0x2e, 0xa9, 0xad, 0x32, 0x87, 0x4a, 0xec, 0x0a, 0x65, + 0xaa, 0x0f, 0x4d, 0x97, 0x34, 0x13, 0x18, 0x88, 0xdf, 0x42, 0x1a, 0x3c, 0x35, 0x22, 0xb6, 0x7e, + 0x7e, 0xc5, 0xdc, 0xa8, 0xec, 0x8e, 0xa3, 0x9b, 0x46, 0x0d, 0x31, 0x87, 0xaf, 0xc4, 0x39, 0x7c, + 0xc8, 0x8c, 0xa8, 0x8b, 0x86, 0x67, 0xd2, 0x4c, 0xe0, 0xb5, 0xd1, 0xa4, 0x98, 0x4e, 0xb1, 0x73, + 0xdd, 0xd0, 0xfa, 0xfa, 0x63, 0xa2, 0xb6, 0xfb, 0x66, 0xe7, 0x51, 0x6d, 0x6d, 0xf6, 0x14, 0x3b, + 0x10, 0xda, 0xfb, 0x54, 0x99, 0x4e, 0xb1, 0xf3, 0xb0, 0x60, 0x7f, 0x05, 0x32, 0x23, 0xad, 0x3f, + 0x24, 0xca, 0x4b, 0x50, 0x08, 0x05, 0x20, 0x54, 0x83, 0x95, 0x01, 0x71, 0x1c, 0xed, 0x82, 0xb0, + 0x78, 0x95, 0xc7, 0x5e, 0x53, 0x29, 0x43, 0x31, 0x1c, 0x74, 0x94, 0xcf, 0x25, 0xdf, 0x92, 0xc6, + 0x13, 0x6a, 0x39, 0x22, 0x36, 0x7b, 0x6d, 0x61, 0x29, 0x9a, 0xe8, 0x79, 0x28, 0xb1, 0x2e, 0xab, + 0xde, 0x7d, 0x1a, 0xd4, 0xd2, 0xb8, 0xc8, 0x84, 0x0f, 0x85, 0xd2, 0x26, 0x14, 0xac, 0x5d, 0xcb, + 0x57, 0x49, 0x31, 0x15, 0xb0, 0x76, 0x2d, 0x4f, 0xe1, 0x39, 0x28, 0xd2, 0xf7, 0xf3, 0x35, 0xd2, + 0xec, 0x21, 0x05, 0x2a, 0x13, 0x2a, 0xca, 0x1f, 0x93, 0x50, 0x1d, 0x0f, 0x54, 0xe8, 0x2e, 0xa4, + 0x69, 0xcc, 0x16, 0xe1, 0x57, 0xde, 0xe6, 0x01, 0x7d, 0xdb, 0x0b, 0xe8, 0xdb, 0x2d, 0x2f, 0xa0, + 0xef, 0xe7, 0xbe, 0xfc, 0x7a, 0x33, 0xf1, 0xf9, 0x5f, 0x36, 0x25, 0xcc, 0x2c, 0xd0, 0x33, 0x34, + 0x3c, 0x69, 0xba, 0xa1, 0xea, 0x5d, 0xd6, 0xe5, 0x3c, 0x8d, 0x3d, 0x9a, 0x6e, 0x1c, 0x76, 0xd1, + 0x11, 0x54, 0x3b, 0xa6, 0xe1, 0x10, 0xc3, 0x19, 0x3a, 0x2a, 0xdf, 0x30, 0x44, 0xd0, 0x8d, 0x84, + 0x4e, 0xbe, 0x0d, 0xd5, 0x3d, 0xcd, 0x53, 0xa6, 0x88, 0x2b, 0x9d, 0xa8, 0x00, 0x1d, 0x00, 0x8c, + 0xb4, 0xbe, 0xde, 0xd5, 0x5c, 0xd3, 0x76, 0x6a, 0xe9, 0xad, 0xd4, 0xcd, 0xc2, 0xee, 0xd6, 0xc4, + 0x87, 0x7d, 0xe8, 0xa9, 0x3c, 0xb0, 0xba, 0x9a, 0x4b, 0xf6, 0xd3, 0xb4, 0xbb, 0x38, 0x64, 0x89, + 0x5e, 0x84, 0x8a, 0x66, 0x59, 0xaa, 0xe3, 0x6a, 0x2e, 0x51, 0xdb, 0x57, 0x2e, 0x71, 0x58, 0x40, + 0x2e, 0xe2, 0x92, 0x66, 0x59, 0x67, 0x54, 0xba, 0x4f, 0x85, 0xe8, 0x05, 0x28, 0xd3, 0xd8, 0xad, + 0x6b, 0x7d, 0xb5, 0x47, 0xf4, 0x8b, 0x9e, 0x5b, 0xcb, 0x6e, 0x49, 0x37, 0x53, 0xb8, 0x24, 0xa4, + 0x4d, 0x26, 0x54, 0xba, 0xfe, 0x17, 0x67, 0x71, 0x1b, 0x21, 0x48, 0x77, 0x35, 0x57, 0x63, 0x23, + 0x59, 0xc4, 0xec, 0x9a, 0xca, 0x2c, 0xcd, 0xed, 0x89, 0xf1, 0x61, 0xd7, 0xe8, 0x1a, 0x64, 0x85, + 0xdb, 0x14, 0x73, 0x2b, 0x5a, 0x68, 0x1d, 0x32, 0x96, 0x6d, 0x8e, 0x08, 0xfb, 0x74, 0x39, 0xcc, + 0x1b, 0x0a, 0x86, 0x72, 0x34, 0xc6, 0xa3, 0x32, 0x24, 0xdd, 0x4b, 0xf1, 0x94, 0xa4, 0x7b, 0x89, + 0xfe, 0x0f, 0xd2, 0x74, 0x20, 0xd9, 0x33, 0xca, 0x53, 0x76, 0x35, 0x61, 0xd7, 0xba, 0xb2, 0x08, + 0x66, 0x9a, 0x4a, 0x05, 0x4a, 0x91, 0xd8, 0xaf, 0x5c, 0x83, 0xf5, 0x69, 0xa1, 0x5c, 0xe9, 0xf9, + 0xf2, 0x48, 0x48, 0x46, 0xaf, 0x43, 0xce, 0x8f, 0xe5, 0x7c, 0xe2, 0x3c, 0x33, 0xf1, 0x58, 0x4f, + 0x19, 0xfb, 0xaa, 0x74, 0xc6, 0xd0, 0x0f, 0xd0, 0xd3, 0xc4, 0xce, 0x5d, 0xc4, 0x2b, 0x9a, 0x65, + 0x35, 0x35, 0xa7, 0xa7, 0x7c, 0x04, 0xb5, 0xb8, 0x38, 0x1d, 0x1a, 0x30, 0x89, 0x4d, 0x7b, 0x6f, + 0xc0, 0xae, 0x41, 0xf6, 0xdc, 0xb4, 0x07, 0x9a, 0xcb, 0x9c, 0x95, 0xb0, 0x68, 0xd1, 0x81, 0xe4, + 0x31, 0x3b, 0xc5, 0xc4, 0xbc, 0xa1, 0xa8, 0xf0, 0x4c, 0x6c, 0xac, 0xa6, 0x26, 0xba, 0xd1, 0x25, + 0x7c, 0x58, 0x4b, 0x98, 0x37, 0x02, 0x47, 0xbc, 0xb3, 0xbc, 0x41, 0x1f, 0xeb, 0xb0, 0x77, 0x65, + 0xfe, 0xf3, 0x58, 0xb4, 0x94, 0x9f, 0x49, 0x70, 0x6d, 0x7a, 0xc4, 0x46, 0x37, 0x00, 0xf8, 0x12, + 0x17, 0x13, 0x24, 0x75, 0xb3, 0x88, 0xf3, 0x4c, 0x72, 0x8f, 0xce, 0x92, 0x17, 0xa1, 0x12, 0xdc, + 0x56, 0x1d, 0xfd, 0x31, 0xff, 0x98, 0x29, 0x5c, 0xf2, 0x75, 0xce, 0xf4, 0xc7, 0x04, 0xdd, 0x86, + 0x0c, 0x8d, 0xa0, 0x74, 0x2d, 0xd1, 0x35, 0x70, 0x6d, 0x72, 0x2d, 0xd1, 0xa8, 0x88, 0xb9, 0x92, + 0xf2, 0x3d, 0x58, 0x9d, 0x88, 0xcc, 0xe8, 0x16, 0xa4, 0x59, 0x2c, 0xe7, 0x5f, 0x2d, 0xce, 0x03, + 0xd3, 0x51, 0x9a, 0x20, 0xc7, 0x47, 0xe2, 0xa5, 0x3c, 0xb5, 0x43, 0x23, 0x13, 0xdd, 0x62, 0xde, + 0xa0, 0xdf, 0x56, 0xa3, 0x83, 0xc9, 0xfd, 0xd4, 0x26, 0xfd, 0x34, 0xd9, 0x7d, 0xb1, 0x9e, 0x85, + 0x36, 0xaa, 0x42, 0xca, 0xbd, 0x74, 0x6a, 0x49, 0x36, 0x94, 0xf4, 0x52, 0xf9, 0x4d, 0xd2, 0x9f, + 0xac, 0x91, 0xe0, 0xee, 0xa9, 0x4a, 0xbe, 0x2a, 0x5d, 0x95, 0xa1, 0x39, 0xc8, 0xae, 0x63, 0x57, + 0x65, 0xd0, 0xc1, 0xf4, 0x52, 0x1d, 0x3c, 0x81, 0x6a, 0x5f, 0x73, 0x5c, 0x95, 0x33, 0x95, 0xca, + 0xb8, 0x33, 0x13, 0x03, 0x71, 0x47, 0x9a, 0xb7, 0x12, 0xe9, 0x56, 0x21, 0x1c, 0x95, 0xfb, 0x11, + 0x29, 0xc2, 0xb0, 0xde, 0xbe, 0x7a, 0xac, 0x19, 0xae, 0x6e, 0x10, 0x35, 0x14, 0x0f, 0xb3, 0x6c, + 0x2e, 0x4c, 0xae, 0xbf, 0xc6, 0x48, 0xef, 0x12, 0xa3, 0xe3, 0x05, 0xc2, 0x35, 0xdf, 0xd8, 0x0f, + 0x94, 0x8e, 0xf2, 0x8f, 0x3c, 0xe4, 0x30, 0x71, 0x2c, 0x1a, 0x70, 0xd1, 0x3e, 0xe4, 0xc9, 0x65, + 0x87, 0x58, 0xae, 0xb7, 0x47, 0x4d, 0xdf, 0xeb, 0xb9, 0x76, 0xc3, 0xd3, 0xa4, 0xa4, 0xeb, 0x9b, + 0xa1, 0x3b, 0x02, 0xe6, 0xe3, 0xb9, 0x5c, 0x98, 0x87, 0x69, 0xfe, 0x0d, 0x8f, 0xe6, 0x53, 0xb1, + 0xa0, 0xca, 0xad, 0xc6, 0x70, 0xfe, 0x8e, 0xc0, 0xf9, 0xf4, 0x9c, 0x87, 0x45, 0x78, 0xbe, 0x1e, + 0xe1, 0xf9, 0xcc, 0x9c, 0xd7, 0x8c, 0x01, 0xfa, 0x37, 0x3c, 0xa0, 0xcf, 0xce, 0xe9, 0xf1, 0x18, + 0xd1, 0x7f, 0x27, 0x44, 0xf4, 0x39, 0x66, 0xba, 0x15, 0x6b, 0x3a, 0x05, 0xe9, 0xdf, 0xf4, 0x91, + 0xbe, 0x10, 0x9b, 0x0e, 0x08, 0xe3, 0x71, 0xa6, 0x3f, 0x99, 0x60, 0x7a, 0xce, 0xe0, 0x2f, 0xc6, + 0xba, 0x98, 0x03, 0xf5, 0x27, 0x13, 0x50, 0x5f, 0x9a, 0xe3, 0x70, 0x0e, 0xd5, 0xbf, 0x3f, 0x9d, + 0xea, 0xe3, 0xb9, 0x5b, 0x74, 0x73, 0x31, 0xac, 0x57, 0x63, 0xb0, 0xbe, 0x12, 0x8b, 0xa0, 0xdc, + 0xfd, 0xc2, 0x5c, 0xff, 0x60, 0x0a, 0xd7, 0x73, 0x02, 0xbf, 0x19, 0xeb, 0x7c, 0x01, 0xb0, 0x7f, + 0x30, 0x05, 0xec, 0x57, 0xe7, 0xba, 0x9d, 0x4b, 0xf6, 0x07, 0x51, 0xb2, 0xe7, 0x20, 0xfe, 0xfc, + 0x8c, 0xd5, 0x1e, 0x83, 0xf6, 0xed, 0x38, 0xb4, 0xe7, 0xf8, 0x7d, 0x3b, 0xd6, 0xe3, 0x12, 0x6c, + 0x7f, 0x32, 0xc1, 0xf6, 0xeb, 0x73, 0x66, 0xda, 0xa2, 0x70, 0xff, 0x32, 0xdd, 0x21, 0xc7, 0xe2, + 0x19, 0xdd, 0xf4, 0x89, 0x6d, 0x9b, 0xb6, 0xc0, 0x74, 0xde, 0x50, 0x6e, 0x52, 0xd8, 0x0b, 0x62, + 0xd7, 0x8c, 0x44, 0x80, 0xc1, 0x55, 0x28, 0x5e, 0x29, 0xbf, 0x95, 0x02, 0x5b, 0x16, 0xc9, 0xc3, + 0xa0, 0x98, 0x17, 0xa0, 0x18, 0x4a, 0x0f, 0x92, 0xd1, 0xf4, 0x60, 0x13, 0x0a, 0x14, 0x9a, 0xc6, + 0xc8, 0x5f, 0xb3, 0x7c, 0xf2, 0xbf, 0x05, 0xab, 0x6c, 0xa7, 0xe1, 0x08, 0x21, 0x36, 0xb1, 0x34, + 0xdb, 0xc4, 0x2a, 0xf4, 0x06, 0x1f, 0x05, 0xbe, 0x9b, 0xbd, 0x0a, 0x6b, 0x21, 0x5d, 0x1f, 0xc6, + 0x38, 0x06, 0x57, 0x7d, 0xed, 0x3d, 0x41, 0x65, 0xbf, 0x97, 0x82, 0x11, 0x0a, 0x52, 0x86, 0x69, + 0x74, 0x2f, 0xfd, 0x97, 0xe8, 0x3e, 0xf9, 0x6f, 0xd3, 0x7d, 0x18, 0x2e, 0x53, 0x51, 0xb8, 0xfc, + 0xbb, 0x14, 0x7c, 0x13, 0x9f, 0xd5, 0x3b, 0x66, 0x97, 0x08, 0xdc, 0x63, 0xd7, 0x94, 0x13, 0xfa, + 0xe6, 0x85, 0x80, 0x3a, 0x7a, 0x49, 0xb5, 0xfc, 0x0d, 0x26, 0x2f, 0xf6, 0x0f, 0x9f, 0x14, 0x33, + 0x6c, 0x84, 0x05, 0x29, 0x56, 0x21, 0xf5, 0x88, 0xf0, 0xed, 0xa0, 0x88, 0xe9, 0x25, 0xd5, 0x63, + 0x93, 0x8c, 0x55, 0x6e, 0x8a, 0x98, 0x37, 0xd0, 0x5d, 0xc8, 0xb3, 0xca, 0x9c, 0x6a, 0x5a, 0x8e, + 0xd8, 0x01, 0x9e, 0x0d, 0xbf, 0x2b, 0x2f, 0xc0, 0x6d, 0x9f, 0x52, 0x9d, 0x13, 0xcb, 0xc1, 0x39, + 0x4b, 0x5c, 0x85, 0xf8, 0x24, 0x1f, 0xe1, 0x93, 0xeb, 0x90, 0xa7, 0xbd, 0x77, 0x2c, 0xad, 0x43, + 0x58, 0xa5, 0x27, 0x8f, 0x03, 0x81, 0xf2, 0xe7, 0x24, 0x54, 0xc6, 0x36, 0x94, 0xa9, 0xef, 0xee, + 0x4d, 0xc9, 0x64, 0x28, 0x77, 0x59, 0x6c, 0x3c, 0x36, 0x00, 0x2e, 0x34, 0x47, 0xfd, 0x54, 0x33, + 0x5c, 0xd2, 0x15, 0x83, 0x12, 0x92, 0x20, 0x19, 0x72, 0xb4, 0x35, 0x74, 0x48, 0x57, 0xa4, 0x51, + 0x7e, 0x1b, 0x35, 0x21, 0x4b, 0x46, 0xc4, 0x70, 0x9d, 0xda, 0xca, 0x24, 0xd0, 0x0a, 0x88, 0x21, + 0x86, 0xbb, 0x5f, 0xa3, 0x1f, 0xfb, 0x6f, 0x5f, 0x6f, 0x56, 0xb9, 0xf6, 0x6d, 0x73, 0xa0, 0xbb, + 0x64, 0x60, 0xb9, 0x57, 0x58, 0xd8, 0x47, 0x47, 0x21, 0x37, 0x36, 0x0a, 0x21, 0x62, 0xcf, 0x87, + 0x89, 0x9d, 0xf6, 0xcd, 0xb2, 0x75, 0xd3, 0xd6, 0xdd, 0x2b, 0x36, 0x74, 0x29, 0xec, 0xb7, 0x69, + 0x56, 0x3e, 0x20, 0x03, 0xcb, 0x34, 0xfb, 0x2a, 0x0f, 0x07, 0x05, 0x66, 0x5a, 0x14, 0xc2, 0x06, + 0x8b, 0x0a, 0x3f, 0x4d, 0x06, 0xeb, 0xe3, 0x1e, 0xe9, 0xeb, 0x23, 0x62, 0xff, 0x2f, 0x0e, 0xb0, + 0x72, 0x48, 0x93, 0xd4, 0x30, 0x79, 0x4c, 0x7d, 0xdf, 0xe7, 0xa1, 0x64, 0x13, 0x57, 0xd3, 0x0d, + 0x35, 0x42, 0xda, 0x45, 0x2e, 0x14, 0x59, 0xf5, 0x29, 0x3c, 0x35, 0x95, 0x40, 0xd0, 0xb7, 0x20, + 0x1f, 0xc0, 0x8b, 0x14, 0x03, 0xbd, 0x7e, 0xd2, 0x19, 0xe8, 0x2a, 0xbf, 0x93, 0x02, 0x97, 0xd1, + 0x34, 0xb6, 0x01, 0x59, 0x9b, 0x38, 0xc3, 0x3e, 0x4f, 0x2c, 0xcb, 0xbb, 0xaf, 0x2e, 0xc6, 0x2e, + 0x54, 0x3a, 0xec, 0xbb, 0x58, 0x18, 0x2b, 0x1f, 0x42, 0x96, 0x4b, 0x50, 0x01, 0x56, 0x1e, 0x1c, + 0xdf, 0x3f, 0x3e, 0x79, 0xf7, 0xb8, 0x9a, 0x40, 0x00, 0xd9, 0xbd, 0x7a, 0xbd, 0x71, 0xda, 0xaa, + 0x4a, 0x28, 0x0f, 0x99, 0xbd, 0xfd, 0x13, 0xdc, 0xaa, 0x26, 0xa9, 0x18, 0x37, 0xde, 0x69, 0xd4, + 0x5b, 0xd5, 0x14, 0x5a, 0x85, 0x12, 0xbf, 0x56, 0x0f, 0x4e, 0xf0, 0x0f, 0xf6, 0x5a, 0xd5, 0x74, + 0x48, 0x74, 0xd6, 0x38, 0xbe, 0xd7, 0xc0, 0xd5, 0x8c, 0xf2, 0x1a, 0xcd, 0x5c, 0x63, 0x68, 0x27, + 0xc8, 0x51, 0xa5, 0x50, 0x8e, 0xaa, 0xfc, 0x3c, 0x49, 0x73, 0xb7, 0x38, 0x84, 0x41, 0xef, 0x8c, + 0xbd, 0xf8, 0xee, 0x12, 0xfc, 0x33, 0xf6, 0xf6, 0xe8, 0x05, 0x28, 0xdb, 0xe4, 0x9c, 0xb8, 0x9d, + 0x1e, 0x47, 0x2a, 0x1e, 0xc3, 0x4b, 0xb8, 0x24, 0xa4, 0xcc, 0xc8, 0xe1, 0x6a, 0x1f, 0x93, 0x8e, + 0xab, 0xf2, 0xc5, 0xc7, 0x93, 0xd8, 0x3c, 0x55, 0xa3, 0xd2, 0x33, 0x2e, 0x54, 0x3e, 0x5a, 0x6a, + 0x2c, 0xf3, 0x90, 0xc1, 0x8d, 0x16, 0x7e, 0xaf, 0x9a, 0x42, 0x08, 0xca, 0xec, 0x52, 0x3d, 0x3b, + 0xde, 0x3b, 0x3d, 0x6b, 0x9e, 0xd0, 0xb1, 0x5c, 0x83, 0x8a, 0x37, 0x96, 0x9e, 0x30, 0xa3, 0xdc, + 0x85, 0xa7, 0x63, 0xf8, 0x6b, 0x4e, 0x9a, 0xae, 0xbc, 0x0f, 0x68, 0x12, 0x88, 0xd0, 0x01, 0x94, + 0xc7, 0xd8, 0x47, 0x9a, 0x84, 0xf3, 0x20, 0x23, 0xf6, 0xb9, 0x06, 0x97, 0x46, 0xe1, 0xa6, 0xf2, + 0x0b, 0x09, 0x9e, 0x9d, 0x41, 0x47, 0xe8, 0xfe, 0xd8, 0x37, 0xbb, 0xb3, 0x0c, 0x5b, 0x8d, 0x4f, + 0xd9, 0xbb, 0x0b, 0x0d, 0xf3, 0xd9, 0xd1, 0xde, 0x59, 0x33, 0x3a, 0x65, 0x95, 0x5f, 0x4b, 0xe1, + 0xf1, 0x8b, 0x52, 0xe5, 0xdb, 0x63, 0x5d, 0xdc, 0x59, 0x14, 0x51, 0xc7, 0xe7, 0x94, 0x0c, 0x39, + 0x22, 0xd2, 0x57, 0x91, 0xe2, 0xfb, 0x6d, 0xe5, 0xd5, 0xf9, 0x5d, 0x0f, 0xfa, 0x9b, 0x54, 0xfe, + 0x90, 0x0c, 0x56, 0x7f, 0xb4, 0x2e, 0xf0, 0xff, 0x41, 0x5d, 0x60, 0x56, 0x0a, 0xe8, 0xc7, 0x75, + 0x5e, 0x3b, 0x38, 0x83, 0x55, 0x1f, 0x3a, 0xd4, 0x21, 0x83, 0x91, 0x65, 0xa9, 0xa5, 0x3a, 0x8a, + 0x8a, 0x1d, 0xf4, 0x1e, 0x3c, 0x3d, 0x46, 0x54, 0xbe, 0xeb, 0x85, 0xcb, 0xa6, 0x4f, 0x45, 0xc1, + 0xca, 0x73, 0x1d, 0x6c, 0x01, 0xe9, 0xff, 0x6c, 0x0b, 0x50, 0x3e, 0x80, 0x72, 0xb4, 0x50, 0x41, + 0x63, 0x8f, 0x6d, 0x0e, 0x8d, 0x2e, 0xfb, 0xdc, 0x19, 0xcc, 0x1b, 0xe8, 0x75, 0xaf, 0x4a, 0x95, + 0x8c, 0x09, 0xd2, 0x74, 0x66, 0x86, 0x0a, 0x1d, 0xa2, 0x5c, 0xf5, 0x18, 0x32, 0xac, 0x27, 0x74, + 0xeb, 0x60, 0xf5, 0x4c, 0x81, 0xc7, 0xf4, 0x1a, 0x7d, 0x00, 0xa0, 0xb9, 0xae, 0xad, 0xb7, 0x87, + 0x81, 0xe3, 0xcd, 0xe9, 0x6f, 0xb2, 0xe7, 0xe9, 0xed, 0x5f, 0x17, 0xaf, 0xb4, 0x1e, 0x98, 0x86, + 0x5e, 0x2b, 0xe4, 0x50, 0x39, 0x86, 0x72, 0xd4, 0xd6, 0x03, 0x3a, 0xde, 0x87, 0x28, 0xd0, 0x71, + 0x3e, 0x17, 0x40, 0xe7, 0xe3, 0x60, 0x8a, 0x17, 0x6d, 0x59, 0x43, 0xf9, 0x4c, 0x82, 0x5c, 0xeb, + 0x52, 0x4c, 0xd3, 0x68, 0xf9, 0x32, 0x52, 0xef, 0xe5, 0xa6, 0xc9, 0x70, 0xcd, 0x91, 0x57, 0x77, + 0x53, 0x7e, 0x75, 0xf7, 0xfb, 0xfe, 0x9a, 0x4a, 0xcf, 0xa9, 0x55, 0xf8, 0x13, 0xd5, 0xab, 0x44, + 0x89, 0xb5, 0xfe, 0x16, 0xe4, 0xfd, 0x79, 0x48, 0xf3, 0x0c, 0xad, 0xdb, 0xb5, 0x89, 0xe3, 0x88, + 0x0d, 0xc3, 0x6b, 0xb2, 0xf2, 0xb3, 0xf9, 0xa9, 0xa8, 0x6a, 0xa6, 0x30, 0x6f, 0x28, 0x5d, 0xa8, + 0x8c, 0x4d, 0x62, 0xf4, 0x16, 0xac, 0x58, 0xc3, 0xb6, 0xea, 0x0d, 0xcf, 0xd8, 0x8f, 0x54, 0x8f, + 0x60, 0x87, 0xed, 0xbe, 0xde, 0xb9, 0x4f, 0xae, 0xbc, 0xce, 0x58, 0xc3, 0xf6, 0x7d, 0x3e, 0x8a, + 0xfc, 0x29, 0xc9, 0xf0, 0x53, 0x46, 0x90, 0xf3, 0x26, 0x05, 0xfa, 0x2e, 0xe4, 0xfd, 0xf5, 0xe1, + 0xff, 0x95, 0x88, 0x5d, 0x58, 0xc2, 0x7d, 0x60, 0x42, 0xd3, 0x21, 0x47, 0xbf, 0x30, 0x48, 0x57, + 0x0d, 0x32, 0x1d, 0xf6, 0xb4, 0x1c, 0xae, 0xf0, 0x1b, 0x47, 0x5e, 0x9a, 0xa3, 0xfc, 0x53, 0x82, + 0x9c, 0x57, 0x27, 0x43, 0xaf, 0x85, 0xe6, 0x5d, 0x79, 0x4a, 0x39, 0xc9, 0x53, 0x0c, 0x0a, 0xe9, + 0xd1, 0xbe, 0x26, 0x97, 0xef, 0x6b, 0x5c, 0xd1, 0xd1, 0xfb, 0x29, 0x93, 0x5e, 0xfa, 0xa7, 0xcc, + 0x6d, 0x40, 0xae, 0xe9, 0x6a, 0x7d, 0x9a, 0x8f, 0xeb, 0xc6, 0x85, 0xca, 0x07, 0x9b, 0x53, 0x63, + 0x95, 0xdd, 0x79, 0xc8, 0x6e, 0x9c, 0xb2, 0x71, 0xff, 0x89, 0x04, 0x39, 0x9f, 0x86, 0x96, 0x2d, + 0xb3, 0x5f, 0x83, 0xac, 0xd8, 0xf0, 0x79, 0x9d, 0x5d, 0xb4, 0xfc, 0xea, 0x6a, 0x3a, 0x54, 0x5d, + 0x95, 0x21, 0x37, 0x20, 0xae, 0xc6, 0xf6, 0x55, 0x9e, 0x6c, 0xfa, 0xed, 0x5b, 0x6f, 0x42, 0x21, + 0xf4, 0x8b, 0x82, 0xae, 0xbc, 0xe3, 0xc6, 0xbb, 0xd5, 0x84, 0xbc, 0xf2, 0xd9, 0x17, 0x5b, 0xa9, + 0x63, 0xf2, 0x29, 0x9d, 0xb3, 0xb8, 0x51, 0x6f, 0x36, 0xea, 0xf7, 0xab, 0x92, 0x5c, 0xf8, 0xec, + 0x8b, 0xad, 0x15, 0x4c, 0x58, 0x49, 0xec, 0x56, 0x13, 0x8a, 0xe1, 0xaf, 0x12, 0xdd, 0x11, 0x10, + 0x94, 0xef, 0x3d, 0x38, 0x3d, 0x3a, 0xac, 0xef, 0xb5, 0x1a, 0xea, 0xc3, 0x93, 0x56, 0xa3, 0x2a, + 0xa1, 0xa7, 0x61, 0xed, 0xe8, 0xf0, 0xed, 0x66, 0x4b, 0xad, 0x1f, 0x1d, 0x36, 0x8e, 0x5b, 0xea, + 0x5e, 0xab, 0xb5, 0x57, 0xbf, 0x5f, 0x4d, 0xee, 0xfe, 0xaa, 0x00, 0x95, 0xbd, 0xfd, 0xfa, 0x21, + 0xe5, 0x1d, 0xbd, 0xa3, 0xb1, 0x4a, 0x40, 0x1d, 0xd2, 0x2c, 0xd7, 0x9f, 0x79, 0x26, 0x41, 0x9e, + 0x5d, 0xe4, 0x44, 0x07, 0x90, 0x61, 0x65, 0x00, 0x34, 0xfb, 0x90, 0x82, 0x3c, 0xa7, 0xea, 0x49, + 0x3b, 0xc3, 0x96, 0xc7, 0xcc, 0x53, 0x0b, 0xf2, 0xec, 0x22, 0x28, 0x3a, 0x82, 0x15, 0x2f, 0x0b, + 0x9c, 0x77, 0x94, 0x40, 0x9e, 0x5b, 0x99, 0xa4, 0xaf, 0xc6, 0xb3, 0xe9, 0xd9, 0x07, 0x1a, 0xe4, + 0x39, 0xe5, 0x51, 0x74, 0x08, 0x59, 0x91, 0x35, 0xcc, 0x39, 0xa3, 0x20, 0xcf, 0x2b, 0x78, 0x22, + 0x0c, 0xf9, 0xa0, 0x4e, 0x31, 0xff, 0x98, 0x86, 0xbc, 0x40, 0xe5, 0x17, 0x7d, 0x08, 0xa5, 0x68, + 0x26, 0xb2, 0xd8, 0x39, 0x08, 0x79, 0xc1, 0xd2, 0x2a, 0xf5, 0x1f, 0x4d, 0x4b, 0x16, 0x3b, 0x17, + 0x21, 0x2f, 0x58, 0x69, 0x45, 0x1f, 0xc3, 0xea, 0x64, 0xda, 0xb0, 0xf8, 0x31, 0x09, 0x79, 0x89, + 0xda, 0x2b, 0x1a, 0x00, 0x9a, 0x92, 0x6e, 0x2c, 0x71, 0x6a, 0x42, 0x5e, 0xa6, 0x14, 0x8b, 0xba, + 0x50, 0x19, 0x67, 0xf8, 0x45, 0x4f, 0x51, 0xc8, 0x0b, 0x97, 0x65, 0xf9, 0x53, 0xa2, 0xa4, 0xbb, + 0xe8, 0xa9, 0x0a, 0x79, 0xe1, 0x2a, 0x2d, 0x7a, 0x00, 0x10, 0xca, 0x2a, 0x16, 0x38, 0x65, 0x21, + 0x2f, 0x52, 0xaf, 0x45, 0x16, 0xac, 0x4d, 0xcb, 0x26, 0x96, 0x39, 0x74, 0x21, 0x2f, 0x55, 0xc6, + 0xa5, 0xf3, 0x39, 0x0a, 0xda, 0x8b, 0x1d, 0xc2, 0x90, 0x17, 0xac, 0xe7, 0xee, 0x37, 0xbe, 0xfc, + 0x66, 0x43, 0xfa, 0xea, 0x9b, 0x0d, 0xe9, 0xaf, 0xdf, 0x6c, 0x48, 0x9f, 0x3f, 0xd9, 0x48, 0x7c, + 0xf5, 0x64, 0x23, 0xf1, 0xa7, 0x27, 0x1b, 0x89, 0x1f, 0xbd, 0x72, 0xa1, 0xbb, 0xbd, 0x61, 0x7b, + 0xbb, 0x63, 0x0e, 0x76, 0xc2, 0xe7, 0xd6, 0xa6, 0x9d, 0xa5, 0x6b, 0x67, 0xd9, 0x6e, 0x7a, 0xe7, + 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x59, 0x1d, 0x83, 0x17, 0x6b, 0x27, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4996,6 +5007,20 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.Votes) > 0 { + for iNdEx := len(m.Votes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Votes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } if m.BlockDataSize != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) i-- @@ -7279,6 +7304,12 @@ func (m *RequestPrepareProposal) Size() (n int) { if m.BlockDataSize != 0 { n += 1 + sovTypes(uint64(m.BlockDataSize)) } + if len(m.Votes) > 0 { + for _, e := range m.Votes { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } return n } @@ -10069,6 +10100,40 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { break } } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Votes", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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.Votes = append(m.Votes, &types1.Vote{}) + if err := m.Votes[len(m.Votes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/internal/consensus/byzantine_test.go b/internal/consensus/byzantine_test.go index f7bae0fa8..6ddd2ae44 100644 --- a/internal/consensus/byzantine_test.go +++ b/internal/consensus/byzantine_test.go @@ -180,6 +180,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { require.NotNil(t, lazyNodeState.privValidator) var commit *types.Commit + var votes []*types.Vote switch { case lazyNodeState.Height == lazyNodeState.state.InitialHeight: // We're creating a proposal for the first block. @@ -188,6 +189,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { case lazyNodeState.LastCommit.HasTwoThirdsMajority(): // Make the commit from LastCommit commit = lazyNodeState.LastCommit.MakeCommit() + votes = lazyNodeState.LastCommit.GetVotes() default: // This shouldn't happen. lazyNodeState.logger.Error("enterPropose: Cannot propose anything: No commit for the previous block") return @@ -205,7 +207,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { proposerAddr := lazyNodeState.privValidatorPubKey.Address() block, blockParts, err := lazyNodeState.blockExec.CreateProposalBlock( - ctx, lazyNodeState.Height, lazyNodeState.state, commit, proposerAddr, + ctx, lazyNodeState.Height, lazyNodeState.state, commit, proposerAddr, votes, ) require.NoError(t, err) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index eb5fb65f1..eb0c26bed 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1334,6 +1334,7 @@ func (cs *State) createProposalBlock(ctx context.Context) (block *types.Block, b } var commit *types.Commit + var votes []*types.Vote switch { case cs.Height == cs.state.InitialHeight: // We're creating a proposal for the first block. @@ -1343,6 +1344,7 @@ func (cs *State) createProposalBlock(ctx context.Context) (block *types.Block, b case cs.LastCommit.HasTwoThirdsMajority(): // Make the commit from LastCommit commit = cs.LastCommit.MakeCommit() + votes = cs.LastCommit.GetVotes() default: // This shouldn't happen. cs.logger.Error("propose step; cannot propose anything without commit for the previous block") @@ -1358,7 +1360,7 @@ func (cs *State) createProposalBlock(ctx context.Context) (block *types.Block, b proposerAddr := cs.privValidatorPubKey.Address() - return cs.blockExec.CreateProposalBlock(ctx, cs.Height, cs.state, commit, proposerAddr) + return cs.blockExec.CreateProposalBlock(ctx, cs.Height, cs.state, commit, proposerAddr, votes) } // Enter: `timeoutPropose` after entering Propose. diff --git a/internal/state/execution.go b/internal/state/execution.go index 380da556e..688a5470b 100644 --- a/internal/state/execution.go +++ b/internal/state/execution.go @@ -106,6 +106,7 @@ func (blockExec *BlockExecutor) CreateProposalBlock( height int64, state State, commit *types.Commit, proposerAddr []byte, + votes []*types.Vote, ) (*types.Block, *types.PartSet, error) { maxBytes := state.ConsensusParams.Block.MaxBytes @@ -120,7 +121,11 @@ func (blockExec *BlockExecutor) CreateProposalBlock( preparedProposal, err := blockExec.proxyApp.PrepareProposal( ctx, - abci.RequestPrepareProposal{BlockData: txs.ToSliceOfBytes(), BlockDataSize: maxDataBytes}, + abci.RequestPrepareProposal{ + BlockData: txs.ToSliceOfBytes(), + BlockDataSize: maxDataBytes, + Votes: types.VotesToProto(votes), + }, ) if err != nil { // The App MUST ensure that only valid (and hence 'processable') transactions @@ -287,7 +292,6 @@ func (blockExec *BlockExecutor) ExtendVote(ctx context.Context, vote *types.Vote if err != nil { return types.VoteExtension{}, err } - return types.VoteExtensionFromProto(resp.VoteExtension), nil } diff --git a/node/node_test.go b/node/node_test.go index 6d37d3fee..a9ab13f8c 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -340,6 +340,7 @@ func TestCreateProposalBlock(t *testing.T) { height, state, commit, proposerAddr, + nil, ) require.NoError(t, err) @@ -415,6 +416,7 @@ func TestMaxTxsProposalBlockSize(t *testing.T) { height, state, commit, proposerAddr, + nil, ) require.NoError(t, err) @@ -526,6 +528,7 @@ func TestMaxProposalBlockSize(t *testing.T) { math.MaxInt64, state, commit, proposerAddr, + nil, ) require.NoError(t, err) diff --git a/types/block.go b/types/block.go index a5e9d05d5..08295d6aa 100644 --- a/types/block.go +++ b/types/block.go @@ -518,7 +518,8 @@ func (h *Header) StringIndented(indent string) string { indent, h.LastResultsHash, indent, h.EvidenceHash, indent, h.ProposerAddress, - indent, h.Hash()) + indent, h.Hash(), + ) } // ToProto converts Header to protobuf diff --git a/types/vote.go b/types/vote.go index 0a3ff2bef..7333f98fc 100644 --- a/types/vote.go +++ b/types/vote.go @@ -326,6 +326,22 @@ func (vote *Vote) ToProto() *tmproto.Vote { } } +func VotesToProto(votes []*Vote) []*tmproto.Vote { + if votes == nil { + return nil + } + + res := make([]*tmproto.Vote, 0, len(votes)) + for _, vote := range votes { + v := vote.ToProto() + // protobuf crashes when serializing "repeated" fields with nil elements + if v != nil { + res = append(res, v) + } + } + return res +} + func VoteExtensionFromProto(pext *tmproto.VoteExtension) VoteExtension { ext := VoteExtension{} if pext != nil { diff --git a/types/vote_set.go b/types/vote_set.go index 03c287666..bb675e110 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -226,6 +226,10 @@ func (voteSet *VoteSet) getVote(valIndex int32, blockKey string) (vote *Vote, ok return nil, false } +func (voteSet *VoteSet) GetVotes() []*Vote { + return voteSet.votes +} + // Assumes signature is valid. // If conflicting vote exists, returns it. func (voteSet *VoteSet) addVerifiedVote(