diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index a9bc7badc1..58f1b88335 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -9,6 +9,7 @@ import "google/protobuf/timestamp.proto"; import "interchain_security/ccv/provider/v1/provider.proto"; import "interchain_security/ccv/v1/shared_consumer.proto"; import "interchain_security/ccv/v1/wire.proto"; +import "tendermint/crypto/keys.proto"; service Query { // ConsumerGenesis queries the genesis state needed to start a consumer chain @@ -195,4 +196,5 @@ message PairValConAddrProviderAndConsumer { string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; // The consensus address of the validator on the consumer chain string consumer_address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ]; + tendermint.crypto.PublicKey consumer_key = 3; } diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 3a3e4eed4f..68b400890f 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -194,9 +194,11 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, ctx := sdk.UnwrapSDKContext(goCtx) validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) for _, data := range validatorConsumerAddrs { + pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ConsumerAddr}) pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), ConsumerAddress: string(data.ConsumerAddr), + ConsumerKey: &pubKey, }) } return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index a0495bc2de..43d9afd887 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -6,6 +6,7 @@ package types import ( context "context" fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -1014,7 +1015,8 @@ type PairValConAddrProviderAndConsumer struct { // The consensus address of the validator on the provider chain ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty" yaml:"address"` // The consensus address of the validator on the consumer chain - ConsumerAddress string `protobuf:"bytes,2,opt,name=consumer_address,json=consumerAddress,proto3" json:"consumer_address,omitempty" yaml:"address"` + ConsumerAddress string `protobuf:"bytes,2,opt,name=consumer_address,json=consumerAddress,proto3" json:"consumer_address,omitempty" yaml:"address"` + ConsumerKey *crypto.PublicKey `protobuf:"bytes,3,opt,name=consumer_key,json=consumerKey,proto3" json:"consumer_key,omitempty"` } func (m *PairValConAddrProviderAndConsumer) Reset() { *m = PairValConAddrProviderAndConsumer{} } @@ -1064,6 +1066,13 @@ func (m *PairValConAddrProviderAndConsumer) GetConsumerAddress() string { return "" } +func (m *PairValConAddrProviderAndConsumer) GetConsumerKey() *crypto.PublicKey { + if m != nil { + return m.ConsumerKey + } + return nil +} + func init() { proto.RegisterType((*QueryConsumerGenesisRequest)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisRequest") proto.RegisterType((*QueryConsumerGenesisResponse)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisResponse") @@ -1095,88 +1104,91 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1285 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x73, 0xdb, 0x44, - 0x14, 0xb6, 0x92, 0xb6, 0x24, 0x5b, 0xfa, 0x83, 0x6d, 0x29, 0xae, 0x5a, 0xec, 0x56, 0x1d, 0x20, - 0x2d, 0x20, 0x25, 0xce, 0x30, 0xd3, 0x1f, 0xa4, 0xa9, 0x1d, 0xb7, 0xc5, 0xd3, 0x74, 0x1a, 0xd4, - 0x50, 0x66, 0x80, 0x41, 0x6c, 0xa4, 0xc5, 0xd6, 0x8c, 0xac, 0x55, 0x76, 0x65, 0xa7, 0x99, 0x0e, - 0x87, 0x72, 0x80, 0x1e, 0x3b, 0x03, 0x5c, 0x38, 0x95, 0x03, 0xff, 0x4b, 0x6f, 0x94, 0xe9, 0x85, - 0x53, 0x61, 0x12, 0x0e, 0x0c, 0x27, 0x86, 0x3b, 0x33, 0x8c, 0x56, 0x2b, 0xd9, 0xb2, 0x15, 0x5b, - 0x76, 0x72, 0xb3, 0x77, 0xf7, 0x7d, 0xef, 0xfb, 0x9e, 0xde, 0x3e, 0x7d, 0x02, 0x9a, 0xed, 0xfa, - 0x98, 0x9a, 0x0d, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8b, 0xda, 0xfe, 0xa6, 0x66, 0x9a, 0x6d, 0xcd, - 0xa3, 0xa4, 0x6d, 0x5b, 0x98, 0x6a, 0xed, 0x39, 0x6d, 0xbd, 0x85, 0xe9, 0xa6, 0xea, 0x51, 0xe2, - 0x13, 0x78, 0x2e, 0x25, 0x40, 0x35, 0xcd, 0xb6, 0x1a, 0x05, 0xa8, 0xed, 0x39, 0xf9, 0x74, 0x9d, - 0x90, 0xba, 0x83, 0x35, 0xe4, 0xd9, 0x1a, 0x72, 0x5d, 0xe2, 0x23, 0xdf, 0x26, 0x2e, 0x0b, 0x21, - 0xe4, 0xe3, 0x75, 0x52, 0x27, 0xfc, 0xa7, 0x16, 0xfc, 0x12, 0xab, 0x45, 0x11, 0xc3, 0xff, 0xad, - 0xb5, 0xbe, 0xd4, 0x7c, 0xbb, 0x89, 0x99, 0x8f, 0x9a, 0x9e, 0x38, 0x50, 0xca, 0x42, 0x35, 0x66, - 0x11, 0xc6, 0xcc, 0xee, 0x14, 0xd3, 0x9e, 0xd3, 0x58, 0x03, 0x51, 0x6c, 0x19, 0x26, 0x71, 0x59, - 0xab, 0x19, 0x47, 0xbc, 0x31, 0x20, 0x62, 0xc3, 0xa6, 0x38, 0x3c, 0xa6, 0x5c, 0x04, 0xa7, 0x3e, - 0x0c, 0xaa, 0xb2, 0x24, 0xa2, 0x6f, 0x62, 0x17, 0x33, 0x9b, 0xe9, 0x78, 0xbd, 0x85, 0x99, 0x0f, - 0x4f, 0x82, 0xa9, 0x10, 0xc2, 0xb6, 0xf2, 0xd2, 0x19, 0x69, 0x66, 0x5a, 0x7f, 0x89, 0xff, 0xaf, - 0x59, 0xca, 0x03, 0x70, 0x3a, 0x3d, 0x92, 0x79, 0xc4, 0x65, 0x18, 0x7e, 0x0a, 0x0e, 0xd5, 0xc3, - 0x25, 0x83, 0xf9, 0xc8, 0xc7, 0x3c, 0xfe, 0x60, 0x69, 0x56, 0xdd, 0xa9, 0xf0, 0xed, 0x39, 0xb5, - 0x07, 0xeb, 0x6e, 0x10, 0x57, 0xd9, 0xf7, 0xf4, 0x45, 0x31, 0xa7, 0xbf, 0x5c, 0xef, 0x5a, 0x53, - 0x4e, 0x03, 0x39, 0x91, 0x7c, 0x29, 0x80, 0x8b, 0x58, 0x2b, 0xa8, 0x47, 0x54, 0xb4, 0x2b, 0x98, - 0x55, 0xc0, 0x01, 0x9e, 0x9e, 0xe5, 0xa5, 0x33, 0x93, 0x33, 0x07, 0x4b, 0x17, 0xd4, 0x0c, 0xbd, - 0xa0, 0x72, 0x10, 0x5d, 0x44, 0x2a, 0xe7, 0xc1, 0x5b, 0xfd, 0x29, 0xee, 0xfa, 0x88, 0xfa, 0x2b, - 0x94, 0x78, 0x84, 0x21, 0x27, 0x66, 0xf3, 0x48, 0x02, 0x33, 0xc3, 0xcf, 0x0a, 0x6e, 0x9f, 0x81, - 0x69, 0x2f, 0x5a, 0x14, 0x15, 0xbb, 0x9a, 0x8d, 0x9e, 0x00, 0x2f, 0x5b, 0x96, 0x1d, 0x34, 0x69, - 0x07, 0xba, 0x03, 0xa8, 0xcc, 0x80, 0x37, 0xd3, 0x98, 0x10, 0xaf, 0x8f, 0xf4, 0x37, 0x52, 0xba, - 0xc0, 0xc4, 0xd1, 0xf8, 0x49, 0xf7, 0x71, 0x5e, 0x18, 0x89, 0xb3, 0x8e, 0x9b, 0xa4, 0x8d, 0x9c, - 0x54, 0xca, 0x8b, 0x60, 0x3f, 0x4f, 0x3d, 0xa0, 0x15, 0xe1, 0x29, 0x30, 0x6d, 0x3a, 0x36, 0x76, - 0xfd, 0x60, 0x6f, 0x82, 0xef, 0x4d, 0x85, 0x0b, 0x35, 0x4b, 0xf9, 0x56, 0x02, 0x67, 0xb9, 0x92, - 0x7b, 0xc8, 0xb1, 0x2d, 0xe4, 0x13, 0xda, 0x55, 0x2a, 0x3a, 0xbc, 0xd1, 0xe1, 0x02, 0x38, 0x1a, - 0x91, 0x36, 0x90, 0x65, 0x51, 0xcc, 0x58, 0x98, 0xa4, 0x02, 0xff, 0x7d, 0x51, 0x3c, 0xbc, 0x89, - 0x9a, 0xce, 0x65, 0x45, 0x6c, 0x28, 0xfa, 0x91, 0xe8, 0x6c, 0x39, 0x5c, 0xb9, 0x3c, 0xf5, 0xe8, - 0x49, 0x31, 0xf7, 0xd7, 0x93, 0x62, 0x4e, 0xb9, 0x03, 0x94, 0x41, 0x44, 0x44, 0x35, 0xcf, 0x83, - 0xa3, 0xd1, 0x55, 0x8e, 0xd3, 0x85, 0x8c, 0x8e, 0x98, 0x5d, 0xe7, 0x83, 0x64, 0xfd, 0xd2, 0x56, - 0xba, 0x92, 0x67, 0x93, 0xd6, 0x97, 0x6b, 0x80, 0xb4, 0x9e, 0xfc, 0x83, 0xa4, 0x25, 0x89, 0x74, - 0xa4, 0xf5, 0x55, 0x52, 0x48, 0xeb, 0xa9, 0x9a, 0x72, 0x0a, 0x9c, 0xe4, 0x80, 0xab, 0x0d, 0x4a, - 0x7c, 0xdf, 0xc1, 0xfc, 0xda, 0x47, 0xcd, 0xf9, 0xab, 0x24, 0xae, 0x7f, 0xcf, 0xae, 0x48, 0x53, - 0x04, 0x07, 0x99, 0x83, 0x58, 0xc3, 0x68, 0x62, 0x1f, 0x53, 0x9e, 0x61, 0x52, 0x07, 0x7c, 0xe9, - 0x76, 0xb0, 0x02, 0x4b, 0xe0, 0xd5, 0xae, 0x03, 0x06, 0x72, 0x1c, 0xb2, 0x81, 0x5c, 0x13, 0x73, - 0xed, 0x93, 0xfa, 0xb1, 0xce, 0xd1, 0x72, 0xb4, 0x05, 0x3f, 0x07, 0x79, 0x17, 0xdf, 0xf7, 0x0d, - 0x8a, 0x3d, 0x07, 0xbb, 0x36, 0x6b, 0x18, 0x26, 0x72, 0xad, 0x40, 0x2c, 0xce, 0x4f, 0xf2, 0x9e, - 0x97, 0xd5, 0x70, 0xf2, 0xab, 0xd1, 0xe4, 0x57, 0x57, 0xa3, 0xc9, 0x5f, 0x99, 0x0a, 0x66, 0xd8, - 0xe3, 0xdf, 0x8b, 0x92, 0x7e, 0x22, 0x40, 0xd1, 0x23, 0x90, 0xa5, 0x08, 0x43, 0x79, 0x07, 0x5c, - 0xe0, 0x92, 0x74, 0x5c, 0xb7, 0x99, 0x8f, 0x29, 0xb6, 0x3a, 0xb7, 0x63, 0x03, 0x51, 0xab, 0x8a, - 0x5d, 0xd2, 0x8c, 0xaf, 0xe7, 0x75, 0xf0, 0x76, 0xa6, 0xd3, 0xa2, 0x22, 0x27, 0xc0, 0x01, 0x8b, - 0xaf, 0xf0, 0x89, 0x37, 0xad, 0x8b, 0x7f, 0x4a, 0x41, 0xcc, 0xf0, 0xf0, 0xe6, 0x61, 0x8b, 0xdf, - 0xb4, 0x5a, 0x35, 0x4e, 0xf3, 0x50, 0x02, 0xaf, 0xef, 0x70, 0x40, 0x20, 0x7f, 0x01, 0x0e, 0x7b, - 0xdd, 0x7b, 0xd1, 0x4c, 0x2d, 0x65, 0x1a, 0x00, 0x09, 0x58, 0x31, 0xe8, 0x7b, 0xf0, 0x94, 0x1a, - 0x38, 0x94, 0x38, 0x06, 0xf3, 0x40, 0xf4, 0x6f, 0x35, 0xd9, 0xce, 0x55, 0x58, 0x00, 0x20, 0x1a, - 0x1c, 0xb5, 0x2a, 0x7f, 0x98, 0xfb, 0xf4, 0xae, 0x15, 0x65, 0x19, 0x68, 0x5c, 0x4d, 0xd9, 0x71, - 0x56, 0x90, 0x4d, 0xd9, 0x3d, 0xe4, 0x2c, 0x11, 0x37, 0x68, 0xb9, 0x4a, 0x72, 0xce, 0xd5, 0xaa, - 0x19, 0x5e, 0x80, 0x3f, 0x4b, 0x60, 0x36, 0x3b, 0x9c, 0xa8, 0xd7, 0x3a, 0x78, 0xc5, 0x43, 0x36, - 0x35, 0xda, 0xc8, 0x09, 0xde, 0xd8, 0xfc, 0x1a, 0x88, 0x92, 0xdd, 0xc8, 0x56, 0x32, 0x64, 0xd3, - 0x4e, 0xa2, 0xf8, 0x9a, 0xb9, 0x9d, 0x06, 0x38, 0xec, 0x25, 0x8e, 0x28, 0x3f, 0x49, 0xe0, 0xec, - 0xd0, 0xa8, 0xd4, 0x29, 0x27, 0x65, 0x9e, 0x72, 0xbb, 0x9c, 0x24, 0xa5, 0x1f, 0x8f, 0x81, 0xfd, - 0xbc, 0x96, 0x70, 0x4b, 0x02, 0xc7, 0xd3, 0x7c, 0x05, 0xbc, 0x96, 0xa9, 0x3c, 0x03, 0xcc, 0x8c, - 0x5c, 0xde, 0x05, 0x42, 0xf8, 0xf8, 0x94, 0xeb, 0x5f, 0x3f, 0xff, 0xf3, 0xbb, 0x89, 0x45, 0xb8, - 0x30, 0xdc, 0x6f, 0xc6, 0xe5, 0x10, 0xc6, 0x45, 0x7b, 0x10, 0x35, 0xd2, 0x57, 0xf0, 0xb9, 0x04, - 0x8e, 0xa5, 0x38, 0x14, 0xb8, 0x38, 0x3a, 0xc3, 0x84, 0xf3, 0x91, 0xaf, 0x8d, 0x0f, 0x20, 0x14, - 0x5e, 0xe2, 0x0a, 0xe7, 0xe1, 0xdc, 0x08, 0x0a, 0x43, 0x4f, 0x04, 0x1f, 0x4e, 0x80, 0xfc, 0x0e, - 0x46, 0x87, 0xc1, 0xe5, 0x31, 0x99, 0xa5, 0x7a, 0x2a, 0xf9, 0xf6, 0x1e, 0xa1, 0x09, 0xd1, 0x1f, - 0x70, 0xd1, 0x15, 0x78, 0x6d, 0x54, 0xd1, 0x81, 0xb5, 0xa5, 0xbe, 0x11, 0xdb, 0x15, 0xf8, 0x9f, - 0x04, 0x5e, 0x4b, 0xf7, 0x4d, 0x0c, 0xde, 0x1a, 0x9b, 0x74, 0xbf, 0x41, 0x93, 0x97, 0xf7, 0x06, - 0x4c, 0x14, 0xe0, 0x26, 0x2f, 0x40, 0x19, 0x2e, 0x8e, 0x51, 0x00, 0xe2, 0x75, 0xe9, 0xff, 0x27, - 0x7a, 0x35, 0xa7, 0x9a, 0x1c, 0x78, 0x23, 0x3b, 0xeb, 0x41, 0x76, 0x4d, 0xbe, 0xb9, 0x6b, 0x1c, - 0x21, 0xbc, 0xcc, 0x85, 0x5f, 0x81, 0x97, 0x32, 0x7c, 0x40, 0x46, 0x40, 0x46, 0x62, 0xd2, 0xa5, - 0x48, 0xee, 0x36, 0x3f, 0x63, 0x49, 0x4e, 0xb1, 0x71, 0x63, 0x49, 0x4e, 0x73, 0x61, 0xe3, 0x49, - 0x4e, 0xbc, 0x1b, 0xe0, 0x2f, 0x12, 0x80, 0xfd, 0x06, 0x0c, 0x5e, 0xcd, 0x4e, 0x31, 0xcd, 0xd7, - 0xc9, 0x8b, 0x63, 0xc7, 0x0b, 0x69, 0x17, 0xb9, 0xb4, 0x12, 0x9c, 0x1d, 0x2e, 0xcd, 0x17, 0x00, - 0xe1, 0xc7, 0x29, 0xfc, 0x61, 0x02, 0x9c, 0xcb, 0xe0, 0xa8, 0xe0, 0x9d, 0xec, 0x14, 0x33, 0x39, - 0x39, 0x79, 0x65, 0xef, 0x00, 0x45, 0x11, 0x6e, 0xf1, 0x22, 0x5c, 0x87, 0x4b, 0xc3, 0x8b, 0x40, - 0x63, 0xc4, 0x4e, 0x4f, 0x53, 0x8e, 0x69, 0x84, 0x0e, 0x11, 0xfe, 0xdd, 0xe7, 0x00, 0x93, 0xc6, - 0x86, 0xc1, 0x11, 0xde, 0xaa, 0x3b, 0xd8, 0x4c, 0xb9, 0xb2, 0x1b, 0x08, 0xa1, 0xba, 0xc2, 0x55, - 0xbf, 0x0f, 0x2f, 0x0f, 0x57, 0x1d, 0x19, 0x4c, 0xa3, 0xf7, 0x05, 0xf6, 0xfd, 0x84, 0xf8, 0x52, - 0xcf, 0xe0, 0xe8, 0xe0, 0x6a, 0x76, 0xd2, 0xd9, 0xfd, 0xa6, 0xfc, 0xd1, 0x1e, 0xa3, 0x8a, 0xea, - 0x5c, 0xe1, 0xd5, 0x79, 0x0f, 0xce, 0x8f, 0x3c, 0xdf, 0x6d, 0xab, 0xf2, 0xf1, 0xd3, 0xad, 0x82, - 0xf4, 0x6c, 0xab, 0x20, 0xfd, 0xb1, 0x55, 0x90, 0x1e, 0x6f, 0x17, 0x72, 0xcf, 0xb6, 0x0b, 0xb9, - 0xdf, 0xb6, 0x0b, 0xb9, 0x4f, 0x16, 0xea, 0xb6, 0xdf, 0x68, 0xad, 0xa9, 0x26, 0x69, 0x6a, 0x26, - 0x61, 0x4d, 0xc2, 0xba, 0xf0, 0xdf, 0x8d, 0xf1, 0xdb, 0xf3, 0xda, 0xfd, 0x9e, 0xdb, 0xb7, 0xe9, - 0x61, 0xb6, 0x76, 0x80, 0x7f, 0x29, 0xcd, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x56, 0xba, 0x85, - 0x15, 0xbd, 0x13, 0x00, 0x00, + // 1336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xdc, 0x44, + 0x14, 0x8e, 0x93, 0xb6, 0x24, 0x93, 0xfe, 0x62, 0x5a, 0x4a, 0xea, 0x86, 0xdd, 0xd6, 0x15, 0x90, + 0x16, 0xb0, 0x93, 0x8d, 0x90, 0xfa, 0x83, 0x34, 0xdd, 0x4d, 0xda, 0x12, 0xa5, 0x55, 0x83, 0x5b, + 0x8a, 0x04, 0x08, 0x33, 0xb1, 0x87, 0x8d, 0x55, 0xaf, 0xc7, 0x9d, 0x99, 0xdd, 0x76, 0x55, 0x71, + 0x28, 0x07, 0xe8, 0xb1, 0x12, 0x70, 0xe1, 0xd4, 0x0b, 0xff, 0x4b, 0x6f, 0x14, 0xf5, 0xc2, 0xa9, + 0xa0, 0x84, 0x03, 0xe2, 0x84, 0xb8, 0x23, 0x21, 0x8f, 0xc7, 0xde, 0xf5, 0xae, 0xb3, 0xeb, 0xdd, + 0xe4, 0xb6, 0x3b, 0xf3, 0xde, 0xf7, 0xde, 0xf7, 0xe6, 0xcd, 0x9b, 0xcf, 0xc0, 0x70, 0x7d, 0x8e, + 0xa9, 0xbd, 0x81, 0x5c, 0xdf, 0x62, 0xd8, 0xae, 0x53, 0x97, 0x37, 0x0d, 0xdb, 0x6e, 0x18, 0x01, + 0x25, 0x0d, 0xd7, 0xc1, 0xd4, 0x68, 0xcc, 0x19, 0xf7, 0xea, 0x98, 0x36, 0xf5, 0x80, 0x12, 0x4e, + 0xe0, 0xe9, 0x0c, 0x07, 0xdd, 0xb6, 0x1b, 0x7a, 0xec, 0xa0, 0x37, 0xe6, 0xd4, 0xe9, 0x2a, 0x21, + 0x55, 0x0f, 0x1b, 0x28, 0x70, 0x0d, 0xe4, 0xfb, 0x84, 0x23, 0xee, 0x12, 0x9f, 0x45, 0x10, 0xea, + 0xd1, 0x2a, 0xa9, 0x12, 0xf1, 0xd3, 0x08, 0x7f, 0xc9, 0xd5, 0xa2, 0xf4, 0x11, 0xff, 0xd6, 0xeb, + 0x5f, 0x19, 0xdc, 0xad, 0x61, 0xc6, 0x51, 0x2d, 0x90, 0x06, 0xa5, 0x3c, 0xa9, 0x26, 0x59, 0x44, + 0x3e, 0xb3, 0xdb, 0xf9, 0x34, 0xe6, 0x0c, 0xb6, 0x81, 0x28, 0x76, 0x2c, 0x9b, 0xf8, 0xac, 0x5e, + 0x4b, 0x3c, 0xde, 0xec, 0xe1, 0x71, 0xdf, 0xa5, 0x58, 0x9a, 0x4d, 0x73, 0xec, 0x3b, 0x98, 0xd6, + 0x5c, 0x9f, 0x1b, 0x36, 0x6d, 0x06, 0x9c, 0x18, 0x77, 0x71, 0x53, 0x32, 0xd4, 0xce, 0x81, 0x13, + 0x1f, 0x85, 0x35, 0x5b, 0x92, 0xd8, 0xd7, 0xb0, 0x8f, 0x99, 0xcb, 0x4c, 0x7c, 0xaf, 0x8e, 0x19, + 0x87, 0xc7, 0xc1, 0x78, 0x14, 0xc0, 0x75, 0xa6, 0x94, 0x93, 0xca, 0xcc, 0x84, 0xf9, 0x8a, 0xf8, + 0xbf, 0xe2, 0x68, 0x0f, 0xc1, 0x74, 0xb6, 0x27, 0x0b, 0x88, 0xcf, 0x30, 0xfc, 0x0c, 0x1c, 0xa8, + 0x46, 0x4b, 0x16, 0xe3, 0x88, 0x63, 0xe1, 0x3f, 0x59, 0x9a, 0xd5, 0xb7, 0x3b, 0x96, 0xc6, 0x9c, + 0xde, 0x81, 0x75, 0x2b, 0xf4, 0xab, 0xec, 0x79, 0xf6, 0xb2, 0x38, 0x62, 0xee, 0xaf, 0xb6, 0xad, + 0x69, 0xd3, 0x40, 0x4d, 0x05, 0x5f, 0x0a, 0xe1, 0xe2, 0xac, 0x35, 0xd4, 0x41, 0x2a, 0xde, 0x95, + 0x99, 0x55, 0xc0, 0x3e, 0x11, 0x9e, 0x4d, 0x29, 0x27, 0xc7, 0x66, 0x26, 0x4b, 0x67, 0xf5, 0x1c, + 0x9d, 0xa2, 0x0b, 0x10, 0x53, 0x7a, 0x6a, 0x67, 0xc0, 0xdb, 0xdd, 0x21, 0x6e, 0x71, 0x44, 0xf9, + 0x1a, 0x25, 0x01, 0x61, 0xc8, 0x4b, 0xb2, 0x79, 0xac, 0x80, 0x99, 0xfe, 0xb6, 0x32, 0xb7, 0xcf, + 0xc1, 0x44, 0x10, 0x2f, 0xca, 0x8a, 0x5d, 0xca, 0x97, 0x9e, 0x04, 0x2f, 0x3b, 0x8e, 0x1b, 0xb6, + 0x70, 0x0b, 0xba, 0x05, 0xa8, 0xcd, 0x80, 0xb7, 0xb2, 0x32, 0x21, 0x41, 0x57, 0xd2, 0xdf, 0x2a, + 0xd9, 0x04, 0x53, 0xa6, 0xc9, 0x49, 0x77, 0xe5, 0xbc, 0x30, 0x50, 0xce, 0x26, 0xae, 0x91, 0x06, + 0xf2, 0x32, 0x53, 0x5e, 0x04, 0x7b, 0x45, 0xe8, 0x1e, 0xad, 0x08, 0x4f, 0x80, 0x09, 0xdb, 0x73, + 0xb1, 0xcf, 0xc3, 0xbd, 0x51, 0xb1, 0x37, 0x1e, 0x2d, 0xac, 0x38, 0xda, 0x77, 0x0a, 0x38, 0x25, + 0x98, 0xdc, 0x41, 0x9e, 0xeb, 0x20, 0x4e, 0x68, 0x5b, 0xa9, 0x68, 0xff, 0x46, 0x87, 0x0b, 0xe0, + 0x70, 0x9c, 0xb4, 0x85, 0x1c, 0x87, 0x62, 0xc6, 0xa2, 0x20, 0x15, 0xf8, 0xef, 0xcb, 0xe2, 0xc1, + 0x26, 0xaa, 0x79, 0x17, 0x34, 0xb9, 0xa1, 0x99, 0x87, 0x62, 0xdb, 0x72, 0xb4, 0x72, 0x61, 0xfc, + 0xf1, 0xd3, 0xe2, 0xc8, 0x5f, 0x4f, 0x8b, 0x23, 0xda, 0x4d, 0xa0, 0xf5, 0x4a, 0x44, 0x56, 0xf3, + 0x0c, 0x38, 0x1c, 0x5f, 0xf4, 0x24, 0x5c, 0x94, 0xd1, 0x21, 0xbb, 0xcd, 0x3e, 0x0c, 0xd6, 0x4d, + 0x6d, 0xad, 0x2d, 0x78, 0x3e, 0x6a, 0x5d, 0xb1, 0x7a, 0x50, 0xeb, 0x88, 0xdf, 0x8b, 0x5a, 0x3a, + 0x91, 0x16, 0xb5, 0xae, 0x4a, 0x4a, 0x6a, 0x1d, 0x55, 0xd3, 0x4e, 0x80, 0xe3, 0x02, 0xf0, 0xf6, + 0x06, 0x25, 0x9c, 0x7b, 0x58, 0x5c, 0xfb, 0xb8, 0x39, 0x7f, 0x55, 0xe4, 0xf5, 0xef, 0xd8, 0x95, + 0x61, 0x8a, 0x60, 0x92, 0x79, 0x88, 0x6d, 0x58, 0x35, 0xcc, 0x31, 0x15, 0x11, 0xc6, 0x4c, 0x20, + 0x96, 0x6e, 0x84, 0x2b, 0xb0, 0x04, 0x5e, 0x6b, 0x33, 0xb0, 0x90, 0xe7, 0x91, 0xfb, 0xc8, 0xb7, + 0xb1, 0xe0, 0x3e, 0x66, 0x1e, 0x69, 0x99, 0x96, 0xe3, 0x2d, 0xf8, 0x05, 0x98, 0xf2, 0xf1, 0x03, + 0x6e, 0x51, 0x1c, 0x78, 0xd8, 0x77, 0xd9, 0x86, 0x65, 0x23, 0xdf, 0x09, 0xc9, 0xe2, 0xa9, 0x31, + 0xd1, 0xf3, 0xaa, 0x1e, 0xbd, 0x0b, 0x7a, 0xfc, 0x2e, 0xe8, 0xb7, 0xe3, 0x77, 0xa1, 0x32, 0x1e, + 0xce, 0xb0, 0x27, 0xbf, 0x17, 0x15, 0xf3, 0x58, 0x88, 0x62, 0xc6, 0x20, 0x4b, 0x31, 0x86, 0xf6, + 0x2e, 0x38, 0x2b, 0x28, 0x99, 0xb8, 0xea, 0x32, 0x8e, 0x29, 0x76, 0x5a, 0xb7, 0xe3, 0x3e, 0xa2, + 0xce, 0x32, 0xf6, 0x49, 0x2d, 0xb9, 0x9e, 0x57, 0xc0, 0x3b, 0xb9, 0xac, 0x65, 0x45, 0x8e, 0x81, + 0x7d, 0x8e, 0x58, 0x11, 0x13, 0x6f, 0xc2, 0x94, 0xff, 0xb4, 0x82, 0x9c, 0xe1, 0xd1, 0xcd, 0xc3, + 0x8e, 0xb8, 0x69, 0x2b, 0xcb, 0x49, 0x98, 0x47, 0x0a, 0x78, 0x63, 0x1b, 0x03, 0x89, 0xfc, 0x25, + 0x38, 0x18, 0xb4, 0xef, 0xc5, 0x33, 0xb5, 0x94, 0x6b, 0x00, 0xa4, 0x60, 0xe5, 0xa0, 0xef, 0xc0, + 0xd3, 0x56, 0xc0, 0x81, 0x94, 0x19, 0x9c, 0x02, 0xb2, 0x7f, 0x97, 0xd3, 0xed, 0xbc, 0x0c, 0x0b, + 0x00, 0xc4, 0x83, 0x63, 0x65, 0x59, 0x1c, 0xe6, 0x1e, 0xb3, 0x6d, 0x45, 0xbb, 0x0e, 0x0c, 0xc1, + 0xa6, 0xec, 0x79, 0x6b, 0xc8, 0xa5, 0xec, 0x0e, 0xf2, 0x96, 0x88, 0x1f, 0xb6, 0x5c, 0x25, 0x3d, + 0xe7, 0x56, 0x96, 0x73, 0x3c, 0x80, 0x3f, 0x2b, 0x60, 0x36, 0x3f, 0x9c, 0xac, 0xd7, 0x3d, 0xf0, + 0x6a, 0x80, 0x5c, 0x6a, 0x35, 0x90, 0x17, 0xbe, 0xe7, 0xe2, 0x1a, 0xc8, 0x92, 0x5d, 0xcd, 0x57, + 0x32, 0xe4, 0xd2, 0x56, 0xa0, 0xe4, 0x9a, 0xf9, 0xad, 0x06, 0x38, 0x18, 0xa4, 0x4c, 0xb4, 0x4d, + 0x05, 0x9c, 0xea, 0xeb, 0x95, 0x39, 0xe5, 0x94, 0xdc, 0x53, 0x6e, 0x87, 0x93, 0x04, 0x2e, 0x82, + 0xfd, 0x89, 0xfb, 0x5d, 0xdc, 0x94, 0x37, 0x6a, 0x5a, 0x6f, 0x69, 0x17, 0x3d, 0xd2, 0x2e, 0xfa, + 0x5a, 0x7d, 0xdd, 0x73, 0xed, 0x55, 0xdc, 0x34, 0x27, 0x63, 0x8f, 0x55, 0xdc, 0x2c, 0xfd, 0x74, + 0x04, 0xec, 0x15, 0x87, 0x01, 0x37, 0x15, 0x70, 0x34, 0x4b, 0x98, 0xc0, 0xcb, 0xb9, 0xea, 0xdb, + 0x43, 0x0d, 0xa9, 0xe5, 0x1d, 0x20, 0x44, 0xe7, 0xaf, 0x5d, 0xf9, 0xe6, 0xc5, 0x9f, 0xdf, 0x8f, + 0x2e, 0xc2, 0x85, 0xfe, 0x72, 0x36, 0x29, 0x88, 0x54, 0x3e, 0xc6, 0xc3, 0xb8, 0x13, 0xbf, 0x86, + 0x2f, 0x14, 0x70, 0x24, 0x43, 0xe2, 0xc0, 0xc5, 0xc1, 0x33, 0x4c, 0x49, 0x27, 0xf5, 0xf2, 0xf0, + 0x00, 0x92, 0xe1, 0x79, 0xc1, 0x70, 0x1e, 0xce, 0x0d, 0xc0, 0x30, 0x12, 0x55, 0xf0, 0xd1, 0x28, + 0x98, 0xda, 0x46, 0x29, 0x31, 0x78, 0x7d, 0xc8, 0xcc, 0x32, 0x45, 0x99, 0x7a, 0x63, 0x97, 0xd0, + 0x24, 0xe9, 0x0f, 0x05, 0xe9, 0x0a, 0xbc, 0x3c, 0x28, 0xe9, 0x50, 0x1b, 0x53, 0x6e, 0x25, 0x7a, + 0x07, 0xfe, 0xa7, 0x80, 0xd7, 0xb3, 0x85, 0x17, 0x83, 0xab, 0x43, 0x27, 0xdd, 0xad, 0xf0, 0xd4, + 0xeb, 0xbb, 0x03, 0x26, 0x0b, 0x70, 0x4d, 0x14, 0xa0, 0x0c, 0x17, 0x87, 0x28, 0x00, 0x09, 0xda, + 0xf8, 0xff, 0x13, 0xbf, 0xed, 0x99, 0x2a, 0x09, 0x5e, 0xcd, 0x9f, 0x75, 0x2f, 0xbd, 0xa7, 0x5e, + 0xdb, 0x31, 0x8e, 0x24, 0x5e, 0x16, 0xc4, 0x2f, 0xc2, 0xf3, 0x39, 0xbe, 0x4f, 0x63, 0x20, 0x2b, + 0x35, 0x2a, 0x33, 0x28, 0xb7, 0xab, 0xa7, 0xa1, 0x28, 0x67, 0xe8, 0xc0, 0xa1, 0x28, 0x67, 0xc9, + 0xb8, 0xe1, 0x28, 0xa7, 0x1e, 0x17, 0xf8, 0x8b, 0x02, 0x60, 0xb7, 0x82, 0x83, 0x97, 0xf2, 0xa7, + 0x98, 0x25, 0x0c, 0xd5, 0xc5, 0xa1, 0xfd, 0x25, 0xb5, 0x73, 0x82, 0x5a, 0x09, 0xce, 0xf6, 0xa7, + 0xc6, 0x25, 0x40, 0xf4, 0x75, 0x0b, 0x7f, 0x1c, 0x05, 0xa7, 0x73, 0x48, 0x32, 0x78, 0x33, 0x7f, + 0x8a, 0xb9, 0xa4, 0xa0, 0xba, 0xb6, 0x7b, 0x80, 0xb2, 0x08, 0xab, 0xa2, 0x08, 0x57, 0xe0, 0x52, + 0xff, 0x22, 0xd0, 0x04, 0xb1, 0xd5, 0xd3, 0x54, 0x60, 0x5a, 0x91, 0xc4, 0x84, 0x7f, 0x77, 0x49, + 0xc8, 0xb4, 0x32, 0x62, 0x70, 0x80, 0x57, 0x75, 0x1b, 0x9d, 0xaa, 0x56, 0x76, 0x02, 0x21, 0x59, + 0x57, 0x04, 0xeb, 0x0f, 0xe0, 0x85, 0xfe, 0xac, 0x63, 0x85, 0x6a, 0x75, 0x3e, 0x60, 0x3f, 0x8c, + 0xca, 0x4f, 0xfd, 0x1c, 0x92, 0x10, 0xde, 0xce, 0x9f, 0x74, 0x7e, 0xc1, 0xaa, 0x7e, 0xbc, 0xcb, + 0xa8, 0xb2, 0x3a, 0x17, 0x45, 0x75, 0xde, 0x87, 0xf3, 0x03, 0xcf, 0x77, 0xd7, 0xa9, 0x7c, 0xf2, + 0x6c, 0xb3, 0xa0, 0x3c, 0xdf, 0x2c, 0x28, 0x7f, 0x6c, 0x16, 0x94, 0x27, 0x5b, 0x85, 0x91, 0xe7, + 0x5b, 0x85, 0x91, 0xdf, 0xb6, 0x0a, 0x23, 0x9f, 0x2e, 0x54, 0x5d, 0xbe, 0x51, 0x5f, 0xd7, 0x6d, + 0x52, 0x33, 0x6c, 0xc2, 0x6a, 0x84, 0xb5, 0xe1, 0xbf, 0x97, 0xe0, 0x37, 0xe6, 0x8d, 0x07, 0x1d, + 0xb7, 0xaf, 0x19, 0x60, 0xb6, 0xbe, 0x4f, 0x7c, 0x6a, 0xcd, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, + 0x6d, 0xa5, 0x22, 0x70, 0x1c, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2330,6 +2342,18 @@ func (m *PairValConAddrProviderAndConsumer) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l + if m.ConsumerKey != nil { + { + size, err := m.ConsumerKey.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } if len(m.ConsumerAddress) > 0 { i -= len(m.ConsumerAddress) copy(dAtA[i:], m.ConsumerAddress) @@ -2659,6 +2683,10 @@ func (m *PairValConAddrProviderAndConsumer) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } + if m.ConsumerKey != nil { + l = m.ConsumerKey.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -4542,6 +4570,42 @@ func (m *PairValConAddrProviderAndConsumer) Unmarshal(dAtA []byte) error { } m.ConsumerAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerKey", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ConsumerKey == nil { + m.ConsumerKey = &crypto.PublicKey{} + } + if err := m.ConsumerKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:])