updates

proto/osmosis/types/v1beta1/wire.proto

@@ -38,6 +38,7 @@ message SlashInfo {
 message ScheduleInfo {
   string validator = 1;
   string actor = 2;
+  string denom = 3;
 }
 
 // ConsumerPacketData contains a consumer packet data and a type tag

x/meshsecurity/keeper/valset_updates.go

@@ -21,6 +21,7 @@ func (k Keeper) ScheduleBonded(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}
@@ -34,6 +35,7 @@ func (k Keeper) ScheduleUnbonded(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}
@@ -74,6 +76,7 @@ func (k Keeper) ScheduleJailed(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}
@@ -87,6 +90,7 @@ func (k Keeper) ScheduleTombstoned(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}
@@ -100,6 +104,7 @@ func (k Keeper) ScheduleUnjailed(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}
@@ -113,6 +118,7 @@ func (k Keeper) ScheduleModified(ctx sdk.Context, addr sdk.ValAddress) error {
 		Data: &cptypes.ConsumerPacketData_SchedulePacketData{
 			SchedulePacketData: &cptypes.ScheduleInfo{
 				Validator: addr.String(),
+				Denom:     k.Staking.BondDenom(ctx),
 			},
 		},
 	}

x/meshsecurityprovider/keeper/relay.go

@@ -101,7 +101,18 @@ func (k Keeper) OnRecvBondedPacket(
 	packet channeltypes.Packet,
 	data *cptypes.ScheduleInfo,
 ) (cptypes.PacketAckResult, error) {
+	intermediary, found := k.GetIntermediary(ctx, data.Denom)
+	if !found {
+		ModuleLogger(ctx).Error("External Staker not found for validor",
+			data.Validator,
+		)
+		panic(fmt.Errorf("external Staker not found for validor %s", data.Validator))
+	}
 
+	if intermediary.Status != types.Bonded {
+		intermediary.Status = types.Bonded
+	}
+	k.SetIntermediary(ctx, intermediary)
 	return cptypes.SlashPacketHandledResult, nil
 }
 
@@ -110,7 +121,18 @@ func (k Keeper) OnRecvUnbondedPacket(
 	packet channeltypes.Packet,
 	data *cptypes.ScheduleInfo,
 ) (cptypes.PacketAckResult, error) {
+	intermediary, found := k.GetIntermediary(ctx, data.Denom)
+	if !found {
+		ModuleLogger(ctx).Error("External Staker not found for validor",
+			data.Validator,
+		)
+		panic(fmt.Errorf("external Staker not found for validor %s", data.Validator))
+	}
 
+	if intermediary.Status != types.Unbonded {
+		intermediary.Status = types.Unbonded
+	}
+	k.SetIntermediary(ctx, intermediary)
 	return cptypes.SlashPacketHandledResult, nil
 }
 
@@ -119,6 +141,31 @@ func (k Keeper) OnRecvJailedPacket(
 	packet channeltypes.Packet,
 	data *cptypes.ScheduleInfo,
 ) (cptypes.PacketAckResult, error) {
+	intermediary, found := k.GetIntermediary(ctx, data.Denom)
+	if !found {
+		ModuleLogger(ctx).Error("External Staker not found for validor",
+			data.Validator,
+		)
+		panic(fmt.Errorf("external Staker not found for validor %s", data.Validator))
+	}
+
+	if intermediary.IsUnboned() {
+		ModuleLogger(ctx).Error("validator %s is unbonded", data.Validator)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+
+	if intermediary.IsTombstoned() {
+		ModuleLogger(ctx).Info(
+			"slash packet dropped because validator %s is already tombstoned", data.Validator,
+		)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+	if intermediary.IsJailed() {
+		ModuleLogger(ctx).Info("validator %s jailed", data.Validator)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+	intermediary.Jailed = true
+	k.SetIntermediary(ctx, intermediary)
 
 	return cptypes.SlashPacketHandledResult, nil
 }
@@ -128,6 +175,20 @@ func (k Keeper) OnRecvTombstonedPacket(
 	packet channeltypes.Packet,
 	data *cptypes.ScheduleInfo,
 ) (cptypes.PacketAckResult, error) {
+	intermediary, found := k.GetIntermediary(ctx, data.Denom)
+	if !found {
+		ModuleLogger(ctx).Error("External Staker not found for validor",
+			data.Validator,
+		)
+		panic(fmt.Errorf("external Staker not found for validor %s", data.Validator))
+	}
+
+	if intermediary.IsUnboned() {
+		ModuleLogger(ctx).Error("validator %s is unbonded", data.Validator)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+	intermediary.Tombstoned = true
+	k.SetIntermediary(ctx, intermediary)
 
 	return cptypes.SlashPacketHandledResult, nil
 }
@@ -136,6 +197,25 @@ func (k Keeper) OnRecvUnjailedPacket(
 	packet channeltypes.Packet,
 	data *cptypes.ScheduleInfo,
 ) (cptypes.PacketAckResult, error) {
+	intermediary, found := k.GetIntermediary(ctx, data.Denom)
+	if !found {
+		ModuleLogger(ctx).Error("External Staker not found for validor",
+			data.Validator,
+		)
+		panic(fmt.Errorf("external Staker not found for validor %s", data.Validator))
+	}
+
+	if intermediary.IsUnboned() {
+		ModuleLogger(ctx).Error("validator %s is unbonded", data.Validator)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+	if !intermediary.Jailed {
+		ModuleLogger(ctx).Error("validator %s is not jailed", data.Validator)
+		return cptypes.SlashPacketHandledResult, nil
+	}
+
+	intermediary.Jailed = false
+	k.SetIntermediary(ctx, intermediary)
 
 	return cptypes.SlashPacketHandledResult, nil
 }