feat: Add queries for PSS and consumer commission rate

x/ccv/provider/keeper/grpc_query.go

@@ -249,7 +249,8 @@ func (k Keeper) QueryConsumerChainOptedInValidators(goCtx context.Context, req *
 	}, nil
 }
 
-// QueryConsumerChainsValidatorHasToValidate returns all consumer chains a given validator has to validate
+// QueryConsumerChainsValidatorHasToValidate returns all consumer chains that the given validator has to validate now
+// or in the next epoch if nothing change.
 func (k Keeper) QueryConsumerChainsValidatorHasToValidate(goCtx context.Context, req *types.QueryConsumerChainsValidatorHasToValidateRequest) (*types.QueryConsumerChainsValidatorHasToValidateResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
@@ -266,15 +267,31 @@ func (k Keeper) QueryConsumerChainsValidatorHasToValidate(goCtx context.Context,
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	// get all the consumer chains for which the validator is already or will be
-	// opted-in starting from the next epoch
+	// get all the consumer chains for which the validator is either already
+	// opted-in, currently a consumer validator or if its voting power is within the TopN validators
 	consumersToValidate := []string{}
 	for _, consumer := range k.GetAllConsumerChains(ctx) {
 		chainID := consumer.ChainId
-
-		if k.IsOptedIn(ctx, chainID, types.NewProviderConsAddress(consAddr)) {
-			consumersToValidate = append(consumersToValidate, chainID)
+		provAddr := types.NewProviderConsAddress(consAddr)
+		if !k.IsOptedIn(ctx, chainID, provAddr) && !k.IsConsumerValidator(ctx, chainID, provAddr) {
+			// check that the validator voting power isn't in the TopN
+			if topN, found := k.GetTopN(ctx, chainID); found && topN > 0 {
+				val, found := k.stakingKeeper.GetValidatorByConsAddr(ctx, consAddr)
+				if !found {
+					return nil, status.Error(codes.InvalidArgument, "invalid provider address")
+				}
+				power := k.stakingKeeper.GetLastValidatorPower(ctx, val.GetOperator())
+				minPowerToOptIn := k.ComputeMinPowerToOptIn(ctx, chainID, k.stakingKeeper.GetLastValidators(ctx), topN)
+
+				// Check that the validator's voting power is smaller
+				// than the minimum to be automatically opt-in
+				if power < minPowerToOptIn {
+					continue
+				}
+			}
 		}
+
+		consumersToValidate = append(consumersToValidate, chainID)
 	}
 
 	return &types.QueryConsumerChainsValidatorHasToValidateResponse{

x/ccv/provider/keeper/proposal_test.go

@@ -1002,12 +1002,7 @@ func TestBeginBlockInit(t *testing.T) {
 	}
 
 	// opt in a sample validator so the chain's proposal can successfully execute
-	providerKeeper.SetOptedIn(ctx, pendingProps[5].ChainId, providertypes.OptedInValidator{
-		ProviderAddr: []byte{1},
-		BlockHeight:  int64(2),
-		Power:        int64(3),
-		PublicKey:    []byte{4},
-	})
+	providerKeeper.SetOptedIn(ctx, pendingProps[5].ChainId, providertypes.ProviderConsAddress{[]byte{1}})
 
 	providerKeeper.BeginBlockInit(ctx)