diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 32109660f..2ec7ae399 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -2912,7 +2912,7 @@ func (m *Validator) GetPower() int64 { 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"` - RelayerBlsKey []byte `protobuf:"bytes,3,opt,name=relayer_bls_key,json=relayerBlsKey,proto3" json:"relayer_bls_key,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"` } @@ -2964,9 +2964,9 @@ func (m *ValidatorUpdate) GetPower() int64 { return 0 } -func (m *ValidatorUpdate) GetRelayerBlsKey() []byte { +func (m *ValidatorUpdate) GetBlsKey() []byte { if m != nil { - return m.RelayerBlsKey + return m.BlsKey } return nil } @@ -3250,185 +3250,185 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2836 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x97, 0xe3, 0xd4, - 0xf1, 0xf7, 0xdb, 0x56, 0xb9, 0xfd, 0xe8, 0x3b, 0xc3, 0x60, 0xcc, 0xd0, 0x3d, 0x88, 0xc3, 0x6b, - 0x80, 0xee, 0x3f, 0xcd, 0x81, 0x3f, 0x04, 0x12, 0xb0, 0x8d, 0x07, 0x37, 0xd3, 0xb4, 0x3b, 0x6a, - 0xcf, 0x90, 0x17, 0x23, 0x64, 0xfb, 0xb6, 0x2d, 0x46, 0x96, 0x84, 0x74, 0xdd, 0xb4, 0x59, 0xe6, - 0xb1, 0x21, 0x1b, 0xb2, 0xcb, 0x86, 0xef, 0x91, 0x55, 0x36, 0xd9, 0x70, 0x4e, 0x36, 0x2c, 0xb3, - 0xc8, 0x21, 0x39, 0x4c, 0xb2, 0xc9, 0x17, 0xc8, 0x2a, 0x27, 0x39, 0xf7, 0xa1, 0x97, 0x6d, 0xd9, - 0x6e, 0xc8, 0x2e, 0x3b, 0xdd, 0x52, 0x55, 0xc9, 0x75, 0x1f, 0xbf, 0xfa, 0x55, 0x5d, 0xc3, 0xa3, - 0x04, 0x9b, 0x43, 0xec, 0x4c, 0x74, 0x93, 0xec, 0x6b, 0xfd, 0x81, 0xbe, 0x4f, 0x66, 0x36, 0x76, - 0xf7, 0x6c, 0xc7, 0x22, 0x16, 0xaa, 0x04, 0x2f, 0xf7, 0xe8, 0xcb, 0xfa, 0x63, 0x21, 0xed, 0x81, - 0x33, 0xb3, 0x89, 0xb5, 0x6f, 0x3b, 0x96, 0x75, 0xc6, 0xf5, 0xeb, 0xd7, 0x43, 0xaf, 0x99, 0x9f, - 0xb0, 0xb7, 0xc8, 0x5b, 0x61, 0x7c, 0x1f, 0xcf, 0xbc, 0xb7, 0x8f, 0x2d, 0xd8, 0xda, 0x9a, 0xa3, - 0x4d, 0xbc, 0xd7, 0xbb, 0x23, 0xcb, 0x1a, 0x19, 0x78, 0x9f, 0x8d, 0xfa, 0xd3, 0xb3, 0x7d, 0xa2, - 0x4f, 0xb0, 0x4b, 0xb4, 0x89, 0x2d, 0x14, 0xae, 0x8e, 0xac, 0x91, 0xc5, 0x1e, 0xf7, 0xe9, 0x13, - 0x97, 0xca, 0xbf, 0x29, 0x40, 0x5e, 0xc1, 0x1f, 0x4f, 0xb1, 0x4b, 0xd0, 0x01, 0x64, 0xf0, 0x60, - 0x6c, 0xd5, 0x92, 0x37, 0x92, 0xcf, 0x14, 0x0f, 0xae, 0xef, 0xcd, 0x05, 0xb7, 0x27, 0xf4, 0xda, - 0x83, 0xb1, 0xd5, 0x49, 0x28, 0x4c, 0x17, 0xbd, 0x0c, 0xd9, 0x33, 0x63, 0xea, 0x8e, 0x6b, 0x29, - 0x66, 0xf4, 0x58, 0x9c, 0xd1, 0x2d, 0xaa, 0xd4, 0x49, 0x28, 0x5c, 0x9b, 0x7e, 0x4a, 0x37, 0xcf, - 0xac, 0x5a, 0x7a, 0xf5, 0xa7, 0x0e, 0xcd, 0x33, 0xf6, 0x29, 0xaa, 0x8b, 0x9a, 0x00, 0x2e, 0x26, - 0xaa, 0x65, 0x13, 0xdd, 0x32, 0x6b, 0x19, 0x66, 0xf9, 0x78, 0x9c, 0xe5, 0x29, 0x26, 0x5d, 0xa6, - 0xd8, 0x49, 0x28, 0x92, 0xeb, 0x0d, 0xa8, 0x0f, 0xdd, 0xd4, 0x89, 0x3a, 0x18, 0x6b, 0xba, 0x59, - 0xcb, 0xae, 0xf6, 0x71, 0x68, 0xea, 0xa4, 0x45, 0x15, 0xa9, 0x0f, 0xdd, 0x1b, 0xd0, 0x90, 0x3f, - 0x9e, 0x62, 0x67, 0x56, 0xcb, 0xad, 0x0e, 0xf9, 0x87, 0x54, 0x89, 0x86, 0xcc, 0xb4, 0x51, 0x1b, - 0x8a, 0x7d, 0x3c, 0xd2, 0x4d, 0xb5, 0x6f, 0x58, 0x83, 0xfb, 0xb5, 0x3c, 0x33, 0x96, 0xe3, 0x8c, - 0x9b, 0x54, 0xb5, 0x49, 0x35, 0x3b, 0x09, 0x05, 0xfa, 0xfe, 0x08, 0xbd, 0x01, 0x85, 0xc1, 0x18, - 0x0f, 0xee, 0xab, 0xe4, 0xa2, 0x56, 0x60, 0x3e, 0x76, 0xe3, 0x7c, 0xb4, 0xa8, 0x5e, 0xef, 0xa2, - 0x93, 0x50, 0xf2, 0x03, 0xfe, 0x48, 0xe3, 0x1f, 0x62, 0x43, 0x3f, 0xc7, 0x0e, 0xb5, 0x97, 0x56, - 0xc7, 0xff, 0x36, 0xd7, 0x64, 0x1e, 0xa4, 0xa1, 0x37, 0x40, 0x6f, 0x82, 0x84, 0xcd, 0xa1, 0x08, - 0x03, 0x98, 0x8b, 0x1b, 0xb1, 0x7b, 0xc5, 0x1c, 0x7a, 0x41, 0x14, 0xb0, 0x78, 0x46, 0xaf, 0x42, - 0x6e, 0x60, 0x4d, 0x26, 0x3a, 0xa9, 0x15, 0x99, 0xf5, 0x4e, 0x6c, 0x00, 0x4c, 0xab, 0x93, 0x50, - 0x84, 0x3e, 0x3a, 0x86, 0xb2, 0xa1, 0xbb, 0x44, 0x75, 0x4d, 0xcd, 0x76, 0xc7, 0x16, 0x71, 0x6b, - 0x5b, 0xcc, 0xc3, 0x93, 0x71, 0x1e, 0x8e, 0x74, 0x97, 0x9c, 0x7a, 0xca, 0x9d, 0x84, 0x52, 0x32, - 0xc2, 0x02, 0xea, 0xcf, 0x3a, 0x3b, 0xc3, 0x8e, 0xef, 0xb0, 0x56, 0x5a, 0xed, 0xaf, 0x4b, 0xb5, - 0x3d, 0x7b, 0xea, 0xcf, 0x0a, 0x0b, 0xd0, 0x4f, 0xe1, 0x8a, 0x61, 0x69, 0x43, 0xdf, 0x9d, 0x3a, - 0x18, 0x4f, 0xcd, 0xfb, 0xb5, 0x32, 0x73, 0xfa, 0x6c, 0xec, 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, 0xd0, 0x51, 0x47, 0x35, 0xc8, 0x4f, - 0xb0, 0xeb, 0x6a, 0x23, 0xcc, 0x90, 0x41, 0x52, 0xbc, 0xa1, 0x5c, 0x86, 0xad, 0xf0, 0xf1, 0x96, - 0x27, 0xbe, 0x21, 0x3d, 0xb8, 0xd4, 0xf0, 0x1c, 0x3b, 0x2e, 0x3d, 0xad, 0xc2, 0x50, 0x0c, 0xd1, - 0x13, 0x50, 0x62, 0xdb, 0x47, 0xf5, 0xde, 0x53, 0xf4, 0xc8, 0x28, 0x5b, 0x4c, 0x78, 0x57, 0x28, - 0xed, 0x42, 0xd1, 0x3e, 0xb0, 0x7d, 0x95, 0x34, 0x53, 0x01, 0xfb, 0xc0, 0x16, 0x0a, 0xf2, 0xf7, - 0xa0, 0x3a, 0x7f, 0xda, 0x51, 0x15, 0xd2, 0xf7, 0xf1, 0x4c, 0x7c, 0x8f, 0x3e, 0xa2, 0xab, 0x22, - 0x2c, 0xf6, 0x0d, 0x49, 0x11, 0x31, 0xfe, 0x31, 0xe5, 0x1b, 0xfb, 0xc7, 0x1c, 0xbd, 0x0a, 0x19, - 0x8a, 0x9a, 0x02, 0x00, 0xeb, 0x7b, 0x1c, 0x52, 0xf7, 0x3c, 0x48, 0xdd, 0xeb, 0x79, 0x90, 0xda, - 0x2c, 0x7c, 0xf9, 0xf5, 0x6e, 0xe2, 0xf3, 0xbf, 0xec, 0x26, 0x15, 0x66, 0x81, 0x1e, 0xa1, 0xa7, - 0x52, 0xd3, 0x4d, 0x55, 0x1f, 0x8a, 0xef, 0xe4, 0xd9, 0xf8, 0x70, 0x88, 0x6e, 0x43, 0x75, 0x60, - 0x99, 0x2e, 0x36, 0xdd, 0xa9, 0xab, 0x72, 0xc8, 0x16, 0xb0, 0xb7, 0x78, 0x6a, 0x5a, 0x9e, 0xe2, - 0x09, 0xd3, 0x53, 0x2a, 0x83, 0xa8, 0x00, 0xdd, 0x02, 0x38, 0xd7, 0x0c, 0x7d, 0xa8, 0x11, 0xcb, - 0x71, 0x6b, 0x99, 0x1b, 0xe9, 0xa5, 0x6e, 0xee, 0x7a, 0x2a, 0x77, 0xec, 0xa1, 0x46, 0x70, 0x33, - 0x43, 0x7f, 0xad, 0x12, 0xb2, 0x44, 0x4f, 0x41, 0x45, 0xb3, 0x6d, 0xd5, 0x25, 0x1a, 0xc1, 0x6a, - 0x7f, 0x46, 0xb0, 0xcb, 0xc0, 0x70, 0x4b, 0x29, 0x69, 0xb6, 0x7d, 0x4a, 0xa5, 0x4d, 0x2a, 0x44, - 0x4f, 0x42, 0x99, 0x02, 0x9f, 0xae, 0x19, 0xea, 0x18, 0xeb, 0xa3, 0x31, 0x61, 0xa0, 0x97, 0x56, - 0x4a, 0x42, 0xda, 0x61, 0x42, 0x79, 0xe8, 0x6f, 0x04, 0x06, 0x7a, 0x08, 0x41, 0x66, 0xa8, 0x11, - 0x8d, 0x4d, 0xe4, 0x96, 0xc2, 0x9e, 0xa9, 0xcc, 0xd6, 0xc8, 0x58, 0x4c, 0x0f, 0x7b, 0x46, 0xd7, - 0x20, 0x27, 0xdc, 0xa6, 0x99, 0x5b, 0x31, 0xa2, 0x6b, 0x66, 0x3b, 0xd6, 0x39, 0x66, 0x28, 0x5f, - 0x50, 0xf8, 0x40, 0xfe, 0x65, 0x0a, 0xb6, 0x17, 0xe0, 0x91, 0xfa, 0x1d, 0x6b, 0xee, 0xd8, 0xfb, - 0x16, 0x7d, 0x46, 0xaf, 0x50, 0xbf, 0xda, 0x10, 0x3b, 0x22, 0x2d, 0xd5, 0xc2, 0x53, 0xc4, 0x53, - 0x6e, 0x87, 0xbd, 0x17, 0x53, 0x23, 0xb4, 0x51, 0x17, 0xaa, 0x86, 0xe6, 0x12, 0x95, 0xc3, 0x8d, - 0x1a, 0x4a, 0x51, 0x8b, 0x20, 0x7b, 0xa4, 0x79, 0x00, 0x45, 0x37, 0xbb, 0x70, 0x54, 0x36, 0x22, - 0x52, 0xa4, 0xc0, 0xd5, 0xfe, 0xec, 0x53, 0xcd, 0x24, 0xba, 0x89, 0xd5, 0x85, 0x95, 0x7b, 0x64, - 0xc1, 0x69, 0xfb, 0x5c, 0x1f, 0x62, 0x73, 0xe0, 0x2d, 0xd9, 0x15, 0xdf, 0xd8, 0x5f, 0x52, 0x57, - 0x56, 0xa0, 0x1c, 0x05, 0x78, 0x54, 0x86, 0x14, 0xb9, 0x10, 0x13, 0x90, 0x22, 0x17, 0xe8, 0xff, - 0x20, 0x43, 0x83, 0x64, 0xc1, 0x97, 0x97, 0x64, 0x57, 0x61, 0xd7, 0x9b, 0xd9, 0x58, 0x61, 0x9a, - 0xb2, 0xec, 0x9f, 0x06, 0x1f, 0xf4, 0xe7, 0xbd, 0xca, 0xcf, 0x42, 0x65, 0x0e, 0xd5, 0x43, 0xeb, - 0x97, 0x0c, 0xaf, 0x9f, 0x5c, 0x81, 0x52, 0x04, 0xc2, 0xe5, 0x6b, 0x70, 0x75, 0x19, 0x22, 0xcb, - 0x63, 0x5f, 0x1e, 0x41, 0x56, 0xf4, 0x32, 0x14, 0x7c, 0x48, 0xe6, 0xa7, 0x71, 0x71, 0xae, 0x3c, - 0x65, 0xc5, 0x57, 0xa5, 0xc7, 0x90, 0x6e, 0x6b, 0xb6, 0x1f, 0x52, 0xec, 0x87, 0xe7, 0x35, 0xdb, - 0xee, 0x68, 0xee, 0x58, 0xfe, 0x10, 0x6a, 0x71, 0x70, 0x3b, 0x17, 0x46, 0xc6, 0xdf, 0x86, 0xd7, - 0x20, 0x77, 0x66, 0x39, 0x13, 0x8d, 0x30, 0x67, 0x25, 0x45, 0x8c, 0xe8, 0xf6, 0xe4, 0xd0, 0x9b, - 0x66, 0x62, 0x3e, 0x90, 0x55, 0x78, 0x24, 0x16, 0x72, 0xa9, 0x89, 0x6e, 0x0e, 0x31, 0x9f, 0xcf, - 0x92, 0xc2, 0x07, 0x81, 0x23, 0xfe, 0x63, 0xf9, 0x80, 0x7e, 0xd6, 0x65, 0xb1, 0x32, 0xff, 0x92, - 0x22, 0x46, 0xf2, 0xdf, 0x0b, 0x50, 0x50, 0xb0, 0x6b, 0x53, 0x4c, 0x40, 0x4d, 0x90, 0xf0, 0xc5, - 0x00, 0x73, 0x32, 0x94, 0x8c, 0x25, 0x13, 0x5c, 0xbb, 0xed, 0x69, 0xd2, 0x4c, 0xee, 0x9b, 0xa1, - 0x97, 0x04, 0xe1, 0x8b, 0xe7, 0x6e, 0xc2, 0x3c, 0xcc, 0xf8, 0x5e, 0xf1, 0x18, 0x5f, 0x3a, 0x36, - 0x79, 0x73, 0xab, 0x39, 0xca, 0xf7, 0x92, 0xa0, 0x7c, 0x99, 0x35, 0x1f, 0x8b, 0x70, 0xbe, 0x56, - 0x84, 0xf3, 0x65, 0xd7, 0x84, 0x19, 0x43, 0xfa, 0x5a, 0x11, 0xd2, 0x97, 0x5b, 0xe3, 0x24, 0x86, - 0xf5, 0xbd, 0xe2, 0xb1, 0xbe, 0xfc, 0x9a, 0xb0, 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, 0xcc, 0x41, 0x0c, 0xf3, 0x7b, 0x2b, 0xcc, 0xfc, 0x8a, - 0xb1, 0xe4, 0x51, 0x6c, 0x9a, 0x65, 0xd4, 0xef, 0x35, 0x9f, 0xfa, 0x6d, 0xc5, 0x72, 0x57, 0x11, - 0xc3, 0x3c, 0xf7, 0xeb, 0x2e, 0x70, 0x3f, 0xce, 0xd5, 0x9e, 0x8a, 0x75, 0xb1, 0x86, 0xfc, 0x75, - 0x17, 0xc8, 0x5f, 0x79, 0x8d, 0xc3, 0x35, 0xec, 0xef, 0x67, 0xcb, 0xd9, 0x5f, 0x3c, 0x3f, 0x13, - 0x3f, 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, 0xcd, 0xc9, 0x81, 0xfe, - 0x05, 0xb8, 0x12, 0xd2, 0xf5, 0x53, 0x08, 0xa7, 0x44, 0x55, 0x5f, 0xbb, 0x21, 0x72, 0xc9, 0x7b, - 0xc1, 0x04, 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, 0x2b, 0xec, 0xb3, 0xc0, 0x6f, 0x37, 0x23, 0x41, - 0xb6, 0xcc, 0xb2, 0xf5, 0x12, 0xd9, 0x52, 0x70, 0xfb, 0x1c, 0xfb, 0x6e, 0x94, 0xdb, 0xe7, 0x79, - 0xfe, 0x64, 0x03, 0xf4, 0x2a, 0x48, 0xac, 0xe9, 0xa2, 0x5a, 0xb6, 0x2b, 0x00, 0xf7, 0xd1, 0x70, - 0xac, 0xbc, 0xb7, 0xb2, 0x77, 0x42, 0x75, 0xba, 0xb6, 0xab, 0x14, 0x6c, 0xf1, 0x14, 0x22, 0x02, - 0x52, 0x84, 0x8f, 0x5e, 0x07, 0x89, 0xfe, 0x7a, 0xd7, 0xd6, 0x06, 0x98, 0x81, 0xa7, 0xa4, 0x04, - 0x02, 0xf9, 0x1e, 0xa0, 0x45, 0xf8, 0x46, 0x1d, 0xc8, 0xe1, 0x73, 0x6c, 0x12, 0xba, 0x6a, 0x74, - 0xba, 0xaf, 0x2d, 0x21, 0x7b, 0xd8, 0x24, 0xcd, 0x1a, 0x9d, 0xe4, 0x7f, 0x7c, 0xbd, 0x5b, 0xe5, - 0xda, 0xcf, 0x5b, 0x13, 0x9d, 0xe0, 0x89, 0x4d, 0x66, 0x8a, 0xb0, 0x97, 0xff, 0x9c, 0xa2, 0xcc, - 0x2b, 0x02, 0xed, 0x4b, 0xe7, 0xd6, 0x3b, 0x40, 0xa9, 0x10, 0xeb, 0xde, 0x6c, 0xbe, 0x77, 0x00, - 0x46, 0x9a, 0xab, 0x7e, 0xa2, 0x99, 0x04, 0x0f, 0xc5, 0xa4, 0x87, 0x24, 0xa8, 0x0e, 0x05, 0x3a, - 0x9a, 0xba, 0x78, 0x28, 0x0a, 0x00, 0x7f, 0x1c, 0x8a, 0x33, 0xff, 0xdd, 0xe2, 0x8c, 0xce, 0x72, - 0x61, 0x6e, 0x96, 0x43, 0xac, 0x48, 0x0a, 0xb3, 0x22, 0xfa, 0xdb, 0x6c, 0x47, 0xb7, 0x1c, 0x9d, - 0xcc, 0xd8, 0xd2, 0xa4, 0x15, 0x7f, 0x4c, 0xeb, 0xcc, 0x09, 0x9e, 0xd8, 0x96, 0x65, 0xa8, 0x1c, - 0xbc, 0x8a, 0xcc, 0x74, 0x4b, 0x08, 0xdb, 0x0c, 0xc3, 0x7e, 0x95, 0x0a, 0x8e, 0x5f, 0xc0, 0x7e, - 0xff, 0xe7, 0x26, 0x58, 0xfe, 0x35, 0x2b, 0x89, 0xa3, 0xc9, 0x1b, 0x9d, 0xc2, 0xb6, 0x7f, 0xfc, - 0xd5, 0x29, 0x83, 0x05, 0x6f, 0x43, 0x6f, 0x8a, 0x1f, 0xd5, 0xf3, 0xa8, 0xd8, 0x45, 0x3f, 0x82, - 0x87, 0xe7, 0xa0, 0xcd, 0x77, 0x9d, 0xda, 0x10, 0xe1, 0x1e, 0x8a, 0x22, 0x9c, 0xe7, 0x39, 0x98, - 0xab, 0xf4, 0x77, 0x3c, 0x74, 0x87, 0xb4, 0xca, 0x0a, 0x53, 0x91, 0xa5, 0xab, 0xff, 0x04, 0x94, - 0x1c, 0x4c, 0x68, 0xe1, 0x1f, 0xa9, 0x63, 0xb7, 0xb8, 0x50, 0x54, 0xc7, 0x27, 0xf0, 0xd0, 0x52, - 0x4a, 0x82, 0xfe, 0x1f, 0xa4, 0x80, 0xcd, 0x24, 0x63, 0x4a, 0x42, 0xbf, 0xcc, 0x09, 0x74, 0xe5, - 0xdf, 0x27, 0x03, 0x97, 0xd1, 0xc2, 0xa9, 0x0d, 0x39, 0x07, 0xbb, 0x53, 0x83, 0x97, 0x32, 0xe5, - 0x83, 0x17, 0x36, 0x23, 0x33, 0x54, 0x3a, 0x35, 0x88, 0x22, 0x8c, 0xe5, 0x7b, 0x90, 0xe3, 0x12, - 0x54, 0x84, 0xfc, 0x9d, 0xe3, 0xdb, 0xc7, 0xdd, 0xf7, 0x8f, 0xab, 0x09, 0x04, 0x90, 0x6b, 0xb4, - 0x5a, 0xed, 0x93, 0x5e, 0x35, 0x89, 0x24, 0xc8, 0x36, 0x9a, 0x5d, 0xa5, 0x57, 0x4d, 0x51, 0xb1, - 0xd2, 0x7e, 0xb7, 0xdd, 0xea, 0x55, 0xd3, 0x68, 0x1b, 0x4a, 0xfc, 0x59, 0xbd, 0xd5, 0x55, 0xde, - 0x6b, 0xf4, 0xaa, 0x99, 0x90, 0xe8, 0xb4, 0x7d, 0xfc, 0x76, 0x5b, 0xa9, 0x66, 0xe5, 0x17, 0x69, - 0xad, 0x14, 0x43, 0x7f, 0x82, 0xaa, 0x28, 0x19, 0xaa, 0x8a, 0xe4, 0xdf, 0xa6, 0xa0, 0x1e, 0xcf, - 0x69, 0xd0, 0xbb, 0x73, 0x81, 0x1f, 0x5c, 0x82, 0x10, 0xcd, 0x45, 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, 0xbe, 0xe9, 0x24, 0xaa, 0x46, 0xa5, 0xa7, 0x5c, 0x28, - 0x7f, 0x78, 0xa9, 0xb9, 0x94, 0x20, 0xab, 0xb4, 0x7b, 0xca, 0x8f, 0xab, 0x69, 0x84, 0xa0, 0xcc, - 0x1e, 0xd5, 0xd3, 0xe3, 0xc6, 0xc9, 0x69, 0xa7, 0x4b, 0xe7, 0xf2, 0x0a, 0x54, 0xbc, 0xb9, 0xf4, - 0x84, 0x59, 0xf9, 0xdf, 0x49, 0xa8, 0xcc, 0x1d, 0x10, 0x74, 0x00, 0x59, 0xce, 0xd3, 0xe3, 0xba, - 0xf9, 0xec, 0x7c, 0x8b, 0xd3, 0xc4, 0x55, 0xd1, 0x1b, 0x50, 0xc0, 0xa2, 0x01, 0xb1, 0xec, 0x20, - 0xf2, 0xc6, 0x89, 0xd7, 0xa2, 0x10, 0xa6, 0xbe, 0x05, 0x7a, 0x13, 0x24, 0xff, 0xa4, 0x8b, 0xe2, - 0xf0, 0xf1, 0x45, 0x73, 0x1f, 0x23, 0x84, 0x7d, 0x60, 0x83, 0x5e, 0x0b, 0xc8, 0x5e, 0x66, 0xb1, - 0x3a, 0x10, 0xe6, 0x5c, 0x41, 0x18, 0x7b, 0xfa, 0x72, 0x0b, 0x8a, 0xa1, 0x78, 0xd0, 0xa3, 0x20, - 0x4d, 0xb4, 0x0b, 0xd1, 0xd8, 0xe2, 0xad, 0x89, 0xc2, 0x44, 0xbb, 0xe0, 0x3d, 0xad, 0x87, 0x21, - 0x4f, 0x5f, 0x8e, 0x34, 0x8e, 0x36, 0x69, 0x25, 0x37, 0xd1, 0x2e, 0xde, 0xd1, 0x5c, 0xf9, 0x03, - 0x28, 0x47, 0x9b, 0x3a, 0x74, 0x27, 0x3a, 0xd6, 0xd4, 0x1c, 0x32, 0x1f, 0x59, 0x85, 0x0f, 0xd0, - 0xcb, 0x90, 0x3d, 0xb7, 0x38, 0x58, 0x2d, 0x3f, 0xb2, 0x77, 0x2d, 0x82, 0x43, 0x4d, 0x21, 0xae, - 0x2d, 0x7f, 0x0a, 0x59, 0x06, 0x3e, 0x14, 0x48, 0x58, 0x7b, 0x46, 0x10, 0x5d, 0xfa, 0x8c, 0x3e, - 0x00, 0xd0, 0x08, 0x71, 0xf4, 0xfe, 0x34, 0x70, 0xbc, 0xbb, 0x1c, 0xbc, 0x1a, 0x9e, 0x5e, 0xf3, - 0xba, 0x40, 0xb1, 0xab, 0x81, 0x69, 0x08, 0xc9, 0x42, 0x0e, 0xe5, 0x63, 0x28, 0x47, 0x6d, 0xc3, - 0x8d, 0xd2, 0xad, 0x25, 0x8d, 0x52, 0x9f, 0x4c, 0xf9, 0x54, 0x2c, 0xcd, 0x5b, 0x71, 0x6c, 0x20, - 0x7f, 0x96, 0x84, 0x42, 0xef, 0x42, 0x6c, 0xeb, 0x98, 0x2e, 0x50, 0x60, 0x9a, 0x0a, 0xf7, 0x3c, - 0x78, 0x5b, 0x29, 0xed, 0x37, 0xab, 0xde, 0xf2, 0x0f, 0x6e, 0x66, 0xd3, 0xaa, 0xd4, 0xeb, 0xda, - 0x09, 0xb0, 0x7a, 0x1d, 0x24, 0x7f, 0x57, 0xd1, 0x8a, 0x41, 0x1b, 0x0e, 0x1d, 0xec, 0xba, 0x22, - 0x36, 0x6f, 0xc8, 0x9a, 0x8a, 0xd6, 0x27, 0xa2, 0xab, 0x92, 0x56, 0xf8, 0x40, 0xfe, 0x5b, 0x12, - 0x2a, 0x73, 0x79, 0x0b, 0xbd, 0x0e, 0x79, 0x7b, 0xda, 0x57, 0xbd, 0xf9, 0x99, 0x3b, 0x3d, 0x1e, - 0x7d, 0x9c, 0xf6, 0x0d, 0x7d, 0x70, 0x1b, 0xcf, 0xbc, 0x5f, 0x63, 0x4f, 0xfb, 0xb7, 0xf9, 0x34, - 0xf2, 0xcf, 0xa4, 0x42, 0x9f, 0x41, 0x4f, 0x41, 0xc5, 0xc1, 0x86, 0x36, 0xc3, 0x8e, 0xda, 0x37, - 0x5c, 0xe6, 0x9a, 0x4f, 0x41, 0x49, 0x88, 0x9b, 0x86, 0x4b, 0xad, 0x9f, 0x0e, 0xf4, 0xbc, 0x30, - 0x32, 0x4c, 0xaf, 0x2c, 0xc4, 0x0d, 0x11, 0xcd, 0x0b, 0x80, 0x06, 0x63, 0xcd, 0x30, 0xb0, 0x39, - 0x0a, 0xe9, 0xf2, 0x8a, 0x65, 0x3b, 0x78, 0x23, 0xd4, 0xe5, 0x73, 0x28, 0x78, 0xbb, 0x12, 0xfd, - 0x20, 0x7c, 0x50, 0xbd, 0x5e, 0x77, 0x6c, 0x2e, 0x17, 0xe1, 0x85, 0xce, 0xe9, 0x4d, 0xd8, 0x76, - 0xf5, 0x91, 0x89, 0x87, 0x6a, 0x50, 0x34, 0xb1, 0x68, 0x0b, 0x4a, 0x85, 0xbf, 0x38, 0xf2, 0x2a, - 0x26, 0xf9, 0x5f, 0x49, 0x28, 0x78, 0x88, 0x81, 0x5e, 0x0c, 0x6d, 0xfc, 0xf2, 0x92, 0x16, 0x90, - 0xa7, 0x18, 0x34, 0x26, 0xa3, 0xbf, 0x35, 0x75, 0xf9, 0xdf, 0x1a, 0xd7, 0x61, 0xf6, 0x5a, 0xfd, - 0x99, 0x4b, 0xb7, 0xfa, 0x9f, 0x07, 0x44, 0x2c, 0xa2, 0x19, 0xea, 0xb9, 0x45, 0x74, 0x73, 0xa4, - 0xf2, 0xc5, 0xe6, 0x94, 0xae, 0xca, 0xde, 0xdc, 0x65, 0x2f, 0x4e, 0xd8, 0xf6, 0xfa, 0x79, 0x12, - 0x0a, 0x7e, 0x72, 0xbe, 0x6c, 0x9f, 0xf1, 0x1a, 0xe4, 0x44, 0xfe, 0xe1, 0x8d, 0x46, 0x31, 0xf2, - 0x5b, 0xde, 0x99, 0x50, 0xcb, 0xbb, 0x0e, 0x85, 0x09, 0x26, 0x1a, 0x63, 0x28, 0x7c, 0x17, 0xf8, - 0xe3, 0x9b, 0xaf, 0x41, 0x31, 0xd4, 0xf2, 0xa5, 0x47, 0xff, 0xb8, 0xfd, 0x7e, 0x35, 0x51, 0xcf, - 0x7f, 0xf6, 0xc5, 0x8d, 0xf4, 0x31, 0xfe, 0x84, 0x1e, 0x1a, 0xa5, 0xdd, 0xea, 0xb4, 0x5b, 0xb7, - 0xab, 0xc9, 0x7a, 0xf1, 0xb3, 0x2f, 0x6e, 0xe4, 0x15, 0xcc, 0x3a, 0x47, 0x37, 0x3b, 0xb0, 0x15, - 0x5e, 0x95, 0x68, 0x0a, 0x43, 0x50, 0x7e, 0xfb, 0xce, 0xc9, 0xd1, 0x61, 0xab, 0xd1, 0x6b, 0xab, - 0x77, 0xbb, 0xbd, 0x76, 0x35, 0x89, 0x1e, 0x86, 0x2b, 0x47, 0x87, 0xef, 0x74, 0x7a, 0x6a, 0xeb, - 0xe8, 0xb0, 0x7d, 0xdc, 0x53, 0x1b, 0xbd, 0x5e, 0xa3, 0x75, 0xbb, 0x9a, 0x3a, 0xf8, 0x05, 0x40, - 0xa5, 0xd1, 0x6c, 0x1d, 0xd2, 0xf4, 0xab, 0x0f, 0x34, 0xd1, 0x99, 0xcb, 0xb0, 0xb6, 0xc1, 0xca, - 0xbb, 0xe6, 0xfa, 0xea, 0xc6, 0x24, 0xba, 0x05, 0x59, 0xd6, 0x51, 0x40, 0xab, 0x2f, 0x9f, 0xeb, - 0x6b, 0x3a, 0x95, 0xf4, 0xc7, 0xb0, 0xe3, 0xb1, 0xf2, 0x36, 0xba, 0xbe, 0xba, 0x71, 0x89, 0x14, - 0x90, 0x82, 0x96, 0xc0, 0xfa, 0xdb, 0xe9, 0xfa, 0x06, 0xcd, 0x4c, 0xea, 0x33, 0xa8, 0x4b, 0xd6, - 0xdf, 0xd6, 0xd6, 0x37, 0x40, 0x50, 0x74, 0x04, 0x79, 0xaf, 0x94, 0x5c, 0x77, 0x7f, 0x5c, 0x5f, - 0xdb, 0x68, 0xa4, 0x4b, 0xc0, 0x4b, 0xfe, 0xd5, 0x97, 0xe1, 0xf5, 0x35, 0x5d, 0x53, 0x74, 0x08, - 0x39, 0x41, 0xb6, 0xd7, 0xdc, 0x09, 0xd7, 0xd7, 0x35, 0x0e, 0xe9, 0xa4, 0x05, 0xbd, 0x94, 0xf5, - 0x57, 0xfc, 0xf5, 0x0d, 0x1a, 0xc2, 0xe8, 0x0e, 0x40, 0xa8, 0xc0, 0xdf, 0xe0, 0xee, 0xbe, 0xbe, - 0x49, 0xa3, 0x17, 0x75, 0xa1, 0xe0, 0xd7, 0x5b, 0x6b, 0x6f, 0xd2, 0xeb, 0xeb, 0x3b, 0xae, 0xe8, - 0x1e, 0x94, 0xa2, 0x85, 0xc6, 0x66, 0xf7, 0xe3, 0xf5, 0x0d, 0x5b, 0xa9, 0xd4, 0x7f, 0xb4, 0xea, - 0xd8, 0xec, 0xbe, 0xbc, 0xbe, 0x61, 0x67, 0x15, 0x7d, 0x04, 0xdb, 0x8b, 0x55, 0xc1, 0xe6, 0xd7, - 0xe7, 0xf5, 0x4b, 0xf4, 0x5a, 0xd1, 0x04, 0xd0, 0x92, 0x6a, 0xe2, 0x12, 0xb7, 0xe9, 0xf5, 0xcb, - 0xb4, 0x5e, 0x9b, 0xed, 0x2f, 0xbf, 0xd9, 0x49, 0x7e, 0xf5, 0xcd, 0x4e, 0xf2, 0xaf, 0xdf, 0xec, - 0x24, 0x3f, 0x7f, 0xb0, 0x93, 0xf8, 0xea, 0xc1, 0x4e, 0xe2, 0x4f, 0x0f, 0x76, 0x12, 0x3f, 0x79, - 0x6e, 0xa4, 0x93, 0xf1, 0xb4, 0xbf, 0x37, 0xb0, 0x26, 0xfb, 0xe1, 0xbf, 0xfa, 0x2c, 0xfb, 0xfb, - 0x51, 0x3f, 0xc7, 0x12, 0xd5, 0x4b, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x69, 0x2e, 0x63, 0xd7, - 0x9e, 0x24, 0x00, 0x00, + // 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, } // Reference imports to suppress errors if they are not otherwise used. @@ -6455,10 +6455,10 @@ func (m *ValidatorUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if len(m.RelayerBlsKey) > 0 { - i -= len(m.RelayerBlsKey) - copy(dAtA[i:], m.RelayerBlsKey) - i = encodeVarintTypes(dAtA, i, uint64(len(m.RelayerBlsKey))) + if len(m.BlsKey) > 0 { + i -= len(m.BlsKey) + copy(dAtA[i:], m.BlsKey) + i = encodeVarintTypes(dAtA, i, uint64(len(m.BlsKey))) i-- dAtA[i] = 0x1a } @@ -7792,7 +7792,7 @@ func (m *ValidatorUpdate) Size() (n int) { if m.Power != 0 { n += 1 + sovTypes(uint64(m.Power)) } - l = len(m.RelayerBlsKey) + l = len(m.BlsKey) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -14075,7 +14075,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { } case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RelayerBlsKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlsKey", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -14102,9 +14102,9 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RelayerBlsKey = append(m.RelayerBlsKey[:0], dAtA[iNdEx:postIndex]...) - if m.RelayerBlsKey == nil { - m.RelayerBlsKey = []byte{} + m.BlsKey = append(m.BlsKey[:0], dAtA[iNdEx:postIndex]...) + if m.BlsKey == nil { + m.BlsKey = []byte{} } iNdEx = postIndex case 4: diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 38625538a..3efb2e412 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -349,7 +349,7 @@ message Validator { message ValidatorUpdate { tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; int64 power = 2; - bytes relayer_bls_key = 3; + bytes bls_key = 3; bytes relayer_address = 4; bytes challenger_address = 5; } diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index 44b877dfe..d96d5f728 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -89,7 +89,7 @@ type Validator struct { 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"` - RelayerBlsKey []byte `protobuf:"bytes,5,opt,name=relayer_bls_key,json=relayerBlsKey,proto3" json:"relayer_bls_key,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"` } @@ -155,9 +155,9 @@ func (m *Validator) GetProposerPriority() int64 { return 0 } -func (m *Validator) GetRelayerBlsKey() []byte { +func (m *Validator) GetBlsKey() []byte { if m != nil { - return m.RelayerBlsKey + return m.BlsKey } return nil } @@ -179,7 +179,7 @@ func (m *Validator) GetChallengerAddress() []byte { 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"` - RelayerBlsKey []byte `protobuf:"bytes,3,opt,name=relayer_bls_key,json=relayerBlsKey,proto3" json:"relayer_bls_key,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"` } @@ -231,9 +231,9 @@ func (m *SimpleValidator) GetVotingPower() int64 { return 0 } -func (m *SimpleValidator) GetRelayerBlsKey() []byte { +func (m *SimpleValidator) GetBlsKey() []byte { if m != nil { - return m.RelayerBlsKey + return m.BlsKey } return nil } @@ -261,35 +261,35 @@ func init() { func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) } var fileDescriptor_4e92274df03d3088 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x18, 0xf4, 0xc6, 0x69, 0x02, 0xdb, 0x40, 0xdb, 0x15, 0x07, 0xab, 0x54, 0xc6, 0xe4, 0x00, 0x91, - 0x00, 0x5b, 0x02, 0xa1, 0x1e, 0x7a, 0x22, 0xd7, 0x5e, 0x82, 0x2b, 0xf5, 0xc0, 0xc5, 0xf2, 0xcf, - 0xca, 0x5d, 0x75, 0xe3, 0x5d, 0xad, 0xd7, 0x41, 0xfb, 0x16, 0x3c, 0x4b, 0x9f, 0xa2, 0xc7, 0x1e, - 0x39, 0x21, 0x94, 0x1c, 0x79, 0x09, 0xe4, 0xf5, 0xaf, 0x4a, 0xa3, 0xd0, 0x9b, 0x3d, 0x33, 0xfb, - 0x7d, 0x33, 0x23, 0x7d, 0xd0, 0x91, 0x38, 0x4b, 0xb0, 0x58, 0x92, 0x4c, 0x7a, 0x52, 0x71, 0x9c, - 0x7b, 0xab, 0x90, 0x92, 0x24, 0x94, 0x4c, 0xb8, 0x5c, 0x30, 0xc9, 0xd0, 0x61, 0xa7, 0x70, 0xb5, - 0xe2, 0xf8, 0x45, 0xca, 0x52, 0xa6, 0x49, 0xaf, 0xfc, 0xaa, 0x74, 0xc7, 0x27, 0xbd, 0x49, 0xb1, - 0x50, 0x5c, 0x32, 0xef, 0x1a, 0xab, 0xbc, 0x62, 0xa7, 0x37, 0x00, 0x4e, 0x2e, 0x9b, 0xc9, 0x17, - 0x58, 0xa2, 0x33, 0x08, 0xdb, 0x4d, 0xb9, 0x05, 0x1c, 0x73, 0xb6, 0xff, 0xf1, 0xa5, 0x7b, 0x7f, - 0x97, 0xdb, 0xbe, 0xf1, 0x7b, 0x72, 0x74, 0x0a, 0x9f, 0x70, 0xc1, 0x38, 0xcb, 0xb1, 0xb0, 0x06, - 0x0e, 0xd8, 0xf5, 0xb4, 0x15, 0xa3, 0xf7, 0x10, 0x49, 0x26, 0x43, 0x1a, 0xac, 0x98, 0x24, 0x59, - 0x1a, 0x70, 0xf6, 0x1d, 0x0b, 0xcb, 0x74, 0xc0, 0xcc, 0xf4, 0x0f, 0x35, 0x73, 0xa9, 0x89, 0x45, - 0x89, 0x4f, 0x6f, 0x06, 0xf0, 0x69, 0x3b, 0x05, 0x59, 0x70, 0x1c, 0x26, 0x89, 0xc0, 0x79, 0x69, - 0x17, 0xcc, 0x26, 0x7e, 0xf3, 0x8b, 0xce, 0xe0, 0x98, 0x17, 0x51, 0x70, 0x8d, 0x55, 0xed, 0xe6, - 0xa4, 0xef, 0xa6, 0x2a, 0xc3, 0x5d, 0x14, 0x11, 0x25, 0xf1, 0x39, 0x56, 0xf3, 0xe1, 0xed, 0xaf, - 0x57, 0x86, 0x3f, 0xe2, 0x45, 0x74, 0x8e, 0x15, 0x7a, 0x0d, 0x27, 0x0f, 0x98, 0xd9, 0x5f, 0x75, - 0x3e, 0xd0, 0x3b, 0x78, 0xd4, 0x24, 0x08, 0xb8, 0x20, 0x4c, 0x10, 0xa9, 0xac, 0x61, 0x65, 0xba, - 0x21, 0x16, 0x35, 0x8e, 0xde, 0xc0, 0x03, 0x81, 0x69, 0xa8, 0xb0, 0x08, 0x22, 0x9a, 0x6b, 0x53, - 0x7b, 0xda, 0xee, 0xb3, 0x1a, 0x9e, 0xd3, 0xbc, 0xdc, 0xfb, 0xb6, 0xd3, 0x35, 0xb1, 0x46, 0x5a, - 0xf7, 0xbc, 0x86, 0xbf, 0xd4, 0xe9, 0x3e, 0x40, 0x14, 0x5f, 0x85, 0x94, 0xe2, 0x2c, 0xed, 0x69, - 0xc7, 0x5a, 0x7b, 0xd4, 0x31, 0xb5, 0x7c, 0xfa, 0x07, 0xc0, 0x83, 0x0b, 0xb2, 0xe4, 0x14, 0x77, - 0xd5, 0x7d, 0xee, 0x0a, 0x02, 0xbb, 0x0b, 0xda, 0x5a, 0xcd, 0xe0, 0xdf, 0x6a, 0x1e, 0x48, 0x6b, - 0xfe, 0x67, 0xda, 0xe1, 0x23, 0xd2, 0xee, 0x6d, 0x49, 0x3b, 0xff, 0x7a, 0xbb, 0xb6, 0xc1, 0xdd, - 0xda, 0x06, 0xbf, 0xd7, 0x36, 0xf8, 0xb1, 0xb1, 0x8d, 0xbb, 0x8d, 0x6d, 0xfc, 0xdc, 0xd8, 0xc6, - 0xb7, 0xd3, 0x94, 0xc8, 0xab, 0x22, 0x72, 0x63, 0xb6, 0xf4, 0xfa, 0x47, 0xd6, 0x7d, 0x56, 0x27, - 0x74, 0xff, 0x00, 0xa3, 0x91, 0xc6, 0x3f, 0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x15, 0x05, 0x26, - 0x83, 0x9b, 0x03, 0x00, 0x00, + // 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, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { @@ -380,10 +380,10 @@ func (m *Validator) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - if len(m.RelayerBlsKey) > 0 { - i -= len(m.RelayerBlsKey) - copy(dAtA[i:], m.RelayerBlsKey) - i = encodeVarintValidator(dAtA, i, uint64(len(m.RelayerBlsKey))) + if len(m.BlsKey) > 0 { + i -= len(m.BlsKey) + copy(dAtA[i:], m.BlsKey) + i = encodeVarintValidator(dAtA, i, uint64(len(m.BlsKey))) i-- dAtA[i] = 0x2a } @@ -451,10 +451,10 @@ func (m *SimpleValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if len(m.RelayerBlsKey) > 0 { - i -= len(m.RelayerBlsKey) - copy(dAtA[i:], m.RelayerBlsKey) - i = encodeVarintValidator(dAtA, i, uint64(len(m.RelayerBlsKey))) + if len(m.BlsKey) > 0 { + i -= len(m.BlsKey) + copy(dAtA[i:], m.BlsKey) + i = encodeVarintValidator(dAtA, i, uint64(len(m.BlsKey))) i-- dAtA[i] = 0x1a } @@ -529,7 +529,7 @@ func (m *Validator) Size() (n int) { if m.ProposerPriority != 0 { n += 1 + sovValidator(uint64(m.ProposerPriority)) } - l = len(m.RelayerBlsKey) + l = len(m.BlsKey) if l > 0 { n += 1 + l + sovValidator(uint64(l)) } @@ -557,7 +557,7 @@ func (m *SimpleValidator) Size() (n int) { if m.VotingPower != 0 { n += 1 + sovValidator(uint64(m.VotingPower)) } - l = len(m.RelayerBlsKey) + l = len(m.BlsKey) if l > 0 { n += 1 + l + sovValidator(uint64(l)) } @@ -853,7 +853,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { } case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RelayerBlsKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlsKey", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -880,9 +880,9 @@ func (m *Validator) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RelayerBlsKey = append(m.RelayerBlsKey[:0], dAtA[iNdEx:postIndex]...) - if m.RelayerBlsKey == nil { - m.RelayerBlsKey = []byte{} + m.BlsKey = append(m.BlsKey[:0], dAtA[iNdEx:postIndex]...) + if m.BlsKey == nil { + m.BlsKey = []byte{} } iNdEx = postIndex case 6: @@ -1060,7 +1060,7 @@ func (m *SimpleValidator) Unmarshal(dAtA []byte) error { } case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RelayerBlsKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlsKey", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -1087,9 +1087,9 @@ func (m *SimpleValidator) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RelayerBlsKey = append(m.RelayerBlsKey[:0], dAtA[iNdEx:postIndex]...) - if m.RelayerBlsKey == nil { - m.RelayerBlsKey = []byte{} + m.BlsKey = append(m.BlsKey[:0], dAtA[iNdEx:postIndex]...) + if m.BlsKey == nil { + m.BlsKey = []byte{} } iNdEx = postIndex case 4: diff --git a/proto/tendermint/types/validator.proto b/proto/tendermint/types/validator.proto index 087633721..5d05e3865 100644 --- a/proto/tendermint/types/validator.proto +++ b/proto/tendermint/types/validator.proto @@ -17,7 +17,7 @@ message Validator { tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; int64 voting_power = 3; int64 proposer_priority = 4; - bytes relayer_bls_key = 5; + bytes bls_key = 5; bytes relayer_address = 6; bytes challenger_address = 7; } @@ -25,7 +25,7 @@ message Validator { message SimpleValidator { tendermint.crypto.PublicKey pub_key = 1; int64 voting_power = 2; - bytes relayer_bls_key = 3; + 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 957866621..747e4aba2 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -252,14 +252,20 @@ func TestValidateValidatorUpdates(t *testing.T) { false, }, { - "updating a validator with relayer public key and relayer address is OK", - []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, RelayerBlsKey: ([]byte)("blspukkey"), RelayerAddress: ([]byte)("relayer")}}, + "updating a validator with bls public key is OK", + []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, BlsKey: ([]byte)("blspukkey")}}, + defaultValidatorParams, + false, + }, + { + "updating a validator with relayer address is OK", + []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, RelayerAddress: ([]byte)("relayer")}}, defaultValidatorParams, false, }, { "updating a validator with challenger address is OK", - []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("relayer")}}, + []abci.ValidatorUpdate{{PubKey: pk1, Power: 20, ChallengerAddress: ([]byte)("challenger")}}, defaultValidatorParams, false, }, @@ -304,7 +310,7 @@ func TestUpdateValidators(t *testing.T) { // updated validator with mock relayer bls public key and relayer address updated := types.NewValidator(pubkey1, 20) blsPubKey := ed25519.GenPrivKey().PubKey().Bytes() - updated.SetRelayerBlsKey(blsPubKey) + updated.SetBlsKey(blsPubKey) relayer := ed25519.GenPrivKey().PubKey().Address().Bytes() updated.SetRelayerAddress(relayer) challenger := ed25519.GenPrivKey().PubKey().Address().Bytes() @@ -351,7 +357,7 @@ func TestUpdateValidators(t *testing.T) { "updating a validator with relayer bls public key, relayer and challenger address is OK", types.NewValidatorSet([]*types.Validator{val1}), []abci.ValidatorUpdate{{PubKey: pk, Power: 20, - RelayerBlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}}, + BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}}, types.NewValidatorSet([]*types.Validator{updated}), false, }, @@ -371,13 +377,13 @@ func TestUpdateValidators(t *testing.T) { assert.Equal(t, tc.resultingSet.TotalVotingPower(), tc.currentSet.TotalVotingPower()) assert.Equal(t, tc.resultingSet.Validators[0].Address, tc.currentSet.Validators[0].Address) - assert.Equal(t, tc.resultingSet.Validators[0].RelayerBlsKey, tc.currentSet.Validators[0].RelayerBlsKey) + 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].RelayerBlsKey, tc.currentSet.Validators[1].RelayerBlsKey) + 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) } @@ -441,7 +447,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) { app.ValidatorUpdates = []abci.ValidatorUpdate{ {PubKey: pk, Power: 10}, // add a new validator {PubKey: currentValPk, Power: currentValPower, - RelayerBlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's relayer pub key and address + BlsKey: blsPubKey, RelayerAddress: relayer, ChallengerAddress: challenger}, // updating a validator's bls pub key and addresses } state, _, err = blockExec.ApplyBlock(state, blockID, block) @@ -459,7 +465,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) { if idx < 0 { t.Fatalf("can't find address %v in the set %v", currentVal.Address, state.NextValidators) } - assert.Equal(t, blsPubKey, val.RelayerBlsKey) + assert.Equal(t, blsPubKey, val.BlsKey) assert.Equal(t, relayer, val.RelayerAddress) assert.Equal(t, challenger, val.ChallengerAddress) } @@ -473,7 +479,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) { assert.Equal(t, pubkey, event.ValidatorUpdates[0].PubKey) assert.EqualValues(t, 10, event.ValidatorUpdates[0].VotingPower) - assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].RelayerBlsKey) + assert.Equal(t, blsPubKey, event.ValidatorUpdates[1].BlsKey) assert.EqualValues(t, relayer, event.ValidatorUpdates[1].RelayerAddress) assert.EqualValues(t, challenger, event.ValidatorUpdates[1].ChallengerAddress) } diff --git a/types/protobuf.go b/types/protobuf.go index 98f76b4c5..ce34c31d7 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -138,7 +138,7 @@ func (pb2tm) ValidatorUpdates(vals []abci.ValidatorUpdate) ([]*Validator, error) return nil, err } updated := NewValidator(pub, v.Power) - updated.SetRelayerBlsKey(v.RelayerBlsKey) + updated.SetBlsKey(v.BlsKey) updated.SetRelayerAddress(v.RelayerAddress) updated.SetChallengerAddress(v.ChallengerAddress) tmVals[i] = updated diff --git a/types/validator.go b/types/validator.go index 68d932f24..f3c6ebd9a 100644 --- a/types/validator.go +++ b/types/validator.go @@ -30,9 +30,8 @@ type Validator struct { ProposerPriority int64 `json:"proposer_priority"` - RelayerBlsKey []byte `json:"relayer_bls_key"` // bls public key of authorized relayer/operator - RelayerAddress []byte `json:"relayer_address"` // address of authorized relayer/operator - + 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 } @@ -63,8 +62,8 @@ func (v *Validator) ValidateBasic() error { return fmt.Errorf("validator address is the wrong size: %v", v.Address) } - if len(v.RelayerBlsKey) != 0 && len(v.RelayerBlsKey) != BlsPubKeySize { - return fmt.Errorf("validator relayer bls key is the wrong size: %v", v.RelayerBlsKey) + if len(v.BlsKey) != 0 && len(v.BlsKey) != BlsPubKeySize { + return fmt.Errorf("validator relayer bls key is the wrong size: %v", v.BlsKey) } if len(v.RelayerAddress) != 0 && len(v.RelayerAddress) != AddressSize { return fmt.Errorf("validator relayer address is the wrong size: %v", v.RelayerAddress) @@ -150,7 +149,7 @@ func (v *Validator) Bytes() []byte { pbv := tmproto.SimpleValidator{ PubKey: &pk, VotingPower: v.VotingPower, - RelayerBlsKey: v.RelayerBlsKey, + BlsKey: v.BlsKey, RelayerAddress: v.RelayerAddress, ChallengerAddress: v.ChallengerAddress, } @@ -162,9 +161,9 @@ func (v *Validator) Bytes() []byte { return bz } -// SetRelayerBlsKey will update the bls public key of relayer. -func (v *Validator) SetRelayerBlsKey(blsKey []byte) { - v.RelayerBlsKey = blsKey +// SetBlsKey will update the bls public key of relayer. +func (v *Validator) SetBlsKey(blsKey []byte) { + v.BlsKey = blsKey } // SetRelayerAddress will update the relayer address of validator. @@ -193,7 +192,7 @@ func (v *Validator) ToProto() (*tmproto.Validator, error) { PubKey: pk, VotingPower: v.VotingPower, ProposerPriority: v.ProposerPriority, - RelayerBlsKey: v.RelayerBlsKey, + BlsKey: v.BlsKey, RelayerAddress: v.RelayerAddress, ChallengerAddress: v.ChallengerAddress, } @@ -217,7 +216,7 @@ func ValidatorFromProto(vp *tmproto.Validator) (*Validator, error) { v.PubKey = pk v.VotingPower = vp.GetVotingPower() v.ProposerPriority = vp.GetProposerPriority() - v.RelayerBlsKey = vp.GetRelayerBlsKey() + 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 92545d61f..5f753e19d 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -1661,7 +1661,7 @@ func TestValidatorSetHash(t *testing.T) { //mock relayer bls public key & address blsPubKey := ed25519.GenPrivKey().PubKey().Bytes() - val.SetRelayerBlsKey(blsPubKey) + val.SetBlsKey(blsPubKey) relayer := ed25519.GenPrivKey().PubKey().Address().Bytes() val.SetRelayerAddress(relayer) challenger := ed25519.GenPrivKey().PubKey().Address().Bytes() diff --git a/types/validator_test.go b/types/validator_test.go index f97ce9bec..41e7da02c 100644 --- a/types/validator_test.go +++ b/types/validator_test.go @@ -51,12 +51,12 @@ func TestValidatorValidateBasic(t *testing.T) { rand.Read(challenger) val := NewValidator(pubKey, 1) - val.SetRelayerBlsKey(blsPubKey) + val.SetBlsKey(blsPubKey) val.SetRelayerAddress(relayer) val.SetChallengerAddress(challenger) wrongBlsPubKey := val.Copy() - wrongBlsPubKey.SetRelayerBlsKey([]byte{'a'}) + wrongBlsPubKey.SetBlsKey([]byte{'a'}) wrongRelayer := val.Copy() wrongRelayer.SetRelayerAddress([]byte{'a'}) diff --git a/votepool/pool_test.go b/votepool/pool_test.go index 71e983538..b06049344 100644 --- a/votepool/pool_test.go +++ b/votepool/pool_test.go @@ -21,12 +21,12 @@ func makeVotePool() (blsCommon.SecretKey, *types.Validator, blsCommon.SecretKey, pubKey1 := ed25519.GenPrivKey().PubKey() blsPrivKey1, _ := blst.RandKey() blsPubKey1 := blsPrivKey1.PublicKey().Marshal() - val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, RelayerBlsKey: blsPubKey1, VotingPower: 10} + val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, BlsKey: blsPubKey1, VotingPower: 10} pubKey2 := ed25519.GenPrivKey().PubKey() blsPrivKey2, _ := blst.RandKey() blsPubKey2 := blsPrivKey2.PublicKey().Marshal() - val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, RelayerBlsKey: blsPubKey2, VotingPower: 10} + val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, BlsKey: blsPubKey2, VotingPower: 10} vals := []*types.Validator{ val1, val2, @@ -55,7 +55,7 @@ func makeValidVotes(secKey blsCommon.SecretKey, val1 *types.Validator) (Vote, Vo eventHash1 := common.HexToHash("0xeefacfed87736ae1d8e8640f6fd7951862997782e5e79842557923e2779d5d5a").Bytes() sign1 := secKey.Sign(eventHash1).Marshal() vote1 := Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: sign1, EventType: FromBscCrossChainEvent, EventHash: eventHash1, @@ -64,7 +64,7 @@ func makeValidVotes(secKey blsCommon.SecretKey, val1 *types.Validator) (Vote, Vo eventHash2 := common.HexToHash("0x7e19be15d0d524a1ca5e39be503d18584c23426920bdc23b159c37a2341913d0").Bytes() sign2 := secKey.Sign(eventHash2).Marshal() vote2 := Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: sign2, EventType: ToBscCrossChainEvent, EventHash: eventHash2, @@ -73,7 +73,7 @@ func makeValidVotes(secKey blsCommon.SecretKey, val1 *types.Validator) (Vote, Vo eventHash3 := common.HexToHash("0xb941130c8d3508f642aba83db420f9cef6a6ebb7f869e3cef06f276bdcf205a9").Bytes() sign3 := secKey.Sign(eventHash3).Marshal() vote3 := Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: sign3, EventType: FromBscCrossChainEvent, EventHash: eventHash3, @@ -101,7 +101,7 @@ func TestPool_AddVote(t *testing.T) { }{ { vote: Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: sign, EventType: FromBscCrossChainEvent, EventHash: eventHash, @@ -111,7 +111,7 @@ func TestPool_AddVote(t *testing.T) { }, { vote: Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: sign, EventType: FromBscCrossChainEvent, EventHash: eventHash, @@ -131,7 +131,7 @@ func TestPool_AddVote(t *testing.T) { }, { vote: Vote{ - PubKey: val1.RelayerBlsKey, + PubKey: val1.BlsKey, Signature: anotherSign, EventType: FromBscCrossChainEvent, EventHash: anotherEventHash, @@ -267,7 +267,7 @@ func TestPool_ValidatorSetUpdate(t *testing.T) { require.Error(t, err, "vote is not from validators") // add validator 1 - addVal := types.Validator{PubKey: val1.PubKey, Address: val1.Address, RelayerBlsKey: val1.RelayerBlsKey, VotingPower: 10} + addVal := types.Validator{PubKey: val1.PubKey, Address: val1.Address, BlsKey: val1.BlsKey, VotingPower: 10} validatorUpdates = []*types.Validator{ &addVal, } diff --git a/votepool/reactor_test.go b/votepool/reactor_test.go index 253013d05..65862c053 100644 --- a/votepool/reactor_test.go +++ b/votepool/reactor_test.go @@ -38,12 +38,12 @@ func makeAndConnectReactors(config *cfg.Config, n int) ([]blsCommon.SecretKey, [ pubKey1 := ed25519.GenPrivKey().PubKey() blsPrivKey1, _ := blst.RandKey() blsPubKey1 := blsPrivKey1.PublicKey().Marshal() - val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, RelayerBlsKey: blsPubKey1, VotingPower: 10} + val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, BlsKey: blsPubKey1, VotingPower: 10} pubKey2 := ed25519.GenPrivKey().PubKey() blsPrivKey2, _ := blst.RandKey() blsPubKey2 := blsPrivKey2.PublicKey().Marshal() - val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, RelayerBlsKey: blsPubKey2, VotingPower: 10} + val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, BlsKey: blsPubKey2, VotingPower: 10} pks := []blsCommon.SecretKey{ blsPrivKey1, blsPrivKey2, @@ -92,7 +92,7 @@ func TestReactorBroadcastVotes(t *testing.T) { eventHash1 := common.HexToHash("0xeefacfed87736ae1d8e8640f6fd7951862997782e5e79842557923e2779d5d5a").Bytes() sign1 := secKey.Sign(eventHash1).Marshal() vote1 := Vote{ - PubKey: vals[0].RelayerBlsKey, + PubKey: vals[0].BlsKey, Signature: sign1, EventType: testEventType, EventHash: eventHash1, @@ -105,7 +105,7 @@ func TestReactorBroadcastVotes(t *testing.T) { eventHash2 := common.HexToHash("0x7e19be15d0d524a1ca5e39be503d18584c23426920bdc23b159c37a2341913d0").Bytes() sign2 := secKey.Sign(eventHash2).Marshal() vote2 := Vote{ - PubKey: vals[0].RelayerBlsKey, + PubKey: vals[0].BlsKey, Signature: sign2, EventType: testEventType, EventHash: eventHash2, diff --git a/votepool/verifier.go b/votepool/verifier.go index a8b8d0286..aa4f58e0d 100644 --- a/votepool/verifier.go +++ b/votepool/verifier.go @@ -30,8 +30,8 @@ func NewFromValidatorVerifier() *FromValidatorVerifier { func (f *FromValidatorVerifier) initValidators(validators []*types.Validator) { for _, val := range validators { - if len(val.RelayerBlsKey) > 0 { - f.validators[string(val.RelayerBlsKey[:])] = val + if len(val.BlsKey) > 0 { + f.validators[string(val.BlsKey[:])] = val } } } @@ -48,8 +48,8 @@ func (f *FromValidatorVerifier) updateValidators(changes []*types.Validator) { valSet := &types.ValidatorSet{Validators: vals} _ = valSet.UpdateWithChangeSet(changes) // use valSet's validators even if there are errors for _, val := range valSet.Validators { - if len(val.RelayerBlsKey) > 0 { - f.validators[string(val.RelayerBlsKey[:])] = val + if len(val.BlsKey) > 0 { + f.validators[string(val.BlsKey[:])] = val } } } diff --git a/votepool/verifier_test.go b/votepool/verifier_test.go index e03042396..59d654063 100644 --- a/votepool/verifier_test.go +++ b/votepool/verifier_test.go @@ -16,12 +16,12 @@ func TestVoteFromValidatorVerifier(t *testing.T) { pubKey1 := ed25519.GenPrivKey().PubKey() blsPrivKey1, _ := blst.RandKey() blsPubKey1 := blsPrivKey1.PublicKey().Marshal() - val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, RelayerBlsKey: blsPubKey1, VotingPower: 10} + val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, BlsKey: blsPubKey1, VotingPower: 10} pubKey2 := ed25519.GenPrivKey().PubKey() blsPrivKey2, _ := blst.RandKey() blsPubKey2 := blsPrivKey2.PublicKey().Marshal() - val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, RelayerBlsKey: blsPubKey2, VotingPower: 10} + val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, BlsKey: blsPubKey2, VotingPower: 10} vals := make([]*types.Validator, 0) vals = append(vals, val1) @@ -45,12 +45,12 @@ func TestVoteFromValidatorVerifier_UpdateValidators(t *testing.T) { pubKey1 := ed25519.GenPrivKey().PubKey() blsPrivKey1, _ := blst.RandKey() blsPubKey1 := blsPrivKey1.PublicKey().Marshal() - val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, RelayerBlsKey: blsPubKey1, VotingPower: 10} + val1 := &types.Validator{Address: pubKey1.Address(), PubKey: pubKey1, BlsKey: blsPubKey1, VotingPower: 10} pubKey2 := ed25519.GenPrivKey().PubKey() blsPrivKey2, _ := blst.RandKey() blsPubKey2 := blsPrivKey2.PublicKey().Marshal() - val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, RelayerBlsKey: blsPubKey2, VotingPower: 10} + val2 := &types.Validator{Address: pubKey2.Address(), PubKey: pubKey2, BlsKey: blsPubKey2, VotingPower: 10} vals := make([]*types.Validator, 0) vals = append(vals, val1) @@ -70,7 +70,7 @@ func TestVoteFromValidatorVerifier_UpdateValidators(t *testing.T) { blsPrivKey3, _ := blst.RandKey() blsPubKey3 := blsPrivKey3.PublicKey().Marshal() - addVal := &types.Validator{PubKey: pubKey3, Address: pubKey3.Address(), RelayerBlsKey: blsPubKey3, VotingPower: 10} + addVal := &types.Validator{PubKey: pubKey3, Address: pubKey3.Address(), BlsKey: blsPubKey3, VotingPower: 10} verifier.updateValidators([]*types.Validator{addVal}) require.Equal(t, 2, len(verifier.validators))