fix!: return a SlashAck even if the validator is not a consumer valid…

…ator (#1763) * init commit * fix test
cosmos · Apr 8, 2024 · 67091f8 · 67091f8
1 parent d0f7a42
commit 67091f8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/x/ccv/provider/keeper/relay.go b/x/ccv/provider/keeper/relay.go
@@ -405,7 +405,8 @@ func (k Keeper) HandleSlashPacket(ctx sdk.Context, chainID string, data ccv.Slas
 	if !k.IsConsumerValidator(ctx, chainID, providerConsAddr) {
 		k.Logger(ctx).Error("cannot jail validator %s that does not belong to consumer %s valset",
 			providerConsAddr.String(), chainID)
-		// drop packet
+		// drop packet but return a slash ack so that the consumer can send another slash packet
+		k.AppendSlashAck(ctx, chainID, consumerConsAddr.String())
 		return
 	}
 

diff --git a/x/ccv/provider/keeper/relay_test.go b/x/ccv/provider/keeper/relay_test.go
@@ -303,8 +303,9 @@ func TestHandleSlashPacket(t *testing.T) {
 		name       string
 		packetData ccv.SlashPacketData
 		// The mocks that we expect to be called for the specified packet data.
-		expectedCalls        func(sdk.Context, testkeeper.MockedKeepers, ccv.SlashPacketData) []*gomock.Call
-		expectedSlashAcksLen int
+		expectedCalls                       func(sdk.Context, testkeeper.MockedKeepers, ccv.SlashPacketData) []*gomock.Call
+		expectedSlashAcksLen                int
+		expectedSlashAckConsumerConsAddress types.ConsumerConsAddress
 	}{
 		{
 			"validator isn't a consumer validator",
@@ -318,7 +319,8 @@ func TestHandleSlashPacket(t *testing.T) {
 			) []*gomock.Call {
 				return []*gomock.Call{}
 			},
-			0,
+			1,
+			dummyConsAddr,
 		},
 		{
 			"unfound validator",
@@ -340,6 +342,7 @@ func TestHandleSlashPacket(t *testing.T) {
 				}
 			},
 			0,
+			consumerConsAddr,
 		},
 		{
 			"found, but tombstoned validator",
@@ -362,6 +365,7 @@ func TestHandleSlashPacket(t *testing.T) {
 				}
 			},
 			0,
+			consumerConsAddr,
 		},
 		{
 			"drop packet when infraction height not found",
@@ -385,6 +389,7 @@ func TestHandleSlashPacket(t *testing.T) {
 				}
 			},
 			0,
+			consumerConsAddr,
 		},
 		{
 			"full downtime packet handling, uses init chain height and non-jailed validator",
@@ -402,6 +407,7 @@ func TestHandleSlashPacket(t *testing.T) {
 					true)                                  // expectJailing = true
 			},
 			1,
+			consumerConsAddr,
 		},
 		{
 			"full downtime packet handling, uses valid vscID and jailed validator",
@@ -419,6 +425,7 @@ func TestHandleSlashPacket(t *testing.T) {
 					false)                                // expectJailing = false, validator is already jailed.
 			},
 			1,
+			consumerConsAddr,
 		},
 		// Note: double-sign slash packet handling should not occur, see OnRecvSlashPacket.
 	}
@@ -447,7 +454,7 @@ func TestHandleSlashPacket(t *testing.T) {
 
 			if tc.expectedSlashAcksLen == 1 {
 				// must match the consumer address
-				require.Equal(t, consumerConsAddr.String(), providerKeeper.GetSlashAcks(ctx, chainId)[0])
+				require.Equal(t, tc.expectedSlashAckConsumerConsAddress.String(), providerKeeper.GetSlashAcks(ctx, chainId)[0])
 				require.NotEqual(t, providerConsAddr.String(), providerKeeper.GetSlashAcks(ctx, chainId)[0])
 				require.NotEqual(t, providerConsAddr.String(), consumerConsAddr.String())
 			}