From cc7fab7995569c633a227395298a5aebf63d5f1b Mon Sep 17 00:00:00 2001 From: KeefeL <90749943+KeefeL@users.noreply.github.com> Date: Thu, 20 Apr 2023 15:33:12 +0800 Subject: [PATCH 1/2] chore: remove challenger address in tendermint (#30) * types: remove challenger address in tendermint * update proto --------- Co-authored-by: Keefe Liu Co-authored-by: forcodedancing --- abci/types/types.pb.go | 418 +++++++++++-------------- proto/tendermint/abci/types.proto | 1 - proto/tendermint/types/validator.pb.go | 182 +++-------- proto/tendermint/types/validator.proto | 2 - state/execution_test.go | 21 +- types/protobuf.go | 1 - types/validator.go | 42 +-- types/validator_set_test.go | 2 - types/validator_test.go | 11 - 9 files changed, 236 insertions(+), 444 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 2ec7ae399..22644dee1 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -2910,11 +2910,10 @@ func (m *Validator) GetPower() int64 { // ValidatorUpdate type ValidatorUpdate struct { - PubKey crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"` - Power int64 `protobuf:"varint,2,opt,name=power,proto3" json:"power,omitempty"` - BlsKey []byte `protobuf:"bytes,3,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` - RelayerAddress []byte `protobuf:"bytes,4,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` - ChallengerAddress []byte `protobuf:"bytes,5,opt,name=challenger_address,json=challengerAddress,proto3" json:"challenger_address,omitempty"` + PubKey crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"` + Power int64 `protobuf:"varint,2,opt,name=power,proto3" json:"power,omitempty"` + BlsKey []byte `protobuf:"bytes,3,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` + RelayerAddress []byte `protobuf:"bytes,4,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` } func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } @@ -2978,13 +2977,6 @@ func (m *ValidatorUpdate) GetRelayerAddress() []byte { return nil } -func (m *ValidatorUpdate) GetChallengerAddress() []byte { - if m != nil { - return m.ChallengerAddress - } - return nil -} - // VoteInfo type VoteInfo struct { Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` @@ -3250,185 +3242,184 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2835 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x93, 0xe3, 0xd4, - 0xf5, 0xf7, 0xdb, 0xd6, 0x71, 0xfb, 0xd1, 0x77, 0x86, 0xc1, 0x98, 0xa1, 0x7b, 0x10, 0xc5, 0x6b, - 0x80, 0xee, 0x3f, 0x4d, 0xc1, 0x1f, 0x02, 0x09, 0xd8, 0xc6, 0x83, 0x9b, 0x69, 0xda, 0x1d, 0xb5, - 0x67, 0xc8, 0x8b, 0x11, 0xb2, 0x7d, 0xdb, 0x16, 0x23, 0x4b, 0x42, 0xba, 0x6e, 0xda, 0x2c, 0xf3, - 0xd8, 0x90, 0x0d, 0xd9, 0x65, 0xc3, 0xf7, 0xc8, 0x2a, 0x9b, 0x6c, 0xa8, 0xca, 0x86, 0x4d, 0xaa, - 0xb2, 0x48, 0x91, 0x14, 0x53, 0xd9, 0xe4, 0x0b, 0x64, 0x95, 0x4a, 0xea, 0x3e, 0xf4, 0xb2, 0x2d, - 0xdb, 0x0d, 0xd9, 0x65, 0xa7, 0x7b, 0x74, 0xce, 0xb1, 0xee, 0xe3, 0xfc, 0xce, 0xef, 0x9c, 0x6b, - 0x78, 0x94, 0x60, 0x73, 0x88, 0x9d, 0x89, 0x6e, 0x92, 0x7d, 0xad, 0x3f, 0xd0, 0xf7, 0xc9, 0xcc, - 0xc6, 0xee, 0x9e, 0xed, 0x58, 0xc4, 0x42, 0x95, 0xe0, 0xe5, 0x1e, 0x7d, 0x59, 0x7f, 0x2c, 0xa4, - 0x3d, 0x70, 0x66, 0x36, 0xb1, 0xf6, 0x6d, 0xc7, 0xb2, 0xce, 0xb8, 0x7e, 0xfd, 0x7a, 0xe8, 0x35, - 0xf3, 0x13, 0xf6, 0x16, 0x79, 0x2b, 0x8c, 0xef, 0xe3, 0x99, 0xf7, 0xf6, 0xb1, 0x05, 0x5b, 0x5b, - 0x73, 0xb4, 0x89, 0xf7, 0x7a, 0x77, 0x64, 0x59, 0x23, 0x03, 0xef, 0xb3, 0x51, 0x7f, 0x7a, 0xb6, - 0x4f, 0xf4, 0x09, 0x76, 0x89, 0x36, 0xb1, 0x85, 0xc2, 0xd5, 0x91, 0x35, 0xb2, 0xd8, 0xe3, 0x3e, - 0x7d, 0xe2, 0x52, 0xf9, 0x37, 0x05, 0xc8, 0x2b, 0xf8, 0xe3, 0x29, 0x76, 0x09, 0x3a, 0x80, 0x0c, - 0x1e, 0x8c, 0xad, 0x5a, 0xf2, 0x46, 0xf2, 0x99, 0xe2, 0xc1, 0xf5, 0xbd, 0xb9, 0xc9, 0xed, 0x09, - 0xbd, 0xf6, 0x60, 0x6c, 0x75, 0x12, 0x0a, 0xd3, 0x45, 0x2f, 0x43, 0xf6, 0xcc, 0x98, 0xba, 0xe3, - 0x5a, 0x8a, 0x19, 0x3d, 0x16, 0x67, 0x74, 0x8b, 0x2a, 0x75, 0x12, 0x0a, 0xd7, 0xa6, 0x3f, 0xa5, - 0x9b, 0x67, 0x56, 0x2d, 0xbd, 0xfa, 0xa7, 0x0e, 0xcd, 0x33, 0xf6, 0x53, 0x54, 0x17, 0x35, 0x01, - 0x5c, 0x4c, 0x54, 0xcb, 0x26, 0xba, 0x65, 0xd6, 0x32, 0xcc, 0xf2, 0xf1, 0x38, 0xcb, 0x53, 0x4c, - 0xba, 0x4c, 0xb1, 0x93, 0x50, 0x24, 0xd7, 0x1b, 0x50, 0x1f, 0xba, 0xa9, 0x13, 0x75, 0x30, 0xd6, - 0x74, 0xb3, 0x96, 0x5d, 0xed, 0xe3, 0xd0, 0xd4, 0x49, 0x8b, 0x2a, 0x52, 0x1f, 0xba, 0x37, 0xa0, - 0x53, 0xfe, 0x78, 0x8a, 0x9d, 0x59, 0x2d, 0xb7, 0x7a, 0xca, 0x3f, 0xa4, 0x4a, 0x74, 0xca, 0x4c, - 0x1b, 0xb5, 0xa1, 0xd8, 0xc7, 0x23, 0xdd, 0x54, 0xfb, 0x86, 0x35, 0xb8, 0x5f, 0xcb, 0x33, 0x63, - 0x39, 0xce, 0xb8, 0x49, 0x55, 0x9b, 0x54, 0xb3, 0x93, 0x50, 0xa0, 0xef, 0x8f, 0xd0, 0x1b, 0x50, - 0x18, 0x8c, 0xf1, 0xe0, 0xbe, 0x4a, 0x2e, 0x6a, 0x05, 0xe6, 0x63, 0x37, 0xce, 0x47, 0x8b, 0xea, - 0xf5, 0x2e, 0x3a, 0x09, 0x25, 0x3f, 0xe0, 0x8f, 0x74, 0xfe, 0x43, 0x6c, 0xe8, 0xe7, 0xd8, 0xa1, - 0xf6, 0xd2, 0xea, 0xf9, 0xbf, 0xcd, 0x35, 0x99, 0x07, 0x69, 0xe8, 0x0d, 0xd0, 0x9b, 0x20, 0x61, - 0x73, 0x28, 0xa6, 0x01, 0xcc, 0xc5, 0x8d, 0xd8, 0xb3, 0x62, 0x0e, 0xbd, 0x49, 0x14, 0xb0, 0x78, - 0x46, 0xaf, 0x42, 0x6e, 0x60, 0x4d, 0x26, 0x3a, 0xa9, 0x15, 0x99, 0xf5, 0x4e, 0xec, 0x04, 0x98, - 0x56, 0x27, 0xa1, 0x08, 0x7d, 0x74, 0x0c, 0x65, 0x43, 0x77, 0x89, 0xea, 0x9a, 0x9a, 0xed, 0x8e, - 0x2d, 0xe2, 0xd6, 0xb6, 0x98, 0x87, 0x27, 0xe3, 0x3c, 0x1c, 0xe9, 0x2e, 0x39, 0xf5, 0x94, 0x3b, - 0x09, 0xa5, 0x64, 0x84, 0x05, 0xd4, 0x9f, 0x75, 0x76, 0x86, 0x1d, 0xdf, 0x61, 0xad, 0xb4, 0xda, - 0x5f, 0x97, 0x6a, 0x7b, 0xf6, 0xd4, 0x9f, 0x15, 0x16, 0xa0, 0x9f, 0xc2, 0x15, 0xc3, 0xd2, 0x86, - 0xbe, 0x3b, 0x75, 0x30, 0x9e, 0x9a, 0xf7, 0x6b, 0x65, 0xe6, 0xf4, 0xd9, 0xd8, 0x8f, 0xb4, 0xb4, - 0xa1, 0xe7, 0xa2, 0x45, 0x0d, 0x3a, 0x09, 0x65, 0xdb, 0x98, 0x17, 0xa2, 0x7b, 0x70, 0x55, 0xb3, - 0x6d, 0x63, 0x36, 0xef, 0xbd, 0xc2, 0xbc, 0xdf, 0x8c, 0xf3, 0xde, 0xa0, 0x36, 0xf3, 0xee, 0x91, - 0xb6, 0x20, 0x6d, 0xe6, 0x21, 0x7b, 0xae, 0x19, 0x53, 0x2c, 0x3f, 0x0d, 0xc5, 0x50, 0xa8, 0xa3, - 0x1a, 0xe4, 0x27, 0xd8, 0x75, 0xb5, 0x11, 0x66, 0xc8, 0x20, 0x29, 0xde, 0x50, 0x2e, 0xc3, 0x56, - 0x38, 0xbc, 0xe5, 0x89, 0x6f, 0x48, 0x03, 0x97, 0x1a, 0x9e, 0x63, 0xc7, 0xa5, 0xd1, 0x2a, 0x0c, - 0xc5, 0x10, 0x3d, 0x01, 0x25, 0x76, 0x7c, 0x54, 0xef, 0x3d, 0x45, 0x8f, 0x8c, 0xb2, 0xc5, 0x84, - 0x77, 0x85, 0xd2, 0x2e, 0x14, 0xed, 0x03, 0xdb, 0x57, 0x49, 0x33, 0x15, 0xb0, 0x0f, 0x6c, 0xa1, - 0x20, 0x7f, 0x0f, 0xaa, 0xf3, 0xd1, 0x8e, 0xaa, 0x90, 0xbe, 0x8f, 0x67, 0xe2, 0xf7, 0xe8, 0x23, - 0xba, 0x2a, 0xa6, 0xc5, 0x7e, 0x43, 0x52, 0xc4, 0x1c, 0xff, 0x98, 0xf2, 0x8d, 0xfd, 0x30, 0x47, - 0xaf, 0x42, 0x86, 0xa2, 0xa6, 0x00, 0xc0, 0xfa, 0x1e, 0x87, 0xd4, 0x3d, 0x0f, 0x52, 0xf7, 0x7a, - 0x1e, 0xa4, 0x36, 0x0b, 0x5f, 0x7e, 0xbd, 0x9b, 0xf8, 0xfc, 0xaf, 0xbb, 0x49, 0x85, 0x59, 0xa0, - 0x47, 0x68, 0x54, 0x6a, 0xba, 0xa9, 0xea, 0x43, 0xf1, 0x3b, 0x79, 0x36, 0x3e, 0x1c, 0xa2, 0xdb, - 0x50, 0x1d, 0x58, 0xa6, 0x8b, 0x4d, 0x77, 0xea, 0xaa, 0x1c, 0xb2, 0x05, 0xec, 0x2d, 0x46, 0x4d, - 0xcb, 0x53, 0x3c, 0x61, 0x7a, 0x4a, 0x65, 0x10, 0x15, 0xa0, 0x5b, 0x00, 0xe7, 0x9a, 0xa1, 0x0f, - 0x35, 0x62, 0x39, 0x6e, 0x2d, 0x73, 0x23, 0xbd, 0xd4, 0xcd, 0x5d, 0x4f, 0xe5, 0x8e, 0x3d, 0xd4, - 0x08, 0x6e, 0x66, 0xe8, 0xd7, 0x2a, 0x21, 0x4b, 0xf4, 0x14, 0x54, 0x34, 0xdb, 0x56, 0x5d, 0xa2, - 0x11, 0xac, 0xf6, 0x67, 0x04, 0xbb, 0x0c, 0x0c, 0xb7, 0x94, 0x92, 0x66, 0xdb, 0xa7, 0x54, 0xda, - 0xa4, 0x42, 0xf4, 0x24, 0x94, 0x29, 0xf0, 0xe9, 0x9a, 0xa1, 0x8e, 0xb1, 0x3e, 0x1a, 0x13, 0x06, - 0x7a, 0x69, 0xa5, 0x24, 0xa4, 0x1d, 0x26, 0x94, 0x87, 0xfe, 0x41, 0x60, 0xa0, 0x87, 0x10, 0x64, - 0x86, 0x1a, 0xd1, 0xd8, 0x42, 0x6e, 0x29, 0xec, 0x99, 0xca, 0x6c, 0x8d, 0x8c, 0xc5, 0xf2, 0xb0, - 0x67, 0x74, 0x0d, 0x72, 0xc2, 0x6d, 0x9a, 0xb9, 0x15, 0x23, 0xba, 0x67, 0xb6, 0x63, 0x9d, 0x63, - 0x86, 0xf2, 0x05, 0x85, 0x0f, 0xe4, 0x5f, 0xa6, 0x60, 0x7b, 0x01, 0x1e, 0xa9, 0xdf, 0xb1, 0xe6, - 0x8e, 0xbd, 0xdf, 0xa2, 0xcf, 0xe8, 0x15, 0xea, 0x57, 0x1b, 0x62, 0x47, 0xa4, 0xa5, 0x5a, 0x78, - 0x89, 0x78, 0xca, 0xed, 0xb0, 0xf7, 0x62, 0x69, 0x84, 0x36, 0xea, 0x42, 0xd5, 0xd0, 0x5c, 0xa2, - 0x72, 0xb8, 0x51, 0x43, 0x29, 0x6a, 0x11, 0x64, 0x8f, 0x34, 0x0f, 0xa0, 0xe8, 0x61, 0x17, 0x8e, - 0xca, 0x46, 0x44, 0x8a, 0x14, 0xb8, 0xda, 0x9f, 0x7d, 0xaa, 0x99, 0x44, 0x37, 0xb1, 0xba, 0xb0, - 0x73, 0x8f, 0x2c, 0x38, 0x6d, 0x9f, 0xeb, 0x43, 0x6c, 0x0e, 0xbc, 0x2d, 0xbb, 0xe2, 0x1b, 0xfb, - 0x5b, 0xea, 0xca, 0x0a, 0x94, 0xa3, 0x00, 0x8f, 0xca, 0x90, 0x22, 0x17, 0x62, 0x01, 0x52, 0xe4, - 0x02, 0xfd, 0x1f, 0x64, 0xe8, 0x24, 0xd9, 0xe4, 0xcb, 0x4b, 0xb2, 0xab, 0xb0, 0xeb, 0xcd, 0x6c, - 0xac, 0x30, 0x4d, 0x59, 0xf6, 0xa3, 0xc1, 0x07, 0xfd, 0x79, 0xaf, 0xf2, 0xb3, 0x50, 0x99, 0x43, - 0xf5, 0xd0, 0xfe, 0x25, 0xc3, 0xfb, 0x27, 0x57, 0xa0, 0x14, 0x81, 0x70, 0xf9, 0x1a, 0x5c, 0x5d, - 0x86, 0xc8, 0xf2, 0xd8, 0x97, 0x47, 0x90, 0x15, 0xbd, 0x0c, 0x05, 0x1f, 0x92, 0x79, 0x34, 0x2e, - 0xae, 0x95, 0xa7, 0xac, 0xf8, 0xaa, 0x34, 0x0c, 0xe9, 0xb1, 0x66, 0xe7, 0x21, 0xc5, 0x3e, 0x3c, - 0xaf, 0xd9, 0x76, 0x47, 0x73, 0xc7, 0xf2, 0x87, 0x50, 0x8b, 0x83, 0xdb, 0xb9, 0x69, 0x64, 0xfc, - 0x63, 0x78, 0x0d, 0x72, 0x67, 0x96, 0x33, 0xd1, 0x08, 0x73, 0x56, 0x52, 0xc4, 0x88, 0x1e, 0x4f, - 0x0e, 0xbd, 0x69, 0x26, 0xe6, 0x03, 0x59, 0x85, 0x47, 0x62, 0x21, 0x97, 0x9a, 0xe8, 0xe6, 0x10, - 0xf3, 0xf5, 0x2c, 0x29, 0x7c, 0x10, 0x38, 0xe2, 0x1f, 0xcb, 0x07, 0xf4, 0x67, 0x5d, 0x36, 0x57, - 0xe6, 0x5f, 0x52, 0xc4, 0x48, 0xfe, 0x7b, 0x01, 0x0a, 0x0a, 0x76, 0x6d, 0x8a, 0x09, 0xa8, 0x09, - 0x12, 0xbe, 0x18, 0x60, 0x4e, 0x86, 0x92, 0xb1, 0x64, 0x82, 0x6b, 0xb7, 0x3d, 0x4d, 0x9a, 0xc9, - 0x7d, 0x33, 0xf4, 0x92, 0x20, 0x7c, 0xf1, 0xdc, 0x4d, 0x98, 0x87, 0x19, 0xdf, 0x2b, 0x1e, 0xe3, - 0x4b, 0xc7, 0x26, 0x6f, 0x6e, 0x35, 0x47, 0xf9, 0x5e, 0x12, 0x94, 0x2f, 0xb3, 0xe6, 0xc7, 0x22, - 0x9c, 0xaf, 0x15, 0xe1, 0x7c, 0xd9, 0x35, 0xd3, 0x8c, 0x21, 0x7d, 0xad, 0x08, 0xe9, 0xcb, 0xad, - 0x71, 0x12, 0xc3, 0xfa, 0x5e, 0xf1, 0x58, 0x5f, 0x7e, 0xcd, 0xb4, 0xe7, 0x68, 0xdf, 0xad, 0x28, - 0xed, 0xe3, 0x94, 0xed, 0x89, 0x58, 0xeb, 0x58, 0xde, 0xf7, 0xfd, 0x10, 0xef, 0x93, 0x62, 0x49, - 0x17, 0x77, 0xb2, 0x84, 0xf8, 0xb5, 0x22, 0xc4, 0x0f, 0xd6, 0xac, 0x41, 0x0c, 0xf3, 0x7b, 0x2b, - 0xcc, 0xfc, 0x8a, 0xb1, 0xe4, 0x51, 0x1c, 0x9a, 0x65, 0xd4, 0xef, 0x35, 0x9f, 0xfa, 0x6d, 0xc5, - 0x72, 0x57, 0x31, 0x87, 0x79, 0xee, 0xd7, 0x5d, 0xe0, 0x7e, 0x9c, 0xab, 0x3d, 0x15, 0xeb, 0x62, - 0x0d, 0xf9, 0xeb, 0x2e, 0x90, 0xbf, 0xf2, 0x1a, 0x87, 0x6b, 0xd8, 0xdf, 0xcf, 0x96, 0xb3, 0xbf, - 0x78, 0x7e, 0x26, 0x3e, 0x73, 0x33, 0xfa, 0xa7, 0xc6, 0xd0, 0xbf, 0x2a, 0x73, 0xff, 0x5c, 0xac, - 0xfb, 0xcb, 0xf3, 0xbf, 0x67, 0x69, 0x9a, 0x9d, 0x03, 0x0e, 0x0a, 0x55, 0xd8, 0x71, 0x2c, 0x47, - 0x50, 0x2b, 0x3e, 0x90, 0x9f, 0xa1, 0x89, 0x3f, 0x00, 0x89, 0x15, 0x5c, 0x91, 0xa5, 0x84, 0x10, - 0x30, 0xc8, 0xbf, 0x4b, 0x06, 0xb6, 0x2c, 0x57, 0x86, 0x49, 0x83, 0x24, 0x48, 0x43, 0x88, 0x42, - 0xa6, 0xa2, 0x14, 0x72, 0x17, 0x8a, 0x14, 0xea, 0xe7, 0xd8, 0xa1, 0x66, 0x7b, 0xec, 0x10, 0xdd, - 0x84, 0x6d, 0x96, 0xcb, 0x39, 0xd1, 0x14, 0xf8, 0x9e, 0x61, 0x69, 0xaa, 0x42, 0x5f, 0xf0, 0xc3, - 0xc9, 0x81, 0xfe, 0x05, 0xb8, 0x12, 0xd2, 0xf5, 0x53, 0x08, 0xa7, 0x44, 0x55, 0x5f, 0xbb, 0x21, - 0x72, 0xc9, 0x7b, 0xc1, 0x02, 0x05, 0xcc, 0x13, 0x41, 0x66, 0x60, 0x0d, 0xb1, 0x00, 0x78, 0xf6, - 0x4c, 0xd9, 0xa8, 0x61, 0x8d, 0x04, 0x8c, 0xd3, 0x47, 0xaa, 0xe5, 0xa3, 0xa0, 0xc4, 0x41, 0x4e, - 0xfe, 0x43, 0x32, 0xf0, 0x17, 0x90, 0xd1, 0x65, 0xbc, 0x31, 0xf9, 0xdf, 0xe1, 0x8d, 0xa9, 0x6f, - 0xcd, 0x1b, 0xc3, 0x09, 0x36, 0x1d, 0x4d, 0xb0, 0xff, 0x4c, 0x06, 0x3b, 0xec, 0xb3, 0xc0, 0x6f, - 0xb7, 0x22, 0x41, 0xb6, 0xcc, 0xb2, 0xfd, 0x12, 0xd9, 0x52, 0x70, 0xfb, 0x1c, 0xfb, 0xdd, 0x28, - 0xb7, 0xcf, 0xf3, 0xfc, 0xc9, 0x06, 0xe8, 0x55, 0x90, 0x58, 0xd3, 0x45, 0xb5, 0x6c, 0x57, 0x00, - 0xee, 0xa3, 0xe1, 0xb9, 0xf2, 0xde, 0xca, 0xde, 0x09, 0xd5, 0xe9, 0xda, 0xae, 0x52, 0xb0, 0xc5, - 0x53, 0x88, 0x08, 0x48, 0x11, 0x3e, 0x7a, 0x1d, 0x24, 0xfa, 0xf5, 0xae, 0xad, 0x0d, 0x30, 0x03, - 0x4f, 0x49, 0x09, 0x04, 0xf2, 0x3d, 0x40, 0x8b, 0xf0, 0x8d, 0x3a, 0x90, 0xc3, 0xe7, 0xd8, 0x24, - 0x74, 0xd7, 0xe8, 0x72, 0x5f, 0x5b, 0x42, 0xf6, 0xb0, 0x49, 0x9a, 0x35, 0xba, 0xc8, 0xff, 0xf8, - 0x7a, 0xb7, 0xca, 0xb5, 0x9f, 0xb7, 0x26, 0x3a, 0xc1, 0x13, 0x9b, 0xcc, 0x14, 0x61, 0x2f, 0xff, - 0x25, 0x45, 0x99, 0x57, 0x04, 0xda, 0x97, 0xae, 0xad, 0x17, 0x40, 0xa9, 0x10, 0xeb, 0xde, 0x6c, - 0xbd, 0x77, 0x00, 0x46, 0x9a, 0xab, 0x7e, 0xa2, 0x99, 0x04, 0x0f, 0xc5, 0xa2, 0x87, 0x24, 0xa8, - 0x0e, 0x05, 0x3a, 0x9a, 0xba, 0x78, 0x28, 0x0a, 0x00, 0x7f, 0x1c, 0x9a, 0x67, 0xfe, 0xbb, 0xcd, - 0x33, 0xba, 0xca, 0x85, 0xb9, 0x55, 0x0e, 0xb1, 0x22, 0x29, 0xcc, 0x8a, 0xe8, 0xb7, 0xd9, 0x8e, - 0x6e, 0x39, 0x3a, 0x99, 0xb1, 0xad, 0x49, 0x2b, 0xfe, 0x98, 0xd6, 0x99, 0x13, 0x3c, 0xb1, 0x2d, - 0xcb, 0x50, 0x39, 0x78, 0x15, 0x99, 0xe9, 0x96, 0x10, 0xb6, 0x19, 0x86, 0xfd, 0x2a, 0x15, 0x84, - 0x5f, 0xc0, 0x7e, 0xff, 0xe7, 0x16, 0x58, 0xfe, 0x35, 0x2b, 0x89, 0xa3, 0xc9, 0x1b, 0x9d, 0xc2, - 0xb6, 0x1f, 0xfe, 0xea, 0x94, 0xc1, 0x82, 0x77, 0xa0, 0x37, 0xc5, 0x8f, 0xea, 0x79, 0x54, 0xec, - 0xa2, 0x1f, 0xc1, 0xc3, 0x73, 0xd0, 0xe6, 0xbb, 0x4e, 0x6d, 0x88, 0x70, 0x0f, 0x45, 0x11, 0xce, - 0xf3, 0x1c, 0xac, 0x55, 0xfa, 0x3b, 0x06, 0xdd, 0x21, 0xad, 0xb2, 0xc2, 0x54, 0x64, 0xe9, 0xee, - 0x3f, 0x01, 0x25, 0x07, 0x13, 0x5a, 0xf8, 0x47, 0xea, 0xd8, 0x2d, 0x2e, 0x14, 0xd5, 0xf1, 0x09, - 0x3c, 0xb4, 0x94, 0x92, 0xa0, 0xff, 0x07, 0x29, 0x60, 0x33, 0xc9, 0x98, 0x92, 0xd0, 0x2f, 0x73, - 0x02, 0x5d, 0xf9, 0xf7, 0xc9, 0xc0, 0x65, 0xb4, 0x70, 0x6a, 0x43, 0xce, 0xc1, 0xee, 0xd4, 0xe0, - 0xa5, 0x4c, 0xf9, 0xe0, 0x85, 0xcd, 0xc8, 0x0c, 0x95, 0x4e, 0x0d, 0xa2, 0x08, 0x63, 0xf9, 0x1e, - 0xe4, 0xb8, 0x04, 0x15, 0x21, 0x7f, 0xe7, 0xf8, 0xf6, 0x71, 0xf7, 0xfd, 0xe3, 0x6a, 0x02, 0x01, - 0xe4, 0x1a, 0xad, 0x56, 0xfb, 0xa4, 0x57, 0x4d, 0x22, 0x09, 0xb2, 0x8d, 0x66, 0x57, 0xe9, 0x55, - 0x53, 0x54, 0xac, 0xb4, 0xdf, 0x6d, 0xb7, 0x7a, 0xd5, 0x34, 0xda, 0x86, 0x12, 0x7f, 0x56, 0x6f, - 0x75, 0x95, 0xf7, 0x1a, 0xbd, 0x6a, 0x26, 0x24, 0x3a, 0x6d, 0x1f, 0xbf, 0xdd, 0x56, 0xaa, 0x59, - 0xf9, 0x45, 0x5a, 0x2b, 0xc5, 0xd0, 0x9f, 0xa0, 0x2a, 0x4a, 0x86, 0xaa, 0x22, 0xf9, 0xb7, 0x29, - 0xa8, 0xc7, 0x73, 0x1a, 0xf4, 0xee, 0xdc, 0xc4, 0x0f, 0x2e, 0x41, 0x88, 0xe6, 0x66, 0x8f, 0x9e, - 0x84, 0xb2, 0x83, 0xcf, 0x30, 0x19, 0x8c, 0x39, 0xc7, 0xe2, 0x19, 0xb3, 0xa4, 0x94, 0x84, 0x94, - 0x19, 0xb9, 0x5c, 0xed, 0x23, 0x3c, 0x20, 0x2a, 0x87, 0x22, 0x7e, 0xe8, 0x24, 0xaa, 0x46, 0xa5, - 0xa7, 0x5c, 0x28, 0x7f, 0x78, 0xa9, 0xb5, 0x94, 0x20, 0xab, 0xb4, 0x7b, 0xca, 0x8f, 0xab, 0x69, - 0x84, 0xa0, 0xcc, 0x1e, 0xd5, 0xd3, 0xe3, 0xc6, 0xc9, 0x69, 0xa7, 0x4b, 0xd7, 0xf2, 0x0a, 0x54, - 0xbc, 0xb5, 0xf4, 0x84, 0x59, 0xf9, 0xdf, 0x49, 0xa8, 0xcc, 0x05, 0x08, 0x3a, 0x80, 0x2c, 0xe7, - 0xe9, 0x71, 0xdd, 0x7c, 0x16, 0xdf, 0x22, 0x9a, 0xb8, 0x2a, 0x7a, 0x03, 0x0a, 0x58, 0x34, 0x20, - 0x96, 0x05, 0x22, 0x6f, 0x9c, 0x78, 0x2d, 0x0a, 0x61, 0xea, 0x5b, 0xa0, 0x37, 0x41, 0xf2, 0x23, - 0x5d, 0x14, 0x87, 0x8f, 0x2f, 0x9a, 0xfb, 0x18, 0x21, 0xec, 0x03, 0x1b, 0xf4, 0x5a, 0x40, 0xf6, - 0x32, 0x8b, 0xd5, 0x81, 0x30, 0xe7, 0x0a, 0xc2, 0xd8, 0xd3, 0x97, 0x5b, 0x50, 0x0c, 0xcd, 0x07, - 0x3d, 0x0a, 0xd2, 0x44, 0xbb, 0x10, 0x8d, 0x2d, 0xde, 0x9a, 0x28, 0x4c, 0xb4, 0x0b, 0xde, 0xd3, - 0x7a, 0x18, 0xf2, 0xf4, 0xe5, 0x48, 0xe3, 0x68, 0x93, 0x56, 0x72, 0x13, 0xed, 0xe2, 0x1d, 0xcd, - 0x95, 0x3f, 0x80, 0x72, 0xb4, 0xa9, 0x43, 0x4f, 0xa2, 0x63, 0x4d, 0xcd, 0x21, 0xf3, 0x91, 0x55, - 0xf8, 0x00, 0xbd, 0x0c, 0xd9, 0x73, 0x8b, 0x83, 0xd5, 0xf2, 0x90, 0xbd, 0x6b, 0x11, 0x1c, 0x6a, - 0x0a, 0x71, 0x6d, 0xf9, 0x53, 0xc8, 0x32, 0xf0, 0xa1, 0x40, 0xc2, 0xda, 0x33, 0x82, 0xe8, 0xd2, - 0x67, 0xf4, 0x01, 0x80, 0x46, 0x88, 0xa3, 0xf7, 0xa7, 0x81, 0xe3, 0xdd, 0xe5, 0xe0, 0xd5, 0xf0, - 0xf4, 0x9a, 0xd7, 0x05, 0x8a, 0x5d, 0x0d, 0x4c, 0x43, 0x48, 0x16, 0x72, 0x28, 0x1f, 0x43, 0x39, - 0x6a, 0x1b, 0x6e, 0x94, 0x6e, 0x2d, 0x69, 0x94, 0xfa, 0x64, 0xca, 0xa7, 0x62, 0x69, 0xde, 0x8a, - 0x63, 0x03, 0xf9, 0xb3, 0x24, 0x14, 0x7a, 0x17, 0xe2, 0x58, 0xc7, 0x74, 0x81, 0x02, 0xd3, 0x54, - 0xb8, 0xe7, 0xc1, 0xdb, 0x4a, 0x69, 0xbf, 0x59, 0xf5, 0x96, 0x1f, 0xb8, 0x99, 0x4d, 0xab, 0x52, - 0xaf, 0x6b, 0x27, 0xc0, 0xea, 0x75, 0x90, 0xfc, 0x53, 0x45, 0x2b, 0x06, 0x6d, 0x38, 0x74, 0xb0, - 0xeb, 0x8a, 0xb9, 0x79, 0x43, 0xd6, 0x54, 0xb4, 0x3e, 0x11, 0x5d, 0x95, 0xb4, 0xc2, 0x07, 0xf2, - 0x9f, 0x92, 0x50, 0x99, 0xcb, 0x5b, 0xe8, 0x75, 0xc8, 0xdb, 0xd3, 0xbe, 0xea, 0xad, 0xcf, 0x5c, - 0xf4, 0x78, 0xf4, 0x71, 0xda, 0x37, 0xf4, 0xc1, 0x6d, 0x3c, 0xf3, 0xbe, 0xc6, 0x9e, 0xf6, 0x6f, - 0xf3, 0x65, 0xe4, 0x3f, 0x93, 0x0a, 0xfd, 0x0c, 0x3d, 0x74, 0x7d, 0xc3, 0x65, 0x2e, 0xf9, 0xd4, - 0x73, 0x7d, 0xc3, 0xa5, 0xea, 0x4f, 0x43, 0xc5, 0xc1, 0x86, 0x36, 0xc3, 0x8e, 0xea, 0x7d, 0x77, - 0x86, 0x29, 0x94, 0x85, 0xb8, 0x21, 0x3e, 0xff, 0x05, 0x40, 0x83, 0xb1, 0x66, 0x18, 0xd8, 0x1c, - 0x85, 0x74, 0x79, 0x89, 0xb2, 0x1d, 0xbc, 0x11, 0xea, 0xf2, 0x39, 0x14, 0xbc, 0x63, 0x88, 0x7e, - 0x10, 0x8e, 0x4c, 0xaf, 0xb9, 0x1d, 0x9b, 0xbc, 0xc5, 0x7c, 0x42, 0x81, 0x79, 0x13, 0xb6, 0x5d, - 0x7d, 0x64, 0xe2, 0xa1, 0x1a, 0x54, 0x49, 0x6c, 0x7a, 0x05, 0xa5, 0xc2, 0x5f, 0x1c, 0x79, 0x25, - 0x92, 0xfc, 0xaf, 0x24, 0x14, 0x3c, 0x88, 0x40, 0x2f, 0x86, 0x4e, 0x7a, 0x79, 0x49, 0xcf, 0xc7, - 0x53, 0x0c, 0x3a, 0x91, 0xd1, 0x6f, 0x4d, 0x5d, 0xfe, 0x5b, 0xe3, 0x5a, 0xca, 0x5e, 0x6f, 0x3f, - 0x73, 0xe9, 0xde, 0xfe, 0xf3, 0x80, 0x88, 0x45, 0x34, 0x43, 0x3d, 0xb7, 0x88, 0x6e, 0x8e, 0x54, - 0xbe, 0xbb, 0x9c, 0xc3, 0x55, 0xd9, 0x9b, 0xbb, 0xec, 0xc5, 0x09, 0x3b, 0x4f, 0x3f, 0x4f, 0x42, - 0xc1, 0xcf, 0xc6, 0x97, 0x6d, 0x2c, 0x5e, 0x83, 0x9c, 0x48, 0x38, 0xbc, 0xb3, 0x28, 0x46, 0x7e, - 0x8f, 0x3b, 0x13, 0xea, 0x71, 0xd7, 0xa1, 0x30, 0xc1, 0x44, 0x63, 0x94, 0x84, 0x9f, 0x02, 0x7f, - 0x7c, 0xf3, 0x35, 0x28, 0x86, 0x7a, 0xbc, 0x34, 0xd6, 0x8f, 0xdb, 0xef, 0x57, 0x13, 0xf5, 0xfc, - 0x67, 0x5f, 0xdc, 0x48, 0x1f, 0xe3, 0x4f, 0x68, 0x94, 0x28, 0xed, 0x56, 0xa7, 0xdd, 0xba, 0x5d, - 0x4d, 0xd6, 0x8b, 0x9f, 0x7d, 0x71, 0x23, 0xaf, 0x60, 0xd6, 0x2a, 0xba, 0xd9, 0x81, 0xad, 0xf0, - 0xae, 0x44, 0x73, 0x16, 0x82, 0xf2, 0xdb, 0x77, 0x4e, 0x8e, 0x0e, 0x5b, 0x8d, 0x5e, 0x5b, 0xbd, - 0xdb, 0xed, 0xb5, 0xab, 0x49, 0xf4, 0x30, 0x5c, 0x39, 0x3a, 0x7c, 0xa7, 0xd3, 0x53, 0x5b, 0x47, - 0x87, 0xed, 0xe3, 0x9e, 0xda, 0xe8, 0xf5, 0x1a, 0xad, 0xdb, 0xd5, 0xd4, 0xc1, 0x2f, 0x00, 0x2a, - 0x8d, 0x66, 0xeb, 0x90, 0xe6, 0x5b, 0x7d, 0xa0, 0x89, 0x56, 0x5c, 0x86, 0xf5, 0x09, 0x56, 0x5e, - 0x2e, 0xd7, 0x57, 0x77, 0x22, 0xd1, 0x2d, 0xc8, 0xb2, 0x16, 0x02, 0x5a, 0x7d, 0xdb, 0x5c, 0x5f, - 0xd3, 0x9a, 0xa4, 0x1f, 0xc3, 0xc2, 0x63, 0xe5, 0xf5, 0x73, 0x7d, 0x75, 0xa7, 0x12, 0x29, 0x20, - 0x05, 0x3d, 0x80, 0xf5, 0xd7, 0xd1, 0xf5, 0x0d, 0xba, 0x97, 0xd4, 0x67, 0x50, 0x88, 0xac, 0xbf, - 0x9e, 0xad, 0x6f, 0x00, 0x99, 0xe8, 0x08, 0xf2, 0x5e, 0xed, 0xb8, 0xee, 0xc2, 0xb8, 0xbe, 0xb6, - 0xb3, 0x48, 0xb7, 0x80, 0xd7, 0xf8, 0xab, 0x6f, 0xbf, 0xeb, 0x6b, 0xda, 0xa4, 0xe8, 0x10, 0x72, - 0x82, 0x5d, 0xaf, 0xb9, 0x04, 0xae, 0xaf, 0xeb, 0x14, 0xd2, 0x45, 0x0b, 0x9a, 0x27, 0xeb, 0xef, - 0xf4, 0xeb, 0x1b, 0x74, 0x80, 0xd1, 0x1d, 0x80, 0x50, 0x45, 0xbf, 0xc1, 0x65, 0x7d, 0x7d, 0x93, - 0xce, 0x2e, 0xea, 0x42, 0xc1, 0x2f, 0xb0, 0xd6, 0x5e, 0x9d, 0xd7, 0xd7, 0xb7, 0x58, 0xd1, 0x3d, - 0x28, 0x45, 0x2b, 0x8b, 0xcd, 0x2e, 0xc4, 0xeb, 0x1b, 0xf6, 0x4e, 0xa9, 0xff, 0x68, 0x99, 0xb1, - 0xd9, 0x05, 0x79, 0x7d, 0xc3, 0x56, 0x2a, 0xfa, 0x08, 0xb6, 0x17, 0xcb, 0x80, 0xcd, 0xef, 0xcb, - 0xeb, 0x97, 0x68, 0xae, 0xa2, 0x09, 0xa0, 0x25, 0xe5, 0xc3, 0x25, 0xae, 0xcf, 0xeb, 0x97, 0xe9, - 0xb5, 0x36, 0xdb, 0x5f, 0x7e, 0xb3, 0x93, 0xfc, 0xea, 0x9b, 0x9d, 0xe4, 0xdf, 0xbe, 0xd9, 0x49, - 0x7e, 0xfe, 0x60, 0x27, 0xf1, 0xd5, 0x83, 0x9d, 0xc4, 0x9f, 0x1f, 0xec, 0x24, 0x7e, 0xf2, 0xdc, - 0x48, 0x27, 0xe3, 0x69, 0x7f, 0x6f, 0x60, 0x4d, 0xf6, 0xc3, 0xff, 0xed, 0x59, 0xf6, 0x7f, 0xa3, - 0x7e, 0x8e, 0x25, 0xaa, 0x97, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x95, 0x13, 0xca, 0xbf, 0x8f, - 0x24, 0x00, 0x00, + // 2818 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xd5, + 0xf1, 0xd7, 0x5b, 0xea, 0x92, 0xf5, 0xf0, 0x1d, 0x33, 0x08, 0x31, 0xd8, 0x43, 0x73, 0x78, 0x0d, + 0x60, 0xff, 0x31, 0x07, 0xfe, 0x10, 0x48, 0x40, 0xd2, 0x68, 0x90, 0xb1, 0xb1, 0x9c, 0xb6, 0x66, + 0xc8, 0x8b, 0x69, 0x5a, 0xd2, 0xb5, 0xd4, 0x8c, 0xd4, 0xdd, 0x74, 0x5f, 0x79, 0x2c, 0x96, 0x79, + 0x6c, 0x26, 0x1b, 0xb2, 0xcb, 0x86, 0x6d, 0x3e, 0x43, 0x56, 0xd9, 0x64, 0xc3, 0x39, 0xd9, 0xb0, + 0xcc, 0x22, 0x87, 0xe4, 0xcc, 0x9c, 0x6c, 0xf2, 0x05, 0xb2, 0xca, 0x49, 0xce, 0x7d, 0xf4, 0x4b, + 0x52, 0x4b, 0x32, 0x64, 0x97, 0x5d, 0xdf, 0xea, 0xaa, 0x52, 0xdf, 0x47, 0xfd, 0xea, 0x57, 0x75, + 0x05, 0x4f, 0x12, 0x6c, 0xf4, 0xb1, 0x3d, 0xd6, 0x0d, 0xb2, 0xa7, 0x75, 0x7b, 0xfa, 0x1e, 0x99, + 0x5a, 0xd8, 0xd9, 0xb5, 0x6c, 0x93, 0x98, 0xa8, 0xe4, 0xbf, 0xdc, 0xa5, 0x2f, 0xab, 0x4f, 0x05, + 0xb4, 0x7b, 0xf6, 0xd4, 0x22, 0xe6, 0x9e, 0x65, 0x9b, 0xe6, 0x19, 0xd7, 0xaf, 0x5e, 0x0b, 0xbc, + 0x66, 0x7e, 0x82, 0xde, 0x42, 0x6f, 0x85, 0xf1, 0x3d, 0x3c, 0x75, 0xdf, 0x3e, 0x35, 0x67, 0x6b, + 0x69, 0xb6, 0x36, 0x76, 0x5f, 0xef, 0x0c, 0x4c, 0x73, 0x30, 0xc2, 0x7b, 0x6c, 0xd4, 0x9d, 0x9c, + 0xed, 0x11, 0x7d, 0x8c, 0x1d, 0xa2, 0x8d, 0x2d, 0xa1, 0xb0, 0x35, 0x30, 0x07, 0x26, 0x7b, 0xdc, + 0xa3, 0x4f, 0x5c, 0x2a, 0xff, 0x26, 0x07, 0x59, 0x05, 0x7f, 0x36, 0xc1, 0x0e, 0x41, 0xfb, 0x90, + 0xc2, 0xbd, 0xa1, 0x59, 0x89, 0x5f, 0x8f, 0xbf, 0x90, 0xdf, 0xbf, 0xb6, 0x3b, 0x33, 0xb9, 0x5d, + 0xa1, 0xd7, 0xec, 0x0d, 0xcd, 0x56, 0x4c, 0x61, 0xba, 0xe8, 0x75, 0x48, 0x9f, 0x8d, 0x26, 0xce, + 0xb0, 0x92, 0x60, 0x46, 0x4f, 0x45, 0x19, 0xdd, 0xa2, 0x4a, 0xad, 0x98, 0xc2, 0xb5, 0xe9, 0x4f, + 0xe9, 0xc6, 0x99, 0x59, 0x49, 0x2e, 0xff, 0xa9, 0x03, 0xe3, 0x8c, 0xfd, 0x14, 0xd5, 0x45, 0x75, + 0x00, 0x07, 0x13, 0xd5, 0xb4, 0x88, 0x6e, 0x1a, 0x95, 0x14, 0xb3, 0x7c, 0x3a, 0xca, 0xf2, 0x14, + 0x93, 0x36, 0x53, 0x6c, 0xc5, 0x14, 0xc9, 0x71, 0x07, 0xd4, 0x87, 0x6e, 0xe8, 0x44, 0xed, 0x0d, + 0x35, 0xdd, 0xa8, 0xa4, 0x97, 0xfb, 0x38, 0x30, 0x74, 0xd2, 0xa0, 0x8a, 0xd4, 0x87, 0xee, 0x0e, + 0xe8, 0x94, 0x3f, 0x9b, 0x60, 0x7b, 0x5a, 0xc9, 0x2c, 0x9f, 0xf2, 0x0f, 0xa9, 0x12, 0x9d, 0x32, + 0xd3, 0x46, 0x4d, 0xc8, 0x77, 0xf1, 0x40, 0x37, 0xd4, 0xee, 0xc8, 0xec, 0xdd, 0xab, 0x64, 0x99, + 0xb1, 0x1c, 0x65, 0x5c, 0xa7, 0xaa, 0x75, 0xaa, 0xd9, 0x8a, 0x29, 0xd0, 0xf5, 0x46, 0xe8, 0x1d, + 0xc8, 0xf5, 0x86, 0xb8, 0x77, 0x4f, 0x25, 0x17, 0x95, 0x1c, 0xf3, 0xb1, 0x13, 0xe5, 0xa3, 0x41, + 0xf5, 0x3a, 0x17, 0xad, 0x98, 0x92, 0xed, 0xf1, 0x47, 0x3a, 0xff, 0x3e, 0x1e, 0xe9, 0xe7, 0xd8, + 0xa6, 0xf6, 0xd2, 0xf2, 0xf9, 0xdf, 0xe4, 0x9a, 0xcc, 0x83, 0xd4, 0x77, 0x07, 0xe8, 0x5d, 0x90, + 0xb0, 0xd1, 0x17, 0xd3, 0x00, 0xe6, 0xe2, 0x7a, 0xe4, 0x59, 0x31, 0xfa, 0xee, 0x24, 0x72, 0x58, + 0x3c, 0xa3, 0x37, 0x21, 0xd3, 0x33, 0xc7, 0x63, 0x9d, 0x54, 0xf2, 0xcc, 0x7a, 0x3b, 0x72, 0x02, + 0x4c, 0xab, 0x15, 0x53, 0x84, 0x3e, 0x3a, 0x86, 0xe2, 0x48, 0x77, 0x88, 0xea, 0x18, 0x9a, 0xe5, + 0x0c, 0x4d, 0xe2, 0x54, 0x36, 0x98, 0x87, 0x67, 0xa3, 0x3c, 0x1c, 0xe9, 0x0e, 0x39, 0x75, 0x95, + 0x5b, 0x31, 0xa5, 0x30, 0x0a, 0x0a, 0xa8, 0x3f, 0xf3, 0xec, 0x0c, 0xdb, 0x9e, 0xc3, 0x4a, 0x61, + 0xb9, 0xbf, 0x36, 0xd5, 0x76, 0xed, 0xa9, 0x3f, 0x33, 0x28, 0x40, 0x3f, 0x85, 0x2b, 0x23, 0x53, + 0xeb, 0x7b, 0xee, 0xd4, 0xde, 0x70, 0x62, 0xdc, 0xab, 0x14, 0x99, 0xd3, 0x17, 0x23, 0x3f, 0xd2, + 0xd4, 0xfa, 0xae, 0x8b, 0x06, 0x35, 0x68, 0xc5, 0x94, 0xcd, 0xd1, 0xac, 0x10, 0xdd, 0x85, 0x2d, + 0xcd, 0xb2, 0x46, 0xd3, 0x59, 0xef, 0x25, 0xe6, 0xfd, 0x46, 0x94, 0xf7, 0x1a, 0xb5, 0x99, 0x75, + 0x8f, 0xb4, 0x39, 0x69, 0x3d, 0x0b, 0xe9, 0x73, 0x6d, 0x34, 0xc1, 0xf2, 0xf3, 0x90, 0x0f, 0x84, + 0x3a, 0xaa, 0x40, 0x76, 0x8c, 0x1d, 0x47, 0x1b, 0x60, 0x86, 0x0c, 0x92, 0xe2, 0x0e, 0xe5, 0x22, + 0x6c, 0x04, 0xc3, 0x5b, 0x1e, 0x7b, 0x86, 0x34, 0x70, 0xa9, 0xe1, 0x39, 0xb6, 0x1d, 0x1a, 0xad, + 0xc2, 0x50, 0x0c, 0xd1, 0x33, 0x50, 0x60, 0xc7, 0x47, 0x75, 0xdf, 0x53, 0xf4, 0x48, 0x29, 0x1b, + 0x4c, 0x78, 0x47, 0x28, 0xed, 0x40, 0xde, 0xda, 0xb7, 0x3c, 0x95, 0x24, 0x53, 0x01, 0x6b, 0xdf, + 0x12, 0x0a, 0xf2, 0xf7, 0xa0, 0x3c, 0x1b, 0xed, 0xa8, 0x0c, 0xc9, 0x7b, 0x78, 0x2a, 0x7e, 0x8f, + 0x3e, 0xa2, 0x2d, 0x31, 0x2d, 0xf6, 0x1b, 0x92, 0x22, 0xe6, 0xf8, 0xa7, 0x84, 0x67, 0xec, 0x85, + 0x39, 0x7a, 0x13, 0x52, 0x14, 0x35, 0x05, 0x00, 0x56, 0x77, 0x39, 0xa4, 0xee, 0xba, 0x90, 0xba, + 0xdb, 0x71, 0x21, 0xb5, 0x9e, 0xfb, 0xea, 0x9b, 0x9d, 0xd8, 0x17, 0x7f, 0xdd, 0x89, 0x2b, 0xcc, + 0x02, 0x3d, 0x41, 0xa3, 0x52, 0xd3, 0x0d, 0x55, 0xef, 0x8b, 0xdf, 0xc9, 0xb2, 0xf1, 0x41, 0x1f, + 0x1d, 0x42, 0xb9, 0x67, 0x1a, 0x0e, 0x36, 0x9c, 0x89, 0xa3, 0x72, 0xc8, 0x16, 0xb0, 0x37, 0x1f, + 0x35, 0x0d, 0x57, 0xf1, 0x84, 0xe9, 0x29, 0xa5, 0x5e, 0x58, 0x80, 0x6e, 0x01, 0x9c, 0x6b, 0x23, + 0xbd, 0xaf, 0x11, 0xd3, 0x76, 0x2a, 0xa9, 0xeb, 0xc9, 0x85, 0x6e, 0xee, 0xb8, 0x2a, 0xb7, 0xad, + 0xbe, 0x46, 0x70, 0x3d, 0x45, 0xbf, 0x56, 0x09, 0x58, 0xa2, 0xe7, 0xa0, 0xa4, 0x59, 0x96, 0xea, + 0x10, 0x8d, 0x60, 0xb5, 0x3b, 0x25, 0xd8, 0x61, 0x60, 0xb8, 0xa1, 0x14, 0x34, 0xcb, 0x3a, 0xa5, + 0xd2, 0x3a, 0x15, 0xa2, 0x67, 0xa1, 0x48, 0x81, 0x4f, 0xd7, 0x46, 0xea, 0x10, 0xeb, 0x83, 0x21, + 0x61, 0xa0, 0x97, 0x54, 0x0a, 0x42, 0xda, 0x62, 0x42, 0xb9, 0xef, 0x1d, 0x04, 0x06, 0x7a, 0x08, + 0x41, 0xaa, 0xaf, 0x11, 0x8d, 0x2d, 0xe4, 0x86, 0xc2, 0x9e, 0xa9, 0xcc, 0xd2, 0xc8, 0x50, 0x2c, + 0x0f, 0x7b, 0x46, 0x57, 0x21, 0x23, 0xdc, 0x26, 0x99, 0x5b, 0x31, 0xa2, 0x7b, 0x66, 0xd9, 0xe6, + 0x39, 0x66, 0x28, 0x9f, 0x53, 0xf8, 0x40, 0xfe, 0x65, 0x02, 0x36, 0xe7, 0xe0, 0x91, 0xfa, 0x1d, + 0x6a, 0xce, 0xd0, 0xfd, 0x2d, 0xfa, 0x8c, 0xde, 0xa0, 0x7e, 0xb5, 0x3e, 0xb6, 0x45, 0x5a, 0xaa, + 0x04, 0x97, 0x88, 0xa7, 0xdc, 0x16, 0x7b, 0x2f, 0x96, 0x46, 0x68, 0xa3, 0x36, 0x94, 0x47, 0x9a, + 0x43, 0x54, 0x0e, 0x37, 0x6a, 0x20, 0x45, 0xcd, 0x83, 0xec, 0x91, 0xe6, 0x02, 0x14, 0x3d, 0xec, + 0xc2, 0x51, 0x71, 0x14, 0x92, 0x22, 0x05, 0xb6, 0xba, 0xd3, 0xcf, 0x35, 0x83, 0xe8, 0x06, 0x56, + 0xe7, 0x76, 0xee, 0x89, 0x39, 0xa7, 0xcd, 0x73, 0xbd, 0x8f, 0x8d, 0x9e, 0xbb, 0x65, 0x57, 0x3c, + 0x63, 0x6f, 0x4b, 0x1d, 0x59, 0x81, 0x62, 0x18, 0xe0, 0x51, 0x11, 0x12, 0xe4, 0x42, 0x2c, 0x40, + 0x82, 0x5c, 0xa0, 0xff, 0x83, 0x14, 0x9d, 0x24, 0x9b, 0x7c, 0x71, 0x41, 0x76, 0x15, 0x76, 0x9d, + 0xa9, 0x85, 0x15, 0xa6, 0x29, 0xcb, 0x5e, 0x34, 0x78, 0xa0, 0x3f, 0xeb, 0x55, 0x7e, 0x11, 0x4a, + 0x33, 0xa8, 0x1e, 0xd8, 0xbf, 0x78, 0x70, 0xff, 0xe4, 0x12, 0x14, 0x42, 0x10, 0x2e, 0x5f, 0x85, + 0xad, 0x45, 0x88, 0x2c, 0x0f, 0x3d, 0x79, 0x08, 0x59, 0xd1, 0xeb, 0x90, 0xf3, 0x20, 0x99, 0x47, + 0xe3, 0xfc, 0x5a, 0xb9, 0xca, 0x8a, 0xa7, 0x4a, 0xc3, 0x90, 0x1e, 0x6b, 0x76, 0x1e, 0x12, 0xec, + 0xc3, 0xb3, 0x9a, 0x65, 0xb5, 0x34, 0x67, 0x28, 0x7f, 0x02, 0x95, 0x28, 0xb8, 0x9d, 0x99, 0x46, + 0xca, 0x3b, 0x86, 0x57, 0x21, 0x73, 0x66, 0xda, 0x63, 0x8d, 0x30, 0x67, 0x05, 0x45, 0x8c, 0xe8, + 0xf1, 0xe4, 0xd0, 0x9b, 0x64, 0x62, 0x3e, 0x90, 0x55, 0x78, 0x22, 0x12, 0x72, 0xa9, 0x89, 0x6e, + 0xf4, 0x31, 0x5f, 0xcf, 0x82, 0xc2, 0x07, 0xbe, 0x23, 0xfe, 0xb1, 0x7c, 0x40, 0x7f, 0xd6, 0x61, + 0x73, 0x65, 0xfe, 0x25, 0x45, 0x8c, 0xe4, 0xbf, 0xe7, 0x20, 0xa7, 0x60, 0xc7, 0xa2, 0x98, 0x80, + 0xea, 0x20, 0xe1, 0x8b, 0x1e, 0xe6, 0x64, 0x28, 0x1e, 0x49, 0x26, 0xb8, 0x76, 0xd3, 0xd5, 0xa4, + 0x99, 0xdc, 0x33, 0x43, 0xaf, 0x09, 0xc2, 0x17, 0xcd, 0xdd, 0x84, 0x79, 0x90, 0xf1, 0xbd, 0xe1, + 0x32, 0xbe, 0x64, 0x64, 0xf2, 0xe6, 0x56, 0x33, 0x94, 0xef, 0x35, 0x41, 0xf9, 0x52, 0x2b, 0x7e, + 0x2c, 0xc4, 0xf9, 0x1a, 0x21, 0xce, 0x97, 0x5e, 0x31, 0xcd, 0x08, 0xd2, 0xd7, 0x08, 0x91, 0xbe, + 0xcc, 0x0a, 0x27, 0x11, 0xac, 0xef, 0x0d, 0x97, 0xf5, 0x65, 0x57, 0x4c, 0x7b, 0x86, 0xf6, 0xdd, + 0x0a, 0xd3, 0x3e, 0x4e, 0xd9, 0x9e, 0x89, 0xb4, 0x8e, 0xe4, 0x7d, 0xdf, 0x0f, 0xf0, 0x3e, 0x29, + 0x92, 0x74, 0x71, 0x27, 0x0b, 0x88, 0x5f, 0x23, 0x44, 0xfc, 0x60, 0xc5, 0x1a, 0x44, 0x30, 0xbf, + 0xf7, 0x82, 0xcc, 0x2f, 0x1f, 0x49, 0x1e, 0xc5, 0xa1, 0x59, 0x44, 0xfd, 0xde, 0xf2, 0xa8, 0xdf, + 0x46, 0x24, 0x77, 0x15, 0x73, 0x98, 0xe5, 0x7e, 0xed, 0x39, 0xee, 0xc7, 0xb9, 0xda, 0x73, 0x91, + 0x2e, 0x56, 0x90, 0xbf, 0xf6, 0x1c, 0xf9, 0x2b, 0xae, 0x70, 0xb8, 0x82, 0xfd, 0xfd, 0x6c, 0x31, + 0xfb, 0x8b, 0xe6, 0x67, 0xe2, 0x33, 0xd7, 0xa3, 0x7f, 0x6a, 0x04, 0xfd, 0x2b, 0x33, 0xf7, 0x2f, + 0x45, 0xba, 0xbf, 0x3c, 0xff, 0x7b, 0x91, 0xa6, 0xd9, 0x19, 0xe0, 0xa0, 0x50, 0x85, 0x6d, 0xdb, + 0xb4, 0x05, 0xb5, 0xe2, 0x03, 0xf9, 0x05, 0x9a, 0xf8, 0x7d, 0x90, 0x58, 0xc2, 0x15, 0x59, 0x4a, + 0x08, 0x00, 0x83, 0xfc, 0xfb, 0xb8, 0x6f, 0xcb, 0x72, 0x65, 0x90, 0x34, 0x48, 0x82, 0x34, 0x04, + 0x28, 0x64, 0x22, 0x4c, 0x21, 0x77, 0x20, 0x4f, 0xa1, 0x7e, 0x86, 0x1d, 0x6a, 0x96, 0xcb, 0x0e, + 0xd1, 0x0d, 0xd8, 0x64, 0xb9, 0x9c, 0x13, 0x4d, 0x81, 0xef, 0x29, 0x96, 0xa6, 0x4a, 0xf4, 0x05, + 0x3f, 0x9c, 0x1c, 0xe8, 0x5f, 0x81, 0x2b, 0x01, 0x5d, 0x2f, 0x85, 0x70, 0x4a, 0x54, 0xf6, 0xb4, + 0x6b, 0x22, 0x97, 0x7c, 0xe8, 0x2f, 0x90, 0xcf, 0x3c, 0x11, 0xa4, 0x7a, 0x66, 0x1f, 0x0b, 0x80, + 0x67, 0xcf, 0x94, 0x8d, 0x8e, 0xcc, 0x81, 0x80, 0x71, 0xfa, 0x48, 0xb5, 0x3c, 0x14, 0x94, 0x38, + 0xc8, 0xc9, 0x7f, 0x8c, 0xfb, 0xfe, 0x7c, 0x32, 0xba, 0x88, 0x37, 0xc6, 0xff, 0x3b, 0xbc, 0x31, + 0xf1, 0xad, 0x79, 0x63, 0x30, 0xc1, 0x26, 0xc3, 0x09, 0xf6, 0x9f, 0x71, 0x7f, 0x87, 0x3d, 0x16, + 0xf8, 0xed, 0x56, 0xc4, 0xcf, 0x96, 0x69, 0xb6, 0x5f, 0x22, 0x5b, 0x0a, 0x6e, 0x9f, 0x61, 0xbf, + 0x1b, 0xe6, 0xf6, 0x59, 0x9e, 0x3f, 0xd9, 0x00, 0xbd, 0x09, 0x12, 0x6b, 0xba, 0xa8, 0xa6, 0xe5, + 0x08, 0xc0, 0x7d, 0x32, 0x38, 0x57, 0xde, 0x5b, 0xd9, 0x3d, 0xa1, 0x3a, 0x6d, 0xcb, 0x51, 0x72, + 0x96, 0x78, 0x0a, 0x10, 0x01, 0x29, 0xc4, 0x47, 0xaf, 0x81, 0x44, 0xbf, 0xde, 0xb1, 0xb4, 0x1e, + 0x66, 0xe0, 0x29, 0x29, 0xbe, 0x40, 0xbe, 0x0b, 0x68, 0x1e, 0xbe, 0x51, 0x0b, 0x32, 0xf8, 0x1c, + 0x1b, 0x84, 0xee, 0x1a, 0x5d, 0xee, 0xab, 0x0b, 0xc8, 0x1e, 0x36, 0x48, 0xbd, 0x42, 0x17, 0xf9, + 0x1f, 0xdf, 0xec, 0x94, 0xb9, 0xf6, 0xcb, 0xe6, 0x58, 0x27, 0x78, 0x6c, 0x91, 0xa9, 0x22, 0xec, + 0xe5, 0xbf, 0x24, 0x28, 0xf3, 0x0a, 0x41, 0xfb, 0xc2, 0xb5, 0x75, 0x03, 0x28, 0x11, 0x60, 0xdd, + 0xeb, 0xad, 0xf7, 0x36, 0xc0, 0x40, 0x73, 0xd4, 0xfb, 0x9a, 0x41, 0x70, 0x5f, 0x2c, 0x7a, 0x40, + 0x82, 0xaa, 0x90, 0xa3, 0xa3, 0x89, 0x83, 0xfb, 0xa2, 0x00, 0xf0, 0xc6, 0x81, 0x79, 0x66, 0xbf, + 0xdb, 0x3c, 0xc3, 0xab, 0x9c, 0x9b, 0x59, 0xe5, 0x00, 0x2b, 0x92, 0x82, 0xac, 0x88, 0x7e, 0x9b, + 0x65, 0xeb, 0xa6, 0xad, 0x93, 0x29, 0xdb, 0x9a, 0xa4, 0xe2, 0x8d, 0x69, 0x9d, 0x39, 0xc6, 0x63, + 0xcb, 0x34, 0x47, 0x2a, 0x07, 0xaf, 0x3c, 0x33, 0xdd, 0x10, 0xc2, 0x26, 0xc3, 0xb0, 0x5f, 0x25, + 0xfc, 0xf0, 0xf3, 0xd9, 0xef, 0xff, 0xdc, 0x02, 0xcb, 0xbf, 0x66, 0x25, 0x71, 0x38, 0x79, 0xa3, + 0x53, 0xd8, 0xf4, 0xc2, 0x5f, 0x9d, 0x30, 0x58, 0x70, 0x0f, 0xf4, 0xba, 0xf8, 0x51, 0x3e, 0x0f, + 0x8b, 0x1d, 0xf4, 0x23, 0x78, 0x7c, 0x06, 0xda, 0x3c, 0xd7, 0x89, 0x35, 0x11, 0xee, 0xb1, 0x30, + 0xc2, 0xb9, 0x9e, 0xfd, 0xb5, 0x4a, 0x7e, 0xc7, 0xa0, 0x3b, 0xa0, 0x55, 0x56, 0x90, 0x8a, 0x2c, + 0xdc, 0xfd, 0x67, 0xa0, 0x60, 0x63, 0x42, 0x0b, 0xff, 0x50, 0x1d, 0xbb, 0xc1, 0x85, 0xa2, 0x3a, + 0x3e, 0x81, 0xc7, 0x16, 0x52, 0x12, 0xf4, 0xff, 0x20, 0xf9, 0x6c, 0x26, 0x1e, 0x51, 0x12, 0x7a, + 0x65, 0x8e, 0xaf, 0x2b, 0xff, 0x21, 0xee, 0xbb, 0x0c, 0x17, 0x4e, 0x4d, 0xc8, 0xd8, 0xd8, 0x99, + 0x8c, 0x78, 0x29, 0x53, 0xdc, 0x7f, 0x65, 0x3d, 0x32, 0x43, 0xa5, 0x93, 0x11, 0x51, 0x84, 0xb1, + 0x7c, 0x17, 0x32, 0x5c, 0x82, 0xf2, 0x90, 0xbd, 0x7d, 0x7c, 0x78, 0xdc, 0xfe, 0xe8, 0xb8, 0x1c, + 0x43, 0x00, 0x99, 0x5a, 0xa3, 0xd1, 0x3c, 0xe9, 0x94, 0xe3, 0x48, 0x82, 0x74, 0xad, 0xde, 0x56, + 0x3a, 0xe5, 0x04, 0x15, 0x2b, 0xcd, 0x0f, 0x9a, 0x8d, 0x4e, 0x39, 0x89, 0x36, 0xa1, 0xc0, 0x9f, + 0xd5, 0x5b, 0x6d, 0xe5, 0xc3, 0x5a, 0xa7, 0x9c, 0x0a, 0x88, 0x4e, 0x9b, 0xc7, 0x37, 0x9b, 0x4a, + 0x39, 0x2d, 0xbf, 0x4a, 0x6b, 0xa5, 0x08, 0xfa, 0xe3, 0x57, 0x45, 0xf1, 0x40, 0x55, 0x24, 0xff, + 0x36, 0x01, 0xd5, 0x68, 0x4e, 0x83, 0x3e, 0x98, 0x99, 0xf8, 0xfe, 0x25, 0x08, 0xd1, 0xcc, 0xec, + 0xd1, 0xb3, 0x50, 0xb4, 0xf1, 0x19, 0x26, 0xbd, 0x21, 0xe7, 0x58, 0x3c, 0x63, 0x16, 0x94, 0x82, + 0x90, 0x32, 0x23, 0x87, 0xab, 0x7d, 0x8a, 0x7b, 0x44, 0xe5, 0x50, 0xc4, 0x0f, 0x9d, 0x44, 0xd5, + 0xa8, 0xf4, 0x94, 0x0b, 0xe5, 0x4f, 0x2e, 0xb5, 0x96, 0x12, 0xa4, 0x95, 0x66, 0x47, 0xf9, 0x71, + 0x39, 0x89, 0x10, 0x14, 0xd9, 0xa3, 0x7a, 0x7a, 0x5c, 0x3b, 0x39, 0x6d, 0xb5, 0xe9, 0x5a, 0x5e, + 0x81, 0x92, 0xbb, 0x96, 0xae, 0x30, 0x2d, 0xff, 0x3b, 0x0e, 0xa5, 0x99, 0x00, 0x41, 0xfb, 0x90, + 0xe6, 0x3c, 0x3d, 0xaa, 0x9b, 0xcf, 0xe2, 0x5b, 0x44, 0x13, 0x57, 0x45, 0xef, 0x40, 0x0e, 0x8b, + 0x06, 0xc4, 0xa2, 0x40, 0xe4, 0x8d, 0x13, 0xb7, 0x45, 0x21, 0x4c, 0x3d, 0x0b, 0xf4, 0x2e, 0x48, + 0x5e, 0xa4, 0x8b, 0xe2, 0xf0, 0xe9, 0x79, 0x73, 0x0f, 0x23, 0x84, 0xbd, 0x6f, 0x83, 0xde, 0xf2, + 0xc9, 0x5e, 0x6a, 0xbe, 0x3a, 0x10, 0xe6, 0x5c, 0x41, 0x18, 0xbb, 0xfa, 0x72, 0x03, 0xf2, 0x81, + 0xf9, 0xa0, 0x27, 0x41, 0x1a, 0x6b, 0x17, 0xa2, 0xb1, 0xc5, 0x5b, 0x13, 0xb9, 0xb1, 0x76, 0xc1, + 0x7b, 0x5a, 0x8f, 0x43, 0x96, 0xbe, 0x1c, 0x68, 0x1c, 0x6d, 0x92, 0x4a, 0x66, 0xac, 0x5d, 0xbc, + 0xaf, 0x39, 0xf2, 0xc7, 0x50, 0x0c, 0x37, 0x75, 0xe8, 0x49, 0xb4, 0xcd, 0x89, 0xd1, 0x67, 0x3e, + 0xd2, 0x0a, 0x1f, 0xa0, 0xd7, 0x21, 0x7d, 0x6e, 0x72, 0xb0, 0x5a, 0x1c, 0xb2, 0x77, 0x4c, 0x82, + 0x03, 0x4d, 0x21, 0xae, 0x2d, 0x7f, 0x0e, 0x69, 0x06, 0x3e, 0x14, 0x48, 0x58, 0x7b, 0x46, 0x10, + 0x5d, 0xfa, 0x8c, 0x3e, 0x06, 0xd0, 0x08, 0xb1, 0xf5, 0xee, 0xc4, 0x77, 0xbc, 0xb3, 0x18, 0xbc, + 0x6a, 0xae, 0x5e, 0xfd, 0x9a, 0x40, 0xb1, 0x2d, 0xdf, 0x34, 0x80, 0x64, 0x01, 0x87, 0xf2, 0x31, + 0x14, 0xc3, 0xb6, 0xc1, 0x46, 0xe9, 0xc6, 0x82, 0x46, 0xa9, 0x47, 0xa6, 0x3c, 0x2a, 0x96, 0xe4, + 0xad, 0x38, 0x36, 0x90, 0x1f, 0xc4, 0x21, 0xd7, 0xb9, 0x10, 0xc7, 0x3a, 0xa2, 0x0b, 0xe4, 0x9b, + 0x26, 0x82, 0x3d, 0x0f, 0xde, 0x56, 0x4a, 0x7a, 0xcd, 0xaa, 0xf7, 0xbc, 0xc0, 0x4d, 0xad, 0x5b, + 0x95, 0xba, 0x5d, 0x3b, 0x01, 0x56, 0x6f, 0x83, 0xe4, 0x9d, 0x2a, 0x5a, 0x31, 0x68, 0xfd, 0xbe, + 0x8d, 0x1d, 0x47, 0xcc, 0xcd, 0x1d, 0xb2, 0xa6, 0xa2, 0x79, 0x5f, 0x74, 0x55, 0x92, 0x0a, 0x1f, + 0xc8, 0xbf, 0x8b, 0x43, 0x69, 0x26, 0x6f, 0xa1, 0xb7, 0x21, 0x6b, 0x4d, 0xba, 0xaa, 0xbb, 0x3e, + 0x33, 0xd1, 0xe3, 0xd2, 0xc7, 0x49, 0x77, 0xa4, 0xf7, 0x0e, 0xf1, 0xd4, 0xfd, 0x1a, 0x6b, 0xd2, + 0x3d, 0xe4, 0xcb, 0xc8, 0x7f, 0x26, 0x11, 0xf8, 0x19, 0x7a, 0xe8, 0xba, 0x23, 0x87, 0xb9, 0xe4, + 0x53, 0xcf, 0x74, 0x47, 0x0e, 0x55, 0x7f, 0x1e, 0x4a, 0x36, 0x1e, 0x69, 0x53, 0x6c, 0xab, 0xee, + 0x77, 0xa7, 0x98, 0x42, 0x51, 0x88, 0x6b, 0x5c, 0x2a, 0x9f, 0x43, 0xce, 0x3d, 0x57, 0xe8, 0x07, + 0xc1, 0x50, 0x73, 0xbb, 0xd5, 0x91, 0xd9, 0x58, 0x7c, 0x60, 0x20, 0xd2, 0x6e, 0xc0, 0xa6, 0xa3, + 0x0f, 0x0c, 0xdc, 0x57, 0xfd, 0xb2, 0x87, 0x7d, 0x6f, 0x4e, 0x29, 0xf1, 0x17, 0x47, 0x6e, 0xcd, + 0x23, 0xff, 0x2b, 0x0e, 0x39, 0x37, 0xe6, 0xd1, 0xab, 0x81, 0xa3, 0x5b, 0x5c, 0xd0, 0xc4, 0x71, + 0x15, 0xfd, 0xd6, 0x62, 0xf8, 0x5b, 0x13, 0x97, 0xff, 0xd6, 0xa8, 0x1e, 0xb1, 0xdb, 0xac, 0x4f, + 0x5d, 0xba, 0x59, 0xff, 0x32, 0x20, 0x62, 0x12, 0x6d, 0xa4, 0x9e, 0x9b, 0x44, 0x37, 0x06, 0x2a, + 0xdf, 0x2e, 0x4e, 0xca, 0xca, 0xec, 0xcd, 0x1d, 0xf6, 0xe2, 0x84, 0x1d, 0x90, 0x9f, 0xc7, 0x21, + 0xe7, 0xa5, 0xd7, 0xcb, 0x76, 0x0a, 0xaf, 0x42, 0x46, 0x64, 0x10, 0xde, 0x2a, 0x14, 0x23, 0xaf, + 0x69, 0x9d, 0x0a, 0x34, 0xad, 0xab, 0x90, 0x1b, 0x63, 0xa2, 0x31, 0x8e, 0xc1, 0x2b, 0x4f, 0x6f, + 0x7c, 0xe3, 0x2d, 0xc8, 0x07, 0x9a, 0xb6, 0x34, 0x78, 0x8f, 0x9b, 0x1f, 0x95, 0x63, 0xd5, 0xec, + 0x83, 0x2f, 0xaf, 0x27, 0x8f, 0xf1, 0x7d, 0x7a, 0xec, 0x95, 0x66, 0xa3, 0xd5, 0x6c, 0x1c, 0x96, + 0xe3, 0xd5, 0xfc, 0x83, 0x2f, 0xaf, 0x67, 0x15, 0xcc, 0x7a, 0x3f, 0x37, 0x5a, 0xb0, 0x11, 0xdc, + 0x95, 0x70, 0x12, 0x42, 0x50, 0xbc, 0x79, 0xfb, 0xe4, 0xe8, 0xa0, 0x51, 0xeb, 0x34, 0xd5, 0x3b, + 0xed, 0x4e, 0xb3, 0x1c, 0x47, 0x8f, 0xc3, 0x95, 0xa3, 0x83, 0xf7, 0x5b, 0x1d, 0xb5, 0x71, 0x74, + 0xd0, 0x3c, 0xee, 0xa8, 0xb5, 0x4e, 0xa7, 0xd6, 0x38, 0x2c, 0x27, 0xf6, 0x7f, 0x01, 0x50, 0xaa, + 0xd5, 0x1b, 0x07, 0x34, 0x81, 0xea, 0x3d, 0x4d, 0xf4, 0xd6, 0x52, 0xac, 0xf0, 0x5f, 0x7a, 0x5b, + 0x5c, 0x5d, 0xde, 0x5a, 0x44, 0xb7, 0x20, 0xcd, 0x7a, 0x02, 0x68, 0xf9, 0xf5, 0x71, 0x75, 0x45, + 0xaf, 0x91, 0x7e, 0x0c, 0x0b, 0x8f, 0xa5, 0xf7, 0xc9, 0xd5, 0xe5, 0xad, 0x47, 0xa4, 0x80, 0xe4, + 0x17, 0xf5, 0xab, 0xef, 0x97, 0xab, 0x6b, 0xb4, 0x23, 0xa9, 0x4f, 0xbf, 0xb2, 0x58, 0x7d, 0xdf, + 0x5a, 0x5d, 0x03, 0x03, 0xd1, 0x11, 0x64, 0xdd, 0x62, 0x70, 0xd5, 0x0d, 0x70, 0x75, 0x65, 0xab, + 0x90, 0x6e, 0x01, 0x2f, 0xda, 0x97, 0x5f, 0x67, 0x57, 0x57, 0xf4, 0x3d, 0xd1, 0x01, 0x64, 0x04, + 0x5d, 0x5e, 0x71, 0xab, 0x5b, 0x5d, 0xd5, 0xfa, 0xa3, 0x8b, 0xe6, 0x77, 0x43, 0x56, 0x5f, 0xd2, + 0x57, 0xd7, 0x68, 0xe9, 0xa2, 0xdb, 0x00, 0x81, 0x12, 0x7d, 0x8d, 0xdb, 0xf7, 0xea, 0x3a, 0xad, + 0x5a, 0xd4, 0x86, 0x9c, 0x57, 0x31, 0xad, 0xbc, 0x0b, 0xaf, 0xae, 0xee, 0x99, 0xa2, 0xbb, 0x50, + 0x08, 0x97, 0x0a, 0xeb, 0xdd, 0x70, 0x57, 0xd7, 0x6c, 0x86, 0x52, 0xff, 0xe1, 0xba, 0x61, 0xbd, + 0x1b, 0xef, 0xea, 0x9a, 0xbd, 0x51, 0xf4, 0x29, 0x6c, 0xce, 0xf3, 0xfa, 0xf5, 0x2f, 0xc0, 0xab, + 0x97, 0xe8, 0x96, 0xa2, 0x31, 0xa0, 0x05, 0xf5, 0xc0, 0x25, 0xee, 0xc3, 0xab, 0x97, 0x69, 0x9e, + 0xd6, 0x9b, 0x5f, 0x3d, 0xdc, 0x8e, 0x7f, 0xfd, 0x70, 0x3b, 0xfe, 0xb7, 0x87, 0xdb, 0xf1, 0x2f, + 0x1e, 0x6d, 0xc7, 0xbe, 0x7e, 0xb4, 0x1d, 0xfb, 0xf3, 0xa3, 0xed, 0xd8, 0x4f, 0x5e, 0x1a, 0xe8, + 0x64, 0x38, 0xe9, 0xee, 0xf6, 0xcc, 0xf1, 0x5e, 0xf0, 0xcf, 0x3a, 0x8b, 0xfe, 0x40, 0xd4, 0xcd, + 0xb0, 0x44, 0xf5, 0xda, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xde, 0xae, 0x17, 0x1d, 0x60, 0x24, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6441,13 +6432,6 @@ func (m *ValidatorUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ChallengerAddress) > 0 { - i -= len(m.ChallengerAddress) - copy(dAtA[i:], m.ChallengerAddress) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ChallengerAddress))) - i-- - dAtA[i] = 0x2a - } if len(m.RelayerAddress) > 0 { i -= len(m.RelayerAddress) copy(dAtA[i:], m.RelayerAddress) @@ -7800,10 +7784,6 @@ func (m *ValidatorUpdate) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.ChallengerAddress) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } return n } @@ -14141,40 +14121,6 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { m.RelayerAddress = []byte{} } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChallengerAddress", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChallengerAddress = append(m.ChallengerAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ChallengerAddress == nil { - m.ChallengerAddress = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 3efb2e412..8837c956a 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -351,7 +351,6 @@ message ValidatorUpdate { int64 power = 2; bytes bls_key = 3; bytes relayer_address = 4; - bytes challenger_address = 5; } // VoteInfo diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index d96d5f728..ac7845cc4 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -85,13 +85,12 @@ func (m *ValidatorSet) GetTotalVotingPower() int64 { } type Validator struct { - Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - PubKey crypto.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"` - VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` - ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"` - BlsKey []byte `protobuf:"bytes,5,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` - RelayerAddress []byte `protobuf:"bytes,6,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` - ChallengerAddress []byte `protobuf:"bytes,7,opt,name=challenger_address,json=challengerAddress,proto3" json:"challenger_address,omitempty"` + Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + PubKey crypto.PublicKey `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"` + VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` + ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"` + BlsKey []byte `protobuf:"bytes,5,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` + RelayerAddress []byte `protobuf:"bytes,6,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` } func (m *Validator) Reset() { *m = Validator{} } @@ -169,19 +168,11 @@ func (m *Validator) GetRelayerAddress() []byte { return nil } -func (m *Validator) GetChallengerAddress() []byte { - if m != nil { - return m.ChallengerAddress - } - return nil -} - type SimpleValidator struct { - PubKey *crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` - VotingPower int64 `protobuf:"varint,2,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` - BlsKey []byte `protobuf:"bytes,3,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` - RelayerAddress []byte `protobuf:"bytes,4,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` - ChallengerAddress []byte `protobuf:"bytes,5,opt,name=challenger_address,json=challengerAddress,proto3" json:"challenger_address,omitempty"` + PubKey *crypto.PublicKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` + VotingPower int64 `protobuf:"varint,2,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` + BlsKey []byte `protobuf:"bytes,3,opt,name=bls_key,json=blsKey,proto3" json:"bls_key,omitempty"` + RelayerAddress []byte `protobuf:"bytes,4,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty"` } func (m *SimpleValidator) Reset() { *m = SimpleValidator{} } @@ -245,13 +236,6 @@ func (m *SimpleValidator) GetRelayerAddress() []byte { return nil } -func (m *SimpleValidator) GetChallengerAddress() []byte { - if m != nil { - return m.ChallengerAddress - } - return nil -} - func init() { proto.RegisterType((*ValidatorSet)(nil), "tendermint.types.ValidatorSet") proto.RegisterType((*Validator)(nil), "tendermint.types.Validator") @@ -261,35 +245,33 @@ func init() { func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) } var fileDescriptor_4e92274df03d3088 = []byte{ - // 435 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcb, 0x6e, 0xd4, 0x30, - 0x14, 0x8d, 0x27, 0xd3, 0x04, 0xdc, 0x11, 0x6d, 0x2d, 0x24, 0xa2, 0x52, 0x85, 0x30, 0x1b, 0x46, - 0x02, 0x12, 0x09, 0x84, 0xba, 0xe8, 0x8a, 0x6e, 0xbb, 0x19, 0x52, 0xa9, 0x0b, 0x36, 0x51, 0x1e, - 0x56, 0x6a, 0xd5, 0x13, 0x5b, 0x8e, 0x33, 0xc8, 0x7f, 0xc1, 0x3f, 0xf0, 0x07, 0x7c, 0x45, 0x97, - 0x5d, 0xb2, 0x40, 0x08, 0xcd, 0xfc, 0x08, 0x8a, 0xf3, 0x54, 0xa1, 0x1a, 0xb1, 0xb3, 0xef, 0x39, - 0xf7, 0xde, 0x73, 0x8e, 0x74, 0xa1, 0x27, 0x71, 0x91, 0x61, 0xb1, 0x22, 0x85, 0x0c, 0xa4, 0xe2, - 0xb8, 0x0c, 0xd6, 0x31, 0x25, 0x59, 0x2c, 0x99, 0xf0, 0xb9, 0x60, 0x92, 0xa1, 0xc3, 0x81, 0xe1, - 0x6b, 0xc6, 0xf1, 0xd3, 0x9c, 0xe5, 0x4c, 0x83, 0x41, 0xfd, 0x6a, 0x78, 0xc7, 0x27, 0xa3, 0x49, - 0xa9, 0x50, 0x5c, 0xb2, 0xe0, 0x06, 0xab, 0xb2, 0x41, 0xe7, 0xdf, 0x01, 0x9c, 0x5d, 0x75, 0x93, - 0x2f, 0xb1, 0x44, 0x67, 0x10, 0xf6, 0x9b, 0x4a, 0x07, 0x78, 0xe6, 0x62, 0xff, 0xdd, 0x73, 0xff, - 0xfe, 0x2e, 0xbf, 0xef, 0x09, 0x47, 0x74, 0x74, 0x0a, 0x1f, 0x71, 0xc1, 0x38, 0x2b, 0xb1, 0x70, - 0x26, 0x1e, 0xd8, 0xd5, 0xda, 0x93, 0xd1, 0x1b, 0x88, 0x24, 0x93, 0x31, 0x8d, 0xd6, 0x4c, 0x92, - 0x22, 0x8f, 0x38, 0xfb, 0x82, 0x85, 0x63, 0x7a, 0x60, 0x61, 0x86, 0x87, 0x1a, 0xb9, 0xd2, 0xc0, - 0xb2, 0xae, 0xcf, 0xbf, 0x4d, 0xe0, 0xe3, 0x7e, 0x0a, 0x72, 0xa0, 0x1d, 0x67, 0x99, 0xc0, 0x65, - 0x2d, 0x17, 0x2c, 0x66, 0x61, 0xf7, 0x45, 0x67, 0xd0, 0xe6, 0x55, 0x12, 0xdd, 0x60, 0xd5, 0xaa, - 0x39, 0x19, 0xab, 0x69, 0xc2, 0xf0, 0x97, 0x55, 0x42, 0x49, 0x7a, 0x81, 0xd5, 0xf9, 0xf4, 0xf6, - 0xd7, 0x0b, 0x23, 0xb4, 0x78, 0x95, 0x5c, 0x60, 0x85, 0x5e, 0xc2, 0xd9, 0x3f, 0xc4, 0xec, 0xaf, - 0x07, 0x1d, 0xe8, 0x35, 0x3c, 0xea, 0x1c, 0x44, 0x5c, 0x10, 0x26, 0x88, 0x54, 0xce, 0xb4, 0x11, - 0xdd, 0x01, 0xcb, 0xb6, 0x8e, 0x9e, 0x41, 0x3b, 0xa1, 0xa5, 0x16, 0xb3, 0xa7, 0x65, 0x5a, 0x09, - 0x2d, 0xeb, 0x45, 0xaf, 0xe0, 0x81, 0xc0, 0x34, 0x56, 0x58, 0x44, 0x9d, 0x0f, 0x4b, 0x13, 0x9e, - 0xb4, 0xe5, 0x8f, 0xad, 0x9d, 0xb7, 0x10, 0xa5, 0xd7, 0x31, 0xa5, 0xb8, 0xc8, 0x47, 0x5c, 0x5b, - 0x73, 0x8f, 0x06, 0xa4, 0xa5, 0xcf, 0x7f, 0x02, 0x78, 0x70, 0x49, 0x56, 0x9c, 0xe2, 0x21, 0xab, - 0x0f, 0x43, 0x22, 0x60, 0x77, 0x22, 0x0f, 0x66, 0x31, 0xf9, 0x3b, 0x8b, 0x91, 0x3d, 0x73, 0x97, - 0xbd, 0xe9, 0x7f, 0xd8, 0xdb, 0x7b, 0xc0, 0xde, 0xf9, 0xa7, 0xdb, 0x8d, 0x0b, 0xee, 0x36, 0x2e, - 0xf8, 0xbd, 0x71, 0xc1, 0xd7, 0xad, 0x6b, 0xdc, 0x6d, 0x5d, 0xe3, 0xc7, 0xd6, 0x35, 0x3e, 0x9f, - 0xe6, 0x44, 0x5e, 0x57, 0x89, 0x9f, 0xb2, 0x55, 0x30, 0x3e, 0xa3, 0xe1, 0xd9, 0x1c, 0xc9, 0xfd, - 0x13, 0x4b, 0x2c, 0x5d, 0x7f, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x38, 0xc7, 0xcd, 0x6a, 0x7d, - 0x03, 0x00, 0x00, + // 412 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0xae, 0xd2, 0x40, + 0x18, 0xc5, 0x3b, 0xb7, 0x58, 0x74, 0x2e, 0x11, 0x9c, 0x98, 0xd8, 0x20, 0xa9, 0x95, 0x8d, 0x24, + 0x9a, 0x36, 0xd1, 0x18, 0x16, 0xac, 0x64, 0xcb, 0x06, 0x4b, 0xc2, 0xc2, 0x4d, 0xd3, 0xd2, 0x49, + 0x9d, 0x50, 0x98, 0xc9, 0x74, 0x8a, 0x99, 0xb7, 0xf0, 0x45, 0xdc, 0xf8, 0x14, 0x2c, 0x59, 0xba, + 0x32, 0x06, 0x5e, 0xc1, 0x07, 0x30, 0x9d, 0xd2, 0x3f, 0x41, 0x6e, 0xd8, 0x0d, 0xe7, 0x9c, 0xf9, + 0xbe, 0xdf, 0x21, 0x53, 0x68, 0x0b, 0xbc, 0x8d, 0x30, 0xdf, 0x90, 0xad, 0x70, 0x85, 0x64, 0x38, + 0x75, 0x77, 0x41, 0x42, 0xa2, 0x40, 0x50, 0xee, 0x30, 0x4e, 0x05, 0x45, 0xbd, 0x3a, 0xe1, 0xa8, + 0x44, 0xff, 0x79, 0x4c, 0x63, 0xaa, 0x4c, 0x37, 0x3f, 0x15, 0xb9, 0xfe, 0xa0, 0x31, 0x69, 0xc5, + 0x25, 0x13, 0xd4, 0x5d, 0x63, 0x99, 0x16, 0xee, 0xf0, 0x27, 0x80, 0x9d, 0x65, 0x39, 0x79, 0x81, + 0x05, 0x9a, 0x40, 0x58, 0x6d, 0x4a, 0x4d, 0x60, 0xeb, 0xa3, 0xfb, 0xf7, 0x2f, 0x9d, 0xcb, 0x5d, + 0x4e, 0x75, 0xc7, 0x6b, 0xc4, 0xd1, 0x18, 0x3e, 0x66, 0x9c, 0x32, 0x9a, 0x62, 0x6e, 0xde, 0xd9, + 0xe0, 0xd6, 0xd5, 0x2a, 0x8c, 0xde, 0x41, 0x24, 0xa8, 0x08, 0x12, 0x7f, 0x47, 0x05, 0xd9, 0xc6, + 0x3e, 0xa3, 0xdf, 0x30, 0x37, 0x75, 0x1b, 0x8c, 0x74, 0xaf, 0xa7, 0x9c, 0xa5, 0x32, 0xe6, 0xb9, + 0x3e, 0xfc, 0x0b, 0xe0, 0x93, 0x6a, 0x0a, 0x32, 0x61, 0x3b, 0x88, 0x22, 0x8e, 0xd3, 0x1c, 0x17, + 0x8c, 0x3a, 0x5e, 0xf9, 0x13, 0x4d, 0x60, 0x9b, 0x65, 0xa1, 0xbf, 0xc6, 0xf2, 0x4c, 0x33, 0x68, + 0xd2, 0x14, 0x7f, 0x86, 0x33, 0xcf, 0xc2, 0x84, 0xac, 0x66, 0x58, 0x4e, 0x5b, 0xfb, 0xdf, 0xaf, + 0x34, 0xcf, 0x60, 0x59, 0x38, 0xc3, 0x12, 0xbd, 0x86, 0x9d, 0x2b, 0x30, 0xf7, 0xbb, 0x9a, 0x03, + 0xbd, 0x85, 0xcf, 0xca, 0x06, 0x3e, 0xe3, 0x84, 0x72, 0x22, 0xa4, 0xd9, 0x2a, 0xa0, 0x4b, 0x63, + 0x7e, 0xd6, 0xd1, 0x0b, 0xd8, 0x0e, 0x93, 0x54, 0xc1, 0x3c, 0x52, 0x98, 0x46, 0x98, 0xa4, 0xf9, + 0xa2, 0x37, 0xb0, 0xcb, 0x71, 0x12, 0x48, 0xcc, 0xfd, 0xb2, 0x87, 0xa1, 0x02, 0x4f, 0xcf, 0xf2, + 0xa7, 0x42, 0x1d, 0xfe, 0x00, 0xb0, 0xbb, 0x20, 0x1b, 0x96, 0xe0, 0xba, 0xfc, 0xc7, 0xba, 0x22, + 0xb8, 0x5d, 0xf1, 0xc1, 0x72, 0x77, 0xff, 0x97, 0x6b, 0xf0, 0xea, 0xb7, 0x78, 0x5b, 0xd7, 0x78, + 0xa7, 0x9f, 0xf7, 0x47, 0x0b, 0x1c, 0x8e, 0x16, 0xf8, 0x73, 0xb4, 0xc0, 0xf7, 0x93, 0xa5, 0x1d, + 0x4e, 0x96, 0xf6, 0xeb, 0x64, 0x69, 0x5f, 0xc6, 0x31, 0x11, 0x5f, 0xb3, 0xd0, 0x59, 0xd1, 0x8d, + 0xdb, 0x7c, 0xe8, 0xf5, 0xb1, 0x78, 0xc6, 0x97, 0x1f, 0x41, 0x68, 0x28, 0xfd, 0xc3, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x0a, 0xf6, 0xf3, 0x81, 0x1f, 0x03, 0x00, 0x00, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { @@ -366,13 +348,6 @@ func (m *Validator) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ChallengerAddress) > 0 { - i -= len(m.ChallengerAddress) - copy(dAtA[i:], m.ChallengerAddress) - i = encodeVarintValidator(dAtA, i, uint64(len(m.ChallengerAddress))) - i-- - dAtA[i] = 0x3a - } if len(m.RelayerAddress) > 0 { i -= len(m.RelayerAddress) copy(dAtA[i:], m.RelayerAddress) @@ -437,13 +412,6 @@ func (m *SimpleValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ChallengerAddress) > 0 { - i -= len(m.ChallengerAddress) - copy(dAtA[i:], m.ChallengerAddress) - i = encodeVarintValidator(dAtA, i, uint64(len(m.ChallengerAddress))) - i-- - dAtA[i] = 0x2a - } if len(m.RelayerAddress) > 0 { i -= len(m.RelayerAddress) copy(dAtA[i:], m.RelayerAddress) @@ -537,10 +505,6 @@ func (m *Validator) Size() (n int) { if l > 0 { n += 1 + l + sovValidator(uint64(l)) } - l = len(m.ChallengerAddress) - if l > 0 { - n += 1 + l + sovValidator(uint64(l)) - } return n } @@ -565,10 +529,6 @@ func (m *SimpleValidator) Size() (n int) { if l > 0 { n += 1 + l + sovValidator(uint64(l)) } - l = len(m.ChallengerAddress) - if l > 0 { - n += 1 + l + sovValidator(uint64(l)) - } return n } @@ -919,40 +879,6 @@ func (m *Validator) Unmarshal(dAtA []byte) error { m.RelayerAddress = []byte{} } iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChallengerAddress", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowValidator - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthValidator - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthValidator - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChallengerAddress = append(m.ChallengerAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ChallengerAddress == nil { - m.ChallengerAddress = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipValidator(dAtA[iNdEx:]) @@ -1126,40 +1052,6 @@ func (m *SimpleValidator) Unmarshal(dAtA []byte) error { m.RelayerAddress = []byte{} } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChallengerAddress", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowValidator - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthValidator - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthValidator - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChallengerAddress = append(m.ChallengerAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ChallengerAddress == nil { - m.ChallengerAddress = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipValidator(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/validator.proto b/proto/tendermint/types/validator.proto index 5d05e3865..b0a8c4a7e 100644 --- a/proto/tendermint/types/validator.proto +++ b/proto/tendermint/types/validator.proto @@ -19,7 +19,6 @@ message Validator { int64 proposer_priority = 4; bytes bls_key = 5; bytes relayer_address = 6; - bytes challenger_address = 7; } message SimpleValidator { @@ -27,5 +26,4 @@ message SimpleValidator { int64 voting_power = 2; bytes bls_key = 3; bytes relayer_address = 4; - bytes challenger_address = 5; } diff --git a/state/execution_test.go b/state/execution_test.go index 747e4aba2..dbfbc6de7 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -263,12 +263,6 @@ func TestValidateValidatorUpdates(t *testing.T) { defaultValidatorParams, false, }, - { - "updating a validator with challenger address is OK", - []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("challenger")}}, - defaultValidatorParams, - false, - }, { "removing a validator is OK", []abci.ValidatorUpdate{{PubKey: pk2, Power: 0}}, @@ -313,8 +307,6 @@ func TestUpdateValidators(t *testing.T) { updated.SetBlsKey(blsPubKey) relayer := ed25519.GenPrivKey().PubKey().Address().Bytes() updated.SetRelayerAddress(relayer) - challenger := ed25519.GenPrivKey().PubKey().Address().Bytes() - updated.SetChallengerAddress(challenger) testCases := []struct { name string @@ -354,10 +346,9 @@ func TestUpdateValidators(t *testing.T) { true, }, { - "updating a validator with relayer bls public key, relayer and challenger address is OK", + "updating a validator with bls public key, and relayer address is OK", types.NewValidatorSet([]*types.Validator{val1}), - []abci.ValidatorUpdate{{PubKey: pk, Power: 20, - BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}}, + []abci.ValidatorUpdate{{PubKey: pk, Power: 20, BlsKey: blsPubKey, RelayerAddress: relayer}}, types.NewValidatorSet([]*types.Validator{updated}), false, }, @@ -379,13 +370,11 @@ func TestUpdateValidators(t *testing.T) { assert.Equal(t, tc.resultingSet.Validators[0].Address, tc.currentSet.Validators[0].Address) assert.Equal(t, tc.resultingSet.Validators[0].BlsKey, tc.currentSet.Validators[0].BlsKey) assert.Equal(t, tc.resultingSet.Validators[0].RelayerAddress, tc.currentSet.Validators[0].RelayerAddress) - assert.Equal(t, tc.resultingSet.Validators[0].ChallengerAddress, tc.currentSet.Validators[0].ChallengerAddress) if tc.resultingSet.Size() > 1 { assert.Equal(t, tc.resultingSet.Validators[1].Address, tc.currentSet.Validators[1].Address) assert.Equal(t, tc.resultingSet.Validators[1].BlsKey, tc.currentSet.Validators[1].BlsKey) assert.Equal(t, tc.resultingSet.Validators[1].RelayerAddress, tc.currentSet.Validators[1].RelayerAddress) - assert.Equal(t, tc.resultingSet.Validators[1].ChallengerAddress, tc.currentSet.Validators[1].ChallengerAddress) } } @@ -442,12 +431,10 @@ func TestEndBlockValidatorUpdates(t *testing.T) { currentValPower := currentVal.VotingPower blsPubKey := ed25519.GenPrivKey().PubKey().Bytes() relayer := ed25519.GenPrivKey().PubKey().Address().Bytes() - challenger := ed25519.GenPrivKey().PubKey().Address().Bytes() app.ValidatorUpdates = []abci.ValidatorUpdate{ {PubKey: pk, Power: 10}, // add a new validator - {PubKey: currentValPk, Power: currentValPower, - BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's bls pub key and addresses + {PubKey: currentValPk, Power: currentValPower, BlsKey: blsPubKey, RelayerAddress: relayer}, // updating a validator's bls pub key and addresses } state, _, err = blockExec.ApplyBlock(state, blockID, block) @@ -467,7 +454,6 @@ func TestEndBlockValidatorUpdates(t *testing.T) { } assert.Equal(t, blsPubKey, val.BlsKey) assert.Equal(t, relayer, val.RelayerAddress) - assert.Equal(t, challenger, val.ChallengerAddress) } // test we threw an event @@ -481,7 +467,6 @@ func TestEndBlockValidatorUpdates(t *testing.T) { assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].BlsKey) assert.EqualValues(t, relayer, event.ValidatorUpdates[1].RelayerAddress) - assert.EqualValues(t, challenger, event.ValidatorUpdates[1].ChallengerAddress) } case <-updatesSub.Cancelled(): t.Fatalf("updatesSub was cancelled (reason: %v)", updatesSub.Err()) diff --git a/types/protobuf.go b/types/protobuf.go index ce34c31d7..42ed6749c 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -140,7 +140,6 @@ func (pb2tm) ValidatorUpdates(vals []abci.ValidatorUpdate) ([]*Validator, error) updated := NewValidator(pub, v.Power) updated.SetBlsKey(v.BlsKey) updated.SetRelayerAddress(v.RelayerAddress) - updated.SetChallengerAddress(v.ChallengerAddress) tmVals[i] = updated } return tmVals, nil diff --git a/types/validator.go b/types/validator.go index f3c6ebd9a..81b07a1c1 100644 --- a/types/validator.go +++ b/types/validator.go @@ -30,9 +30,8 @@ type Validator struct { ProposerPriority int64 `json:"proposer_priority"` - BlsKey []byte `json:"bls_key"` // bls public key - RelayerAddress []byte `json:"relayer_address"` // address of authorized relayer/operator - ChallengerAddress []byte `json:"challenger_address"` // address of authorized challenger/operator + BlsKey []byte `json:"bls_key"` // bls public key + RelayerAddress []byte `json:"relayer_address"` // address of authorized relayer/operator } // NewValidator returns a new validator with the given pubkey and voting power. @@ -68,9 +67,6 @@ func (v *Validator) ValidateBasic() error { if len(v.RelayerAddress) != 0 && len(v.RelayerAddress) != AddressSize { return fmt.Errorf("validator relayer address is the wrong size: %v", v.RelayerAddress) } - if len(v.ChallengerAddress) != 0 && len(v.ChallengerAddress) != AddressSize { - return fmt.Errorf("validator challenger address is the wrong size: %v", v.ChallengerAddress) - } return nil } @@ -112,18 +108,16 @@ func (v *Validator) CompareProposerPriority(other *Validator) *Validator { // 3. voting power // 4. proposer priority // 5. relayer address -// 6. challenger address func (v *Validator) String() string { if v == nil { return "nil-Validator" } - return fmt.Sprintf("Validator{%v %v VP:%v A:%v R:%v C:%v}", + return fmt.Sprintf("Validator{%v %v VP:%v A:%v R:%v}", v.Address, v.PubKey, v.VotingPower, v.ProposerPriority, - v.RelayerAddress, - v.ChallengerAddress) + v.RelayerAddress) } // ValidatorListString returns a prettified validator list for logging purposes. @@ -147,11 +141,10 @@ func (v *Validator) Bytes() []byte { } pbv := tmproto.SimpleValidator{ - PubKey: &pk, - VotingPower: v.VotingPower, - BlsKey: v.BlsKey, - RelayerAddress: v.RelayerAddress, - ChallengerAddress: v.ChallengerAddress, + PubKey: &pk, + VotingPower: v.VotingPower, + BlsKey: v.BlsKey, + RelayerAddress: v.RelayerAddress, } bz, err := pbv.Marshal() @@ -171,11 +164,6 @@ func (v *Validator) SetRelayerAddress(address []byte) { v.RelayerAddress = address } -// SetChallengerAddress will update the challenger address of validator. -func (v *Validator) SetChallengerAddress(address []byte) { - v.ChallengerAddress = address -} - // ToProto converts Validator to protobuf func (v *Validator) ToProto() (*tmproto.Validator, error) { if v == nil { @@ -188,13 +176,12 @@ func (v *Validator) ToProto() (*tmproto.Validator, error) { } vp := tmproto.Validator{ - Address: v.Address, - PubKey: pk, - VotingPower: v.VotingPower, - ProposerPriority: v.ProposerPriority, - BlsKey: v.BlsKey, - RelayerAddress: v.RelayerAddress, - ChallengerAddress: v.ChallengerAddress, + Address: v.Address, + PubKey: pk, + VotingPower: v.VotingPower, + ProposerPriority: v.ProposerPriority, + BlsKey: v.BlsKey, + RelayerAddress: v.RelayerAddress, } return &vp, nil @@ -218,7 +205,6 @@ func ValidatorFromProto(vp *tmproto.Validator) (*Validator, error) { v.ProposerPriority = vp.GetProposerPriority() v.BlsKey = vp.GetBlsKey() v.RelayerAddress = vp.GetRelayerAddress() - v.ChallengerAddress = vp.GetChallengerAddress() return v, nil } diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 5f753e19d..1602f1dad 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -1664,8 +1664,6 @@ func TestValidatorSetHash(t *testing.T) { val.SetBlsKey(blsPubKey) relayer := ed25519.GenPrivKey().PubKey().Address().Bytes() val.SetRelayerAddress(relayer) - challenger := ed25519.GenPrivKey().PubKey().Address().Bytes() - val.SetChallengerAddress(challenger) validatorSet = ValidatorSet{ Validators: []*Validator{val}, diff --git a/types/validator_test.go b/types/validator_test.go index 41e7da02c..0ad494357 100644 --- a/types/validator_test.go +++ b/types/validator_test.go @@ -47,13 +47,10 @@ func TestValidatorValidateBasic(t *testing.T) { rand.Read(blsPubKey) relayer := make([]byte, AddressSize) rand.Read(relayer) - challenger := make([]byte, AddressSize) - rand.Read(challenger) val := NewValidator(pubKey, 1) val.SetBlsKey(blsPubKey) val.SetRelayerAddress(relayer) - val.SetChallengerAddress(challenger) wrongBlsPubKey := val.Copy() wrongBlsPubKey.SetBlsKey([]byte{'a'}) @@ -61,9 +58,6 @@ func TestValidatorValidateBasic(t *testing.T) { wrongRelayer := val.Copy() wrongRelayer.SetRelayerAddress([]byte{'a'}) - wrongChallenger := val.Copy() - wrongChallenger.SetChallengerAddress([]byte{'b'}) - testCases := []struct { val *Validator err bool @@ -122,11 +116,6 @@ func TestValidatorValidateBasic(t *testing.T) { err: true, msg: "validator relayer address is the wrong size: [97]", }, - { - val: wrongChallenger, - err: true, - msg: "validator challenger address is the wrong size: [98]", - }, } for _, tc := range testCases { From 47f82a1045e42b7e699f87dc605ee8e07536ed9d Mon Sep 17 00:00:00 2001 From: KeefeL <90749943+KeefeL@users.noreply.github.com> Date: Thu, 20 Apr 2023 16:45:34 +0800 Subject: [PATCH 2/2] release: prepare for release v0.0.4 (#31) Co-authored-by: Keefe Liu --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ebb64b13..a39073c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v0.0.4 + +This is a maintenance release. + +* [\#30](https://github.com/bnb-chain/greenfield-tendermint/pull/30) chore: remove challenger address in tendermint + ## v0.0.3 This is a maintenance release.