diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 8fe3ef6b1..bc5dfdbd0 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -13,6 +13,7 @@ - P2P Protocol - [abci] [\#100](https://github.com/line/tendermint/pull/100) Add `voters_hash` field, which is needed for verification of a block header + - [abci] [\#102](https://github.com/line/tendermint/pull/102) Add voting power in `VoterInfo` of abci - Go API diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index a51fa603b..ebc4a7d85 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -2700,7 +2700,8 @@ func (m *ValidatorUpdate) GetPower() int64 { // VoteInfo type VoteInfo struct { Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` - SignedLastBlock bool `protobuf:"varint,2,opt,name=signed_last_block,json=signedLastBlock,proto3" json:"signed_last_block,omitempty"` + VotingPower int64 `protobuf:"varint,2,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` + SignedLastBlock bool `protobuf:"varint,3,opt,name=signed_last_block,json=signedLastBlock,proto3" json:"signed_last_block,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2746,6 +2747,13 @@ func (m *VoteInfo) GetValidator() Validator { return Validator{} } +func (m *VoteInfo) GetVotingPower() int64 { + if m != nil { + return m.VotingPower + } + return 0 +} + func (m *VoteInfo) GetSignedLastBlock() bool { if m != nil { return m.SignedLastBlock @@ -2976,157 +2984,158 @@ func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_9f1eaa func init() { golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_9f1eaa49c51fa1ac) } var fileDescriptor_9f1eaa49c51fa1ac = []byte{ - // 2400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4d, 0x6c, 0x1b, 0xc7, - 0x15, 0xd6, 0x52, 0x94, 0x48, 0x3e, 0x4a, 0x22, 0x3d, 0x76, 0x12, 0x9a, 0x75, 0x24, 0x63, 0x15, - 0xdb, 0x72, 0x92, 0x52, 0xa9, 0x8a, 0x14, 0x71, 0x6d, 0xa4, 0x10, 0x65, 0xa7, 0x22, 0x62, 0x3b, - 0xca, 0xda, 0x56, 0xdd, 0x16, 0xc8, 0x62, 0xc8, 0x1d, 0x93, 0x0b, 0x91, 0xbb, 0x9b, 0xdd, 0x21, - 0x4d, 0x16, 0xbd, 0x17, 0x05, 0x5a, 0xa0, 0x97, 0x02, 0xbd, 0xf4, 0xde, 0x63, 0x0f, 0x3d, 0xe4, - 0xd8, 0x63, 0x0e, 0x3d, 0xf4, 0xd0, 0xb3, 0xdb, 0xaa, 0x3d, 0x15, 0x3d, 0x16, 0x45, 0x8f, 0xc5, - 0xbc, 0x99, 0xfd, 0xa3, 0x48, 0x71, 0x9d, 0xfa, 0xd6, 0x0b, 0xb9, 0x33, 0xf3, 0xde, 0x9b, 0x99, - 0x37, 0xf3, 0xde, 0xf7, 0xde, 0x1b, 0x78, 0x9d, 0xb6, 0x3b, 0xf6, 0x2e, 0x9f, 0x78, 0x2c, 0x90, - 0xbf, 0x0d, 0xcf, 0x77, 0xb9, 0x4b, 0x5e, 0xe3, 0xcc, 0xb1, 0x98, 0x3f, 0xb0, 0x1d, 0xde, 0x10, - 0x24, 0x0d, 0x1c, 0xac, 0x5f, 0xe7, 0x3d, 0xdb, 0xb7, 0x4c, 0x8f, 0xfa, 0x7c, 0xb2, 0x8b, 0x94, - 0xbb, 0x5d, 0xb7, 0xeb, 0xc6, 0x5f, 0x92, 0xbd, 0x5e, 0xef, 0xf8, 0x13, 0x8f, 0xbb, 0xbb, 0x03, - 0xe6, 0x9f, 0xf4, 0x99, 0xfa, 0x53, 0x63, 0x17, 0xfb, 0x76, 0x3b, 0xd8, 0x3d, 0x19, 0x25, 0xe7, - 0xab, 0x6f, 0x75, 0x5d, 0xb7, 0xdb, 0x67, 0x52, 0x66, 0x7b, 0xf8, 0x6c, 0x97, 0xdb, 0x03, 0x16, - 0x70, 0x3a, 0xf0, 0x14, 0xc1, 0xe6, 0x34, 0x81, 0x35, 0xf4, 0x29, 0xb7, 0x5d, 0x47, 0x8e, 0xeb, - 0xff, 0x5e, 0x81, 0x82, 0xc1, 0x3e, 0x1f, 0xb2, 0x80, 0x93, 0x0f, 0x20, 0xcf, 0x3a, 0x3d, 0xb7, - 0x96, 0xbb, 0xaa, 0xed, 0x94, 0xf7, 0xf4, 0xc6, 0xcc, 0xbd, 0x34, 0x14, 0xf5, 0xbd, 0x4e, 0xcf, - 0x3d, 0x5c, 0x32, 0x90, 0x83, 0xdc, 0x86, 0x95, 0x67, 0xfd, 0x61, 0xd0, 0xab, 0x2d, 0x23, 0xeb, - 0xf6, 0xf9, 0xac, 0x1f, 0x09, 0xd2, 0xc3, 0x25, 0x43, 0xf2, 0x88, 0x69, 0x6d, 0xe7, 0x99, 0x5b, - 0xcb, 0x67, 0x99, 0xb6, 0xe5, 0x3c, 0xc3, 0x69, 0x05, 0x07, 0x39, 0x04, 0x08, 0x18, 0x37, 0x5d, - 0x4f, 0x6c, 0xa8, 0xb6, 0x82, 0xfc, 0x37, 0xce, 0xe7, 0x7f, 0xc4, 0xf8, 0x27, 0x48, 0x7e, 0xb8, - 0x64, 0x94, 0x82, 0xb0, 0x21, 0x24, 0xd9, 0x8e, 0xcd, 0xcd, 0x4e, 0x8f, 0xda, 0x4e, 0x6d, 0x35, - 0x8b, 0xa4, 0x96, 0x63, 0xf3, 0x03, 0x41, 0x2e, 0x24, 0xd9, 0x61, 0x43, 0xa8, 0xe2, 0xf3, 0x21, - 0xf3, 0x27, 0xb5, 0x42, 0x16, 0x55, 0x7c, 0x2a, 0x48, 0x85, 0x2a, 0x90, 0x87, 0x7c, 0x0c, 0xe5, - 0x36, 0xeb, 0xda, 0x8e, 0xd9, 0xee, 0xbb, 0x9d, 0x93, 0x5a, 0x11, 0x45, 0xec, 0x9c, 0x2f, 0xa2, - 0x29, 0x18, 0x9a, 0x82, 0xfe, 0x70, 0xc9, 0x80, 0x76, 0xd4, 0x22, 0x4d, 0x28, 0x76, 0x7a, 0xac, - 0x73, 0x62, 0xf2, 0x71, 0xad, 0x84, 0x92, 0xae, 0x9d, 0x2f, 0xe9, 0x40, 0x50, 0x3f, 0x1e, 0x1f, - 0x2e, 0x19, 0x85, 0x8e, 0xfc, 0x14, 0x7a, 0xb1, 0x58, 0xdf, 0x1e, 0x31, 0x5f, 0x48, 0xb9, 0x98, - 0x45, 0x2f, 0x77, 0x25, 0x3d, 0xca, 0x29, 0x59, 0x61, 0x83, 0xdc, 0x83, 0x12, 0x73, 0x2c, 0xb5, - 0xb1, 0x32, 0x0a, 0xba, 0xbe, 0xe0, 0x86, 0x39, 0x56, 0xb8, 0xad, 0x22, 0x53, 0xdf, 0xe4, 0x43, - 0x58, 0xed, 0xb8, 0x83, 0x81, 0xcd, 0x6b, 0x6b, 0x28, 0xe3, 0xad, 0x05, 0x5b, 0x42, 0xda, 0xc3, - 0x25, 0x43, 0x71, 0x35, 0x0b, 0xb0, 0x32, 0xa2, 0xfd, 0x21, 0xd3, 0x6f, 0x40, 0x39, 0x71, 0x93, - 0x49, 0x0d, 0x0a, 0x03, 0x16, 0x04, 0xb4, 0xcb, 0x6a, 0xda, 0x55, 0x6d, 0xa7, 0x64, 0x84, 0x4d, - 0x7d, 0x03, 0xd6, 0x92, 0xf7, 0x56, 0x1f, 0x44, 0x8c, 0xe2, 0x2e, 0x0a, 0xc6, 0x11, 0xf3, 0x03, - 0x71, 0x01, 0x15, 0xa3, 0x6a, 0x92, 0x6d, 0x58, 0xc7, 0xdd, 0x9a, 0xe1, 0xb8, 0xb0, 0xab, 0xbc, - 0xb1, 0x86, 0x9d, 0xc7, 0x8a, 0x68, 0x0b, 0xca, 0xde, 0x9e, 0x17, 0x91, 0x2c, 0x23, 0x09, 0x78, - 0x7b, 0x9e, 0x22, 0xd0, 0xbf, 0x0d, 0xd5, 0xe9, 0xab, 0x4b, 0xaa, 0xb0, 0x7c, 0xc2, 0x26, 0x6a, - 0x3e, 0xf1, 0x49, 0x2e, 0xa9, 0x6d, 0xe1, 0x1c, 0x25, 0x43, 0xed, 0xf1, 0xb7, 0xb9, 0x88, 0x39, - 0xba, 0xad, 0xc2, 0xdc, 0x84, 0x93, 0x40, 0xee, 0xf2, 0x5e, 0xbd, 0x21, 0x1d, 0x44, 0x23, 0x74, - 0x10, 0x8d, 0xc7, 0xa1, 0x07, 0x69, 0x16, 0xbf, 0x7c, 0xb1, 0xb5, 0xf4, 0x8b, 0x3f, 0x6f, 0x69, - 0x06, 0x72, 0x90, 0xcb, 0xe2, 0x42, 0x51, 0xdb, 0x31, 0x6d, 0x4b, 0xcd, 0x53, 0xc0, 0x76, 0xcb, - 0x22, 0x9f, 0x42, 0xb5, 0xe3, 0x3a, 0x01, 0x73, 0x82, 0x61, 0x20, 0xdc, 0x1c, 0x1d, 0x04, 0xca, - 0x17, 0xcc, 0x3b, 0xe4, 0x83, 0x90, 0xfc, 0x08, 0xa9, 0x8d, 0x4a, 0x27, 0xdd, 0x41, 0xee, 0x03, - 0x8c, 0x68, 0xdf, 0xb6, 0x28, 0x77, 0xfd, 0xa0, 0x96, 0xbf, 0xba, 0x7c, 0x8e, 0xb0, 0xe3, 0x90, - 0xf0, 0x89, 0x67, 0x51, 0xce, 0x9a, 0x79, 0xb1, 0x72, 0x23, 0xc1, 0x4f, 0xae, 0x43, 0x85, 0x7a, - 0x9e, 0x19, 0x70, 0xca, 0x99, 0xd9, 0x9e, 0x70, 0x16, 0xa0, 0xbf, 0x58, 0x33, 0xd6, 0xa9, 0xe7, - 0x3d, 0x12, 0xbd, 0x4d, 0xd1, 0xa9, 0x5b, 0xd1, 0x69, 0xa3, 0x69, 0x12, 0x02, 0x79, 0x8b, 0x72, - 0x8a, 0xda, 0x5a, 0x33, 0xf0, 0x5b, 0xf4, 0x79, 0x94, 0xf7, 0x94, 0x0e, 0xf0, 0x9b, 0xbc, 0x0e, - 0xab, 0x3d, 0x66, 0x77, 0x7b, 0x1c, 0xb7, 0xbd, 0x6c, 0xa8, 0x96, 0x38, 0x18, 0xcf, 0x77, 0x47, - 0x0c, 0xbd, 0x5b, 0xd1, 0x90, 0x0d, 0xfd, 0x97, 0x39, 0xb8, 0x70, 0xc6, 0x7c, 0x85, 0xdc, 0x1e, - 0x0d, 0x7a, 0xe1, 0x5c, 0xe2, 0x9b, 0xdc, 0x16, 0x72, 0xa9, 0xc5, 0x7c, 0xe5, 0x95, 0xdf, 0x9c, - 0xa3, 0x81, 0x43, 0x24, 0x52, 0x1b, 0x57, 0x2c, 0xe4, 0x09, 0x54, 0xfb, 0x34, 0xe0, 0xa6, 0xbc, - 0xfb, 0x26, 0x7a, 0xd9, 0xe5, 0x73, 0x3d, 0xc1, 0x7d, 0x1a, 0xda, 0x8c, 0xb8, 0xdc, 0x4a, 0xdc, - 0x46, 0x3f, 0xd5, 0x4b, 0x9e, 0xc2, 0xa5, 0xf6, 0xe4, 0x47, 0xd4, 0xe1, 0xb6, 0xc3, 0xcc, 0x33, - 0x67, 0xb4, 0x35, 0x47, 0xf4, 0xbd, 0x91, 0x6d, 0x31, 0xa7, 0x13, 0x1e, 0xce, 0xc5, 0x48, 0x44, - 0x74, 0x78, 0x81, 0xfe, 0x14, 0x36, 0xd2, 0xbe, 0x88, 0x6c, 0x40, 0x8e, 0x8f, 0x95, 0x46, 0x72, - 0x7c, 0x4c, 0xbe, 0x05, 0x79, 0x21, 0x0e, 0xb5, 0xb1, 0x31, 0x17, 0x2c, 0x14, 0xf7, 0xe3, 0x89, - 0xc7, 0x0c, 0xa4, 0xd7, 0xf5, 0xc8, 0x12, 0x22, 0xff, 0x34, 0x2d, 0x5b, 0xbf, 0x09, 0x95, 0x29, - 0xd7, 0x93, 0x38, 0x56, 0x2d, 0x79, 0xac, 0x7a, 0x05, 0xd6, 0x53, 0x1e, 0x46, 0xff, 0xc3, 0x2a, - 0x14, 0x0d, 0x16, 0x78, 0xe2, 0x12, 0x93, 0x43, 0x28, 0xb1, 0x71, 0x87, 0x49, 0x58, 0xd2, 0x16, - 0x38, 0x71, 0xc9, 0x73, 0x2f, 0xa4, 0x17, 0x5e, 0x33, 0x62, 0x26, 0xb7, 0x52, 0x90, 0xbc, 0xbd, - 0x48, 0x48, 0x12, 0x93, 0xef, 0xa4, 0x31, 0xf9, 0xad, 0x05, 0xbc, 0x53, 0xa0, 0x7c, 0x2b, 0x05, - 0xca, 0x8b, 0x26, 0x4e, 0xa1, 0x72, 0x6b, 0x06, 0x2a, 0x2f, 0xda, 0xfe, 0x1c, 0x58, 0x6e, 0xcd, - 0x80, 0xe5, 0x9d, 0x85, 0x6b, 0x99, 0x89, 0xcb, 0x77, 0xd2, 0xb8, 0xbc, 0x48, 0x1d, 0x53, 0xc0, - 0x7c, 0x7f, 0x16, 0x30, 0xdf, 0x5c, 0x20, 0x63, 0x2e, 0x32, 0x1f, 0x9c, 0x41, 0xe6, 0xeb, 0x0b, - 0x44, 0xcd, 0x80, 0xe6, 0x56, 0x0a, 0x9a, 0x21, 0x93, 0x6e, 0xe6, 0x60, 0xf3, 0x47, 0x67, 0xb1, - 0xf9, 0xc6, 0xa2, 0xab, 0x36, 0x0b, 0x9c, 0xbf, 0x33, 0x05, 0xce, 0xd7, 0x16, 0xed, 0x6a, 0x2e, - 0x3a, 0xdf, 0x14, 0xfe, 0x71, 0xca, 0x32, 0x84, 0x2f, 0x65, 0xbe, 0xef, 0xfa, 0x0a, 0xf8, 0x64, - 0x43, 0xdf, 0x11, 0x1e, 0x3b, 0xbe, 0xff, 0xe7, 0x20, 0x39, 0x1a, 0x6d, 0xe2, 0xb6, 0xeb, 0x5f, - 0x68, 0x31, 0x2f, 0x7a, 0xb6, 0xa4, 0xb7, 0x2f, 0x29, 0x6f, 0x9f, 0x00, 0xf8, 0x5c, 0x1a, 0xe0, - 0xb7, 0xa0, 0x2c, 0x30, 0x65, 0x0a, 0xbb, 0xa9, 0x17, 0x62, 0x37, 0x79, 0x1b, 0x2e, 0xa0, 0xff, - 0x95, 0x61, 0x80, 0x72, 0x24, 0x79, 0x74, 0x24, 0x15, 0x31, 0x20, 0x35, 0x28, 0x81, 0xe2, 0xeb, - 0x70, 0x31, 0x41, 0x2b, 0xe4, 0x22, 0x16, 0x48, 0x90, 0xaa, 0x46, 0xd4, 0xfb, 0x9e, 0x77, 0x48, - 0x83, 0x9e, 0xfe, 0x20, 0x56, 0x50, 0x1c, 0x17, 0x10, 0xc8, 0x77, 0x5c, 0x4b, 0xee, 0x7b, 0xdd, - 0xc0, 0x6f, 0x11, 0x2b, 0xf4, 0xdd, 0x2e, 0x2e, 0xae, 0x64, 0x88, 0x4f, 0x41, 0x15, 0x99, 0x76, - 0x49, 0xda, 0xac, 0xfe, 0x3b, 0x2d, 0x96, 0x17, 0x87, 0x0a, 0xb3, 0x50, 0x5d, 0x7b, 0x95, 0xa8, - 0x9e, 0xfb, 0xdf, 0x50, 0x5d, 0xff, 0x97, 0x16, 0x1f, 0x69, 0x84, 0xd7, 0x5f, 0x4d, 0x05, 0xe2, - 0x76, 0xd9, 0x8e, 0xc5, 0xc6, 0xa8, 0xf2, 0x65, 0x43, 0x36, 0xc2, 0x50, 0x6b, 0x15, 0x8f, 0x21, - 0x1d, 0x6a, 0x15, 0xb0, 0x4f, 0x36, 0xc8, 0xfb, 0x88, 0xf3, 0xee, 0x33, 0xe5, 0x1a, 0x52, 0x20, - 0x28, 0x93, 0xba, 0x86, 0xca, 0xe6, 0x8e, 0x04, 0x99, 0x21, 0xa9, 0x13, 0xf8, 0x52, 0x4a, 0x85, - 0x0d, 0x57, 0xa0, 0x24, 0x96, 0x1e, 0x78, 0xb4, 0xc3, 0xd0, 0xb6, 0x4b, 0x46, 0xdc, 0xa1, 0x5b, - 0x40, 0xce, 0xfa, 0x18, 0xf2, 0x10, 0x56, 0xd9, 0x88, 0x39, 0x5c, 0x9c, 0x91, 0x50, 0xeb, 0x95, - 0xb9, 0x40, 0xcc, 0x1c, 0xde, 0xac, 0x09, 0x65, 0xfe, 0xe3, 0xc5, 0x56, 0x55, 0xf2, 0xbc, 0xeb, - 0x0e, 0x6c, 0xce, 0x06, 0x1e, 0x9f, 0x18, 0x4a, 0x8a, 0xfe, 0x93, 0x9c, 0xc0, 0xc3, 0x94, 0xff, - 0x99, 0xa9, 0xde, 0xd0, 0x68, 0x72, 0x89, 0x10, 0x29, 0x9b, 0xca, 0xdf, 0x04, 0xe8, 0xd2, 0xc0, - 0x7c, 0x4e, 0x1d, 0xce, 0x2c, 0xa5, 0xf7, 0x52, 0x97, 0x06, 0xdf, 0xc3, 0x0e, 0x11, 0x6f, 0x8a, - 0xe1, 0x61, 0xc0, 0x2c, 0x3c, 0x80, 0x65, 0xa3, 0xd0, 0xa5, 0xc1, 0x93, 0x80, 0x59, 0x89, 0xbd, - 0x16, 0x5e, 0xc5, 0x5e, 0xd3, 0xfa, 0x2e, 0x4e, 0xeb, 0xfb, 0xa7, 0xb9, 0xd8, 0x3a, 0xe2, 0xf0, - 0xe1, 0xff, 0x53, 0x17, 0xbf, 0xc6, 0x9c, 0x22, 0x0d, 0x02, 0xe4, 0xfb, 0x70, 0x21, 0xb2, 0x4a, - 0x73, 0x88, 0xd6, 0x1a, 0xde, 0xc2, 0x97, 0x33, 0xee, 0xea, 0x28, 0xdd, 0x1d, 0x90, 0xcf, 0xe0, - 0x8d, 0x29, 0x1f, 0x14, 0x4d, 0x90, 0x7b, 0x29, 0x57, 0xf4, 0x5a, 0xda, 0x15, 0x85, 0xf2, 0x63, - 0xed, 0x2d, 0xbf, 0x12, 0xab, 0x69, 0x89, 0x10, 0x36, 0x09, 0x6f, 0x33, 0xef, 0xc4, 0x36, 0xac, - 0xfb, 0x8c, 0x8b, 0x5c, 0x2a, 0x95, 0x35, 0xac, 0xc9, 0x4e, 0x09, 0x09, 0xfa, 0x9f, 0x34, 0xa8, - 0x4c, 0xed, 0x82, 0x7c, 0x00, 0x2b, 0x12, 0xa6, 0xb5, 0x73, 0xab, 0x25, 0x78, 0x2c, 0x6a, 0xe3, - 0x92, 0x81, 0xec, 0x43, 0x91, 0xa9, 0x10, 0x5c, 0x69, 0xee, 0xda, 0x82, 0x48, 0x5d, 0xf1, 0x47, - 0x6c, 0xe4, 0x2e, 0x94, 0xa2, 0xf3, 0x59, 0x90, 0xde, 0x45, 0xc7, 0xab, 0x84, 0xc4, 0x8c, 0xfa, - 0x01, 0x94, 0x13, 0xcb, 0x23, 0x5f, 0x83, 0xd2, 0x80, 0x8e, 0x55, 0x4e, 0x26, 0xa3, 0xec, 0xe2, - 0x80, 0x8e, 0x31, 0x1d, 0x23, 0x6f, 0x40, 0x41, 0x0c, 0x76, 0xa9, 0x3c, 0xed, 0x65, 0x63, 0x75, - 0x40, 0xc7, 0xdf, 0xa5, 0x81, 0xfe, 0x33, 0x0d, 0x36, 0xd2, 0xeb, 0x24, 0xef, 0x00, 0x11, 0xb4, - 0xb4, 0xcb, 0x4c, 0x67, 0x38, 0x90, 0x40, 0x1a, 0x4a, 0xac, 0x0c, 0xe8, 0x78, 0xbf, 0xcb, 0x1e, - 0x0e, 0x07, 0x38, 0x75, 0x40, 0x1e, 0x40, 0x35, 0x24, 0x0e, 0x2b, 0x62, 0x4a, 0x2b, 0x97, 0xcf, - 0x64, 0xc4, 0x77, 0x15, 0x81, 0x4c, 0x88, 0x7f, 0x25, 0x12, 0xe2, 0x0d, 0x29, 0x2f, 0x1c, 0xd1, - 0xdf, 0x87, 0xca, 0xd4, 0x8e, 0x89, 0x0e, 0xeb, 0xde, 0xb0, 0x6d, 0x9e, 0xb0, 0x89, 0x89, 0x2a, - 0x41, 0x7b, 0x28, 0x19, 0x65, 0x6f, 0xd8, 0xfe, 0x98, 0x4d, 0x44, 0x6a, 0x12, 0xe8, 0x1d, 0xd8, - 0x48, 0x67, 0x5c, 0x02, 0x5d, 0x7c, 0x77, 0xe8, 0x58, 0xb8, 0xee, 0x15, 0x43, 0x36, 0xc8, 0x6d, - 0x58, 0x19, 0xb9, 0xf2, 0xca, 0x9f, 0x97, 0x62, 0x1d, 0xbb, 0x9c, 0x25, 0xf2, 0x36, 0xc9, 0xa3, - 0x07, 0xb0, 0x82, 0x97, 0x57, 0x5c, 0x44, 0xcc, 0x9d, 0x54, 0x74, 0x23, 0xbe, 0xc9, 0x31, 0x00, - 0xe5, 0xdc, 0xb7, 0xdb, 0xc3, 0x58, 0x7c, 0x2d, 0x29, 0xbe, 0x6f, 0xb7, 0x83, 0xc6, 0xc9, 0xa8, - 0x71, 0x44, 0x6d, 0xbf, 0x79, 0x45, 0x5d, 0xff, 0x4b, 0x31, 0x4f, 0xc2, 0x04, 0x12, 0x92, 0xf4, - 0x9f, 0xaf, 0xc0, 0xaa, 0xcc, 0x49, 0xc9, 0x87, 0xe9, 0x0a, 0x49, 0x79, 0x6f, 0x73, 0xde, 0xf2, - 0x25, 0x95, 0x5a, 0x7d, 0x14, 0x66, 0x5d, 0x9f, 0x2e, 0x3b, 0x34, 0xcb, 0xa7, 0x2f, 0xb6, 0x0a, - 0x18, 0xa2, 0xb4, 0xee, 0xc6, 0x35, 0x88, 0x79, 0x29, 0x78, 0x58, 0xf0, 0xc8, 0xbf, 0x74, 0xc1, - 0xe3, 0x10, 0xd6, 0x13, 0x31, 0x99, 0x6d, 0xa9, 0x64, 0x66, 0xf3, 0x3c, 0xa3, 0x6b, 0xdd, 0x55, - 0xeb, 0x2f, 0x47, 0x31, 0x5b, 0xcb, 0x22, 0x3b, 0xe9, 0x4c, 0x1c, 0x43, 0x3b, 0x19, 0x53, 0x24, - 0x92, 0x6b, 0x11, 0xd8, 0x09, 0x73, 0x10, 0x1e, 0x42, 0x92, 0xc8, 0x10, 0xa3, 0x28, 0x3a, 0x70, - 0x70, 0x0b, 0xca, 0xe2, 0x4c, 0xfd, 0x40, 0x0e, 0x17, 0x71, 0x18, 0x64, 0x17, 0x12, 0xdc, 0x80, - 0x4a, 0x1c, 0x1e, 0x49, 0xa2, 0x92, 0x9c, 0x26, 0xee, 0x46, 0xc2, 0xf7, 0xe0, 0x92, 0xc3, 0xc6, - 0xdc, 0x9c, 0xa6, 0x06, 0xa4, 0x26, 0x62, 0xec, 0x38, 0xcd, 0x71, 0x0d, 0x36, 0x62, 0x47, 0x8c, - 0xb4, 0x65, 0x59, 0x40, 0x89, 0x7a, 0x91, 0xec, 0x32, 0x14, 0xa3, 0xe0, 0x75, 0x0d, 0x09, 0x0a, - 0x54, 0xc6, 0xac, 0x51, 0x38, 0xec, 0xb3, 0x60, 0xd8, 0xe7, 0x4a, 0xc8, 0x3a, 0xd2, 0x60, 0x38, - 0x6c, 0xc8, 0x7e, 0xa4, 0xdd, 0x86, 0xf5, 0xd0, 0xed, 0x48, 0xba, 0x0d, 0xa4, 0x5b, 0x0b, 0x3b, - 0x91, 0xe8, 0x26, 0x54, 0x3d, 0xdf, 0xf5, 0xdc, 0x80, 0xf9, 0x26, 0xb5, 0x2c, 0x9f, 0x05, 0x41, - 0xad, 0x22, 0xe5, 0x85, 0xfd, 0xfb, 0xb2, 0x5b, 0xff, 0x06, 0x14, 0xc2, 0xa8, 0xfc, 0x12, 0xac, - 0x34, 0x23, 0x17, 0x9a, 0x37, 0x64, 0x43, 0xa0, 0xf4, 0xbe, 0xe7, 0xa9, 0x1a, 0x9d, 0xf8, 0xd4, - 0xfb, 0x50, 0x50, 0x27, 0x3a, 0xb3, 0x32, 0xf3, 0x00, 0xd6, 0x3c, 0xea, 0x8b, 0x6d, 0x24, 0xeb, - 0x33, 0xf3, 0xf2, 0xca, 0x23, 0xea, 0xf3, 0x47, 0x8c, 0xa7, 0xca, 0x34, 0x65, 0xe4, 0x97, 0x5d, - 0xfa, 0x2d, 0x58, 0x4f, 0xd1, 0x88, 0x65, 0x72, 0x97, 0xd3, 0x7e, 0xe8, 0x09, 0xb0, 0x11, 0xad, - 0x24, 0x17, 0xaf, 0x44, 0xbf, 0x0d, 0xa5, 0xe8, 0xac, 0x44, 0xba, 0x12, 0xaa, 0x42, 0x53, 0xea, - 0x97, 0x4d, 0x2c, 0x45, 0xb9, 0xcf, 0x99, 0xaf, 0xcc, 0x43, 0x36, 0x74, 0x96, 0xf0, 0x5c, 0x12, - 0x13, 0xc9, 0x1d, 0x28, 0x28, 0xcf, 0xa5, 0x0c, 0x76, 0x5e, 0xd1, 0xe9, 0x08, 0x5d, 0x59, 0x58, - 0x74, 0x92, 0x8e, 0x2d, 0x9e, 0x26, 0x97, 0x9c, 0xe6, 0xc7, 0x50, 0x0c, 0xbd, 0x53, 0x1a, 0x46, - 0xe4, 0x0c, 0x57, 0x17, 0xc1, 0x88, 0x9a, 0x24, 0x66, 0x14, 0xb7, 0x29, 0xb0, 0xbb, 0x0e, 0xb3, - 0xcc, 0xd8, 0x46, 0x71, 0xce, 0xa2, 0x51, 0x91, 0x03, 0xf7, 0x43, 0x03, 0xd4, 0xdf, 0x83, 0x55, - 0xb9, 0xd6, 0x99, 0x3e, 0x70, 0x06, 0x40, 0xeb, 0x7f, 0xd7, 0xa0, 0x18, 0xe2, 0xcb, 0x4c, 0xa6, - 0xd4, 0x26, 0x72, 0x5f, 0x75, 0x13, 0xaf, 0xde, 0x67, 0xbd, 0x0b, 0x04, 0x6f, 0x8a, 0x39, 0x72, - 0xb9, 0xed, 0x74, 0x4d, 0x79, 0x16, 0x32, 0x9e, 0xac, 0xe2, 0xc8, 0x31, 0x0e, 0x1c, 0x89, 0xfe, - 0xb7, 0xb7, 0xa1, 0x9c, 0xa8, 0x95, 0x91, 0x02, 0x2c, 0x3f, 0x64, 0xcf, 0xab, 0x4b, 0xa4, 0x0c, - 0x05, 0x83, 0x61, 0xa5, 0xa1, 0xaa, 0xed, 0xfd, 0xb3, 0x00, 0x95, 0xfd, 0xe6, 0x41, 0x6b, 0xdf, - 0xf3, 0xfa, 0x76, 0x07, 0x01, 0x8f, 0x7c, 0x02, 0x79, 0xcc, 0xb6, 0x33, 0xbc, 0x12, 0xd5, 0xb3, - 0x94, 0xad, 0x88, 0x01, 0x2b, 0x98, 0x94, 0x93, 0x2c, 0x8f, 0x47, 0xf5, 0x4c, 0xd5, 0x2c, 0xb1, - 0x48, 0xbc, 0x70, 0x19, 0xde, 0x94, 0xea, 0x59, 0x4a, 0x5c, 0xe4, 0x33, 0x28, 0xc5, 0xd9, 0x76, - 0xd6, 0x97, 0xa6, 0x7a, 0xe6, 0xe2, 0x97, 0x90, 0x1f, 0xe7, 0x17, 0x59, 0xdf, 0x59, 0xea, 0x99, - 0xab, 0x3e, 0xe4, 0x29, 0x14, 0xc2, 0x4c, 0x2e, 0xdb, 0x5b, 0x50, 0x3d, 0x63, 0x61, 0x4a, 0x1c, - 0x9f, 0x4c, 0xc0, 0xb3, 0x3c, 0x78, 0xd5, 0x33, 0x55, 0xdf, 0xc8, 0x13, 0x58, 0x55, 0x21, 0x74, - 0xa6, 0x57, 0x9e, 0x7a, 0xb6, 0x72, 0x93, 0x50, 0x72, 0x5c, 0xe2, 0xc8, 0xfa, 0xc8, 0x57, 0xcf, - 0x5c, 0x76, 0x24, 0x14, 0x20, 0x91, 0x95, 0x67, 0x7e, 0xbd, 0xab, 0x67, 0x2f, 0x27, 0x92, 0x1f, - 0x42, 0x31, 0xca, 0xbd, 0x32, 0xbe, 0xa2, 0xd5, 0xb3, 0x56, 0xf4, 0x9a, 0xad, 0xff, 0xfc, 0x75, - 0x53, 0xfb, 0xcd, 0xe9, 0xa6, 0xf6, 0xc5, 0xe9, 0xa6, 0xf6, 0xe5, 0xe9, 0xa6, 0xf6, 0xc7, 0xd3, - 0x4d, 0xed, 0x2f, 0xa7, 0x9b, 0xda, 0xef, 0xff, 0xb6, 0xa9, 0xfd, 0xe0, 0x9d, 0xae, 0xcd, 0x7b, - 0xc3, 0x76, 0xa3, 0xe3, 0x0e, 0x76, 0x63, 0x81, 0xc9, 0xcf, 0xf8, 0x69, 0xbc, 0xbd, 0x8a, 0x0e, - 0xeb, 0x9b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x8e, 0xda, 0xd9, 0x2f, 0x1f, 0x00, 0x00, + // 2412 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcf, 0x6f, 0x1b, 0xc7, + 0xf5, 0xd7, 0x52, 0x94, 0x48, 0x3e, 0x4a, 0x22, 0x3d, 0x76, 0x12, 0x9a, 0x5f, 0x47, 0xf2, 0x77, + 0x15, 0xdb, 0x72, 0x92, 0x52, 0xa9, 0x8a, 0x14, 0x71, 0x6d, 0xa4, 0x10, 0x65, 0xa7, 0x22, 0x62, + 0x3b, 0xca, 0xda, 0x56, 0xdd, 0x16, 0xc8, 0x62, 0xc8, 0x1d, 0x93, 0x0b, 0x91, 0xbb, 0x9b, 0xdd, + 0x21, 0x4d, 0xf6, 0x1f, 0x28, 0x0a, 0xb4, 0x40, 0x2f, 0x05, 0x7a, 0x29, 0x7a, 0xed, 0xb1, 0x87, + 0x1e, 0x72, 0xec, 0x31, 0x87, 0x1e, 0x7a, 0xe8, 0xd9, 0x6d, 0xd5, 0x9e, 0x8a, 0x1e, 0x8b, 0xa2, + 0xc7, 0x62, 0xde, 0xcc, 0xfe, 0xa2, 0x48, 0x71, 0x9d, 0xfa, 0xd6, 0x0b, 0xb9, 0x33, 0xf3, 0xde, + 0x9b, 0x99, 0x37, 0xf3, 0xde, 0xe7, 0xbd, 0x37, 0xf0, 0x3a, 0x6d, 0x77, 0xec, 0x5d, 0x3e, 0xf1, + 0x58, 0x20, 0x7f, 0x1b, 0x9e, 0xef, 0x72, 0x97, 0xbc, 0xc6, 0x99, 0x63, 0x31, 0x7f, 0x60, 0x3b, + 0xbc, 0x21, 0x48, 0x1a, 0x38, 0x58, 0xbf, 0xce, 0x7b, 0xb6, 0x6f, 0x99, 0x1e, 0xf5, 0xf9, 0x64, + 0x17, 0x29, 0x77, 0xbb, 0x6e, 0xd7, 0x8d, 0xbf, 0x24, 0x7b, 0xbd, 0xde, 0xf1, 0x27, 0x1e, 0x77, + 0x77, 0x07, 0xcc, 0x3f, 0xe9, 0x33, 0xf5, 0xa7, 0xc6, 0x2e, 0xf6, 0xed, 0x76, 0xb0, 0x7b, 0x32, + 0x4a, 0xce, 0x57, 0xdf, 0xea, 0xba, 0x6e, 0xb7, 0xcf, 0xa4, 0xcc, 0xf6, 0xf0, 0xd9, 0x2e, 0xb7, + 0x07, 0x2c, 0xe0, 0x74, 0xe0, 0x29, 0x82, 0xcd, 0x69, 0x02, 0x6b, 0xe8, 0x53, 0x6e, 0xbb, 0x8e, + 0x1c, 0xd7, 0xff, 0xb5, 0x02, 0x05, 0x83, 0x7d, 0x3e, 0x64, 0x01, 0x27, 0x1f, 0x40, 0x9e, 0x75, + 0x7a, 0x6e, 0x2d, 0x77, 0x55, 0xdb, 0x29, 0xef, 0xe9, 0x8d, 0x99, 0x7b, 0x69, 0x28, 0xea, 0x7b, + 0x9d, 0x9e, 0x7b, 0xb8, 0x64, 0x20, 0x07, 0xb9, 0x0d, 0x2b, 0xcf, 0xfa, 0xc3, 0xa0, 0x57, 0x5b, + 0x46, 0xd6, 0xed, 0xf3, 0x59, 0x3f, 0x12, 0xa4, 0x87, 0x4b, 0x86, 0xe4, 0x11, 0xd3, 0xda, 0xce, + 0x33, 0xb7, 0x96, 0xcf, 0x32, 0x6d, 0xcb, 0x79, 0x86, 0xd3, 0x0a, 0x0e, 0x72, 0x08, 0x10, 0x30, + 0x6e, 0xba, 0x9e, 0xd8, 0x50, 0x6d, 0x05, 0xf9, 0x6f, 0x9c, 0xcf, 0xff, 0x88, 0xf1, 0x4f, 0x90, + 0xfc, 0x70, 0xc9, 0x28, 0x05, 0x61, 0x43, 0x48, 0xb2, 0x1d, 0x9b, 0x9b, 0x9d, 0x1e, 0xb5, 0x9d, + 0xda, 0x6a, 0x16, 0x49, 0x2d, 0xc7, 0xe6, 0x07, 0x82, 0x5c, 0x48, 0xb2, 0xc3, 0x86, 0x50, 0xc5, + 0xe7, 0x43, 0xe6, 0x4f, 0x6a, 0x85, 0x2c, 0xaa, 0xf8, 0x54, 0x90, 0x0a, 0x55, 0x20, 0x0f, 0xf9, + 0x18, 0xca, 0x6d, 0xd6, 0xb5, 0x1d, 0xb3, 0xdd, 0x77, 0x3b, 0x27, 0xb5, 0x22, 0x8a, 0xd8, 0x39, + 0x5f, 0x44, 0x53, 0x30, 0x34, 0x05, 0xfd, 0xe1, 0x92, 0x01, 0xed, 0xa8, 0x45, 0x9a, 0x50, 0xec, + 0xf4, 0x58, 0xe7, 0xc4, 0xe4, 0xe3, 0x5a, 0x09, 0x25, 0x5d, 0x3b, 0x5f, 0xd2, 0x81, 0xa0, 0x7e, + 0x3c, 0x3e, 0x5c, 0x32, 0x0a, 0x1d, 0xf9, 0x29, 0xf4, 0x62, 0xb1, 0xbe, 0x3d, 0x62, 0xbe, 0x90, + 0x72, 0x31, 0x8b, 0x5e, 0xee, 0x4a, 0x7a, 0x94, 0x53, 0xb2, 0xc2, 0x06, 0xb9, 0x07, 0x25, 0xe6, + 0x58, 0x6a, 0x63, 0x65, 0x14, 0x74, 0x7d, 0xc1, 0x0d, 0x73, 0xac, 0x70, 0x5b, 0x45, 0xa6, 0xbe, + 0xc9, 0x87, 0xb0, 0xda, 0x71, 0x07, 0x03, 0x9b, 0xd7, 0xd6, 0x50, 0xc6, 0x5b, 0x0b, 0xb6, 0x84, + 0xb4, 0x87, 0x4b, 0x86, 0xe2, 0x6a, 0x16, 0x60, 0x65, 0x44, 0xfb, 0x43, 0xa6, 0xdf, 0x80, 0x72, + 0xe2, 0x26, 0x93, 0x1a, 0x14, 0x06, 0x2c, 0x08, 0x68, 0x97, 0xd5, 0xb4, 0xab, 0xda, 0x4e, 0xc9, + 0x08, 0x9b, 0xfa, 0x06, 0xac, 0x25, 0xef, 0xad, 0x3e, 0x88, 0x18, 0xc5, 0x5d, 0x14, 0x8c, 0x23, + 0xe6, 0x07, 0xe2, 0x02, 0x2a, 0x46, 0xd5, 0x24, 0xdb, 0xb0, 0x8e, 0xbb, 0x35, 0xc3, 0x71, 0x61, + 0x57, 0x79, 0x63, 0x0d, 0x3b, 0x8f, 0x15, 0xd1, 0x16, 0x94, 0xbd, 0x3d, 0x2f, 0x22, 0x59, 0x46, + 0x12, 0xf0, 0xf6, 0x3c, 0x45, 0xa0, 0x7f, 0x0b, 0xaa, 0xd3, 0x57, 0x97, 0x54, 0x61, 0xf9, 0x84, + 0x4d, 0xd4, 0x7c, 0xe2, 0x93, 0x5c, 0x52, 0xdb, 0xc2, 0x39, 0x4a, 0x86, 0xda, 0xe3, 0x6f, 0x72, + 0x11, 0x73, 0x74, 0x5b, 0x85, 0xb9, 0x09, 0x27, 0x81, 0xdc, 0xe5, 0xbd, 0x7a, 0x43, 0x3a, 0x88, + 0x46, 0xe8, 0x20, 0x1a, 0x8f, 0x43, 0x0f, 0xd2, 0x2c, 0x7e, 0xf9, 0x62, 0x6b, 0xe9, 0x67, 0x7f, + 0xda, 0xd2, 0x0c, 0xe4, 0x20, 0x97, 0xc5, 0x85, 0xa2, 0xb6, 0x63, 0xda, 0x96, 0x9a, 0xa7, 0x80, + 0xed, 0x96, 0x45, 0x3e, 0x85, 0x6a, 0xc7, 0x75, 0x02, 0xe6, 0x04, 0xc3, 0x40, 0xb8, 0x39, 0x3a, + 0x08, 0x94, 0x2f, 0x98, 0x77, 0xc8, 0x07, 0x21, 0xf9, 0x11, 0x52, 0x1b, 0x95, 0x4e, 0xba, 0x83, + 0xdc, 0x07, 0x18, 0xd1, 0xbe, 0x6d, 0x51, 0xee, 0xfa, 0x41, 0x2d, 0x7f, 0x75, 0xf9, 0x1c, 0x61, + 0xc7, 0x21, 0xe1, 0x13, 0xcf, 0xa2, 0x9c, 0x35, 0xf3, 0x62, 0xe5, 0x46, 0x82, 0x9f, 0x5c, 0x87, + 0x0a, 0xf5, 0x3c, 0x33, 0xe0, 0x94, 0x33, 0xb3, 0x3d, 0xe1, 0x2c, 0x40, 0x7f, 0xb1, 0x66, 0xac, + 0x53, 0xcf, 0x7b, 0x24, 0x7a, 0x9b, 0xa2, 0x53, 0xb7, 0xa2, 0xd3, 0x46, 0xd3, 0x24, 0x04, 0xf2, + 0x16, 0xe5, 0x14, 0xb5, 0xb5, 0x66, 0xe0, 0xb7, 0xe8, 0xf3, 0x28, 0xef, 0x29, 0x1d, 0xe0, 0x37, + 0x79, 0x1d, 0x56, 0x7b, 0xcc, 0xee, 0xf6, 0x38, 0x6e, 0x7b, 0xd9, 0x50, 0x2d, 0x71, 0x30, 0x9e, + 0xef, 0x8e, 0x18, 0x7a, 0xb7, 0xa2, 0x21, 0x1b, 0xfa, 0xcf, 0x73, 0x70, 0xe1, 0x8c, 0xf9, 0x0a, + 0xb9, 0x3d, 0x1a, 0xf4, 0xc2, 0xb9, 0xc4, 0x37, 0xb9, 0x2d, 0xe4, 0x52, 0x8b, 0xf9, 0xca, 0x2b, + 0xbf, 0x39, 0x47, 0x03, 0x87, 0x48, 0xa4, 0x36, 0xae, 0x58, 0xc8, 0x13, 0xa8, 0xf6, 0x69, 0xc0, + 0x4d, 0x79, 0xf7, 0x4d, 0xf4, 0xb2, 0xcb, 0xe7, 0x7a, 0x82, 0xfb, 0x34, 0xb4, 0x19, 0x71, 0xb9, + 0x95, 0xb8, 0x8d, 0x7e, 0xaa, 0x97, 0x3c, 0x85, 0x4b, 0xed, 0xc9, 0x0f, 0xa9, 0xc3, 0x6d, 0x87, + 0x99, 0x67, 0xce, 0x68, 0x6b, 0x8e, 0xe8, 0x7b, 0x23, 0xdb, 0x62, 0x4e, 0x27, 0x3c, 0x9c, 0x8b, + 0x91, 0x88, 0xe8, 0xf0, 0x02, 0xfd, 0x29, 0x6c, 0xa4, 0x7d, 0x11, 0xd9, 0x80, 0x1c, 0x1f, 0x2b, + 0x8d, 0xe4, 0xf8, 0x98, 0x7c, 0x13, 0xf2, 0x42, 0x1c, 0x6a, 0x63, 0x63, 0x2e, 0x58, 0x28, 0xee, + 0xc7, 0x13, 0x8f, 0x19, 0x48, 0xaf, 0xeb, 0x91, 0x25, 0x44, 0xfe, 0x69, 0x5a, 0xb6, 0x7e, 0x13, + 0x2a, 0x53, 0xae, 0x27, 0x71, 0xac, 0x5a, 0xf2, 0x58, 0xf5, 0x0a, 0xac, 0xa7, 0x3c, 0x8c, 0xfe, + 0xfb, 0x55, 0x28, 0x1a, 0x2c, 0xf0, 0xc4, 0x25, 0x26, 0x87, 0x50, 0x62, 0xe3, 0x0e, 0x93, 0xb0, + 0xa4, 0x2d, 0x70, 0xe2, 0x92, 0xe7, 0x5e, 0x48, 0x2f, 0xbc, 0x66, 0xc4, 0x4c, 0x6e, 0xa5, 0x20, + 0x79, 0x7b, 0x91, 0x90, 0x24, 0x26, 0xdf, 0x49, 0x63, 0xf2, 0x5b, 0x0b, 0x78, 0xa7, 0x40, 0xf9, + 0x56, 0x0a, 0x94, 0x17, 0x4d, 0x9c, 0x42, 0xe5, 0xd6, 0x0c, 0x54, 0x5e, 0xb4, 0xfd, 0x39, 0xb0, + 0xdc, 0x9a, 0x01, 0xcb, 0x3b, 0x0b, 0xd7, 0x32, 0x13, 0x97, 0xef, 0xa4, 0x71, 0x79, 0x91, 0x3a, + 0xa6, 0x80, 0xf9, 0xfe, 0x2c, 0x60, 0xbe, 0xb9, 0x40, 0xc6, 0x5c, 0x64, 0x3e, 0x38, 0x83, 0xcc, + 0xd7, 0x17, 0x88, 0x9a, 0x01, 0xcd, 0xad, 0x14, 0x34, 0x43, 0x26, 0xdd, 0xcc, 0xc1, 0xe6, 0x8f, + 0xce, 0x62, 0xf3, 0x8d, 0x45, 0x57, 0x6d, 0x16, 0x38, 0x7f, 0x7b, 0x0a, 0x9c, 0xaf, 0x2d, 0xda, + 0xd5, 0x5c, 0x74, 0xbe, 0x29, 0xfc, 0xe3, 0x94, 0x65, 0x08, 0x5f, 0xca, 0x7c, 0xdf, 0xf5, 0x15, + 0xf0, 0xc9, 0x86, 0xbe, 0x23, 0x3c, 0x76, 0x7c, 0xff, 0xcf, 0x41, 0x72, 0x34, 0xda, 0xc4, 0x6d, + 0xd7, 0xbf, 0xd0, 0x62, 0x5e, 0xf4, 0x6c, 0x49, 0x6f, 0x5f, 0x52, 0xde, 0x3e, 0x01, 0xf0, 0xb9, + 0x34, 0xc0, 0x6f, 0x41, 0x59, 0x60, 0xca, 0x14, 0x76, 0x53, 0x2f, 0xc4, 0x6e, 0xf2, 0x36, 0x5c, + 0x40, 0xff, 0x2b, 0xc3, 0x00, 0xe5, 0x48, 0xf2, 0xe8, 0x48, 0x2a, 0x62, 0x40, 0x6a, 0x50, 0x02, + 0xc5, 0xd7, 0xe0, 0x62, 0x82, 0x56, 0xc8, 0x45, 0x2c, 0x90, 0x20, 0x55, 0x8d, 0xa8, 0xf7, 0x3d, + 0xef, 0x90, 0x06, 0x3d, 0xfd, 0x41, 0xac, 0xa0, 0x38, 0x2e, 0x20, 0x90, 0xef, 0xb8, 0x96, 0xdc, + 0xf7, 0xba, 0x81, 0xdf, 0x22, 0x56, 0xe8, 0xbb, 0x5d, 0x5c, 0x5c, 0xc9, 0x10, 0x9f, 0x82, 0x2a, + 0x32, 0xed, 0x92, 0xb4, 0x59, 0xfd, 0xb7, 0x5a, 0x2c, 0x2f, 0x0e, 0x15, 0x66, 0xa1, 0xba, 0xf6, + 0x2a, 0x51, 0x3d, 0xf7, 0xdf, 0xa1, 0xba, 0xfe, 0x4f, 0x2d, 0x3e, 0xd2, 0x08, 0xaf, 0xbf, 0x9a, + 0x0a, 0xc4, 0xed, 0xb2, 0x1d, 0x8b, 0x8d, 0x51, 0xe5, 0xcb, 0x86, 0x6c, 0x84, 0xa1, 0xd6, 0x2a, + 0x1e, 0x43, 0x3a, 0xd4, 0x2a, 0x60, 0x9f, 0x6c, 0x90, 0xf7, 0x11, 0xe7, 0xdd, 0x67, 0xca, 0x35, + 0xa4, 0x40, 0x50, 0x26, 0x75, 0x0d, 0x95, 0xcd, 0x1d, 0x09, 0x32, 0x43, 0x52, 0x27, 0xf0, 0xa5, + 0x94, 0x0a, 0x1b, 0xae, 0x40, 0x49, 0x2c, 0x3d, 0xf0, 0x68, 0x87, 0xa1, 0x6d, 0x97, 0x8c, 0xb8, + 0x43, 0xb7, 0x80, 0x9c, 0xf5, 0x31, 0xe4, 0x21, 0xac, 0xb2, 0x11, 0x73, 0xb8, 0x38, 0x23, 0xa1, + 0xd6, 0x2b, 0x73, 0x81, 0x98, 0x39, 0xbc, 0x59, 0x13, 0xca, 0xfc, 0xfb, 0x8b, 0xad, 0xaa, 0xe4, + 0x79, 0xd7, 0x1d, 0xd8, 0x9c, 0x0d, 0x3c, 0x3e, 0x31, 0x94, 0x14, 0xfd, 0x47, 0x39, 0x81, 0x87, + 0x29, 0xff, 0x33, 0x53, 0xbd, 0xa1, 0xd1, 0xe4, 0x12, 0x21, 0x52, 0x36, 0x95, 0xbf, 0x09, 0xd0, + 0xa5, 0x81, 0xf9, 0x9c, 0x3a, 0x9c, 0x59, 0x4a, 0xef, 0xa5, 0x2e, 0x0d, 0xbe, 0x8b, 0x1d, 0x22, + 0xde, 0x14, 0xc3, 0xc3, 0x80, 0x59, 0x78, 0x00, 0xcb, 0x46, 0xa1, 0x4b, 0x83, 0x27, 0x01, 0xb3, + 0x12, 0x7b, 0x2d, 0xbc, 0x8a, 0xbd, 0xa6, 0xf5, 0x5d, 0x9c, 0xd6, 0xf7, 0x8f, 0x73, 0xb1, 0x75, + 0xc4, 0xe1, 0xc3, 0xff, 0xa6, 0x2e, 0x7e, 0x89, 0x39, 0x45, 0x1a, 0x04, 0xc8, 0xf7, 0xe0, 0x42, + 0x64, 0x95, 0xe6, 0x10, 0xad, 0x35, 0xbc, 0x85, 0x2f, 0x67, 0xdc, 0xd5, 0x51, 0xba, 0x3b, 0x20, + 0x9f, 0xc1, 0x1b, 0x53, 0x3e, 0x28, 0x9a, 0x20, 0xf7, 0x52, 0xae, 0xe8, 0xb5, 0xb4, 0x2b, 0x0a, + 0xe5, 0xc7, 0xda, 0x5b, 0x7e, 0x25, 0x56, 0xd3, 0x12, 0x21, 0x6c, 0x12, 0xde, 0x66, 0xde, 0x89, + 0x6d, 0x58, 0xf7, 0x19, 0x17, 0xb9, 0x54, 0x2a, 0x6b, 0x58, 0x93, 0x9d, 0x12, 0x12, 0xf4, 0x3f, + 0x6a, 0x50, 0x99, 0xda, 0x05, 0xf9, 0x00, 0x56, 0x24, 0x4c, 0x6b, 0xe7, 0x56, 0x4b, 0xf0, 0x58, + 0xd4, 0xc6, 0x25, 0x03, 0xd9, 0x87, 0x22, 0x53, 0x21, 0xb8, 0xd2, 0xdc, 0xb5, 0x05, 0x91, 0xba, + 0xe2, 0x8f, 0xd8, 0xc8, 0x5d, 0x28, 0x45, 0xe7, 0xb3, 0x20, 0xbd, 0x8b, 0x8e, 0x57, 0x09, 0x89, + 0x19, 0xf5, 0x03, 0x28, 0x27, 0x96, 0x47, 0xfe, 0x0f, 0x4a, 0x03, 0x3a, 0x56, 0x39, 0x99, 0x8c, + 0xb2, 0x8b, 0x03, 0x3a, 0xc6, 0x74, 0x8c, 0xbc, 0x01, 0x05, 0x31, 0xd8, 0xa5, 0xf2, 0xb4, 0x97, + 0x8d, 0xd5, 0x01, 0x1d, 0x7f, 0x87, 0x06, 0xfa, 0x4f, 0x34, 0xd8, 0x48, 0xaf, 0x93, 0xbc, 0x03, + 0x44, 0xd0, 0xd2, 0x2e, 0x33, 0x9d, 0xe1, 0x40, 0x02, 0x69, 0x28, 0xb1, 0x32, 0xa0, 0xe3, 0xfd, + 0x2e, 0x7b, 0x38, 0x1c, 0xe0, 0xd4, 0x01, 0x79, 0x00, 0xd5, 0x90, 0x38, 0xac, 0x88, 0x29, 0xad, + 0x5c, 0x3e, 0x93, 0x11, 0xdf, 0x55, 0x04, 0x32, 0x21, 0xfe, 0x85, 0x48, 0x88, 0x37, 0xa4, 0xbc, + 0x70, 0x44, 0x7f, 0x1f, 0x2a, 0x53, 0x3b, 0x26, 0x3a, 0xac, 0x7b, 0xc3, 0xb6, 0x79, 0xc2, 0x26, + 0x26, 0xaa, 0x04, 0xed, 0xa1, 0x64, 0x94, 0xbd, 0x61, 0xfb, 0x63, 0x36, 0x11, 0xa9, 0x49, 0xa0, + 0x77, 0x60, 0x23, 0x9d, 0x71, 0x09, 0x74, 0xf1, 0xdd, 0xa1, 0x63, 0xe1, 0xba, 0x57, 0x0c, 0xd9, + 0x20, 0xb7, 0x61, 0x65, 0xe4, 0xca, 0x2b, 0x7f, 0x5e, 0x8a, 0x75, 0xec, 0x72, 0x96, 0xc8, 0xdb, + 0x24, 0x8f, 0x1e, 0xc0, 0x0a, 0x5e, 0x5e, 0x71, 0x11, 0x31, 0x77, 0x52, 0xd1, 0x8d, 0xf8, 0x26, + 0xc7, 0x00, 0x94, 0x73, 0xdf, 0x6e, 0x0f, 0x63, 0xf1, 0xb5, 0xa4, 0xf8, 0xbe, 0xdd, 0x0e, 0x1a, + 0x27, 0xa3, 0xc6, 0x11, 0xb5, 0xfd, 0xe6, 0x15, 0x75, 0xfd, 0x2f, 0xc5, 0x3c, 0x09, 0x13, 0x48, + 0x48, 0xd2, 0x7f, 0xba, 0x02, 0xab, 0x32, 0x27, 0x25, 0x1f, 0xa6, 0x2b, 0x24, 0xe5, 0xbd, 0xcd, + 0x79, 0xcb, 0x97, 0x54, 0x6a, 0xf5, 0x51, 0x98, 0x75, 0x7d, 0xba, 0xec, 0xd0, 0x2c, 0x9f, 0xbe, + 0xd8, 0x2a, 0x60, 0x88, 0xd2, 0xba, 0x1b, 0xd7, 0x20, 0xe6, 0xa5, 0xe0, 0x61, 0xc1, 0x23, 0xff, + 0xd2, 0x05, 0x8f, 0x43, 0x58, 0x4f, 0xc4, 0x64, 0xb6, 0xa5, 0x92, 0x99, 0xcd, 0xf3, 0x8c, 0xae, + 0x75, 0x57, 0xad, 0xbf, 0x1c, 0xc5, 0x6c, 0x2d, 0x8b, 0xec, 0xa4, 0x33, 0x71, 0x0c, 0xed, 0x64, + 0x4c, 0x91, 0x48, 0xae, 0x45, 0x60, 0x27, 0xcc, 0x41, 0x78, 0x08, 0x49, 0x22, 0x43, 0x8c, 0xa2, + 0xe8, 0xc0, 0xc1, 0x2d, 0x28, 0x8b, 0x33, 0xf5, 0x03, 0x39, 0x5c, 0xc4, 0x61, 0x90, 0x5d, 0x48, + 0x70, 0x03, 0x2a, 0x71, 0x78, 0x24, 0x89, 0x4a, 0x72, 0x9a, 0xb8, 0x1b, 0x09, 0xdf, 0x83, 0x4b, + 0x0e, 0x1b, 0x73, 0x73, 0x9a, 0x1a, 0x90, 0x9a, 0x88, 0xb1, 0xe3, 0x34, 0xc7, 0x35, 0xd8, 0x88, + 0x1d, 0x31, 0xd2, 0x96, 0x65, 0x01, 0x25, 0xea, 0x45, 0xb2, 0xcb, 0x50, 0x8c, 0x82, 0xd7, 0x35, + 0x24, 0x28, 0x50, 0x19, 0xb3, 0x46, 0xe1, 0xb0, 0xcf, 0x82, 0x61, 0x9f, 0x2b, 0x21, 0xeb, 0x48, + 0x83, 0xe1, 0xb0, 0x21, 0xfb, 0x91, 0x76, 0x1b, 0xd6, 0x43, 0xb7, 0x23, 0xe9, 0x36, 0x90, 0x6e, + 0x2d, 0xec, 0x44, 0xa2, 0x9b, 0x50, 0xf5, 0x7c, 0xd7, 0x73, 0x03, 0xe6, 0x9b, 0xd4, 0xb2, 0x7c, + 0x16, 0x04, 0xb5, 0x8a, 0x94, 0x17, 0xf6, 0xef, 0xcb, 0x6e, 0xfd, 0xeb, 0x50, 0x08, 0xa3, 0xf2, + 0x4b, 0xb0, 0xd2, 0x8c, 0x5c, 0x68, 0xde, 0x90, 0x0d, 0x81, 0xd2, 0xfb, 0x9e, 0xa7, 0x6a, 0x74, + 0xe2, 0x53, 0xef, 0x43, 0x41, 0x9d, 0xe8, 0xcc, 0xca, 0xcc, 0x03, 0x58, 0xf3, 0xa8, 0x2f, 0xb6, + 0x91, 0xac, 0xcf, 0xcc, 0xcb, 0x2b, 0x8f, 0xa8, 0xcf, 0x1f, 0x31, 0x9e, 0x2a, 0xd3, 0x94, 0x91, + 0x5f, 0x76, 0xe9, 0xb7, 0x60, 0x3d, 0x45, 0x23, 0x96, 0xc9, 0x5d, 0x4e, 0xfb, 0xa1, 0x27, 0xc0, + 0x46, 0xb4, 0x92, 0x5c, 0xbc, 0x12, 0xfd, 0x36, 0x94, 0xa2, 0xb3, 0x12, 0xe9, 0x4a, 0xa8, 0x0a, + 0x4d, 0xa9, 0x5f, 0x36, 0xb1, 0x14, 0xe5, 0x3e, 0x67, 0xbe, 0x32, 0x0f, 0xd9, 0xd0, 0x59, 0xc2, + 0x73, 0x49, 0x4c, 0x24, 0x77, 0xa0, 0xa0, 0x3c, 0x97, 0x32, 0xd8, 0x79, 0x45, 0xa7, 0x23, 0x74, + 0x65, 0x61, 0xd1, 0x49, 0x3a, 0xb6, 0x78, 0x9a, 0x5c, 0x72, 0x9a, 0x5f, 0x69, 0x50, 0x0c, 0xdd, + 0x53, 0x1a, 0x47, 0xe4, 0x14, 0x57, 0x17, 0xe1, 0x88, 0x9a, 0x25, 0x66, 0x24, 0xff, 0x0f, 0x6b, + 0x23, 0x97, 0xdb, 0x4e, 0xd7, 0x4c, 0xce, 0x57, 0x96, 0x7d, 0x47, 0xa2, 0x4b, 0xdc, 0xb8, 0xc0, + 0xee, 0x3a, 0xcc, 0x32, 0x63, 0x3b, 0xc6, 0xed, 0x17, 0x8d, 0x8a, 0x1c, 0xb8, 0x1f, 0x1a, 0xa9, + 0xfe, 0x1e, 0xac, 0xca, 0xfd, 0xcc, 0xf4, 0x93, 0x33, 0x40, 0x5c, 0xff, 0x9b, 0x06, 0xc5, 0x10, + 0x83, 0x66, 0x32, 0xa5, 0xf6, 0x99, 0xfb, 0xaa, 0xfb, 0x7c, 0xf5, 0x7e, 0xed, 0x5d, 0x20, 0x78, + 0x9b, 0xcc, 0x94, 0xfe, 0x64, 0xcc, 0x59, 0xc5, 0x91, 0xe3, 0x58, 0x89, 0x6f, 0x6f, 0x43, 0x39, + 0x51, 0x4f, 0x23, 0x05, 0x58, 0x7e, 0xc8, 0x9e, 0x57, 0x97, 0x48, 0x19, 0x0a, 0x06, 0xc3, 0x6a, + 0x44, 0x55, 0xdb, 0xfb, 0x47, 0x01, 0x2a, 0xfb, 0xcd, 0x83, 0xd6, 0xbe, 0xe7, 0xf5, 0xed, 0x0e, + 0x82, 0x22, 0xf9, 0x04, 0xf2, 0x98, 0x91, 0x67, 0x78, 0x49, 0xaa, 0x67, 0x29, 0x6d, 0x11, 0x03, + 0x56, 0x30, 0x71, 0x27, 0x59, 0x1e, 0x98, 0xea, 0x99, 0x2a, 0x5e, 0x62, 0x91, 0x78, 0x27, 0x33, + 0xbc, 0x3b, 0xd5, 0xb3, 0x94, 0xc1, 0xc8, 0x67, 0x50, 0x8a, 0x33, 0xf2, 0xac, 0xaf, 0x51, 0xf5, + 0xcc, 0x05, 0x32, 0x21, 0x3f, 0xce, 0x41, 0xb2, 0xbe, 0xc5, 0xd4, 0x33, 0x57, 0x86, 0xc8, 0x53, + 0x28, 0x84, 0xd9, 0x5e, 0xb6, 0xf7, 0xa2, 0x7a, 0xc6, 0xe2, 0x95, 0x38, 0x3e, 0x99, 0xa4, 0x67, + 0x79, 0x14, 0xab, 0x67, 0xaa, 0xd0, 0x91, 0x27, 0xb0, 0xaa, 0xc2, 0xec, 0x4c, 0x2f, 0x41, 0xf5, + 0x6c, 0x25, 0x29, 0xa1, 0xe4, 0xb8, 0x0c, 0x92, 0xf5, 0x21, 0xb0, 0x9e, 0xb9, 0x34, 0x49, 0x28, + 0x40, 0x22, 0x73, 0xcf, 0xfc, 0xc2, 0x57, 0xcf, 0x5e, 0x72, 0x24, 0x3f, 0x80, 0x62, 0x94, 0x9f, + 0x65, 0x7c, 0x69, 0xab, 0x67, 0xad, 0xfa, 0x35, 0x5b, 0xff, 0xfe, 0xcb, 0xa6, 0xf6, 0xeb, 0xd3, + 0x4d, 0xed, 0x8b, 0xd3, 0x4d, 0xed, 0xcb, 0xd3, 0x4d, 0xed, 0x0f, 0xa7, 0x9b, 0xda, 0x9f, 0x4f, + 0x37, 0xb5, 0xdf, 0xfd, 0x75, 0x53, 0xfb, 0xfe, 0x3b, 0x5d, 0x9b, 0xf7, 0x86, 0xed, 0x46, 0xc7, + 0x1d, 0xec, 0xc6, 0x02, 0x93, 0x9f, 0xf1, 0xf3, 0x79, 0x7b, 0x15, 0x1d, 0xd6, 0x37, 0xfe, 0x13, + 0x00, 0x00, 0xff, 0xff, 0xc6, 0x15, 0x72, 0xe4, 0x53, 0x1f, 0x00, 0x00, } func (this *Request) Equal(that interface{}) bool { @@ -4973,6 +4982,9 @@ func (this *VoteInfo) Equal(that interface{}) bool { if !this.Validator.Equal(&that1.Validator) { return false } + if this.VotingPower != that1.VotingPower { + return false + } if this.SignedLastBlock != that1.SignedLastBlock { return false } @@ -7821,6 +7833,11 @@ func (m *VoteInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- + dAtA[i] = 0x18 + } + if m.VotingPower != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.VotingPower)) + i-- dAtA[i] = 0x10 } { @@ -8767,9 +8784,13 @@ func NewPopulatedVoteInfo(r randyTypes, easy bool) *VoteInfo { this := &VoteInfo{} v55 := NewPopulatedValidator(r, easy) this.Validator = *v55 + this.VotingPower = int64(r.Int63()) + if r.Intn(2) == 0 { + this.VotingPower *= -1 + } this.SignedLastBlock = bool(bool(r.Intn(2) == 0)) if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 3) + this.XXX_unrecognized = randUnrecognizedTypes(r, 4) } return this } @@ -10002,6 +10023,9 @@ func (m *VoteInfo) Size() (n int) { _ = l l = m.Validator.Size() n += 1 + l + sovTypes(uint64(l)) + if m.VotingPower != 0 { + n += 1 + sovTypes(uint64(m.VotingPower)) + } if m.SignedLastBlock { n += 2 } @@ -15954,6 +15978,25 @@ func (m *VoteInfo) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPower", wireType) + } + m.VotingPower = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.VotingPower |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SignedLastBlock", wireType) } diff --git a/abci/types/types.proto b/abci/types/types.proto index a644b6159..78daa8de8 100644 --- a/abci/types/types.proto +++ b/abci/types/types.proto @@ -314,7 +314,8 @@ message ValidatorUpdate { // VoteInfo message VoteInfo { Validator validator = 1 [(gogoproto.nullable) = false]; - bool signed_last_block = 2; + int64 voting_power = 2; + bool signed_last_block = 3; } message PubKey { diff --git a/state/execution.go b/state/execution.go index 9764df6e0..119638dd5 100644 --- a/state/execution.go +++ b/state/execution.go @@ -346,7 +346,9 @@ func getBeginBlockValidatorInfo(block *types.Block, stateDB dbm.DB, voterParams for i, val := range lastVoterSet.Voters { commitSig := block.LastCommit.Signatures[i] voteInfos[i] = abci.VoteInfo{ - Validator: types.TM2PB.Validator(val), + Validator: types.TM2PB.Validator(val), + // TODO We need to change distribution of cosmos-sdk in order to reference this power for reward later + VotingPower: val.VotingPower, SignedLastBlock: !commitSig.Absent(), } }