more cleaning up

x/ccv/provider/keeper/key_assignment.go

@@ -547,8 +547,9 @@ func (k Keeper) AssignConsumerKey(
 	return nil
 }
 
-// MustApplyKeyAssignmentToValUpdates applies the key assignment to the validator updates
-// received from the staking module.
+// MustApplyKeyAssignmentToValUpdates applies the key assignment to the validator updates received from the
+// staking module. For validators that do not have a validator update in `valUpdates`, the method also considers
+// key-assignment replacements when the `considerKeyReplacement` predicate evaluates to `true` for this validator.
 // The method panics if the key-assignment state is corrupted.
 func (k Keeper) MustApplyKeyAssignmentToValUpdates(
 	ctx sdk.Context,
@@ -610,9 +611,9 @@ func (k Keeper) MustApplyKeyAssignmentToValUpdates(
 	for _, replacement := range k.GetAllKeyAssignmentReplacements(ctx, chainID) {
 		providerAddr := types.NewProviderConsAddress(replacement.ProviderAddr)
 
-		// only consider updates for validators that are considered here ...
+		// filter out key-assignment replacements
 		if !considerKeyReplacement(providerAddr) {
-			return
+			continue
 		}
 		k.DeleteKeyAssignmentReplacement(ctx, chainID, providerAddr)
 		newUpdates = append(newUpdates, abci.ValidatorUpdate{

x/ccv/provider/keeper/msg_server.go

@@ -139,20 +139,30 @@ func (k msgServer) SubmitConsumerDoubleVoting(goCtx context.Context, msg *types.
 func (k msgServer) OptIn(goCtx context.Context, msg *types.MsgOptIn) (*types.MsgOptInResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	valAddress, err := sdk.ConsAddressFromBech32(msg.ProviderAddr)
+	providerValidatorAddr, err := sdk.ValAddressFromBech32(msg.ProviderAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	// validator must already be registered
+	validator, found := k.stakingKeeper.GetValidator(ctx, providerValidatorAddr)
+	if !found {
+		return nil, stakingtypes.ErrNoValidatorFound
+	}
+
+	consAddress, err := validator.GetConsAddr()
 	if err != nil {
 		return nil, err
 	}
-	// FIXME: something is off here .. val to cons ...
-	providerAddr := types.NewProviderConsAddress(valAddress)
+	providerConsAddr := types.NewProviderConsAddress(consAddress)
 	if err != nil {
 		return nil, err
 	}
 
 	if msg.ConsumerKey != "" {
-		err = k.Keeper.HandleOptIn(ctx, msg.ChainId, providerAddr, &msg.ConsumerKey)
+		err = k.Keeper.HandleOptIn(ctx, msg.ChainId, providerConsAddr, &msg.ConsumerKey)
 	} else {
-		err = k.Keeper.HandleOptIn(ctx, msg.ChainId, providerAddr, nil)
+		err = k.Keeper.HandleOptIn(ctx, msg.ChainId, providerConsAddr, nil)
 	}
 
 	if err != nil {
@@ -173,16 +183,27 @@ func (k msgServer) OptIn(goCtx context.Context, msg *types.MsgOptIn) (*types.Msg
 func (k msgServer) OptOut(goCtx context.Context, msg *types.MsgOptOut) (*types.MsgOptOutResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	valAddress, err := sdk.ConsAddressFromBech32(msg.ProviderAddr)
+	providerValidatorAddr, err := sdk.ValAddressFromBech32(msg.ProviderAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	// validator must already be registered
+	validator, found := k.stakingKeeper.GetValidator(ctx, providerValidatorAddr)
+	if !found {
+		return nil, stakingtypes.ErrNoValidatorFound
+	}
+
+	consAddress, err := validator.GetConsAddr()
 	if err != nil {
 		return nil, err
 	}
-	providerAddr := types.NewProviderConsAddress(valAddress)
+	providerConsAddr := types.NewProviderConsAddress(consAddress)
 	if err != nil {
 		return nil, err
 	}
 
-	err = k.Keeper.HandleOptOut(ctx, msg.ChainId, providerAddr)
+	err = k.Keeper.HandleOptOut(ctx, msg.ChainId, providerConsAddr)
 	if err != nil {
 		return nil, err
 	}