add pubkey in PairValConAddrProviderAndConsumer struct

cosmos · Dec 13, 2023 · a5647a8 · a5647a8
1 parent d25fa28
commit a5647a8
Show file tree

Hide file tree

Showing 3 changed files with 151 additions and 83 deletions.
diff --git 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
@@ -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{