update logic check tombstoned

proto/quicksilver/interchainstaking/v1/interchainstaking.proto

@@ -4,7 +4,6 @@ package quicksilver.interchainstaking.v1;
 import "cosmos/base/v1beta1/coin.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
-import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
 option go_package = "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types";
@@ -158,8 +157,6 @@ message Validator {
     (gogoproto.nullable) = false,
     (gogoproto.stdtime) = true
   ];
-  // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any.
-  google.protobuf.Any consensus_pubkey = 10 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];
 }
 
 message DelegatorIntent {

x/interchainstaking/keeper/callbacks.go

@@ -272,7 +272,16 @@ func SigningInfoCallback(k *Keeper, ctx sdk.Context, args []byte, query icqtypes
 		return err
 	}
 	if valSigningInfo.Tombstoned {
-		k.Logger(ctx).Error("Tombstoned validator found", "valoper", valSigningInfo.Address)
+		consAddr, err := sdk.ConsAddressFromBech32(valSigningInfo.Address)
+		if err != nil {
+			return err
+		}
+		valAddr, found := k.GetValidatorAddrByConsAddr(ctx, zone.ChainId, consAddr)
+		if !found {
+
+		}
+
+		k.Logger(ctx).Error("Tombstoned validator found", "valoper", valAddr)
 
 		valAddrBytes, err := addressutils.ValAddressFromBech32(valSigningInfo.Address, zone.GetValoperPrefix())
 		if err != nil {

x/interchainstaking/keeper/keeper.go

@@ -270,7 +270,17 @@ func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []b
 
 		jailTime := time.Time{}
 		if validator.IsJailed() {
+			consAddr, err := validator.GetConsAddr()
+			if err != nil {
+				return err
+			}
+			k.SetValidatorAddrByConsAddr(ctx, zone.ChainId, validator.OperatorAddress, consAddr)
 			jailTime = ctx.BlockTime()
+
+			err = k.EmitSigningInfoQuery(ctx, zone.ConnectionId, zone.ChainId, validator)
+			if err != nil {
+				return err
+			}
 		}
 		if err := k.SetValidator(ctx, zone.ChainId, types.Validator{
 			ValoperAddress:  validator.OperatorAddress,
@@ -297,7 +307,17 @@ func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []b
 
 		if !val.Jailed && validator.IsJailed() {
 			k.Logger(ctx).Info("Transitioning validator to jailed state", "valoper", validator.OperatorAddress, "old_vp", val.VotingPower, "new_vp", validator.Tokens, "new_shares", validator.DelegatorShares, "old_shares", val.DelegatorShares)
+
+			consAddr, err := validator.GetConsAddr()
+			if err != nil {
+				return err
+			}
+			k.SetValidatorAddrByConsAddr(ctx, zone.ChainId, validator.OperatorAddress, consAddr)
 
+			err = k.EmitSigningInfoQuery(ctx, zone.ConnectionId, zone.ChainId, validator)
+			if err != nil {
+				return err
+			}
 			val.Jailed = true
 			val.JailedSince = ctx.BlockTime()
 			if !val.VotingPower.IsPositive() {
@@ -315,6 +335,12 @@ func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []b
 				return err
 			}
 		} else if val.Jailed && !validator.IsJailed() {
+			consAddr, err := validator.GetConsAddr()
+			if err != nil {
+				return err
+			}
+			k.DeleteValidatorAddrByConsAddr(ctx, zone.ChainId, consAddr)
+
 			k.Logger(ctx).Info("Transitioning validator to unjailed state", "valoper", validator.OperatorAddress)
 
 			val.Jailed = false
@@ -353,14 +379,6 @@ func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []b
 		}
 	}
 
-	// checking whether validator was tombstoned or not
-	if val.Jailed {
-		err := k.EmitSigningInfoQuery(ctx, zone.ConnectionId, zone.ChainId, validator)
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 

x/interchainstaking/keeper/validator_test.go

@@ -77,17 +77,14 @@ func (suite *KeeperTestSuite) TestStoreGetDeleteValidatorByConsAddr() {
 		pkAny, err := codectypes.NewAnyWithValue(PKs[0])
 		suite.Require().NoError(err)
 
-		newValidator := types.Validator{
-			ValoperAddress:  validator.String(),
-			CommissionRate:  sdk.NewDec(5.0),
-			DelegatorShares: sdk.NewDec(1000.0),
-			VotingPower:     sdk.NewInt(1000),
-			Status:          stakingtypes.BondStatusBonded,
-			Score:           sdk.NewDec(0),
+		newValidator := stakingtypes.Validator{
+			OperatorAddress:  validator.String(),
 			ConsensusPubkey: pkAny,
 		}
+		consAddr, err := newValidator.GetConsAddr()
+		suite.NoError(err)
 
-		err = app.InterchainstakingKeeper.SetValidatorAddrByConsAddr(ctx, zone.ChainId, newValidator)
+		err = app.InterchainstakingKeeper.SetValidatorAddrByConsAddr(ctx, zone.ChainId, newValidator.OperatorAddress, consAddr)
 		suite.NoError(err)
 
 		_, found = app.InterchainstakingKeeper.GetValidatorAddrByConsAddr(ctx, zone.ChainId, sdk.ConsAddress(PKs[0].Address()))

x/interchainstaking/keeper/validators.go

@@ -105,13 +105,9 @@ func (k Keeper) GetValidatorAddrByConsAddr(ctx sdk.Context, chainID string, cons
 }
 
 // SetValidatorAddrByConsAddr set validator address by Consensus address.
-func (k Keeper) SetValidatorAddrByConsAddr(ctx sdk.Context, chainID string, val types.Validator) error {
+func (k Keeper) SetValidatorAddrByConsAddr(ctx sdk.Context, chainID string, valAddr string, consAddr sdk.ConsAddress) error {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.GetZoneValidatorAddrsByConsAddrKey(chainID))
-	consPk, err := val.GetConsAddr()
-	if err != nil {
-		return err
-	}
-	store.Set(consPk, []byte(val.ValoperAddress))
+	store.Set(consAddr, []byte(valAddr))
 	return nil
 }