diff --git a/.github/compatibility-test-matrices/main/client-chain-b.json b/.github/compatibility-test-matrices/main/client-chain-b.json index 3c6a2a38426..f7bf9a92c10 100644 --- a/.github/compatibility-test-matrices/main/client-chain-b.json +++ b/.github/compatibility-test-matrices/main/client-chain-b.json @@ -17,8 +17,7 @@ ], "test": [ "TestClientUpdateProposal_Succeeds", - "TestClient_Update_Misbehaviour", - "TestAllowedClientsParam" + "TestClient_Update_Misbehaviour" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/main/ica-chain-a.json b/.github/compatibility-test-matrices/main/ica-chain-a.json index 78c47df79bc..065fd5db03b 100644 --- a/.github/compatibility-test-matrices/main/ica-chain-a.json +++ b/.github/compatibility-test-matrices/main/ica-chain-a.json @@ -15,8 +15,7 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", - "TestHostEnabledParam" + "TestControllerEnabledParam" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/main/ica-chain-b.json b/.github/compatibility-test-matrices/main/ica-chain-b.json index 16b4b62481c..a7bf577ff1e 100644 --- a/.github/compatibility-test-matrices/main/ica-chain-b.json +++ b/.github/compatibility-test-matrices/main/ica-chain-b.json @@ -15,7 +15,6 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", "TestHostEnabledParam" ], "relayer-type": [ diff --git a/.github/compatibility-test-matrices/main/transfer-chain-b.json b/.github/compatibility-test-matrices/main/transfer-chain-b.json index a79e801bf89..eb3a4295f44 100644 --- a/.github/compatibility-test-matrices/main/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/main/transfer-chain-b.json @@ -19,9 +19,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json index 4e914021d18..31c89827311 100644 --- a/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json index 87fac524ad9..c81c1309eca 100644 --- a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json index 9b5239c952a..56d15ce0327 100644 --- a/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json index baa8be197f3..e88cb988ee2 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json @@ -16,8 +16,7 @@ ], "test": [ "TestClientUpdateProposal_Succeeds", - "TestClient_Update_Misbehaviour", - "TestAllowedClientsParam" + "TestClient_Update_Misbehaviour" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json index e147730f594..d9c38616e2c 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json @@ -15,8 +15,7 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", - "TestHostEnabledParam" + "TestControllerEnabledParam" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json index c6c006f3fda..8d90f271099 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json @@ -15,7 +15,6 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", "TestHostEnabledParam" ], "relayer-type": [ diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json index 9e3fcf1f393..46300adc540 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json index c55a889e833..9ec92721208 100644 --- a/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json @@ -16,8 +16,7 @@ ], "test": [ "TestClientUpdateProposal_Succeeds", - "TestClient_Update_Misbehaviour", - "TestAllowedClientsParam" + "TestClient_Update_Misbehaviour" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json index ed1fbd2c647..37d7ef0d112 100644 --- a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json @@ -15,8 +15,7 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", - "TestHostEnabledParam" + "TestControllerEnabledParam" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json index b410beaef75..684306e8683 100644 --- a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json @@ -15,7 +15,6 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", "TestHostEnabledParam" ], "relayer-type": [ diff --git a/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json index d8ed982316b..2f027deee9d 100644 --- a/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json index c7611def032..01590b1db7f 100644 --- a/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json @@ -16,8 +16,7 @@ ], "test": [ "TestClientUpdateProposal_Succeeds", - "TestClient_Update_Misbehaviour", - "TestAllowedClientsParam" + "TestClient_Update_Misbehaviour" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json index ea2fd7e3604..d357bc57963 100644 --- a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json @@ -15,8 +15,7 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", - "TestHostEnabledParam" + "TestControllerEnabledParam" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json index 0a3d595596c..ef2fab8e5d3 100644 --- a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json @@ -15,7 +15,6 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", "TestHostEnabledParam" ], "relayer-type": [ diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json index b44f5c948fa..4aac962af4a 100644 --- a/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json index 8b07ed9573a..1dd81660cc6 100644 --- a/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json @@ -16,8 +16,7 @@ ], "test": [ "TestClientUpdateProposal_Succeeds", - "TestClient_Update_Misbehaviour", - "TestAllowedClientsParam" + "TestClient_Update_Misbehaviour" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json index 980dca4f7e2..af674a386c8 100644 --- a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json @@ -15,8 +15,7 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", - "TestHostEnabledParam" + "TestControllerEnabledParam" ], "relayer-type": [ "rly" diff --git a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json index 6325c1bbc43..b1f9eb841fb 100644 --- a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json @@ -15,7 +15,6 @@ "TestMsgSendTx_SuccessfulTransfer", "TestMsgSendTx_FailedTransfer_InsufficientFunds", "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA", - "TestControllerEnabledParam", "TestHostEnabledParam" ], "relayer-type": [ diff --git a/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json index 770492c5827..001ffffec1e 100644 --- a/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json @@ -18,9 +18,7 @@ "TestMsgTransfer_Succeeds_Nonincentivized", "TestMsgTransfer_Fails_InvalidAddress", "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" + "TestMsgTransfer_WithMemo" ], "relayer-type": [ "rly" diff --git a/e2e/tests/core/02-client/client_test.go b/e2e/tests/core/02-client/client_test.go index 4f2e5da5a55..53a9d3659f4 100644 --- a/e2e/tests/core/02-client/client_test.go +++ b/e2e/tests/core/02-client/client_test.go @@ -3,6 +3,7 @@ package client import ( "context" "fmt" + "slices" "sort" "strings" "testing" @@ -269,7 +270,12 @@ func (s *ClientTestSuite) TestAllowedClientsParam() { t.Run("ensure allowed clients are set to the default", func(t *testing.T) { allowedClients := s.QueryAllowedClients(ctx, chainA) - s.Require().Equal(clienttypes.DefaultAllowedClients, allowedClients) + + defaultAllowedClients := clienttypes.DefaultAllowedClients + if !testvalues.LocalhostClientFeatureReleases.IsSupported(chainAVersion) { + defaultAllowedClients = slices.DeleteFunc(defaultAllowedClients, func(s string) bool { return s == ibcexported.Localhost }) + } + s.Require().Equal(defaultAllowedClients, allowedClients) }) allowedClient := ibcexported.Solomachine diff --git a/e2e/testvalues/values.go b/e2e/testvalues/values.go index a72ae5827be..4351afdf720 100644 --- a/e2e/testvalues/values.go +++ b/e2e/testvalues/values.go @@ -101,3 +101,10 @@ var TotalEscrowFeatureReleases = semverutil.FeatureReleases{ var IbcErrorsFeatureReleases = semverutil.FeatureReleases{ MajorVersion: "v8.0", } + +// LocalhostClientFeatureReleases represents the releases the localhost client was released in. +var LocalhostClientFeatureReleases = semverutil.FeatureReleases{ + MinorVersions: []string{ + "v7.1", + }, +}