diff --git a/api/side/btcbridge/btcbridge.pulsar.go b/api/side/btcbridge/btcbridge.pulsar.go index 04d88d36..18a86cda 100644 --- a/api/side/btcbridge/btcbridge.pulsar.go +++ b/api/side/btcbridge/btcbridge.pulsar.go @@ -5994,10 +5994,10 @@ func (x *fastReflection_RunesConsolidation) ProtoMethods() *protoiface.Methods { } var ( - md_DKGParticipant protoreflect.MessageDescriptor - fd_DKGParticipant_moniker protoreflect.FieldDescriptor - fd_DKGParticipant_operator_address protoreflect.FieldDescriptor - fd_DKGParticipant_consensus_address protoreflect.FieldDescriptor + md_DKGParticipant protoreflect.MessageDescriptor + fd_DKGParticipant_moniker protoreflect.FieldDescriptor + fd_DKGParticipant_operator_address protoreflect.FieldDescriptor + fd_DKGParticipant_consensus_pubkey protoreflect.FieldDescriptor ) func init() { @@ -6005,7 +6005,7 @@ func init() { md_DKGParticipant = File_side_btcbridge_btcbridge_proto.Messages().ByName("DKGParticipant") fd_DKGParticipant_moniker = md_DKGParticipant.Fields().ByName("moniker") fd_DKGParticipant_operator_address = md_DKGParticipant.Fields().ByName("operator_address") - fd_DKGParticipant_consensus_address = md_DKGParticipant.Fields().ByName("consensus_address") + fd_DKGParticipant_consensus_pubkey = md_DKGParticipant.Fields().ByName("consensus_pubkey") } var _ protoreflect.Message = (*fastReflection_DKGParticipant)(nil) @@ -6085,9 +6085,9 @@ func (x *fastReflection_DKGParticipant) Range(f func(protoreflect.FieldDescripto return } } - if x.ConsensusAddress != "" { - value := protoreflect.ValueOfString(x.ConsensusAddress) - if !f(fd_DKGParticipant_consensus_address, value) { + if x.ConsensusPubkey != "" { + value := protoreflect.ValueOfString(x.ConsensusPubkey) + if !f(fd_DKGParticipant_consensus_pubkey, value) { return } } @@ -6110,8 +6110,8 @@ func (x *fastReflection_DKGParticipant) Has(fd protoreflect.FieldDescriptor) boo return x.Moniker != "" case "side.btcbridge.DKGParticipant.operator_address": return x.OperatorAddress != "" - case "side.btcbridge.DKGParticipant.consensus_address": - return x.ConsensusAddress != "" + case "side.btcbridge.DKGParticipant.consensus_pubkey": + return x.ConsensusPubkey != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: side.btcbridge.DKGParticipant")) @@ -6132,8 +6132,8 @@ func (x *fastReflection_DKGParticipant) Clear(fd protoreflect.FieldDescriptor) { x.Moniker = "" case "side.btcbridge.DKGParticipant.operator_address": x.OperatorAddress = "" - case "side.btcbridge.DKGParticipant.consensus_address": - x.ConsensusAddress = "" + case "side.btcbridge.DKGParticipant.consensus_pubkey": + x.ConsensusPubkey = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: side.btcbridge.DKGParticipant")) @@ -6156,8 +6156,8 @@ func (x *fastReflection_DKGParticipant) Get(descriptor protoreflect.FieldDescrip case "side.btcbridge.DKGParticipant.operator_address": value := x.OperatorAddress return protoreflect.ValueOfString(value) - case "side.btcbridge.DKGParticipant.consensus_address": - value := x.ConsensusAddress + case "side.btcbridge.DKGParticipant.consensus_pubkey": + value := x.ConsensusPubkey return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { @@ -6183,8 +6183,8 @@ func (x *fastReflection_DKGParticipant) Set(fd protoreflect.FieldDescriptor, val x.Moniker = value.Interface().(string) case "side.btcbridge.DKGParticipant.operator_address": x.OperatorAddress = value.Interface().(string) - case "side.btcbridge.DKGParticipant.consensus_address": - x.ConsensusAddress = value.Interface().(string) + case "side.btcbridge.DKGParticipant.consensus_pubkey": + x.ConsensusPubkey = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: side.btcbridge.DKGParticipant")) @@ -6209,8 +6209,8 @@ func (x *fastReflection_DKGParticipant) Mutable(fd protoreflect.FieldDescriptor) panic(fmt.Errorf("field moniker of message side.btcbridge.DKGParticipant is not mutable")) case "side.btcbridge.DKGParticipant.operator_address": panic(fmt.Errorf("field operator_address of message side.btcbridge.DKGParticipant is not mutable")) - case "side.btcbridge.DKGParticipant.consensus_address": - panic(fmt.Errorf("field consensus_address of message side.btcbridge.DKGParticipant is not mutable")) + case "side.btcbridge.DKGParticipant.consensus_pubkey": + panic(fmt.Errorf("field consensus_pubkey of message side.btcbridge.DKGParticipant is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: side.btcbridge.DKGParticipant")) @@ -6228,7 +6228,7 @@ func (x *fastReflection_DKGParticipant) NewField(fd protoreflect.FieldDescriptor return protoreflect.ValueOfString("") case "side.btcbridge.DKGParticipant.operator_address": return protoreflect.ValueOfString("") - case "side.btcbridge.DKGParticipant.consensus_address": + case "side.btcbridge.DKGParticipant.consensus_pubkey": return protoreflect.ValueOfString("") default: if fd.IsExtension() { @@ -6307,7 +6307,7 @@ func (x *fastReflection_DKGParticipant) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.ConsensusAddress) + l = len(x.ConsensusPubkey) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -6340,10 +6340,10 @@ func (x *fastReflection_DKGParticipant) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } - if len(x.ConsensusAddress) > 0 { - i -= len(x.ConsensusAddress) - copy(dAtA[i:], x.ConsensusAddress) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ConsensusAddress))) + if len(x.ConsensusPubkey) > 0 { + i -= len(x.ConsensusPubkey) + copy(dAtA[i:], x.ConsensusPubkey) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ConsensusPubkey))) i-- dAtA[i] = 0x1a } @@ -6476,7 +6476,7 @@ func (x *fastReflection_DKGParticipant) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 3: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ConsensusAddress", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ConsensusPubkey", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6504,7 +6504,7 @@ func (x *fastReflection_DKGParticipant) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.ConsensusAddress = string(dAtA[iNdEx:postIndex]) + x.ConsensusPubkey = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -9018,8 +9018,8 @@ type DKGParticipant struct { Moniker string `protobuf:"bytes,1,opt,name=moniker,proto3" json:"moniker,omitempty"` // the operator address of the corresponding validator OperatorAddress string `protobuf:"bytes,2,opt,name=operator_address,json=operatorAddress,proto3" json:"operator_address,omitempty"` - // the consensus address of the corresponding validator - ConsensusAddress string `protobuf:"bytes,3,opt,name=consensus_address,json=consensusAddress,proto3" json:"consensus_address,omitempty"` + // the consensus public key of the corresponding validator + ConsensusPubkey string `protobuf:"bytes,3,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty"` } func (x *DKGParticipant) Reset() { @@ -9056,9 +9056,9 @@ func (x *DKGParticipant) GetOperatorAddress() string { return "" } -func (x *DKGParticipant) GetConsensusAddress() string { +func (x *DKGParticipant) GetConsensusPubkey() string { if x != nil { - return x.ConsensusAddress + return x.ConsensusPubkey } return "" } @@ -9334,83 +9334,83 @@ var file_side_btcbridge_btcbridge_proto_rawDesc = []byte{ 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x6d, 0x61, 0x78, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, - 0x6d, 0x61, 0x78, 0x4e, 0x75, 0x6d, 0x22, 0x82, 0x01, 0x0a, 0x0e, 0x44, 0x4b, 0x47, 0x50, 0x61, + 0x6d, 0x61, 0x78, 0x4e, 0x75, 0x6d, 0x22, 0x80, 0x01, 0x0a, 0x0e, 0x44, 0x4b, 0x47, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2b, - 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x65, - 0x6e, 0x73, 0x75, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x8b, 0x03, 0x0a, 0x0a, - 0x44, 0x4b, 0x47, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x42, 0x0a, 0x0c, 0x70, 0x61, - 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1e, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, - 0x65, 0x2e, 0x44, 0x4b, 0x47, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, - 0x52, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x1c, - 0x0a, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x3a, 0x0a, 0x0b, - 0x76, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0e, 0x32, 0x19, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, - 0x67, 0x65, 0x2e, 0x41, 0x73, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x76, 0x61, - 0x75, 0x6c, 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, - 0x72, 0x12, 0x26, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x75, 0x74, 0x78, 0x6f, - 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x74, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x55, 0x74, 0x78, 0x6f, 0x4e, 0x75, 0x6d, 0x12, 0x44, 0x0a, 0x0a, 0x65, 0x78, 0x70, - 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x01, 0x90, - 0xdf, 0x1f, 0x01, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x38, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x20, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, - 0x2e, 0x44, 0x4b, 0x47, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x44, 0x4b, - 0x47, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, - 0x75, 0x6c, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x75, 0x6c, - 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, - 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, - 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2a, 0xa4, 0x01, - 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, - 0x1e, 0x0a, 0x1a, 0x53, 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, - 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, - 0x1a, 0x0a, 0x16, 0x53, 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, - 0x53, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x53, - 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x42, 0x52, - 0x4f, 0x41, 0x44, 0x43, 0x41, 0x53, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1c, 0x0a, 0x18, 0x53, - 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x43, 0x4f, - 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x49, 0x47, - 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, - 0x45, 0x44, 0x10, 0x04, 0x2a, 0xb8, 0x01, 0x0a, 0x10, 0x44, 0x4b, 0x47, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x44, 0x4b, 0x47, - 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, - 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1e, 0x0a, - 0x1a, 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, - 0x54, 0x55, 0x53, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x20, 0x0a, - 0x1c, 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, - 0x54, 0x55, 0x53, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, - 0x1d, 0x0a, 0x19, 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, - 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x12, 0x1f, - 0x0a, 0x1b, 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, - 0x41, 0x54, 0x55, 0x53, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x44, 0x4f, 0x55, 0x54, 0x10, 0x04, 0x42, - 0x9e, 0x01, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, - 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x42, 0x0e, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, - 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x69, 0x64, 0x65, 0x2f, - 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0xa2, 0x02, 0x03, 0x53, 0x42, 0x58, 0xaa, - 0x02, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x2e, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, - 0xca, 0x02, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x5c, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, - 0x65, 0xe2, 0x02, 0x1a, 0x53, 0x69, 0x64, 0x65, 0x5c, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, - 0x67, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x0f, 0x53, 0x69, 0x64, 0x65, 0x3a, 0x3a, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x29, + 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x70, 0x75, 0x62, 0x6b, + 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x73, 0x75, 0x73, 0x50, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x22, 0x8b, 0x03, 0x0a, 0x0a, 0x44, 0x4b, + 0x47, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x42, 0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, + 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, + 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2e, + 0x44, 0x4b, 0x47, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x52, 0x0c, + 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, + 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x3a, 0x0a, 0x0b, 0x76, 0x61, + 0x75, 0x6c, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, + 0x19, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, + 0x2e, 0x41, 0x73, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x76, 0x61, 0x75, 0x6c, + 0x74, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, + 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x12, + 0x26, 0x0a, 0x0f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x75, 0x74, 0x78, 0x6f, 0x5f, 0x6e, + 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x55, 0x74, 0x78, 0x6f, 0x4e, 0x75, 0x6d, 0x12, 0x44, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x01, 0x90, 0xdf, 0x1f, + 0x01, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, + 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2e, 0x44, + 0x4b, 0x47, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x44, 0x4b, 0x47, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x75, 0x6c, + 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x73, + 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, + 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1c, 0x0a, + 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2a, 0xa4, 0x01, 0x0a, 0x0d, + 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, + 0x1a, 0x53, 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, + 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, + 0x16, 0x53, 0x49, 0x47, 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, + 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x49, 0x47, + 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x42, 0x52, 0x4f, 0x41, + 0x44, 0x43, 0x41, 0x53, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x49, 0x47, + 0x4e, 0x49, 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x43, 0x4f, 0x4e, 0x46, + 0x49, 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x49, 0x47, 0x4e, 0x49, + 0x4e, 0x47, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, + 0x10, 0x04, 0x2a, 0xb8, 0x01, 0x0a, 0x10, 0x44, 0x4b, 0x47, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x44, 0x4b, 0x47, 0x5f, 0x52, + 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, + 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x1a, 0x44, + 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, + 0x53, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x44, + 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, + 0x53, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1d, 0x0a, + 0x19, 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, + 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x12, 0x1f, 0x0a, 0x1b, + 0x44, 0x4b, 0x47, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x54, + 0x55, 0x53, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x44, 0x4f, 0x55, 0x54, 0x10, 0x04, 0x42, 0x9e, 0x01, + 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x69, 0x64, 0x65, 0x2e, 0x62, 0x74, 0x63, 0x62, 0x72, + 0x69, 0x64, 0x67, 0x65, 0x42, 0x0e, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x1f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, + 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x69, 0x64, 0x65, 0x2f, 0x62, 0x74, + 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0xa2, 0x02, 0x03, 0x53, 0x42, 0x58, 0xaa, 0x02, 0x0e, + 0x53, 0x69, 0x64, 0x65, 0x2e, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0xca, 0x02, + 0x0e, 0x53, 0x69, 0x64, 0x65, 0x5c, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0xe2, + 0x02, 0x1a, 0x53, 0x69, 0x64, 0x65, 0x5c, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0f, 0x53, + 0x69, 0x64, 0x65, 0x3a, 0x3a, 0x42, 0x74, 0x63, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/side/btcbridge/btcbridge.proto b/proto/side/btcbridge/btcbridge.proto index c88d53ad..29b1d3d0 100644 --- a/proto/side/btcbridge/btcbridge.proto +++ b/proto/side/btcbridge/btcbridge.proto @@ -123,8 +123,8 @@ message DKGParticipant { string moniker = 1; // the operator address of the corresponding validator string operator_address = 2; - // the consensus address of the corresponding validator - string consensus_address = 3; + // the consensus public key of the corresponding validator + string consensus_pubkey = 3; } enum DKGRequestStatus { diff --git a/x/btcbridge/keeper/tss.go b/x/btcbridge/keeper/tss.go index 297a5b48..e6d47200 100644 --- a/x/btcbridge/keeper/tss.go +++ b/x/btcbridge/keeper/tss.go @@ -2,6 +2,7 @@ package keeper import ( "bytes" + "encoding/base64" "time" "github.com/btcsuite/btcd/btcutil/psbt" @@ -169,13 +170,23 @@ func (k Keeper) IterateDKGCompletionRequests(ctx sdk.Context, id uint64, cb func // InitiateDKG initiates the DKG request by the specified params func (k Keeper) InitiateDKG(ctx sdk.Context, participants []*types.DKGParticipant, threshold uint32, vaultTypes []types.AssetType, enableTransfer bool, targetUtxoNum uint32) (*types.DKGRequest, error) { for _, p := range participants { - consAddress, _ := sdk.ConsAddressFromHex(p.ConsensusAddress) + valAddr, _ := sdk.ValAddressFromBech32(p.OperatorAddress) - validator, err := k.stakingKeeper.GetValidatorByConsAddr(ctx, consAddress) + validator, err := k.stakingKeeper.GetValidator(ctx, valAddr) if err != nil { return nil, errorsmod.Wrap(types.ErrInvalidDKGParams, "non validator") } + pubKey, err := validator.ConsPubKey() + if err != nil { + return nil, err + } + + pubKeyBytes, _ := base64.StdEncoding.DecodeString(p.ConsensusPubkey) + if !bytes.Equal(pubKeyBytes, pubKey.Bytes()) { + errorsmod.Wrap(types.ErrInvalidDKGParams, "incorrect consensus public key") + } + if validator.Status != stakingtypes.Bonded { return nil, errorsmod.Wrap(types.ErrInvalidDKGParams, "validator not bonded") } diff --git a/x/btcbridge/types/btcbridge.pb.go b/x/btcbridge/types/btcbridge.pb.go index 60321bb3..6a00dfbb 100644 --- a/x/btcbridge/types/btcbridge.pb.go +++ b/x/btcbridge/types/btcbridge.pb.go @@ -825,8 +825,8 @@ type DKGParticipant struct { Moniker string `protobuf:"bytes,1,opt,name=moniker,proto3" json:"moniker,omitempty"` // the operator address of the corresponding validator OperatorAddress string `protobuf:"bytes,2,opt,name=operator_address,json=operatorAddress,proto3" json:"operator_address,omitempty"` - // the consensus address of the corresponding validator - ConsensusAddress string `protobuf:"bytes,3,opt,name=consensus_address,json=consensusAddress,proto3" json:"consensus_address,omitempty"` + // the consensus public key of the corresponding validator + ConsensusPubkey string `protobuf:"bytes,3,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty"` } func (m *DKGParticipant) Reset() { *m = DKGParticipant{} } @@ -876,9 +876,9 @@ func (m *DKGParticipant) GetOperatorAddress() string { return "" } -func (m *DKGParticipant) GetConsensusAddress() string { +func (m *DKGParticipant) GetConsensusPubkey() string { if m != nil { - return m.ConsensusAddress + return m.ConsensusPubkey } return "" } @@ -1095,85 +1095,86 @@ func init() { func init() { proto.RegisterFile("side/btcbridge/btcbridge.proto", fileDescriptor_9ff68b16012a2359) } var fileDescriptor_9ff68b16012a2359 = []byte{ - // 1242 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x56, 0x41, 0x6f, 0x1a, 0xc7, - 0x17, 0xf7, 0x1a, 0x8c, 0xf1, 0xc3, 0x26, 0x64, 0xfe, 0xf9, 0x3b, 0x18, 0x27, 0xd8, 0x42, 0x55, - 0xea, 0xa6, 0x12, 0x28, 0xae, 0xa2, 0x56, 0xbd, 0x19, 0x83, 0x09, 0x72, 0x82, 0xdd, 0x05, 0xb7, - 0x55, 0x2f, 0xab, 0xd9, 0xdd, 0x09, 0x8c, 0xcc, 0xee, 0x6c, 0x66, 0x66, 0x5d, 0x7c, 0xed, 0xb5, - 0x97, 0x7c, 0x85, 0x4a, 0xfd, 0x10, 0xfd, 0x08, 0x39, 0xe6, 0xd8, 0x53, 0x5b, 0x25, 0xf7, 0xaa, - 0x87, 0x7e, 0x80, 0x6a, 0x66, 0x67, 0xc1, 0x20, 0x9c, 0xdc, 0xde, 0xfb, 0xbd, 0x37, 0xf3, 0xde, - 0xfc, 0xde, 0xef, 0x2d, 0x40, 0x55, 0x50, 0x9f, 0x34, 0x5c, 0xe9, 0xb9, 0x9c, 0xfa, 0xc3, 0x1b, - 0x56, 0x3d, 0xe2, 0x4c, 0x32, 0x54, 0x54, 0xf1, 0xfa, 0x14, 0xad, 0xdc, 0x1b, 0xb2, 0x21, 0xd3, - 0xa1, 0x86, 0xb2, 0x92, 0xac, 0xca, 0xce, 0x90, 0xb1, 0xe1, 0x98, 0x34, 0xb4, 0xe7, 0xc6, 0x2f, - 0x1b, 0x38, 0xbc, 0x36, 0xa1, 0xbd, 0xc5, 0x90, 0xa4, 0x01, 0x11, 0x12, 0x07, 0x91, 0x49, 0xa8, - 0x7a, 0x4c, 0x04, 0x4c, 0x34, 0x5c, 0x2c, 0x48, 0xe3, 0xea, 0x89, 0x4b, 0x24, 0x7e, 0xd2, 0xf0, - 0x18, 0x0d, 0xd3, 0xbb, 0x93, 0xb8, 0x93, 0x14, 0x4d, 0x1c, 0x13, 0xda, 0x5d, 0x68, 0x3e, 0xc2, - 0x1c, 0x07, 0x26, 0x58, 0xfb, 0xd7, 0x82, 0x42, 0x73, 0xcc, 0xbc, 0xcb, 0x67, 0x04, 0xfb, 0x84, - 0xa3, 0x32, 0xac, 0x5f, 0x11, 0x2e, 0x28, 0x0b, 0xcb, 0xd6, 0xbe, 0x75, 0x90, 0xb5, 0x53, 0x17, - 0x21, 0xc8, 0x8e, 0xb0, 0x18, 0x95, 0x57, 0xf7, 0xad, 0x83, 0x0d, 0x5b, 0xdb, 0x68, 0x1b, 0x72, - 0x23, 0x42, 0x87, 0x23, 0x59, 0xce, 0xe8, 0x64, 0xe3, 0xa1, 0x3a, 0xfc, 0x2f, 0xe2, 0xe4, 0x8a, - 0xb2, 0x58, 0x38, 0xae, 0xba, 0xdd, 0xd1, 0x47, 0xb3, 0xfa, 0xe8, 0xdd, 0x34, 0x94, 0xd4, 0x55, - 0xf7, 0xec, 0x41, 0x21, 0x20, 0xfc, 0x72, 0x4c, 0x1c, 0xce, 0x98, 0x2c, 0xaf, 0xe9, 0x3c, 0x48, - 0x20, 0x9b, 0x31, 0x89, 0xee, 0xc1, 0x5a, 0xc8, 0x42, 0x8f, 0x94, 0x73, 0xba, 0x4e, 0xe2, 0xa8, - 0x96, 0x5c, 0x2a, 0x45, 0x79, 0x3d, 0x69, 0x49, 0xd9, 0x0a, 0x53, 0xdc, 0x95, 0xf3, 0x3a, 0x51, - 0xdb, 0xa8, 0x04, 0x99, 0x50, 0x4e, 0xca, 0x1b, 0x1a, 0x52, 0x66, 0xed, 0x4b, 0x58, 0x3f, 0x21, - 0xc4, 0xc6, 0x92, 0xa8, 0xab, 0xaf, 0xf0, 0x38, 0x26, 0xfa, 0xbd, 0x19, 0x3b, 0x71, 0x6e, 0xbc, - 0x6c, 0x55, 0xc3, 0xc6, 0xab, 0xfd, 0x63, 0x41, 0xb1, 0x4f, 0x87, 0x21, 0x0d, 0x87, 0x36, 0x79, - 0x15, 0x13, 0x21, 0x15, 0x65, 0xd8, 0xf7, 0x39, 0x11, 0x42, 0x5f, 0xb1, 0x61, 0xa7, 0x2e, 0xaa, - 0x40, 0x5e, 0xa8, 0x24, 0xd5, 0xf8, 0xaa, 0x2e, 0x3e, 0xf5, 0x75, 0x9f, 0x13, 0xea, 0x6b, 0xe2, - 0x36, 0x6c, 0x6d, 0x2b, 0x2c, 0x12, 0xae, 0x34, 0x3c, 0x69, 0x1b, 0x75, 0x61, 0xcb, 0xe3, 0x04, - 0x4b, 0xca, 0x42, 0x47, 0x3f, 0x4c, 0x91, 0x53, 0x38, 0xac, 0xd4, 0x13, 0xc5, 0xd4, 0x53, 0xc5, - 0xd4, 0x07, 0xa9, 0x62, 0x9a, 0xf9, 0x37, 0x7f, 0xec, 0xad, 0xbc, 0xfe, 0x73, 0xcf, 0xb2, 0x37, - 0xd3, 0xa3, 0x2a, 0x88, 0x9e, 0x42, 0x4e, 0x48, 0x2c, 0x63, 0xa1, 0x59, 0x2c, 0x1e, 0x3e, 0xac, - 0xcf, 0xcb, 0xb6, 0x6e, 0x1e, 0xd6, 0xd7, 0x49, 0xb6, 0x49, 0xae, 0x09, 0xb8, 0xf3, 0x1d, 0x95, - 0x23, 0x9f, 0xe3, 0x1f, 0x3f, 0xfe, 0xe4, 0x6d, 0xc8, 0xe1, 0x80, 0xc5, 0xa1, 0x34, 0x3a, 0x31, - 0xde, 0x1c, 0x15, 0x99, 0x5b, 0xa8, 0xc8, 0xce, 0xa8, 0xa8, 0xfd, 0x6d, 0x41, 0xf6, 0x62, 0xf0, - 0xfd, 0xd9, 0x34, 0x68, 0xcd, 0xf3, 0x74, 0xc5, 0x62, 0x69, 0x38, 0xd5, 0xf6, 0xcd, 0x96, 0x32, - 0xb7, 0xb5, 0x94, 0x4d, 0x44, 0x6a, 0x5a, 0x9a, 0x8d, 0x78, 0x6d, 0x4e, 0xbc, 0x9f, 0x40, 0x31, - 0x8a, 0x5d, 0xe7, 0x92, 0x5c, 0x3b, 0xc2, 0xe3, 0x34, 0x92, 0x9a, 0xae, 0x4d, 0x7b, 0x33, 0x8a, - 0xdd, 0x53, 0x72, 0xdd, 0xd7, 0x18, 0xda, 0x85, 0x0d, 0x2a, 0x1c, 0xa5, 0x60, 0xe2, 0x6b, 0x01, - 0xe6, 0xed, 0x3c, 0x15, 0xcf, 0xb5, 0x8f, 0x9e, 0xc0, 0x1a, 0x8f, 0x43, 0x22, 0xca, 0xf9, 0xfd, - 0xcc, 0x41, 0xe1, 0x70, 0x77, 0x91, 0x68, 0x3b, 0x0e, 0x49, 0x13, 0x8f, 0x71, 0xe8, 0x11, 0x3b, - 0xc9, 0xac, 0x3d, 0x85, 0xc2, 0x0d, 0x14, 0x15, 0x61, 0x75, 0xfa, 0xe8, 0x55, 0xea, 0xdf, 0xc6, - 0x6b, 0xad, 0x0e, 0x39, 0x75, 0xac, 0xeb, 0x2b, 0x1d, 0xeb, 0x55, 0x33, 0x7b, 0x9b, 0x38, 0xea, - 0x1e, 0x39, 0xd1, 0x67, 0xb6, 0xec, 0x55, 0x39, 0xa9, 0x39, 0xb0, 0xd6, 0xf6, 0xa9, 0x27, 0xd1, - 0xa3, 0x69, 0x81, 0xc2, 0xe1, 0xf6, 0xb2, 0xfe, 0xba, 0xfe, 0x87, 0x0a, 0x2b, 0x9c, 0xc5, 0x32, - 0x8a, 0x93, 0xd5, 0xdf, 0xb2, 0x8d, 0x57, 0xfb, 0x16, 0x4a, 0x4d, 0xe9, 0x1d, 0xb3, 0x50, 0xb0, - 0x31, 0xf5, 0xb5, 0xf8, 0xd0, 0x67, 0x50, 0x92, 0x98, 0x0f, 0x89, 0x74, 0xe4, 0x88, 0x13, 0x31, - 0x62, 0x63, 0xdf, 0x6c, 0xdb, 0x9d, 0x04, 0x1f, 0xa4, 0x30, 0xba, 0x0f, 0xeb, 0x01, 0x9e, 0x38, - 0x61, 0x1c, 0x98, 0xa6, 0x73, 0x01, 0x9e, 0xf4, 0xe2, 0xa0, 0xf6, 0x0a, 0x90, 0xea, 0x4a, 0xcc, - 0xdf, 0x7c, 0x1f, 0xd6, 0x15, 0x7d, 0xce, 0x94, 0xab, 0x1c, 0x4f, 0xd8, 0x58, 0x56, 0x32, 0x79, - 0xc0, 0x87, 0x4a, 0x66, 0xe6, 0x4a, 0xfe, 0x64, 0x41, 0xb1, 0x75, 0xda, 0x39, 0xc7, 0x5c, 0x52, - 0x8f, 0x46, 0x38, 0xd4, 0x2a, 0x0b, 0x58, 0x48, 0x2f, 0x09, 0x4f, 0x85, 0x6f, 0x5c, 0x55, 0x90, - 0x45, 0x84, 0x63, 0xc9, 0xb8, 0x93, 0x0a, 0xd1, 0x14, 0x4c, 0xf1, 0x23, 0x23, 0xc8, 0xcf, 0xe1, - 0xae, 0xc7, 0x42, 0x41, 0x42, 0x11, 0x0b, 0x67, 0x5e, 0xb4, 0xa5, 0x69, 0xc0, 0x24, 0xd7, 0x7e, - 0xce, 0x00, 0xb4, 0x4e, 0x3b, 0xe9, 0xe6, 0xcd, 0x74, 0x91, 0xd5, 0xe3, 0x69, 0xc2, 0x66, 0x34, - 0xeb, 0x4f, 0x95, 0x54, 0x82, 0xab, 0x2e, 0x0e, 0x74, 0xfe, 0x19, 0xf6, 0xdc, 0x19, 0xf4, 0x00, - 0x36, 0x66, 0x24, 0x25, 0x14, 0xcc, 0x00, 0xf4, 0x35, 0x14, 0xae, 0x70, 0x3c, 0x96, 0x8e, 0xbc, - 0x8e, 0x88, 0x28, 0x67, 0xf7, 0x33, 0x07, 0xc5, 0xc3, 0x9d, 0xc5, 0x02, 0x47, 0x42, 0x10, 0x39, - 0xb8, 0x8e, 0x88, 0x0d, 0x3a, 0x5b, 0x99, 0x02, 0x7d, 0x0a, 0x77, 0x48, 0x88, 0xdd, 0x31, 0x71, - 0x24, 0xc7, 0xa1, 0x78, 0x49, 0xb8, 0xde, 0xb5, 0xbc, 0x5d, 0x4c, 0xe0, 0x81, 0x41, 0xd1, 0x23, - 0x30, 0x63, 0x71, 0x62, 0x39, 0x61, 0x7a, 0x16, 0x39, 0xdd, 0xc8, 0x56, 0x02, 0x5f, 0xc8, 0x09, - 0xeb, 0xc5, 0x01, 0x6a, 0x01, 0x90, 0x49, 0x44, 0xb9, 0x9e, 0xbe, 0x5e, 0xbb, 0x8f, 0x7f, 0x0a, - 0x2d, 0xfd, 0x29, 0xbc, 0x71, 0x0e, 0x7d, 0x35, 0xfd, 0x10, 0xe6, 0xf5, 0x87, 0x70, 0x7f, 0x09, - 0x5d, 0x86, 0xf0, 0x85, 0x6f, 0xe1, 0x2f, 0x16, 0xdc, 0x6b, 0x9d, 0x76, 0x8e, 0x59, 0x10, 0x8d, - 0x89, 0xba, 0xeb, 0xb6, 0xb9, 0x6c, 0x43, 0x4e, 0x90, 0xd0, 0x27, 0x3c, 0x5d, 0x9b, 0xc4, 0x53, - 0xb8, 0xe6, 0x47, 0x0d, 0x3c, 0xa3, 0xf0, 0xc4, 0x5b, 0xae, 0x89, 0xec, 0x72, 0x4d, 0xa8, 0x81, - 0x09, 0x3a, 0x0c, 0xb1, 0x8c, 0x39, 0x31, 0x3f, 0x96, 0x33, 0xe0, 0xf1, 0xaf, 0x16, 0x6c, 0xcd, - 0x7d, 0xc9, 0x51, 0x15, 0x2a, 0xfd, 0x6e, 0xa7, 0xd7, 0xed, 0x75, 0x9c, 0xfe, 0xe0, 0x68, 0x70, - 0xd1, 0x77, 0x2e, 0x7a, 0xfd, 0xf3, 0xf6, 0x71, 0xf7, 0xa4, 0xdb, 0x6e, 0x95, 0x56, 0x50, 0x05, - 0xb6, 0x17, 0xe2, 0xe7, 0xed, 0x5e, 0xab, 0xdb, 0xeb, 0x94, 0xac, 0x25, 0x67, 0x9b, 0xf6, 0xd9, - 0x51, 0xeb, 0xf8, 0xa8, 0x3f, 0x68, 0xb7, 0x4a, 0xab, 0xe8, 0x01, 0x94, 0x17, 0xe2, 0xc7, 0x67, - 0xbd, 0x93, 0xae, 0xfd, 0xa2, 0xdd, 0x2a, 0x65, 0xd0, 0x0e, 0xfc, 0x7f, 0x21, 0x7a, 0x72, 0xd4, - 0x7d, 0xde, 0x6e, 0x95, 0xb2, 0x8f, 0x7f, 0xb3, 0xa0, 0xb4, 0xc8, 0x33, 0xaa, 0x41, 0xb5, 0x75, - 0xda, 0x71, 0xec, 0xf6, 0x37, 0x17, 0xed, 0xfe, 0x60, 0x79, 0xb7, 0x55, 0xa8, 0x2c, 0xc9, 0x99, - 0x75, 0xbc, 0x0f, 0x0f, 0x96, 0xc4, 0x8f, 0xcf, 0x5e, 0x9c, 0x3f, 0x6f, 0x27, 0x3d, 0x3f, 0x84, - 0x9d, 0x25, 0x19, 0xa6, 0xb3, 0x0c, 0xda, 0x83, 0xdd, 0x25, 0xe1, 0x41, 0xf7, 0x45, 0xbb, 0x75, - 0x76, 0x31, 0x28, 0x65, 0x9b, 0xcf, 0xde, 0xbc, 0xab, 0x5a, 0x6f, 0xdf, 0x55, 0xad, 0xbf, 0xde, - 0x55, 0xad, 0xd7, 0xef, 0xab, 0x2b, 0x6f, 0xdf, 0x57, 0x57, 0x7e, 0x7f, 0x5f, 0x5d, 0xf9, 0xa1, - 0x3e, 0xa4, 0x72, 0x14, 0xbb, 0x75, 0x8f, 0x05, 0x0d, 0xa5, 0x29, 0x2d, 0x49, 0x8f, 0x8d, 0xb5, - 0xd3, 0x98, 0xdc, 0xf8, 0x17, 0xa6, 0xb7, 0xc9, 0xcd, 0xe9, 0x84, 0x2f, 0xfe, 0x0b, 0x00, 0x00, - 0xff, 0xff, 0x4c, 0x27, 0xa2, 0xed, 0x61, 0x0a, 0x00, 0x00, + // 1255 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x56, 0x41, 0x6f, 0x1a, 0x47, + 0x14, 0xf6, 0x02, 0xc6, 0xf0, 0xb0, 0x31, 0x99, 0xa6, 0x0e, 0xc6, 0x0e, 0xb6, 0x50, 0x95, 0x3a, + 0xa9, 0x04, 0x8a, 0xab, 0xa8, 0x55, 0x6f, 0xc6, 0x60, 0x82, 0x9c, 0x60, 0x77, 0xc1, 0x6d, 0xd5, + 0xcb, 0x6a, 0x76, 0x77, 0x02, 0x2b, 0xb3, 0x3b, 0x9b, 0x99, 0x59, 0x17, 0xdf, 0x7a, 0xef, 0x25, + 0x7f, 0xa1, 0x52, 0x7f, 0x44, 0x7f, 0x42, 0x8e, 0x39, 0xf6, 0xd4, 0x56, 0xf1, 0xbd, 0xea, 0xa1, + 0x3f, 0xa0, 0x9a, 0xd9, 0x59, 0x30, 0x08, 0x27, 0xb7, 0xf7, 0xbe, 0xf7, 0x66, 0xde, 0x9b, 0x6f, + 0xbe, 0x37, 0xbb, 0x50, 0xe5, 0x9e, 0x4b, 0x1a, 0xb6, 0x70, 0x6c, 0xe6, 0xb9, 0xc3, 0x5b, 0x56, + 0x3d, 0x64, 0x54, 0x50, 0x54, 0x94, 0xf1, 0xfa, 0x14, 0xad, 0xdc, 0x1f, 0xd2, 0x21, 0x55, 0xa1, + 0x86, 0xb4, 0xe2, 0xac, 0xca, 0xf6, 0x90, 0xd2, 0xe1, 0x98, 0x34, 0x94, 0x67, 0x47, 0xaf, 0x1a, + 0x38, 0xb8, 0xd6, 0xa1, 0xbd, 0xc5, 0x90, 0xf0, 0x7c, 0xc2, 0x05, 0xf6, 0x43, 0x9d, 0x50, 0x75, + 0x28, 0xf7, 0x29, 0x6f, 0xd8, 0x98, 0x93, 0xc6, 0xd5, 0x53, 0x9b, 0x08, 0xfc, 0xb4, 0xe1, 0x50, + 0x2f, 0x48, 0xf6, 0x8e, 0xe3, 0x56, 0x5c, 0x34, 0x76, 0x74, 0x68, 0x67, 0xa1, 0xf9, 0x10, 0x33, + 0xec, 0xeb, 0x60, 0xed, 0x3f, 0x03, 0x0a, 0xcd, 0x31, 0x75, 0x2e, 0x9f, 0x13, 0xec, 0x12, 0x86, + 0xca, 0xb0, 0x76, 0x45, 0x18, 0xf7, 0x68, 0x50, 0x36, 0xf6, 0x8d, 0x83, 0x8c, 0x99, 0xb8, 0x08, + 0x41, 0x66, 0x84, 0xf9, 0xa8, 0x9c, 0xda, 0x37, 0x0e, 0xf2, 0xa6, 0xb2, 0xd1, 0x16, 0x64, 0x47, + 0xc4, 0x1b, 0x8e, 0x44, 0x39, 0xad, 0x92, 0xb5, 0x87, 0xea, 0xf0, 0x49, 0xc8, 0xc8, 0x95, 0x47, + 0x23, 0x6e, 0xd9, 0x72, 0x77, 0x4b, 0x2d, 0xcd, 0xa8, 0xa5, 0xf7, 0x92, 0x50, 0x5c, 0x57, 0xee, + 0xb3, 0x07, 0x05, 0x9f, 0xb0, 0xcb, 0x31, 0xb1, 0x18, 0xa5, 0xa2, 0xbc, 0xaa, 0xf2, 0x20, 0x86, + 0x4c, 0x4a, 0x05, 0xba, 0x0f, 0xab, 0x01, 0x0d, 0x1c, 0x52, 0xce, 0xaa, 0x3a, 0xb1, 0x23, 0x5b, + 0xb2, 0x3d, 0xc1, 0xcb, 0x6b, 0x71, 0x4b, 0xd2, 0x96, 0x98, 0xe4, 0xae, 0x9c, 0x53, 0x89, 0xca, + 0x46, 0x25, 0x48, 0x07, 0x62, 0x52, 0xce, 0x2b, 0x48, 0x9a, 0xb5, 0xaf, 0x60, 0xed, 0x84, 0x10, + 0x13, 0x0b, 0x22, 0xb7, 0xbe, 0xc2, 0xe3, 0x88, 0xa8, 0xf3, 0xa6, 0xcd, 0xd8, 0xb9, 0x75, 0xb2, + 0x94, 0x82, 0xb5, 0x57, 0xfb, 0xd7, 0x80, 0x62, 0xdf, 0x1b, 0x06, 0x5e, 0x30, 0x34, 0xc9, 0xeb, + 0x88, 0x70, 0x21, 0x29, 0xc3, 0xae, 0xcb, 0x08, 0xe7, 0x6a, 0x8b, 0xbc, 0x99, 0xb8, 0xa8, 0x02, + 0x39, 0x2e, 0x93, 0x64, 0xe3, 0x29, 0x55, 0x7c, 0xea, 0xab, 0x3e, 0x27, 0x9e, 0xab, 0x88, 0xcb, + 0x9b, 0xca, 0x96, 0x58, 0xc8, 0x6d, 0xa1, 0x79, 0x52, 0x36, 0xea, 0xc2, 0x86, 0xc3, 0x08, 0x16, + 0x1e, 0x0d, 0x2c, 0x75, 0x30, 0x49, 0x4e, 0xe1, 0xb0, 0x52, 0x8f, 0x15, 0x53, 0x4f, 0x14, 0x53, + 0x1f, 0x24, 0x8a, 0x69, 0xe6, 0xde, 0xfe, 0xb9, 0xb7, 0xf2, 0xe6, 0xaf, 0x3d, 0xc3, 0x5c, 0x4f, + 0x96, 0xca, 0x20, 0x7a, 0x06, 0x59, 0x2e, 0xb0, 0x88, 0xb8, 0x62, 0xb1, 0x78, 0xf8, 0xb0, 0x3e, + 0x2f, 0xdb, 0xba, 0x3e, 0x58, 0x5f, 0x25, 0x99, 0x3a, 0xb9, 0xc6, 0x61, 0xf3, 0x7b, 0x4f, 0x8c, + 0x5c, 0x86, 0x7f, 0xfa, 0xf8, 0x91, 0xb7, 0x20, 0x8b, 0x7d, 0x1a, 0x05, 0x42, 0xeb, 0x44, 0x7b, + 0x73, 0x54, 0xa4, 0xef, 0xa0, 0x22, 0x33, 0xa3, 0xa2, 0xf6, 0x8f, 0x01, 0x99, 0x8b, 0xc1, 0x0f, + 0x67, 0xd3, 0xa0, 0x31, 0xcf, 0xd3, 0x15, 0x8d, 0x84, 0xe6, 0x54, 0xd9, 0xb7, 0x5b, 0x4a, 0xdf, + 0xd5, 0x52, 0x26, 0x16, 0xa9, 0x6e, 0x69, 0x76, 0xc5, 0xab, 0x73, 0xe2, 0xfd, 0x0c, 0x8a, 0x61, + 0x64, 0x5b, 0x97, 0xe4, 0xda, 0xe2, 0x0e, 0xf3, 0x42, 0xa1, 0xe8, 0x5a, 0x37, 0xd7, 0xc3, 0xc8, + 0x3e, 0x25, 0xd7, 0x7d, 0x85, 0xa1, 0x1d, 0xc8, 0x7b, 0xdc, 0x92, 0x0a, 0x26, 0xae, 0x12, 0x60, + 0xce, 0xcc, 0x79, 0xfc, 0x85, 0xf2, 0xd1, 0x53, 0x58, 0x65, 0x51, 0x40, 0x78, 0x39, 0xb7, 0x9f, + 0x3e, 0x28, 0x1c, 0xee, 0x2c, 0x12, 0x6d, 0x46, 0x01, 0x69, 0xe2, 0x31, 0x0e, 0x1c, 0x62, 0xc6, + 0x99, 0xb5, 0x67, 0x50, 0xb8, 0x85, 0xa2, 0x22, 0xa4, 0xa6, 0x87, 0x4e, 0x79, 0xee, 0x5d, 0xbc, + 0xd6, 0xea, 0x90, 0x95, 0xcb, 0xba, 0xae, 0xd4, 0xb1, 0x1a, 0x35, 0x3d, 0xb7, 0xb1, 0x23, 0xf7, + 0x11, 0x13, 0xb5, 0x66, 0xc3, 0x4c, 0x89, 0x49, 0xcd, 0x82, 0xd5, 0xb6, 0xeb, 0x39, 0x02, 0x3d, + 0x9a, 0x16, 0x28, 0x1c, 0x6e, 0x2d, 0xeb, 0xaf, 0xeb, 0x7e, 0xa8, 0xb0, 0xc4, 0x69, 0x24, 0xc2, + 0x28, 0x1e, 0xfd, 0x0d, 0x53, 0x7b, 0xb5, 0xef, 0xa0, 0xd4, 0x14, 0xce, 0x31, 0x0d, 0x38, 0x1d, + 0x7b, 0xae, 0x12, 0x1f, 0x7a, 0x0c, 0x25, 0x81, 0xd9, 0x90, 0x08, 0x4b, 0x8c, 0x18, 0xe1, 0x23, + 0x3a, 0x76, 0xf5, 0xb4, 0x6d, 0xc6, 0xf8, 0x20, 0x81, 0xd1, 0x03, 0x58, 0xf3, 0xf1, 0xc4, 0x0a, + 0x22, 0x5f, 0x37, 0x9d, 0xf5, 0xf1, 0xa4, 0x17, 0xf9, 0xb5, 0xd7, 0x80, 0x64, 0x57, 0x7c, 0x7e, + 0xe7, 0x07, 0xb0, 0x26, 0xe9, 0xb3, 0xa6, 0x5c, 0x65, 0x59, 0xcc, 0xc6, 0xb2, 0x92, 0xf1, 0x01, + 0x3e, 0x54, 0x32, 0x3d, 0x57, 0xf2, 0x67, 0x03, 0x8a, 0xad, 0xd3, 0xce, 0x39, 0x66, 0xc2, 0x73, + 0xbc, 0x10, 0x07, 0x4a, 0x65, 0x3e, 0x0d, 0xbc, 0x4b, 0xc2, 0x12, 0xe1, 0x6b, 0x57, 0x16, 0xa4, + 0x21, 0x61, 0x58, 0x50, 0x66, 0x25, 0x42, 0xd4, 0x05, 0x13, 0xfc, 0x48, 0x0b, 0xf2, 0x31, 0x94, + 0x1c, 0x1a, 0x70, 0x12, 0xf0, 0x88, 0x5b, 0x61, 0x64, 0x5f, 0x92, 0x6b, 0xad, 0xd9, 0xcd, 0x29, + 0x7e, 0xae, 0xe0, 0xda, 0x2f, 0x69, 0x80, 0xd6, 0x69, 0x27, 0x99, 0xbb, 0x99, 0x2a, 0x32, 0xea, + 0x72, 0x9a, 0xb0, 0x1e, 0xce, 0xba, 0x93, 0x05, 0xa5, 0xdc, 0xaa, 0x8b, 0xd7, 0x39, 0x7f, 0x08, + 0x73, 0x6e, 0x0d, 0xda, 0x85, 0xfc, 0x8c, 0xa2, 0x98, 0x80, 0x19, 0x80, 0xbe, 0x81, 0xc2, 0x15, + 0x8e, 0xc6, 0xc2, 0x12, 0xd7, 0x21, 0xe1, 0xe5, 0xcc, 0x7e, 0xfa, 0xa0, 0x78, 0xb8, 0xbd, 0x58, + 0xe0, 0x88, 0x73, 0x22, 0x06, 0xd7, 0x21, 0x31, 0x41, 0x65, 0x4b, 0x93, 0xa3, 0xcf, 0x61, 0x93, + 0x04, 0xd8, 0x1e, 0x13, 0x4b, 0x30, 0x1c, 0xf0, 0x57, 0x84, 0xa9, 0x49, 0xcb, 0x99, 0xc5, 0x18, + 0x1e, 0x68, 0x14, 0x3d, 0x02, 0x7d, 0x29, 0x56, 0x24, 0x26, 0x54, 0xdd, 0x44, 0x56, 0x35, 0xb2, + 0x11, 0xc3, 0x17, 0x62, 0x42, 0x7b, 0x91, 0x8f, 0x5a, 0x00, 0x64, 0x12, 0x7a, 0x4c, 0xdd, 0xbd, + 0x1a, 0xba, 0x8f, 0x3f, 0x84, 0x86, 0x7a, 0x08, 0x6f, 0xad, 0x43, 0x5f, 0x4f, 0x9f, 0xc1, 0x9c, + 0x7a, 0x06, 0xf7, 0x97, 0xd0, 0xa5, 0x09, 0x5f, 0x78, 0x09, 0x7f, 0x35, 0xe0, 0x7e, 0xeb, 0xb4, + 0x73, 0x4c, 0xfd, 0x70, 0x4c, 0xe4, 0x5e, 0x77, 0xdd, 0xcb, 0x16, 0x64, 0x39, 0x09, 0x5c, 0xc2, + 0x92, 0xa1, 0x89, 0x3d, 0x89, 0x2b, 0x7e, 0xe4, 0x1b, 0x95, 0x96, 0x78, 0xec, 0xa1, 0x2f, 0xe0, + 0xde, 0x4c, 0x11, 0x89, 0x7a, 0xe2, 0xe7, 0x70, 0x26, 0x95, 0x44, 0x3e, 0xbb, 0x90, 0xe7, 0xde, + 0x30, 0xc0, 0x22, 0x62, 0x44, 0x7f, 0x2a, 0x67, 0xc0, 0x93, 0xdf, 0x0c, 0xd8, 0x98, 0x7b, 0xc7, + 0x51, 0x15, 0x2a, 0xfd, 0x6e, 0xa7, 0xd7, 0xed, 0x75, 0xac, 0xfe, 0xe0, 0x68, 0x70, 0xd1, 0xb7, + 0x2e, 0x7a, 0xfd, 0xf3, 0xf6, 0x71, 0xf7, 0xa4, 0xdb, 0x6e, 0x95, 0x56, 0x50, 0x05, 0xb6, 0x16, + 0xe2, 0xe7, 0xed, 0x5e, 0xab, 0xdb, 0xeb, 0x94, 0x8c, 0x25, 0x6b, 0x9b, 0xe6, 0xd9, 0x51, 0xeb, + 0xf8, 0xa8, 0x3f, 0x68, 0xb7, 0x4a, 0x29, 0xb4, 0x0b, 0xe5, 0x85, 0xf8, 0xf1, 0x59, 0xef, 0xa4, + 0x6b, 0xbe, 0x6c, 0xb7, 0x4a, 0x69, 0xb4, 0x0d, 0x9f, 0x2e, 0x44, 0x4f, 0x8e, 0xba, 0x2f, 0xda, + 0xad, 0x52, 0xe6, 0xc9, 0xef, 0x06, 0x94, 0x16, 0x79, 0x46, 0x35, 0xa8, 0xb6, 0x4e, 0x3b, 0x96, + 0xd9, 0xfe, 0xf6, 0xa2, 0xdd, 0x1f, 0x2c, 0xef, 0xb6, 0x0a, 0x95, 0x25, 0x39, 0xb3, 0x8e, 0xf7, + 0x61, 0x77, 0x49, 0xfc, 0xf8, 0xec, 0xe5, 0xf9, 0x8b, 0x76, 0xdc, 0xf3, 0x43, 0xd8, 0x5e, 0x92, + 0xa1, 0x3b, 0x4b, 0xa3, 0x3d, 0xd8, 0x59, 0x12, 0x1e, 0x74, 0x5f, 0xb6, 0x5b, 0x67, 0x17, 0x83, + 0x52, 0xa6, 0xf9, 0xfc, 0xed, 0xfb, 0xaa, 0xf1, 0xee, 0x7d, 0xd5, 0xf8, 0xfb, 0x7d, 0xd5, 0x78, + 0x73, 0x53, 0x5d, 0x79, 0x77, 0x53, 0x5d, 0xf9, 0xe3, 0xa6, 0xba, 0xf2, 0x63, 0x7d, 0xe8, 0x89, + 0x51, 0x64, 0xd7, 0x1d, 0xea, 0x37, 0xa4, 0xa6, 0x94, 0x24, 0x1d, 0x3a, 0x56, 0x4e, 0x63, 0x72, + 0xeb, 0x1f, 0x4c, 0x4d, 0x93, 0x9d, 0x55, 0x09, 0x5f, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x7f, + 0x60, 0xcf, 0x0d, 0x5f, 0x0a, 0x00, 0x00, } func (m *BlockHeader) Marshal() (dAtA []byte, err error) { @@ -1691,10 +1692,10 @@ func (m *DKGParticipant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ConsensusAddress) > 0 { - i -= len(m.ConsensusAddress) - copy(dAtA[i:], m.ConsensusAddress) - i = encodeVarintBtcbridge(dAtA, i, uint64(len(m.ConsensusAddress))) + if len(m.ConsensusPubkey) > 0 { + i -= len(m.ConsensusPubkey) + copy(dAtA[i:], m.ConsensusPubkey) + i = encodeVarintBtcbridge(dAtA, i, uint64(len(m.ConsensusPubkey))) i-- dAtA[i] = 0x1a } @@ -2127,7 +2128,7 @@ func (m *DKGParticipant) Size() (n int) { if l > 0 { n += 1 + l + sovBtcbridge(uint64(l)) } - l = len(m.ConsensusAddress) + l = len(m.ConsensusPubkey) if l > 0 { n += 1 + l + sovBtcbridge(uint64(l)) } @@ -3868,7 +3869,7 @@ func (m *DKGParticipant) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ConsensusAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusPubkey", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3896,7 +3897,7 @@ func (m *DKGParticipant) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ConsensusAddress = string(dAtA[iNdEx:postIndex]) + m.ConsensusPubkey = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/btcbridge/types/expected_keepers.go b/x/btcbridge/types/expected_keepers.go index ff8aa68f..3875df00 100644 --- a/x/btcbridge/types/expected_keepers.go +++ b/x/btcbridge/types/expected_keepers.go @@ -36,5 +36,6 @@ type BankKeeper interface { // StakingKeeper defines the expected staking keeper used to retrieve validator (noalias) type StakingKeeper interface { + GetValidator(ctx context.Context, addr sdk.ValAddress) (stakingtypes.Validator, error) GetValidatorByConsAddr(ctx context.Context, consAddr sdk.ConsAddress) (stakingtypes.Validator, error) } diff --git a/x/btcbridge/types/msg_initiate_dkg.go b/x/btcbridge/types/msg_initiate_dkg.go index ab1355a6..c0fc9ae5 100644 --- a/x/btcbridge/types/msg_initiate_dkg.go +++ b/x/btcbridge/types/msg_initiate_dkg.go @@ -1,7 +1,10 @@ package types import ( + "encoding/base64" + errorsmod "cosmossdk.io/errors" + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) @@ -29,15 +32,15 @@ func (m *MsgInitiateDKG) ValidateBasic() error { return errorsmod.Wrap(err, "invalid operator address") } - if _, err := sdk.ConsAddressFromHex(p.ConsensusAddress); err != nil { - return errorsmod.Wrap(err, "invalid consensus address") + if pubKey, err := base64.StdEncoding.DecodeString(p.ConsensusPubkey); err != nil || len(pubKey) != ed25519.PubKeySize { + return errorsmod.Wrap(err, "invalid consensus public key") } - if participants[p.ConsensusAddress] { + if participants[p.ConsensusPubkey] { return errorsmod.Wrap(ErrInvalidDKGParams, "duplicate participant") } - participants[p.ConsensusAddress] = true + participants[p.ConsensusPubkey] = true } if len(m.VaultTypes) == 0 { diff --git a/x/btcbridge/types/tss.go b/x/btcbridge/types/tss.go index 5df2d22c..f72a9a1e 100644 --- a/x/btcbridge/types/tss.go +++ b/x/btcbridge/types/tss.go @@ -2,17 +2,30 @@ package types import ( "crypto/ed25519" + "encoding/base64" "encoding/binary" "encoding/hex" "reflect" "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/crypto/tmhash" ) +// MustGetConsensusAddr gets the hex-encoded consensus address from the given consensus public key +// Panic if any error occurs +func MustGetConsensusAddr(consPubKey string) string { + pubKey, err := base64.StdEncoding.DecodeString(consPubKey) + if err != nil { + panic(err) + } + + return hex.EncodeToString(tmhash.SumTruncated(pubKey)) +} + // ParticipantExists returns true if the given address is a participant, false otherwise func ParticipantExists(participants []*DKGParticipant, consAddress string) bool { for _, p := range participants { - if p.ConsensusAddress == consAddress { + if MustGetConsensusAddr(p.ConsensusPubkey) == consAddress { return true } }