zolfa
/
tendermint
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 221 Wiki Activity
Browse Source

Revert "PrepareProposal-VoteExtension integration (#6915)" (#7769) 

This reverts commit 39ffa80ae7.

Nightly end-to-end tests are currently failing; revert temporarily so we can
debug.
pull/7780/head
M. J. Fromberger 3 years ago
committed by GitHub
parent
ce61abc038
commit
c67ace3433
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 188 additions and 281 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +183
    -248
      abci/types/types.pb.go
  2. +1
    -3
      internal/consensus/byzantine_test.go
  3. +1
    -3
      internal/consensus/state.go
  4. +2
    -6
      internal/state/execution.go
  5. +0
    -3
      node/node_test.go
  6. +1
    -2
      types/block.go
  7. +0
    -12
      types/vote.go
  8. +0
    -4
      types/vote_set.go

+ 183
- 248
abci/types/types.pb.go View File

@ -1234,9 +1234,6 @@ 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{} }
@ -1286,13 +1283,6 @@ 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"`
@ -3368,191 +3358,190 @@ func init() {
func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) }
var fileDescriptor_252557cfdd89a31a = []byte{
// 2943 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x24, 0xc5,
0xf1, 0x9f, 0xa7, 0x34, 0x9d, 0xa3, 0x79, 0xa8, 0xb4, 0x2c, 0x43, 0xb3, 0x2b, 0x2d, 0x4d, 0x00,
0xcb, 0xb2, 0x48, 0x7f, 0xb4, 0x01, 0xff, 0x25, 0xb0, 0x0d, 0x9a, 0xd9, 0x91, 0x47, 0xac, 0x2c,
0xc9, 0xa5, 0xd9, 0x25, 0xb0, 0x61, 0x9b, 0x9e, 0xe9, 0x92, 0xa6, 0xd9, 0x99, 0xee, 0xa6, 0xbb,
0x67, 0x90, 0xf6, 0xe8, 0xb0, 0x2f, 0x84, 0x1d, 0xc1, 0xd1, 0x17, 0x4e, 0xf6, 0x87, 0xf0, 0xc9,
0x27, 0x1f, 0x38, 0xd8, 0x11, 0x1c, 0x7d, 0x70, 0x60, 0x07, 0xdc, 0xfc, 0x05, 0x7c, 0x72, 0x84,
0xa3, 0x1e, 0xfd, 0x9a, 0x99, 0x9e, 0x07, 0xf8, 0xe6, 0x5b, 0x55, 0x56, 0x66, 0x76, 0x55, 0x56,
0x55, 0xe6, 0x2f, 0xb3, 0x0b, 0x9e, 0xf5, 0x88, 0xa9, 0x13, 0x67, 0x60, 0x98, 0xde, 0x8e, 0xd6,
0xe9, 0x1a, 0x3b, 0xde, 0xa5, 0x4d, 0xdc, 0x6d, 0xdb, 0xb1, 0x3c, 0x0b, 0x55, 0xc2, 0xc1, 0x6d,
0x3a, 0x28, 0x5f, 0x8f, 0x70, 0x77, 0x9d, 0x4b, 0xdb, 0xb3, 0x76, 0x6c, 0xc7, 0xb2, 0xce, 0x38,
0xbf, 0x7c, 0x2d, 0x32, 0xcc, 0xf4, 0x44, 0xb5, 0xc5, 0x46, 0x85, 0xf0, 0x63, 0x72, 0xe9, 0x8f,
0x5e, 0x9f, 0x90, 0xb5, 0x35, 0x47, 0x1b, 0xf8, 0xc3, 0x5b, 0xe7, 0x96, 0x75, 0xde, 0x27, 0x3b,
0xac, 0xd7, 0x19, 0x9e, 0xed, 0x78, 0xc6, 0x80, 0xb8, 0x9e, 0x36, 0xb0, 0x05, 0xc3, 0x95, 0x73,
0xeb, 0xdc, 0x62, 0xcd, 0x1d, 0xda, 0xe2, 0x54, 0xe5, 0x2f, 0x12, 0xac, 0x62, 0xf2, 0xc9, 0x90,
0xb8, 0x1e, 0xda, 0x85, 0x1c, 0xe9, 0xf6, 0xac, 0x5a, 0xfa, 0x46, 0xfa, 0x66, 0x71, 0xf7, 0xda,
0xf6, 0xd8, 0xe2, 0xb6, 0x05, 0x5f, 0xb3, 0xdb, 0xb3, 0x5a, 0x29, 0xcc, 0x78, 0xd1, 0xeb, 0x90,
0x3f, 0xeb, 0x0f, 0xdd, 0x5e, 0x2d, 0xc3, 0x84, 0xae, 0x27, 0x09, 0xed, 0x53, 0xa6, 0x56, 0x0a,
0x73, 0x6e, 0xfa, 0x29, 0xc3, 0x3c, 0xb3, 0x6a, 0xd9, 0xd9, 0x9f, 0x3a, 0x30, 0xcf, 0xd8, 0xa7,
0x28, 0x2f, 0xaa, 0x03, 0x18, 0xa6, 0xe1, 0xa9, 0xdd, 0x9e, 0x66, 0x98, 0xb5, 0x1c, 0x93, 0x7c,
0x2e, 0x59, 0xd2, 0xf0, 0x1a, 0x94, 0xb1, 0x95, 0xc2, 0x92, 0xe1, 0x77, 0xe8, 0x74, 0x3f, 0x19,
0x12, 0xe7, 0xb2, 0x96, 0x9f, 0x3d, 0xdd, 0x9f, 0x52, 0x26, 0x3a, 0x5d, 0xc6, 0x8d, 0x9a, 0x50,
0xec, 0x90, 0x73, 0xc3, 0x54, 0x3b, 0x7d, 0xab, 0xfb, 0xb8, 0xb6, 0xc2, 0x84, 0x95, 0x24, 0xe1,
0x3a, 0x65, 0xad, 0x53, 0xce, 0x56, 0x0a, 0x43, 0x27, 0xe8, 0xa1, 0x1f, 0x40, 0xa1, 0xdb, 0x23,
0xdd, 0xc7, 0xaa, 0x77, 0x51, 0x5b, 0x65, 0x3a, 0xb6, 0x92, 0x74, 0x34, 0x28, 0x5f, 0xfb, 0xa2,
0x95, 0xc2, 0xab, 0x5d, 0xde, 0xa4, 0xeb, 0xd7, 0x49, 0xdf, 0x18, 0x11, 0x87, 0xca, 0x17, 0x66,
0xaf, 0xff, 0x1e, 0xe7, 0x64, 0x1a, 0x24, 0xdd, 0xef, 0xa0, 0xb7, 0x41, 0x22, 0xa6, 0x2e, 0x96,
0x21, 0x31, 0x15, 0x37, 0x12, 0xf7, 0xd9, 0xd4, 0xfd, 0x45, 0x14, 0x88, 0x68, 0xa3, 0xbb, 0xb0,
0xd2, 0xb5, 0x06, 0x03, 0xc3, 0xab, 0x01, 0x93, 0xde, 0x4c, 0x5c, 0x00, 0xe3, 0x6a, 0xa5, 0xb0,
0xe0, 0x47, 0x47, 0x50, 0xee, 0x1b, 0xae, 0xa7, 0xba, 0xa6, 0x66, 0xbb, 0x3d, 0xcb, 0x73, 0x6b,
0x45, 0xa6, 0xe1, 0x85, 0x24, 0x0d, 0x87, 0x86, 0xeb, 0x9d, 0xfa, 0xcc, 0xad, 0x14, 0x2e, 0xf5,
0xa3, 0x04, 0xaa, 0xcf, 0x3a, 0x3b, 0x23, 0x4e, 0xa0, 0xb0, 0xb6, 0x36, 0x5b, 0xdf, 0x31, 0xe5,
0xf6, 0xe5, 0xa9, 0x3e, 0x2b, 0x4a, 0x40, 0x3f, 0x87, 0x8d, 0xbe, 0xa5, 0xe9, 0x81, 0x3a, 0xb5,
0xdb, 0x1b, 0x9a, 0x8f, 0x6b, 0x25, 0xa6, 0xf4, 0xe5, 0xc4, 0x49, 0x5a, 0x9a, 0xee, 0xab, 0x68,
0x50, 0x81, 0x56, 0x0a, 0xaf, 0xf7, 0xc7, 0x89, 0xe8, 0x11, 0x5c, 0xd1, 0x6c, 0xbb, 0x7f, 0x39,
0xae, 0xbd, 0xcc, 0xb4, 0xdf, 0x4a, 0xd2, 0xbe, 0x47, 0x65, 0xc6, 0xd5, 0x23, 0x6d, 0x82, 0x8a,
0xda, 0x50, 0xb5, 0x1d, 0x62, 0x6b, 0x0e, 0x51, 0x6d, 0xc7, 0xb2, 0x2d, 0x57, 0xeb, 0xd7, 0x2a,
0x4c, 0xf7, 0x4b, 0x49, 0xba, 0x4f, 0x38, 0xff, 0x89, 0x60, 0x6f, 0xa5, 0x70, 0xc5, 0x8e, 0x93,
0xe8, 0xb1, 0x27, 0x17, 0x54, 0x5c, 0x1d, 0x59, 0x1e, 0xa9, 0x55, 0x67, 0x1f, 0xfb, 0x26, 0x63,
0x7d, 0x68, 0x79, 0x84, 0x1e, 0x7b, 0x12, 0xf4, 0x90, 0x06, 0x4f, 0x8d, 0x88, 0x63, 0x9c, 0x5d,
0x32, 0x35, 0x2a, 0x1b, 0x71, 0x0d, 0xcb, 0xac, 0xad, 0x33, 0x85, 0xaf, 0x24, 0x29, 0x7c, 0xc8,
0x84, 0xa8, 0x8a, 0xa6, 0x2f, 0xd2, 0x4a, 0xe1, 0x8d, 0xd1, 0x24, 0xb9, 0xbe, 0x0a, 0xf9, 0x91,
0xd6, 0x1f, 0x12, 0xe5, 0x25, 0x28, 0x46, 0xdc, 0x14, 0xaa, 0xc1, 0xea, 0x80, 0xb8, 0xae, 0x76,
0x4e, 0x98, 0x57, 0x93, 0xb0, 0xdf, 0x55, 0xca, 0xb0, 0x16, 0x75, 0x4d, 0xca, 0xe7, 0xe9, 0x40,
0x92, 0x7a, 0x1d, 0x2a, 0x39, 0x22, 0x0e, 0x9b, 0xa6, 0x90, 0x14, 0x5d, 0xf4, 0x3c, 0x94, 0xd8,
0xfd, 0x51, 0xfd, 0x71, 0xea, 0xfa, 0x72, 0x78, 0x8d, 0x11, 0x1f, 0x0a, 0xa6, 0x2d, 0x28, 0xda,
0xbb, 0x76, 0xc0, 0x92, 0x65, 0x2c, 0x60, 0xef, 0xda, 0x3e, 0xc3, 0x73, 0xb0, 0x46, 0xd7, 0x1a,
0x70, 0xe4, 0xd8, 0x47, 0x8a, 0x94, 0x26, 0x58, 0x94, 0x3f, 0x67, 0xa0, 0x3a, 0xee, 0xce, 0xd0,
0x5d, 0xc8, 0x51, 0xcf, 0x2e, 0x9c, 0xb4, 0xbc, 0xcd, 0xdd, 0xfe, 0xb6, 0xef, 0xf6, 0xb7, 0xdb,
0xbe, 0xdb, 0xaf, 0x17, 0xbe, 0xfc, 0x7a, 0x2b, 0xf5, 0xf9, 0xdf, 0xb7, 0xd2, 0x98, 0x49, 0xa0,
0x67, 0xa8, 0xf7, 0xd1, 0x0c, 0x53, 0x35, 0x74, 0x36, 0x65, 0x89, 0xba, 0x16, 0xcd, 0x30, 0x0f,
0x74, 0x74, 0x08, 0xd5, 0xae, 0x65, 0xba, 0xc4, 0x74, 0x87, 0xae, 0xca, 0xc3, 0x8a, 0x70, 0xcd,
0x31, 0x07, 0xc3, 0x83, 0x55, 0xc3, 0xe7, 0x3c, 0x61, 0x8c, 0xb8, 0xd2, 0x8d, 0x13, 0xd0, 0x3e,
0xc0, 0x48, 0xeb, 0x1b, 0xba, 0xe6, 0x59, 0x8e, 0x5b, 0xcb, 0xdd, 0xc8, 0x4e, 0xf5, 0x32, 0x0f,
0x7d, 0x96, 0x07, 0xb6, 0xae, 0x79, 0xa4, 0x9e, 0xa3, 0xd3, 0xc5, 0x11, 0x49, 0xf4, 0x22, 0x54,
0x34, 0xdb, 0x56, 0x5d, 0x4f, 0xf3, 0x88, 0xda, 0xb9, 0xf4, 0x88, 0xcb, 0xdc, 0xf6, 0x1a, 0x2e,
0x69, 0xb6, 0x7d, 0x4a, 0xa9, 0x75, 0x4a, 0x44, 0x2f, 0x40, 0x99, 0x7a, 0x78, 0x43, 0xeb, 0xab,
0x3d, 0x62, 0x9c, 0xf7, 0x3c, 0xe6, 0xa0, 0xb3, 0xb8, 0x24, 0xa8, 0x2d, 0x46, 0x54, 0xf4, 0x60,
0xc7, 0x99, 0x77, 0x47, 0x08, 0x72, 0xba, 0xe6, 0x69, 0xcc, 0x92, 0x6b, 0x98, 0xb5, 0x29, 0xcd,
0xd6, 0xbc, 0x9e, 0xb0, 0x0f, 0x6b, 0xa3, 0xab, 0xb0, 0x22, 0xd4, 0x66, 0x99, 0x5a, 0xd1, 0x43,
0x57, 0x20, 0x6f, 0x3b, 0xd6, 0x88, 0xb0, 0xad, 0x2b, 0x60, 0xde, 0x51, 0x7e, 0x99, 0x81, 0xf5,
0x89, 0x38, 0x40, 0xf5, 0xf6, 0x34, 0xb7, 0xe7, 0x7f, 0x8b, 0xb6, 0xd1, 0x1b, 0x54, 0xaf, 0xa6,
0x13, 0x47, 0xc4, 0xce, 0xda, 0xa4, 0xa9, 0x5b, 0x6c, 0x5c, 0x98, 0x46, 0x70, 0xa3, 0x63, 0xa8,
0xf6, 0x35, 0xd7, 0x53, 0xb9, 0x5f, 0x55, 0x23, 0x71, 0x74, 0x32, 0x9a, 0x1c, 0x6a, 0xbe, 0x27,
0xa6, 0x87, 0x5a, 0x28, 0x2a, 0xf7, 0x63, 0x54, 0x84, 0xe1, 0x4a, 0xe7, 0xf2, 0x89, 0x66, 0x7a,
0x86, 0x49, 0xd4, 0x89, 0x9d, 0x7b, 0x66, 0x42, 0x69, 0x73, 0x64, 0xe8, 0xc4, 0xec, 0xfa, 0x5b,
0xb6, 0x11, 0x08, 0x07, 0x5b, 0xea, 0x2a, 0x18, 0xca, 0xf1, 0x48, 0x86, 0xca, 0x90, 0xf1, 0x2e,
0x84, 0x01, 0x32, 0xde, 0x05, 0xfa, 0x3f, 0xc8, 0xd1, 0x45, 0xb2, 0xc5, 0x97, 0xa7, 0x40, 0x00,
0x21, 0xd7, 0xbe, 0xb4, 0x09, 0x66, 0x9c, 0x8a, 0x12, 0x5c, 0x87, 0x20, 0xba, 0x8d, 0x6b, 0x55,
0x5e, 0x86, 0xca, 0x58, 0xf8, 0x8a, 0xec, 0x5f, 0x3a, 0xba, 0x7f, 0x4a, 0x05, 0x4a, 0xb1, 0x58,
0xa5, 0x5c, 0x85, 0x2b, 0xd3, 0x42, 0x8f, 0xd2, 0x0b, 0xe8, 0xb1, 0x10, 0x82, 0x5e, 0x87, 0x42,
0x10, 0x7b, 0xf8, 0x75, 0x9c, 0xb4, 0x95, 0xcf, 0x8c, 0x03, 0x56, 0x7a, 0x0f, 0xe9, 0xb1, 0x66,
0xe7, 0x21, 0xc3, 0x26, 0xbe, 0xaa, 0xd9, 0x76, 0x4b, 0x73, 0x7b, 0xca, 0x47, 0x50, 0x4b, 0x8a,
0x2b, 0x63, 0xcb, 0xc8, 0x05, 0xc7, 0xf0, 0x2a, 0xac, 0x9c, 0x59, 0xce, 0x40, 0xf3, 0x98, 0xb2,
0x12, 0x16, 0x3d, 0x7a, 0x3c, 0x79, 0x8c, 0xc9, 0x32, 0x32, 0xef, 0x28, 0x2a, 0x3c, 0x93, 0x18,
0x5b, 0xa8, 0x88, 0x61, 0xea, 0x84, 0xdb, 0xb3, 0x84, 0x79, 0x27, 0x54, 0xc4, 0x27, 0xcb, 0x3b,
0xf4, 0xb3, 0x2e, 0x5b, 0x2b, 0xd3, 0x2f, 0x61, 0xd1, 0x53, 0x7e, 0x93, 0x86, 0xab, 0xd3, 0x23,
0x0c, 0xba, 0x0e, 0xc0, 0x1d, 0xa7, 0xb8, 0x76, 0xd9, 0x9b, 0x6b, 0x58, 0x62, 0x94, 0x7b, 0xf4,
0xee, 0xbd, 0x08, 0x95, 0x70, 0x58, 0x75, 0x8d, 0x27, 0xfc, 0x6c, 0x64, 0x71, 0x29, 0xe0, 0x39,
0x35, 0x9e, 0x10, 0x74, 0x1b, 0xf2, 0x34, 0x8e, 0x50, 0x0f, 0x45, 0xcf, 0xe7, 0xd5, 0xc9, 0x6b,
0x43, 0x63, 0x03, 0xe6, 0x4c, 0xca, 0xdb, 0xc1, 0x75, 0x0c, 0xe3, 0x13, 0xba, 0x05, 0x39, 0x16,
0xd1, 0xf8, 0xae, 0x25, 0x69, 0x60, 0x3c, 0x4a, 0x0b, 0xe4, 0xe4, 0x78, 0xb4, 0x94, 0xa6, 0xdf,
0x01, 0x14, 0x30, 0x71, 0x6d, 0xea, 0x2e, 0x51, 0x1d, 0x24, 0x72, 0xd1, 0x25, 0xb6, 0xe7, 0x47,
0x98, 0xe9, 0x91, 0x95, 0x73, 0x37, 0x7d, 0x4e, 0x8a, 0xe6, 0x02, 0x31, 0x74, 0x47, 0x00, 0xf6,
0x64, 0xec, 0x2d, 0xc4, 0xa3, 0x88, 0xfd, 0x0d, 0x1f, 0xb1, 0x67, 0x13, 0x01, 0x1c, 0x97, 0x1a,
0x83, 0xec, 0x77, 0x04, 0x64, 0xcf, 0xcd, 0xf9, 0x58, 0x0c, 0xb3, 0x37, 0x62, 0x98, 0x3d, 0x3f,
0x67, 0x99, 0x09, 0xa0, 0xfd, 0x0d, 0x1f, 0xb4, 0xaf, 0xcc, 0x99, 0xf1, 0x18, 0x6a, 0xdf, 0x8f,
0xa3, 0x76, 0x8e, 0xb8, 0x9f, 0x4f, 0x94, 0x4e, 0x84, 0xed, 0x3f, 0x8c, 0xc0, 0xf6, 0x42, 0x22,
0x66, 0xe6, 0x4a, 0xa6, 0xe0, 0xf6, 0x46, 0x0c, 0xb7, 0x4b, 0x73, 0x6c, 0x90, 0x00, 0xdc, 0xdf,
0x89, 0x02, 0x77, 0x48, 0xc4, 0xfe, 0x62, 0xbf, 0xa7, 0x21, 0xf7, 0x37, 0x03, 0xe4, 0x5e, 0x4c,
0x4c, 0x3d, 0xc4, 0x1a, 0xc6, 0xa1, 0xfb, 0xf1, 0x04, 0x74, 0xe7, 0x50, 0xfb, 0xc5, 0x44, 0x15,
0x73, 0xb0, 0xfb, 0xf1, 0x04, 0x76, 0x2f, 0xcd, 0x51, 0x38, 0x07, 0xbc, 0x7f, 0x30, 0x1d, 0xbc,
0x27, 0xc3, 0x6b, 0x31, 0xcd, 0xc5, 0xd0, 0xbb, 0x9a, 0x80, 0xde, 0x2b, 0x89, 0xf8, 0x95, 0xab,
0x5f, 0x18, 0xbe, 0x3f, 0x98, 0x02, 0xdf, 0x39, 0xda, 0xbe, 0x99, 0xa8, 0x7c, 0x01, 0xfc, 0xbe,
0x1f, 0xc7, 0xef, 0xeb, 0x73, 0x2e, 0x40, 0x22, 0x80, 0xef, 0x24, 0x01, 0x78, 0xc4, 0x34, 0xde,
0x4e, 0xd4, 0xf8, 0x5d, 0x10, 0xfc, 0xcb, 0xd4, 0x61, 0x8f, 0xb9, 0x3d, 0x1a, 0x83, 0x88, 0xe3,
0x58, 0x8e, 0xc0, 0xe2, 0xbc, 0xa3, 0xdc, 0xa4, 0x88, 0x2e, 0x74, 0x71, 0x33, 0xd0, 0x3e, 0x8b,
0xf5, 0x11, 0xb7, 0xa6, 0xfc, 0x21, 0x1d, 0xca, 0x32, 0x10, 0x14, 0x45, 0x83, 0x92, 0x40, 0x83,
0x91, 0x1c, 0x20, 0x13, 0xcf, 0x01, 0xb6, 0xa0, 0x48, 0x63, 0xf8, 0x18, 0xbc, 0xd7, 0xec, 0x00,
0xde, 0xdf, 0x82, 0x75, 0x06, 0xd2, 0x78, 0x44, 0x13, 0x81, 0x3b, 0xc7, 0xc2, 0x59, 0x85, 0x0e,
0xf0, 0xfb, 0xc9, 0x23, 0xf8, 0xab, 0xb0, 0x11, 0xe1, 0x0d, 0xb0, 0x01, 0xc7, 0xba, 0xd5, 0x80,
0x7b, 0x4f, 0x80, 0x84, 0x3f, 0xa5, 0x43, 0x0b, 0x85, 0x79, 0xc1, 0x34, 0x08, 0x9f, 0xfe, 0x2f,
0x41, 0xf8, 0xcc, 0x77, 0x86, 0xf0, 0x51, 0xac, 0x93, 0x8d, 0x63, 0x9d, 0x7f, 0xa5, 0xc3, 0x3d,
0x09, 0x00, 0x79, 0xd7, 0xd2, 0x89, 0x40, 0x1f, 0xac, 0x8d, 0xaa, 0x90, 0xed, 0x5b, 0xe7, 0x02,
0x63, 0xd0, 0x26, 0xe5, 0x0a, 0xe2, 0x90, 0x24, 0xc2, 0x4c, 0x00, 0x5c, 0xf2, 0xcc, 0xc2, 0x02,
0xb8, 0x54, 0x21, 0xfb, 0x98, 0xf0, 0xa8, 0xb1, 0x86, 0x69, 0x93, 0xf2, 0xb1, 0x43, 0xc6, 0x62,
0xc1, 0x1a, 0xe6, 0x1d, 0x74, 0x17, 0x24, 0x56, 0xa4, 0x53, 0x2d, 0xdb, 0x15, 0x0e, 0xfe, 0xd9,
0xe8, 0x5a, 0x79, 0x2d, 0x6e, 0xfb, 0x84, 0xf2, 0x1c, 0xdb, 0x2e, 0x2e, 0xd8, 0xa2, 0x15, 0xc1,
0x64, 0x52, 0x2c, 0x35, 0xb8, 0x06, 0x12, 0x9d, 0xbd, 0x6b, 0x6b, 0x5d, 0xc2, 0xbc, 0xb5, 0x84,
0x43, 0x82, 0xf2, 0x08, 0xd0, 0x64, 0xcc, 0x41, 0x2d, 0x58, 0x21, 0x23, 0x62, 0x7a, 0x2e, 0x43,
0x46, 0x63, 0x58, 0x42, 0xe0, 0x6e, 0x62, 0x7a, 0xf5, 0x1a, 0x35, 0xf2, 0x3f, 0xbf, 0xde, 0xaa,
0x72, 0xee, 0xdb, 0xd6, 0xc0, 0xf0, 0xc8, 0xc0, 0xf6, 0x2e, 0xb1, 0x90, 0x57, 0xfe, 0x96, 0xa1,
0x20, 0x38, 0x16, 0x8f, 0xa6, 0xda, 0xd6, 0x3f, 0xf2, 0x99, 0x48, 0x02, 0xb4, 0x98, 0xbd, 0x37,
0x01, 0xce, 0x35, 0x57, 0xfd, 0x54, 0x33, 0x3d, 0xa2, 0x0b, 0xa3, 0x47, 0x28, 0x48, 0x86, 0x02,
0xed, 0x0d, 0x5d, 0xa2, 0x8b, 0x5c, 0x2c, 0xe8, 0x47, 0xd6, 0xb9, 0xfa, 0xfd, 0xd6, 0x19, 0xb7,
0x72, 0x61, 0xcc, 0xca, 0x11, 0x80, 0x2a, 0x45, 0x01, 0x2a, 0x9d, 0x9b, 0xed, 0x18, 0x96, 0x63,
0x78, 0x97, 0x6c, 0x6b, 0xb2, 0x38, 0xe8, 0xd3, 0xd4, 0x7e, 0x40, 0x06, 0xb6, 0x65, 0xf5, 0x55,
0xee, 0x6e, 0x8a, 0x4c, 0x74, 0x4d, 0x10, 0x9b, 0xcc, 0xeb, 0xfc, 0x2a, 0x13, 0xde, 0xbf, 0x30,
0x11, 0xf9, 0x9f, 0x33, 0xb0, 0xf2, 0x6b, 0x56, 0x9e, 0x88, 0x23, 0x0e, 0x74, 0x0a, 0xeb, 0xc1,
0xf5, 0x57, 0x87, 0xcc, 0x2d, 0xf8, 0x07, 0x7a, 0x51, 0xff, 0x51, 0x1d, 0xc5, 0xc9, 0x2e, 0x7a,
0x1f, 0x9e, 0x1e, 0xf3, 0x6d, 0x81, 0xea, 0xcc, 0xa2, 0x2e, 0xee, 0xa9, 0xb8, 0x8b, 0xf3, 0x55,
0x87, 0xc6, 0xca, 0x7e, 0xcf, 0x5b, 0x77, 0x40, 0x33, 0xde, 0x28, 0x80, 0x9a, 0xba, 0xfd, 0xcf,
0x43, 0xc9, 0x21, 0x9e, 0x66, 0x98, 0x6a, 0xac, 0xa6, 0xb0, 0xc6, 0x89, 0xa2, 0x52, 0x71, 0x02,
0x4f, 0x4d, 0x05, 0x52, 0xe8, 0xff, 0x41, 0x0a, 0x31, 0x58, 0x3a, 0x21, 0x3d, 0x0f, 0x52, 0xce,
0x90, 0x57, 0xf9, 0x63, 0x3a, 0x54, 0x19, 0x4f, 0x62, 0x9b, 0xb0, 0xe2, 0x10, 0x77, 0xd8, 0xe7,
0x69, 0x65, 0x79, 0xf7, 0xd5, 0xc5, 0x20, 0x18, 0xa5, 0x0e, 0xfb, 0x1e, 0x16, 0xc2, 0xca, 0x23,
0x58, 0xe1, 0x14, 0x54, 0x84, 0xd5, 0x07, 0x47, 0xf7, 0x8f, 0x8e, 0xdf, 0x3b, 0xaa, 0xa6, 0x10,
0xc0, 0xca, 0x5e, 0xa3, 0xd1, 0x3c, 0x69, 0x57, 0xd3, 0x48, 0x82, 0xfc, 0x5e, 0xfd, 0x18, 0xb7,
0xab, 0x19, 0x4a, 0xc6, 0xcd, 0x77, 0x9b, 0x8d, 0x76, 0x35, 0x8b, 0xd6, 0xa1, 0xc4, 0xdb, 0xea,
0xfe, 0x31, 0xfe, 0xc9, 0x5e, 0xbb, 0x9a, 0x8b, 0x90, 0x4e, 0x9b, 0x47, 0xf7, 0x9a, 0xb8, 0x9a,
0x57, 0x5e, 0xa3, 0x79, 0x6b, 0x02, 0x68, 0x0b, 0x33, 0xd4, 0x74, 0x24, 0x43, 0x55, 0x7e, 0x9b,
0xa1, 0x99, 0x5b, 0x12, 0x12, 0x43, 0xef, 0x8e, 0x2d, 0x7c, 0x77, 0x09, 0x18, 0x37, 0xb6, 0x7a,
0xf4, 0x02, 0x94, 0x1d, 0x72, 0x46, 0xbc, 0x6e, 0x8f, 0x23, 0x43, 0x1e, 0x32, 0x4b, 0xb8, 0x24,
0xa8, 0x4c, 0xc8, 0xe5, 0x6c, 0x1f, 0x93, 0xae, 0xa7, 0x72, 0x5f, 0xc4, 0x0f, 0x9d, 0x44, 0xd9,
0x28, 0xf5, 0x94, 0x13, 0x95, 0x8f, 0x96, 0xb2, 0xa5, 0x04, 0x79, 0xdc, 0x6c, 0xe3, 0xf7, 0xab,
0x59, 0x84, 0xa0, 0xcc, 0x9a, 0xea, 0xe9, 0xd1, 0xde, 0xc9, 0x69, 0xeb, 0x98, 0xda, 0x72, 0x03,
0x2a, 0xbe, 0x2d, 0x7d, 0x62, 0x5e, 0xb9, 0x0b, 0x4f, 0x27, 0xc0, 0xc8, 0x39, 0x49, 0xba, 0xf2,
0x41, 0x18, 0xbb, 0x22, 0xf9, 0xf4, 0x3e, 0x94, 0xc7, 0x90, 0x61, 0x7a, 0x32, 0xc7, 0x08, 0xf3,
0xe1, 0x00, 0xf5, 0xe1, 0xd2, 0x28, 0xda, 0x55, 0x7e, 0x9f, 0x86, 0x67, 0x67, 0x60, 0x47, 0x74,
0x7f, 0x6c, 0xcf, 0xee, 0x2c, 0x83, 0x3c, 0xc7, 0x8f, 0xec, 0xdd, 0x85, 0xcc, 0x7c, 0x7a, 0xb8,
0x77, 0xda, 0x8a, 0x1f, 0x59, 0xe5, 0x43, 0x28, 0xc7, 0x0b, 0x6b, 0xf4, 0x04, 0x3a, 0xd6, 0xd0,
0xd4, 0xd9, 0xbc, 0xf2, 0x98, 0x77, 0xd0, 0xeb, 0x7e, 0xa5, 0x22, 0x93, 0x70, 0x55, 0xe9, 0xfc,
0x22, 0x85, 0x39, 0x51, 0xb2, 0x78, 0x02, 0x79, 0xe6, 0x74, 0xa8, 0x03, 0x61, 0x25, 0x32, 0x81,
0x49, 0x69, 0x1b, 0x7d, 0x08, 0xa0, 0x79, 0x9e, 0x63, 0x74, 0x86, 0xa1, 0xe2, 0xad, 0xe9, 0x4e,
0x6b, 0xcf, 0xe7, 0xab, 0x5f, 0x13, 0xde, 0xeb, 0x4a, 0x28, 0x1a, 0xf1, 0x60, 0x11, 0x85, 0xca,
0x11, 0x94, 0xe3, 0xb2, 0x3e, 0x8a, 0xe2, 0x73, 0x88, 0xa3, 0x28, 0x0e, 0x8a, 0x05, 0x8a, 0x0a,
0x30, 0x58, 0x96, 0x97, 0x43, 0x59, 0x47, 0xf9, 0x2c, 0x0d, 0x85, 0xf6, 0x85, 0xb0, 0x73, 0x42,
0x25, 0x2e, 0x14, 0xcd, 0x44, 0xeb, 0x4e, 0xbc, 0xb4, 0x97, 0x0d, 0x0a, 0x86, 0xef, 0x04, 0x9b,
0x9f, 0x5b, 0x34, 0x87, 0xf6, 0x2b, 0xa7, 0x62, 0xc7, 0xdf, 0x02, 0x29, 0x08, 0x39, 0x14, 0xdc,
0x6b, 0xba, 0xee, 0x10, 0xd7, 0x15, 0x6e, 0xc3, 0xef, 0xb2, 0xc2, 0xae, 0xf5, 0xa9, 0xa8, 0x6c,
0x65, 0x31, 0xef, 0x28, 0x3a, 0x54, 0xc6, 0xe2, 0x15, 0x7a, 0x0b, 0x56, 0xed, 0x61, 0x47, 0xf5,
0xcd, 0x33, 0xf6, 0x23, 0xd3, 0x87, 0x8d, 0xc3, 0x4e, 0xdf, 0xe8, 0xde, 0x27, 0x97, 0xfe, 0x64,
0xec, 0x61, 0xe7, 0x3e, 0xb7, 0x22, 0xff, 0x4a, 0x26, 0xfa, 0x95, 0x11, 0x14, 0xfc, 0x43, 0x81,
0x7e, 0x04, 0x52, 0x10, 0x0a, 0x83, 0x7a, 0x7f, 0x62, 0x0c, 0x15, 0xea, 0x43, 0x11, 0x9a, 0x83,
0xb8, 0xc6, 0xb9, 0x49, 0x74, 0x35, 0x4c, 0x2f, 0xd8, 0xd7, 0x0a, 0xb8, 0xc2, 0x07, 0x0e, 0xfd,
0xdc, 0x42, 0xf9, 0x77, 0x1a, 0x0a, 0x7e, 0x5d, 0x17, 0xbd, 0x16, 0x39, 0x77, 0xe5, 0x29, 0xa5,
0x1e, 0x9f, 0x31, 0xac, 0xcd, 0xc6, 0xe7, 0x9a, 0x59, 0x7e, 0xae, 0x49, 0x45, 0x76, 0xff, 0x77,
0x47, 0x6e, 0xe9, 0xdf, 0x1d, 0xb7, 0x01, 0x79, 0x96, 0xa7, 0xf5, 0x69, 0xce, 0x6a, 0x98, 0xe7,
0x2a, 0x37, 0x36, 0x87, 0x52, 0x55, 0x36, 0xf2, 0x90, 0x0d, 0x9c, 0x30, 0xbb, 0xff, 0x22, 0x0d,
0x85, 0x20, 0x26, 0x2e, 0x5b, 0x6a, 0xbd, 0x0a, 0x2b, 0xc2, 0xed, 0xf3, 0x5a, 0xab, 0xe8, 0x05,
0x55, 0xff, 0x5c, 0xa4, 0xea, 0x2f, 0x43, 0x61, 0x40, 0x3c, 0x8d, 0x79, 0x57, 0x9e, 0xe1, 0x05,
0xfd, 0x5b, 0x6f, 0x42, 0x31, 0x52, 0xf5, 0xa6, 0x37, 0xef, 0xa8, 0xf9, 0x5e, 0x35, 0x25, 0xaf,
0x7e, 0xf6, 0xc5, 0x8d, 0xec, 0x11, 0xf9, 0x94, 0x9e, 0x59, 0xdc, 0x6c, 0xb4, 0x9a, 0x8d, 0xfb,
0xd5, 0xb4, 0x5c, 0xfc, 0xec, 0x8b, 0x1b, 0xab, 0x98, 0xb0, 0x32, 0xd3, 0xad, 0x16, 0xac, 0x45,
0x77, 0x25, 0xee, 0xd2, 0x10, 0x94, 0xef, 0x3d, 0x38, 0x39, 0x3c, 0x68, 0xec, 0xb5, 0x9b, 0xea,
0xc3, 0xe3, 0x76, 0xb3, 0x9a, 0x46, 0x4f, 0xc3, 0xc6, 0xe1, 0xc1, 0x8f, 0x5b, 0x6d, 0xb5, 0x71,
0x78, 0xd0, 0x3c, 0x6a, 0xab, 0x7b, 0xed, 0xf6, 0x5e, 0xe3, 0x7e, 0x35, 0xb3, 0xfb, 0x75, 0x11,
// 2926 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5,
0x15, 0xd7, 0xa7, 0xad, 0x79, 0xb2, 0x3e, 0xdc, 0x5e, 0x16, 0x31, 0xec, 0xda, 0xcb, 0x50, 0xc0,
0xb2, 0x80, 0x1d, 0xbc, 0x05, 0x59, 0x8a, 0x24, 0x60, 0x69, 0xe5, 0xc8, 0xac, 0x63, 0x3b, 0x6d,
0xed, 0x52, 0x24, 0xb0, 0xc3, 0x48, 0xd3, 0xb6, 0x86, 0x95, 0x66, 0x86, 0x99, 0x91, 0xb0, 0xf7,
0x98, 0x4a, 0x2e, 0x54, 0x0e, 0x1c, 0x73, 0xe1, 0x94, 0xfc, 0x11, 0x39, 0xe5, 0x94, 0x03, 0x87,
0xa4, 0x8a, 0x63, 0x0e, 0x29, 0x92, 0x62, 0x6f, 0xf9, 0x07, 0x72, 0x4a, 0x55, 0xaa, 0x3f, 0xe6,
0x4b, 0xd2, 0xe8, 0x03, 0x72, 0xcb, 0xad, 0xfb, 0xf5, 0x7b, 0x6f, 0xba, 0x5f, 0x77, 0xbf, 0xf7,
0x7b, 0x6f, 0x1a, 0x9e, 0xf5, 0x88, 0xa9, 0x13, 0x67, 0x60, 0x98, 0xde, 0x8e, 0xd6, 0xe9, 0x1a,
0x3b, 0xde, 0xa5, 0x4d, 0xdc, 0x6d, 0xdb, 0xb1, 0x3c, 0x0b, 0x55, 0xc2, 0xc1, 0x6d, 0x3a, 0x28,
0x5f, 0x8f, 0x70, 0x77, 0x9d, 0x4b, 0xdb, 0xb3, 0x76, 0x6c, 0xc7, 0xb2, 0xce, 0x38, 0xbf, 0x7c,
0x2d, 0x32, 0xcc, 0xf4, 0x44, 0xb5, 0xc5, 0x46, 0x85, 0xf0, 0x23, 0x72, 0xe9, 0x8f, 0x5e, 0x9f,
0x90, 0xb5, 0x35, 0x47, 0x1b, 0xf8, 0xc3, 0x5b, 0xe7, 0x96, 0x75, 0xde, 0x27, 0x3b, 0xac, 0xd7,
0x19, 0x9e, 0xed, 0x78, 0xc6, 0x80, 0xb8, 0x9e, 0x36, 0xb0, 0x05, 0xc3, 0x95, 0x73, 0xeb, 0xdc,
0x62, 0xcd, 0x1d, 0xda, 0xe2, 0x54, 0xe5, 0xaf, 0x12, 0xac, 0x62, 0xf2, 0xe9, 0x90, 0xb8, 0x1e,
0xda, 0x85, 0x1c, 0xe9, 0xf6, 0xac, 0x5a, 0xfa, 0x46, 0xfa, 0x66, 0x71, 0xf7, 0xda, 0xf6, 0xd8,
0xe2, 0xb6, 0x05, 0x5f, 0xb3, 0xdb, 0xb3, 0x5a, 0x29, 0xcc, 0x78, 0xd1, 0x1b, 0x90, 0x3f, 0xeb,
0x0f, 0xdd, 0x5e, 0x2d, 0xc3, 0x84, 0xae, 0x27, 0x09, 0xed, 0x53, 0xa6, 0x56, 0x0a, 0x73, 0x6e,
0xfa, 0x29, 0xc3, 0x3c, 0xb3, 0x6a, 0xd9, 0xd9, 0x9f, 0x3a, 0x30, 0xcf, 0xd8, 0xa7, 0x28, 0x2f,
0xaa, 0x03, 0x18, 0xa6, 0xe1, 0xa9, 0xdd, 0x9e, 0x66, 0x98, 0xb5, 0x1c, 0x93, 0x7c, 0x2e, 0x59,
0xd2, 0xf0, 0x1a, 0x94, 0xb1, 0x95, 0xc2, 0x92, 0xe1, 0x77, 0xe8, 0x74, 0x3f, 0x1d, 0x12, 0xe7,
0xb2, 0x96, 0x9f, 0x3d, 0xdd, 0x9f, 0x53, 0x26, 0x3a, 0x5d, 0xc6, 0x8d, 0x9a, 0x50, 0xec, 0x90,
0x73, 0xc3, 0x54, 0x3b, 0x7d, 0xab, 0xfb, 0xa8, 0xb6, 0xc2, 0x84, 0x95, 0x24, 0xe1, 0x3a, 0x65,
0xad, 0x53, 0xce, 0x56, 0x0a, 0x43, 0x27, 0xe8, 0xa1, 0x1f, 0x41, 0xa1, 0xdb, 0x23, 0xdd, 0x47,
0xaa, 0x77, 0x51, 0x5b, 0x65, 0x3a, 0xb6, 0x92, 0x74, 0x34, 0x28, 0x5f, 0xfb, 0xa2, 0x95, 0xc2,
0xab, 0x5d, 0xde, 0xa4, 0xeb, 0xd7, 0x49, 0xdf, 0x18, 0x11, 0x87, 0xca, 0x17, 0x66, 0xaf, 0xff,
0x2e, 0xe7, 0x64, 0x1a, 0x24, 0xdd, 0xef, 0xa0, 0x77, 0x40, 0x22, 0xa6, 0x2e, 0x96, 0x21, 0x31,
0x15, 0x37, 0x12, 0xf7, 0xd9, 0xd4, 0xfd, 0x45, 0x14, 0x88, 0x68, 0xa3, 0x3b, 0xb0, 0xd2, 0xb5,
0x06, 0x03, 0xc3, 0xab, 0x01, 0x93, 0xde, 0x4c, 0x5c, 0x00, 0xe3, 0x6a, 0xa5, 0xb0, 0xe0, 0x47,
0x47, 0x50, 0xee, 0x1b, 0xae, 0xa7, 0xba, 0xa6, 0x66, 0xbb, 0x3d, 0xcb, 0x73, 0x6b, 0x45, 0xa6,
0xe1, 0x85, 0x24, 0x0d, 0x87, 0x86, 0xeb, 0x9d, 0xfa, 0xcc, 0xad, 0x14, 0x2e, 0xf5, 0xa3, 0x04,
0xaa, 0xcf, 0x3a, 0x3b, 0x23, 0x4e, 0xa0, 0xb0, 0xb6, 0x36, 0x5b, 0xdf, 0x31, 0xe5, 0xf6, 0xe5,
0xa9, 0x3e, 0x2b, 0x4a, 0x40, 0xbf, 0x84, 0x8d, 0xbe, 0xa5, 0xe9, 0x81, 0x3a, 0xb5, 0xdb, 0x1b,
0x9a, 0x8f, 0x6a, 0x25, 0xa6, 0xf4, 0xe5, 0xc4, 0x49, 0x5a, 0x9a, 0xee, 0xab, 0x68, 0x50, 0x81,
0x56, 0x0a, 0xaf, 0xf7, 0xc7, 0x89, 0xe8, 0x21, 0x5c, 0xd1, 0x6c, 0xbb, 0x7f, 0x39, 0xae, 0xbd,
0xcc, 0xb4, 0xdf, 0x4a, 0xd2, 0xbe, 0x47, 0x65, 0xc6, 0xd5, 0x23, 0x6d, 0x82, 0x8a, 0xda, 0x50,
0xb5, 0x1d, 0x62, 0x6b, 0x0e, 0x51, 0x6d, 0xc7, 0xb2, 0x2d, 0x57, 0xeb, 0xd7, 0x2a, 0x4c, 0xf7,
0x4b, 0x49, 0xba, 0x4f, 0x38, 0xff, 0x89, 0x60, 0x6f, 0xa5, 0x70, 0xc5, 0x8e, 0x93, 0xe8, 0xb1,
0x27, 0x17, 0x54, 0x5c, 0x1d, 0x59, 0x1e, 0xa9, 0x55, 0x67, 0x1f, 0xfb, 0x26, 0x63, 0x7d, 0x60,
0x79, 0x84, 0x1e, 0x7b, 0x12, 0xf4, 0x90, 0x06, 0x4f, 0x8d, 0x88, 0x63, 0x9c, 0x5d, 0x32, 0x35,
0x2a, 0x1b, 0x71, 0x0d, 0xcb, 0xac, 0xad, 0x33, 0x85, 0xaf, 0x24, 0x29, 0x7c, 0xc0, 0x84, 0xa8,
0x8a, 0xa6, 0x2f, 0xd2, 0x4a, 0xe1, 0x8d, 0xd1, 0x24, 0xb9, 0xbe, 0x0a, 0xf9, 0x91, 0xd6, 0x1f,
0x12, 0xe5, 0x25, 0x28, 0x46, 0xdc, 0x14, 0xaa, 0xc1, 0xea, 0x80, 0xb8, 0xae, 0x76, 0x4e, 0x98,
0x57, 0x93, 0xb0, 0xdf, 0x55, 0xca, 0xb0, 0x16, 0x75, 0x4d, 0xca, 0x17, 0xe9, 0x40, 0x92, 0x7a,
0x1d, 0x2a, 0x39, 0x22, 0x0e, 0x9b, 0xa6, 0x90, 0x14, 0x5d, 0xf4, 0x3c, 0x94, 0xd8, 0xfd, 0x51,
0xfd, 0x71, 0xea, 0xfa, 0x72, 0x78, 0x8d, 0x11, 0x1f, 0x08, 0xa6, 0x2d, 0x28, 0xda, 0xbb, 0x76,
0xc0, 0x92, 0x65, 0x2c, 0x60, 0xef, 0xda, 0x3e, 0xc3, 0x73, 0xb0, 0x46, 0xd7, 0x1a, 0x70, 0xe4,
0xd8, 0x47, 0x8a, 0x94, 0x26, 0x58, 0x94, 0xbf, 0x64, 0xa0, 0x3a, 0xee, 0xce, 0xd0, 0x1d, 0xc8,
0x51, 0xcf, 0x2e, 0x9c, 0xb4, 0xbc, 0xcd, 0xdd, 0xfe, 0xb6, 0xef, 0xf6, 0xb7, 0xdb, 0xbe, 0xdb,
0xaf, 0x17, 0xbe, 0xfa, 0x66, 0x2b, 0xf5, 0xc5, 0x3f, 0xb6, 0xd2, 0x98, 0x49, 0xa0, 0x67, 0xa8,
0xf7, 0xd1, 0x0c, 0x53, 0x35, 0x74, 0x36, 0x65, 0x89, 0xba, 0x16, 0xcd, 0x30, 0x0f, 0x74, 0x74,
0x08, 0xd5, 0xae, 0x65, 0xba, 0xc4, 0x74, 0x87, 0xae, 0xca, 0xc3, 0x8a, 0x70, 0xcd, 0x31, 0x07,
0xc3, 0x83, 0x55, 0xc3, 0xe7, 0x3c, 0x61, 0x8c, 0xb8, 0xd2, 0x8d, 0x13, 0xd0, 0x3e, 0xc0, 0x48,
0xeb, 0x1b, 0xba, 0xe6, 0x59, 0x8e, 0x5b, 0xcb, 0xdd, 0xc8, 0x4e, 0xf5, 0x32, 0x0f, 0x7c, 0x96,
0xfb, 0xb6, 0xae, 0x79, 0xa4, 0x9e, 0xa3, 0xd3, 0xc5, 0x11, 0x49, 0xf4, 0x22, 0x54, 0x34, 0xdb,
0x56, 0x5d, 0x4f, 0xf3, 0x88, 0xda, 0xb9, 0xf4, 0x88, 0xcb, 0xdc, 0xf6, 0x1a, 0x2e, 0x69, 0xb6,
0x7d, 0x4a, 0xa9, 0x75, 0x4a, 0x44, 0x2f, 0x40, 0x99, 0x7a, 0x78, 0x43, 0xeb, 0xab, 0x3d, 0x62,
0x9c, 0xf7, 0x3c, 0xe6, 0xa0, 0xb3, 0xb8, 0x24, 0xa8, 0x2d, 0x46, 0x54, 0xf4, 0x60, 0xc7, 0x99,
0x77, 0x47, 0x08, 0x72, 0xba, 0xe6, 0x69, 0xcc, 0x92, 0x6b, 0x98, 0xb5, 0x29, 0xcd, 0xd6, 0xbc,
0x9e, 0xb0, 0x0f, 0x6b, 0xa3, 0xab, 0xb0, 0x22, 0xd4, 0x66, 0x99, 0x5a, 0xd1, 0x43, 0x57, 0x20,
0x6f, 0x3b, 0xd6, 0x88, 0xb0, 0xad, 0x2b, 0x60, 0xde, 0x51, 0x7e, 0x9d, 0x81, 0xf5, 0x89, 0x38,
0x40, 0xf5, 0xf6, 0x34, 0xb7, 0xe7, 0x7f, 0x8b, 0xb6, 0xd1, 0x9b, 0x54, 0xaf, 0xa6, 0x13, 0x47,
0xc4, 0xce, 0xda, 0xa4, 0xa9, 0x5b, 0x6c, 0x5c, 0x98, 0x46, 0x70, 0xa3, 0x63, 0xa8, 0xf6, 0x35,
0xd7, 0x53, 0xb9, 0x5f, 0x55, 0x23, 0x71, 0x74, 0x32, 0x9a, 0x1c, 0x6a, 0xbe, 0x27, 0xa6, 0x87,
0x5a, 0x28, 0x2a, 0xf7, 0x63, 0x54, 0x84, 0xe1, 0x4a, 0xe7, 0xf2, 0xb1, 0x66, 0x7a, 0x86, 0x49,
0xd4, 0x89, 0x9d, 0x7b, 0x66, 0x42, 0x69, 0x73, 0x64, 0xe8, 0xc4, 0xec, 0xfa, 0x5b, 0xb6, 0x11,
0x08, 0x07, 0x5b, 0xea, 0x2a, 0x18, 0xca, 0xf1, 0x48, 0x86, 0xca, 0x90, 0xf1, 0x2e, 0x84, 0x01,
0x32, 0xde, 0x05, 0xfa, 0x01, 0xe4, 0xe8, 0x22, 0xd9, 0xe2, 0xcb, 0x53, 0x20, 0x80, 0x90, 0x6b,
0x5f, 0xda, 0x04, 0x33, 0x4e, 0x45, 0x09, 0xae, 0x43, 0x10, 0xdd, 0xc6, 0xb5, 0x2a, 0x2f, 0x43,
0x65, 0x2c, 0x7c, 0x45, 0xf6, 0x2f, 0x1d, 0xdd, 0x3f, 0xa5, 0x02, 0xa5, 0x58, 0xac, 0x52, 0xae,
0xc2, 0x95, 0x69, 0xa1, 0x47, 0xe9, 0x05, 0xf4, 0x58, 0x08, 0x41, 0x6f, 0x40, 0x21, 0x88, 0x3d,
0xfc, 0x3a, 0x4e, 0xda, 0xca, 0x67, 0xc6, 0x01, 0x2b, 0xbd, 0x87, 0xf4, 0x58, 0xb3, 0xf3, 0x90,
0x61, 0x13, 0x5f, 0xd5, 0x6c, 0xbb, 0xa5, 0xb9, 0x3d, 0xe5, 0x63, 0xa8, 0x25, 0xc5, 0x95, 0xb1,
0x65, 0xe4, 0x82, 0x63, 0x78, 0x15, 0x56, 0xce, 0x2c, 0x67, 0xa0, 0x79, 0x4c, 0x59, 0x09, 0x8b,
0x1e, 0x3d, 0x9e, 0x3c, 0xc6, 0x64, 0x19, 0x99, 0x77, 0x14, 0x15, 0x9e, 0x49, 0x8c, 0x2d, 0x54,
0xc4, 0x30, 0x75, 0xc2, 0xed, 0x59, 0xc2, 0xbc, 0x13, 0x2a, 0xe2, 0x93, 0xe5, 0x1d, 0xfa, 0x59,
0x97, 0xad, 0x95, 0xe9, 0x97, 0xb0, 0xe8, 0x29, 0x2a, 0x5c, 0x9d, 0x1e, 0x60, 0xd0, 0x75, 0x00,
0xee, 0x37, 0xc5, 0xad, 0xcb, 0xde, 0x5c, 0xc3, 0x12, 0xa3, 0xdc, 0xa5, 0x57, 0xef, 0x45, 0xa8,
0x84, 0xc3, 0xaa, 0x6b, 0x3c, 0xe6, 0x47, 0x23, 0x8b, 0x4b, 0x01, 0xcf, 0xa9, 0xf1, 0x98, 0x28,
0xef, 0x04, 0xf7, 0x2b, 0x0c, 0x38, 0xe8, 0x16, 0xe4, 0x58, 0x88, 0xe2, 0xdb, 0x70, 0x75, 0xf2,
0x26, 0x51, 0x2e, 0xcc, 0x78, 0x94, 0x16, 0xc8, 0xc9, 0x01, 0x66, 0x29, 0x4d, 0xbf, 0x07, 0x28,
0x60, 0xe2, 0xda, 0xd4, 0xff, 0xa1, 0x3a, 0x48, 0xe4, 0xa2, 0x4b, 0x6c, 0xcf, 0x0f, 0x19, 0xd3,
0x43, 0x25, 0xe7, 0x6e, 0xfa, 0x9c, 0x14, 0x9e, 0x05, 0x62, 0xe8, 0xb6, 0x40, 0xe0, 0xc9, 0x60,
0x5a, 0x88, 0x47, 0x21, 0xf8, 0x9b, 0x3e, 0x04, 0xcf, 0x26, 0x22, 0x32, 0x2e, 0x35, 0x86, 0xc1,
0x6f, 0x0b, 0x0c, 0x9e, 0x9b, 0xf3, 0xb1, 0x18, 0x08, 0x6f, 0xc4, 0x40, 0x78, 0x7e, 0xce, 0x32,
0x13, 0x50, 0xf8, 0x9b, 0x3e, 0x0a, 0x5f, 0x99, 0x33, 0xe3, 0x31, 0x18, 0xbe, 0x1f, 0x87, 0xe1,
0x1c, 0x42, 0x3f, 0x9f, 0x28, 0x9d, 0x88, 0xc3, 0x7f, 0x1c, 0xc1, 0xe1, 0x85, 0x44, 0x10, 0xcc,
0x95, 0x4c, 0x01, 0xe2, 0x8d, 0x18, 0x10, 0x97, 0xe6, 0xd8, 0x20, 0x01, 0x89, 0xbf, 0x1b, 0x45,
0xe2, 0x90, 0x08, 0xe6, 0xc5, 0x7e, 0x4f, 0x83, 0xe2, 0x6f, 0x05, 0x50, 0xbc, 0x98, 0x98, 0x4b,
0x88, 0x35, 0x8c, 0x63, 0xf1, 0xe3, 0x09, 0x2c, 0xce, 0xb1, 0xf3, 0x8b, 0x89, 0x2a, 0xe6, 0x80,
0xf1, 0xe3, 0x09, 0x30, 0x5e, 0x9a, 0xa3, 0x70, 0x0e, 0x1a, 0xff, 0x70, 0x3a, 0x1a, 0x4f, 0xc6,
0xcb, 0x62, 0x9a, 0x8b, 0xc1, 0x71, 0x35, 0x01, 0x8e, 0x57, 0x12, 0x01, 0x29, 0x57, 0xbf, 0x30,
0x1e, 0xbf, 0x3f, 0x05, 0x8f, 0x73, 0xf8, 0x7c, 0x33, 0x51, 0xf9, 0x02, 0x80, 0x7c, 0x3f, 0x0e,
0xc8, 0xd7, 0xe7, 0x5c, 0x80, 0x44, 0x44, 0xde, 0x49, 0x42, 0xe4, 0x88, 0x69, 0x7c, 0x35, 0x51,
0xe3, 0x77, 0x81, 0xe4, 0x2f, 0x53, 0x87, 0x3d, 0xe6, 0xf6, 0x68, 0x50, 0x21, 0x8e, 0x63, 0x39,
0x02, 0x5c, 0xf3, 0x8e, 0x72, 0x93, 0x42, 0xb4, 0xd0, 0xc5, 0xcd, 0x80, 0xef, 0x2c, 0x78, 0x47,
0xdc, 0x9a, 0xf2, 0xc7, 0x74, 0x28, 0xcb, 0x50, 0x4d, 0x14, 0xde, 0x49, 0x02, 0xde, 0x45, 0x40,
0x7d, 0x26, 0x0e, 0xea, 0xb7, 0xa0, 0x48, 0x83, 0xf2, 0x18, 0x5e, 0xd7, 0xec, 0x00, 0xaf, 0xdf,
0x82, 0x75, 0x86, 0xba, 0x78, 0x8c, 0x12, 0x91, 0x38, 0xc7, 0x02, 0x54, 0x85, 0x0e, 0xf0, 0xfb,
0xc9, 0x43, 0xf2, 0x6b, 0xb0, 0x11, 0xe1, 0x0d, 0x82, 0x3d, 0x07, 0xaf, 0xd5, 0x80, 0x7b, 0x4f,
0x44, 0xfd, 0x3f, 0xa7, 0x43, 0x0b, 0x85, 0x40, 0x7f, 0x1a, 0x26, 0x4f, 0xff, 0x8f, 0x30, 0x79,
0xe6, 0x3b, 0x63, 0xf2, 0x28, 0x78, 0xc9, 0xc6, 0xc1, 0xcb, 0xbf, 0xd3, 0xe1, 0x9e, 0x04, 0x08,
0xbb, 0x6b, 0xe9, 0x44, 0xc0, 0x09, 0xd6, 0x46, 0x55, 0xc8, 0xf6, 0xad, 0x73, 0x01, 0x1a, 0x68,
0x93, 0x72, 0x05, 0x71, 0x48, 0x12, 0x61, 0x26, 0x40, 0x22, 0x79, 0x66, 0x61, 0x81, 0x44, 0xaa,
0x90, 0x7d, 0x44, 0x78, 0xd4, 0x58, 0xc3, 0xb4, 0x49, 0xf9, 0xd8, 0x21, 0x63, 0xb1, 0x60, 0x0d,
0xf3, 0x0e, 0xba, 0x03, 0x12, 0xab, 0xba, 0xa9, 0x96, 0xed, 0x0a, 0x07, 0xff, 0x6c, 0x74, 0xad,
0xbc, 0xb8, 0xb6, 0x7d, 0x42, 0x79, 0x8e, 0x6d, 0x17, 0x17, 0x6c, 0xd1, 0x8a, 0x80, 0x2c, 0x29,
0x86, 0xf5, 0xaf, 0x81, 0x44, 0x67, 0xef, 0xda, 0x5a, 0x97, 0x30, 0x6f, 0x2d, 0xe1, 0x90, 0xa0,
0x3c, 0x04, 0x34, 0x19, 0x73, 0x50, 0x0b, 0x56, 0xc8, 0x88, 0x98, 0x9e, 0xcb, 0xb0, 0xce, 0x18,
0x96, 0x10, 0x40, 0x9a, 0x98, 0x5e, 0xbd, 0x46, 0x8d, 0xfc, 0xaf, 0x6f, 0xb6, 0xaa, 0x9c, 0xfb,
0x55, 0x6b, 0x60, 0x78, 0x64, 0x60, 0x7b, 0x97, 0x58, 0xc8, 0x2b, 0x7f, 0xcf, 0x50, 0x54, 0x1b,
0x8b, 0x47, 0x53, 0x6d, 0xeb, 0x1f, 0xf9, 0x4c, 0x24, 0xa3, 0x59, 0xcc, 0xde, 0x9b, 0x00, 0xe7,
0x9a, 0xab, 0x7e, 0xa6, 0x99, 0x1e, 0xd1, 0x85, 0xd1, 0x23, 0x14, 0x24, 0x43, 0x81, 0xf6, 0x86,
0x2e, 0xd1, 0x45, 0x72, 0x15, 0xf4, 0x23, 0xeb, 0x5c, 0xfd, 0x7e, 0xeb, 0x8c, 0x5b, 0xb9, 0x30,
0x66, 0xe5, 0x08, 0xe2, 0x94, 0xa2, 0x88, 0x93, 0xce, 0xcd, 0x76, 0x0c, 0xcb, 0x31, 0xbc, 0x4b,
0xb6, 0x35, 0x59, 0x1c, 0xf4, 0x69, 0xae, 0x3e, 0x20, 0x03, 0xdb, 0xb2, 0xfa, 0x2a, 0x77, 0x37,
0x45, 0x26, 0xba, 0x26, 0x88, 0x4d, 0xe6, 0x75, 0x7e, 0x93, 0x09, 0xef, 0x5f, 0x98, 0x59, 0xfc,
0xdf, 0x19, 0x58, 0xf9, 0x2d, 0xab, 0x37, 0xc4, 0x11, 0x07, 0x3a, 0x85, 0xf5, 0xe0, 0xfa, 0xab,
0x43, 0xe6, 0x16, 0xfc, 0x03, 0xbd, 0xa8, 0xff, 0xa8, 0x8e, 0xe2, 0x64, 0x17, 0x7d, 0x00, 0x4f,
0x8f, 0xf9, 0xb6, 0x40, 0x75, 0x66, 0x51, 0x17, 0xf7, 0x54, 0xdc, 0xc5, 0xf9, 0xaa, 0x43, 0x63,
0x65, 0xbf, 0xe7, 0xad, 0x3b, 0xa0, 0x29, 0x6c, 0x14, 0x40, 0x4d, 0xdd, 0xfe, 0xe7, 0xa1, 0xe4,
0x10, 0x4f, 0x33, 0x4c, 0x35, 0x56, 0x24, 0x58, 0xe3, 0x44, 0x51, 0x7a, 0x38, 0x81, 0xa7, 0xa6,
0x02, 0x29, 0xf4, 0x43, 0x90, 0x42, 0x0c, 0x96, 0x4e, 0xc8, 0xb7, 0x83, 0x1c, 0x32, 0xe4, 0x55,
0xfe, 0x94, 0x0e, 0x55, 0xc6, 0xb3, 0xd2, 0x26, 0xac, 0x38, 0xc4, 0x1d, 0xf6, 0x79, 0x9e, 0x58,
0xde, 0x7d, 0x6d, 0x31, 0x08, 0x46, 0xa9, 0xc3, 0xbe, 0x87, 0x85, 0xb0, 0xf2, 0x10, 0x56, 0x38,
0x05, 0x15, 0x61, 0xf5, 0xfe, 0xd1, 0xbd, 0xa3, 0xe3, 0xf7, 0x8f, 0xaa, 0x29, 0x04, 0xb0, 0xb2,
0xd7, 0x68, 0x34, 0x4f, 0xda, 0xd5, 0x34, 0x92, 0x20, 0xbf, 0x57, 0x3f, 0xc6, 0xed, 0x6a, 0x86,
0x92, 0x71, 0xf3, 0xbd, 0x66, 0xa3, 0x5d, 0xcd, 0xa2, 0x75, 0x28, 0xf1, 0xb6, 0xba, 0x7f, 0x8c,
0x7f, 0xb6, 0xd7, 0xae, 0xe6, 0x22, 0xa4, 0xd3, 0xe6, 0xd1, 0xdd, 0x26, 0xae, 0xe6, 0x95, 0xd7,
0x69, 0x22, 0x9a, 0x00, 0xda, 0xc2, 0x94, 0x33, 0x1d, 0x49, 0x39, 0x95, 0xdf, 0x65, 0x68, 0xe6,
0x96, 0x84, 0xc4, 0xd0, 0x7b, 0x63, 0x0b, 0xdf, 0x5d, 0x02, 0xc6, 0x8d, 0xad, 0x1e, 0xbd, 0x00,
0x65, 0x87, 0x9c, 0x11, 0xaf, 0xdb, 0xe3, 0xc8, 0x90, 0x87, 0xcc, 0x12, 0x2e, 0x09, 0x2a, 0x13,
0x72, 0x39, 0xdb, 0x27, 0xa4, 0xeb, 0xa9, 0xdc, 0x17, 0xf1, 0x43, 0x27, 0x51, 0x36, 0x4a, 0x3d,
0xe5, 0x44, 0xe5, 0xe3, 0xa5, 0x6c, 0x29, 0x41, 0x1e, 0x37, 0xdb, 0xf8, 0x83, 0x6a, 0x16, 0x21,
0x28, 0xb3, 0xa6, 0x7a, 0x7a, 0xb4, 0x77, 0x72, 0xda, 0x3a, 0xa6, 0xb6, 0xdc, 0x80, 0x8a, 0x6f,
0x4b, 0x9f, 0x98, 0x57, 0xee, 0xc0, 0xd3, 0x09, 0x30, 0x72, 0x4e, 0xda, 0xad, 0x7c, 0x18, 0xc6,
0xae, 0x48, 0x3e, 0xbd, 0x0f, 0xe5, 0x31, 0x64, 0x98, 0x9e, 0xcc, 0x31, 0xc2, 0x7c, 0x38, 0x40,
0x7d, 0xb8, 0x34, 0x8a, 0x76, 0x95, 0x3f, 0xa4, 0xe1, 0xd9, 0x19, 0xd8, 0x11, 0xdd, 0x1b, 0xdb,
0xb3, 0xdb, 0xcb, 0x20, 0xcf, 0xf1, 0x23, 0x7b, 0x67, 0x21, 0x33, 0x9f, 0x1e, 0xee, 0x9d, 0xb6,
0xe2, 0x47, 0x56, 0xf9, 0x08, 0xca, 0xf1, 0x4a, 0x19, 0x3d, 0x81, 0x8e, 0x35, 0x34, 0x75, 0x36,
0xaf, 0x3c, 0xe6, 0x1d, 0xf4, 0x06, 0xe4, 0xe9, 0xfa, 0x7c, 0x00, 0x35, 0x79, 0x55, 0xe9, 0xfc,
0x22, 0x95, 0x36, 0xce, 0xad, 0x3c, 0x86, 0x3c, 0x73, 0x3a, 0xd4, 0x81, 0xb0, 0x9a, 0x97, 0xc0,
0xa4, 0xb4, 0x8d, 0x3e, 0x02, 0xd0, 0x3c, 0xcf, 0x31, 0x3a, 0xc3, 0x50, 0xf1, 0xd6, 0x74, 0xa7,
0xb5, 0xe7, 0xf3, 0xd5, 0xaf, 0x09, 0xef, 0x75, 0x25, 0x14, 0x8d, 0x78, 0xb0, 0x88, 0x42, 0xe5,
0x08, 0xca, 0x71, 0x59, 0x1f, 0x45, 0xf1, 0x39, 0xc4, 0x51, 0x14, 0x07, 0xc5, 0x02, 0x45, 0x05,
0x18, 0x2c, 0xcb, 0xeb, 0x9b, 0xac, 0xa3, 0x7c, 0x9e, 0x86, 0x42, 0xfb, 0x42, 0xd8, 0x39, 0xa1,
0xb4, 0x16, 0x8a, 0x66, 0xa2, 0x85, 0x24, 0x5e, 0xab, 0xcb, 0x06, 0x15, 0xc0, 0x77, 0x83, 0xcd,
0xcf, 0x2d, 0x9a, 0x43, 0xfb, 0xa5, 0x50, 0xb1, 0xe3, 0x6f, 0x83, 0x14, 0x84, 0x1c, 0x0a, 0xee,
0x35, 0x5d, 0x77, 0x88, 0xeb, 0x0a, 0xb7, 0xe1, 0x77, 0x59, 0xa5, 0xd6, 0xfa, 0x4c, 0x94, 0xaa,
0xb2, 0x98, 0x77, 0x14, 0x1d, 0x2a, 0x63, 0xf1, 0x0a, 0xbd, 0x0d, 0xab, 0xf6, 0xb0, 0xa3, 0xfa,
0xe6, 0x19, 0xfb, 0x33, 0xe9, 0xc3, 0xc6, 0x61, 0xa7, 0x6f, 0x74, 0xef, 0x91, 0x4b, 0x7f, 0x32,
0xf6, 0xb0, 0x73, 0x8f, 0x5b, 0x91, 0x7f, 0x25, 0x13, 0xfd, 0xca, 0x08, 0x0a, 0xfe, 0xa1, 0x40,
0x3f, 0x01, 0x29, 0x08, 0x85, 0x41, 0x01, 0x3f, 0x31, 0x86, 0x0a, 0xf5, 0xa1, 0x08, 0xcd, 0x41,
0x5c, 0xe3, 0xdc, 0x24, 0xba, 0x1a, 0xa6, 0x17, 0xec, 0x6b, 0x05, 0x5c, 0xe1, 0x03, 0x87, 0x7e,
0x6e, 0xa1, 0xfc, 0x27, 0x0d, 0x05, 0xbf, 0x50, 0x8b, 0x5e, 0x8f, 0x9c, 0xbb, 0xf2, 0x94, 0x52,
0x8f, 0xcf, 0x18, 0x16, 0x5b, 0xe3, 0x73, 0xcd, 0x2c, 0x3f, 0xd7, 0xa4, 0xaa, 0xb9, 0xff, 0xff,
0x22, 0xb7, 0xf4, 0xff, 0x8b, 0x57, 0x01, 0x79, 0x96, 0xa7, 0xf5, 0x69, 0xce, 0x6a, 0x98, 0xe7,
0x2a, 0x37, 0x36, 0x87, 0x52, 0x55, 0x36, 0xf2, 0x80, 0x0d, 0x9c, 0x30, 0xbb, 0xff, 0x2a, 0x0d,
0x85, 0x20, 0x26, 0x2e, 0x5b, 0x3b, 0xbd, 0x0a, 0x2b, 0xc2, 0xed, 0xf3, 0xe2, 0xa9, 0xe8, 0x05,
0x65, 0xfc, 0x5c, 0xa4, 0x8c, 0x2f, 0x43, 0x61, 0x40, 0x3c, 0x8d, 0x79, 0x57, 0x9e, 0xe1, 0x05,
0xfd, 0x5b, 0x6f, 0x41, 0x31, 0x52, 0xc6, 0xa6, 0x37, 0xef, 0xa8, 0xf9, 0x7e, 0x35, 0x25, 0xaf,
0x7e, 0xfe, 0xe5, 0x8d, 0xec, 0x11, 0xf9, 0x8c, 0x9e, 0x59, 0xdc, 0x6c, 0xb4, 0x9a, 0x8d, 0x7b,
0xd5, 0xb4, 0x5c, 0xfc, 0xfc, 0xcb, 0x1b, 0xab, 0x98, 0xb0, 0x32, 0xd3, 0xad, 0x16, 0xac, 0x45,
0x77, 0x25, 0xee, 0xd2, 0x10, 0x94, 0xef, 0xde, 0x3f, 0x39, 0x3c, 0x68, 0xec, 0xb5, 0x9b, 0xea,
0x83, 0xe3, 0x76, 0xb3, 0x9a, 0x46, 0x4f, 0xc3, 0xc6, 0xe1, 0xc1, 0x4f, 0x5b, 0x6d, 0xb5, 0x71,
0x78, 0xd0, 0x3c, 0x6a, 0xab, 0x7b, 0xed, 0xf6, 0x5e, 0xe3, 0x5e, 0x35, 0xb3, 0xfb, 0x4d, 0x11,
0x2a, 0x7b, 0xf5, 0xc6, 0x01, 0x8d, 0x7a, 0x46, 0x57, 0x63, 0xe9, 0x77, 0x03, 0x72, 0x2c, 0xc1,
0x9e, 0xf9, 0x26, 0x40, 0x9e, 0x5d, 0x80, 0x44, 0xfb, 0x90, 0x67, 0xb9, 0x37, 0x9a, 0xfd, 0x48,
0x40, 0x9e, 0x53, 0x91, 0xa4, 0x93, 0x61, 0xd7, 0x63, 0xe6, 0xab, 0x01, 0x79, 0x76, 0x81, 0x12,
0x61, 0x90, 0x42, 0xec, 0x3e, 0xff, 0x2f, 0xba, 0xbc, 0x80, 0xb3, 0x41, 0x87, 0xb0, 0xea, 0xa7,
0x5b, 0xf3, 0xfe, 0xeb, 0xcb, 0x73, 0x2b, 0x88, 0xd4, 0x5c, 0x3c, 0x2d, 0x9e, 0xfd, 0x48, 0x41,
0x9e, 0x53, 0x0e, 0x45, 0x07, 0xb0, 0x22, 0xf0, 0xe8, 0x9c, 0x7f, 0xf5, 0xf2, 0xbc, 0x8a, 0x20,
0x35, 0x5a, 0x58, 0x70, 0x98, 0xff, 0xf4, 0x42, 0x5e, 0xa0, 0xd2, 0x8b, 0x1e, 0x00, 0x44, 0x92,
0xe0, 0x05, 0xde, 0x54, 0xc8, 0x8b, 0x54, 0x70, 0xd1, 0x31, 0x14, 0x82, 0x9c, 0x64, 0xee, 0x0b,
0x07, 0x79, 0x7e, 0x29, 0x15, 0x3d, 0x82, 0x52, 0x1c, 0x8b, 0x2f, 0xf6, 0x6e, 0x41, 0x5e, 0xb0,
0x46, 0x4a, 0xf5, 0xc7, 0x81, 0xf9, 0x62, 0xef, 0x18, 0xe4, 0x05, 0x4b, 0xa6, 0xe8, 0x63, 0x58,
0x9f, 0x04, 0xce, 0x8b, 0x3f, 0x6b, 0x90, 0x97, 0x28, 0xa2, 0xa2, 0x01, 0xa0, 0x29, 0x80, 0x7b,
0x89, 0x57, 0x0e, 0xf2, 0x32, 0x35, 0x55, 0xa4, 0x43, 0x65, 0x1c, 0xc5, 0x2e, 0xfa, 0xea, 0x41,
0x5e, 0xb8, 0xbe, 0x4a, 0x0f, 0x6a, 0x04, 0xf1, 0x2e, 0xf0, 0x0a, 0x42, 0x5e, 0xa4, 0xd2, 0x8a,
0x6c, 0xd8, 0x98, 0x86, 0x74, 0x97, 0x79, 0x14, 0x21, 0x2f, 0x55, 0x80, 0xad, 0x37, 0xbf, 0xfc,
0x66, 0x33, 0xfd, 0xd5, 0x37, 0x9b, 0xe9, 0x7f, 0x7c, 0xb3, 0x99, 0xfe, 0xfc, 0xdb, 0xcd, 0xd4,
0x57, 0xdf, 0x6e, 0xa6, 0xfe, 0xfa, 0xed, 0x66, 0xea, 0x67, 0xaf, 0x9c, 0x1b, 0x5e, 0x6f, 0xd8,
0xd9, 0xee, 0x5a, 0x83, 0x9d, 0xe8, 0x6b, 0xb3, 0x69, 0x2f, 0xe0, 0x3a, 0x2b, 0x2c, 0x06, 0xdf,
0xf9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x69, 0x39, 0x77, 0x21, 0x27, 0x00, 0x00,
0x9e, 0xf9, 0x93, 0x5f, 0x9e, 0x5d, 0x80, 0x44, 0xfb, 0x90, 0x67, 0xb9, 0x37, 0x9a, 0xfd, 0xd7,
0x5f, 0x9e, 0x53, 0x91, 0xa4, 0x93, 0x61, 0xd7, 0x63, 0xe6, 0x33, 0x00, 0x79, 0x76, 0x81, 0x12,
0x61, 0x90, 0x42, 0xec, 0x3e, 0xff, 0xb7, 0xb8, 0xbc, 0x80, 0xb3, 0x41, 0x87, 0xb0, 0xea, 0xa7,
0x5b, 0xf3, 0x7e, 0xd4, 0xcb, 0x73, 0x2b, 0x88, 0xd4, 0x5c, 0x3c, 0x2d, 0x9e, 0xfd, 0xea, 0x40,
0x9e, 0x53, 0x0e, 0x45, 0x07, 0xb0, 0x22, 0xf0, 0xe8, 0x9c, 0x9f, 0xef, 0xf2, 0xbc, 0x8a, 0x20,
0x35, 0x5a, 0x58, 0x70, 0x98, 0xff, 0x96, 0x42, 0x5e, 0xa0, 0xd2, 0x8b, 0xee, 0x03, 0x44, 0x92,
0xe0, 0x05, 0x1e, 0x49, 0xc8, 0x8b, 0x54, 0x70, 0xd1, 0x31, 0x14, 0x82, 0x9c, 0x64, 0xee, 0x93,
0x05, 0x79, 0x7e, 0x29, 0x15, 0x3d, 0x84, 0x52, 0x1c, 0x8b, 0x2f, 0xf6, 0x10, 0x41, 0x5e, 0xb0,
0x46, 0x4a, 0xf5, 0xc7, 0x81, 0xf9, 0x62, 0x0f, 0x13, 0xe4, 0x05, 0x4b, 0xa6, 0xe8, 0x13, 0x58,
0x9f, 0x04, 0xce, 0x8b, 0xbf, 0x53, 0x90, 0x97, 0x28, 0xa2, 0xa2, 0x01, 0xa0, 0x29, 0x80, 0x7b,
0x89, 0x67, 0x0b, 0xf2, 0x32, 0x35, 0x55, 0xa4, 0x43, 0x65, 0x1c, 0xc5, 0x2e, 0xfa, 0x8c, 0x41,
0x5e, 0xb8, 0xbe, 0x4a, 0x0f, 0x6a, 0x04, 0xf1, 0x2e, 0xf0, 0xac, 0x41, 0x5e, 0xa4, 0xd2, 0x8a,
0x6c, 0xd8, 0x98, 0x86, 0x74, 0x97, 0x79, 0xe5, 0x20, 0x2f, 0x55, 0x80, 0xad, 0x37, 0xbf, 0xfa,
0x76, 0x33, 0xfd, 0xf5, 0xb7, 0x9b, 0xe9, 0x7f, 0x7e, 0xbb, 0x99, 0xfe, 0xe2, 0xc9, 0x66, 0xea,
0xeb, 0x27, 0x9b, 0xa9, 0xbf, 0x3d, 0xd9, 0x4c, 0xfd, 0xe2, 0x95, 0x73, 0xc3, 0xeb, 0x0d, 0x3b,
0xdb, 0x5d, 0x6b, 0xb0, 0x13, 0x7d, 0x3e, 0x36, 0xed, 0x49, 0x5b, 0x67, 0x85, 0xc5, 0xe0, 0xdb,
0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x05, 0x6a, 0x5b, 0xf0, 0xf2, 0x26, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -5177,20 +5166,6 @@ 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--
@ -7417,12 +7392,6 @@ 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
}
@ -10539,40 +10508,6 @@ 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:])


+ 1
- 3
internal/consensus/byzantine_test.go View File

@ -180,7 +180,6 @@ 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.
@ -189,7 +188,6 @@ 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
@ -207,7 +205,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
proposerAddr := lazyNodeState.privValidatorPubKey.Address()
block, blockParts, err := lazyNodeState.blockExec.CreateProposalBlock(
lazyNodeState.Height, lazyNodeState.state, commit, proposerAddr, votes,
lazyNodeState.Height, lazyNodeState.state, commit, proposerAddr,
)
require.NoError(t, err)


+ 1
- 3
internal/consensus/state.go View File

@ -1334,7 +1334,6 @@ func (cs *State) createProposalBlock() (block *types.Block, blockParts *types.Pa
}
var commit *types.Commit
var votes []*types.Vote
switch {
case cs.Height == cs.state.InitialHeight:
// We're creating a proposal for the first block.
@ -1344,7 +1343,6 @@ func (cs *State) createProposalBlock() (block *types.Block, blockParts *types.Pa
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")
@ -1360,7 +1358,7 @@ func (cs *State) createProposalBlock() (block *types.Block, blockParts *types.Pa
proposerAddr := cs.privValidatorPubKey.Address()
return cs.blockExec.CreateProposalBlock(cs.Height, cs.state, commit, proposerAddr, votes)
return cs.blockExec.CreateProposalBlock(cs.Height, cs.state, commit, proposerAddr)
}
// Enter: `timeoutPropose` after entering Propose.


+ 2
- 6
internal/state/execution.go View File

@ -105,7 +105,6 @@ 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,11 +119,7 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
preparedProposal, err := blockExec.proxyApp.PrepareProposal(
context.Background(),
abci.RequestPrepareProposal{
BlockData: txs.ToSliceOfBytes(),
BlockDataSize: maxDataBytes,
Votes: types.VotesToProto(votes),
},
abci.RequestPrepareProposal{BlockData: txs.ToSliceOfBytes(), BlockDataSize: maxDataBytes},
)
if err != nil {
// The App MUST ensure that only valid (and hence 'processable') transactions
@ -275,6 +270,7 @@ func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtensio
if err != nil {
return types.VoteExtension{}, err
}
return types.VoteExtensionFromProto(resp.VoteExtension), nil
}


+ 0
- 3
node/node_test.go View File

@ -339,7 +339,6 @@ func TestCreateProposalBlock(t *testing.T) {
height,
state, commit,
proposerAddr,
nil,
)
require.NoError(t, err)
@ -414,7 +413,6 @@ func TestMaxTxsProposalBlockSize(t *testing.T) {
height,
state, commit,
proposerAddr,
nil,
)
require.NoError(t, err)
@ -525,7 +523,6 @@ func TestMaxProposalBlockSize(t *testing.T) {
math.MaxInt64,
state, commit,
proposerAddr,
nil,
)
require.NoError(t, err)


+ 1
- 2
types/block.go View File

@ -518,8 +518,7 @@ 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


+ 0
- 12
types/vote.go View File

@ -326,18 +326,6 @@ func (vote *Vote) ToProto() *tmproto.Vote {
}
}
func VotesToProto(votes []*Vote) (res []*tmproto.Vote) {
if votes == nil {
return nil
}
res = make([]*tmproto.Vote, len(votes))
for i, vote := range votes {
res[i] = vote.ToProto()
}
return
}
func VoteExtensionFromProto(pext *tmproto.VoteExtension) VoteExtension {
ext := VoteExtension{}
if pext != nil {


+ 0
- 4
types/vote_set.go View File

@ -226,10 +226,6 @@ 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(


Write Preview
Loading…
Cancel
Save