Merge branch 'release/v2.1.x-provider-lsm' into feat/ics-misbehaviour…

…-handling-sdk-45

CHANGELOG.md

@@ -3,17 +3,12 @@
 ## [Unreleased]
 
 Add an entry to the unreleased section whenever merging a PR to main that is not targeted at a specific release. These entries will eventually be included in a release.
+### Cryptographic verification of equivocation
+* New feature enabling the provider chain to verify equivocation evidence on its own instead of trusting consumer chains, see [EPIC](https://github.com/cosmos/interchain-security/issues/732).
 
 ## v2.1.0-lsm-provider
 
 * (feature!) [#1280](https://github.com/cosmos/interchain-security/pull/1280) provider proposal for changing reward denoms
-* (feature!) [#826](https://github.com/cosmos/interchain-security/pull/826) add new endpoint to provider to handle consumer light client attacks
-* (feature!) [#1227](https://github.com/cosmos/interchain-security/pull/1227) add new endpoint to provider to handle consumer double signing attacks
-
-
-### Cryptographic verification of equivocation
-* New feature enabling the provider chain to verify equivocation evidence on its own instead of trusting consumer chains, see [EPIC](https://github.com/cosmos/interchain-security/issues/732).
-
 
 ## v2.0.0-lsm
 

x/ccv/provider/proposal_handler_test.go

@@ -62,6 +62,13 @@ func TestProviderProposalHandler(t *testing.T) {
 			blockTime:                 hourFromNow,
 			expValidChangeRewardDenom: true,
 		},
+		{
+			name: "valid change reward denoms proposal",
+			content: providertypes.NewChangeRewardDenomsProposal(
+				"title", "description", []string{"denom1"}, []string{"denom2"}),
+			blockTime:                 hourFromNow,
+			expValidChangeRewardDenom: true,
+		},
 		{
 			name:      "nil proposal",
 			content:   nil,
@@ -104,6 +111,7 @@ func TestProviderProposalHandler(t *testing.T) {
 		if tc.expValidConsumerAddition || tc.expValidConsumerRemoval ||
 			tc.expValidChangeRewardDenom {
 			require.NoError(t, err)
+			require.Error(t, err)
 		} else {
 			require.Error(t, err)
 		}

x/ccv/provider/types/codec.go

@@ -41,6 +41,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 		(*sdk.Msg)(nil),
 		&MsgSubmitConsumerDoubleVoting{},
 	)
+	registry.RegisterImplementations(
+		(*govtypes.Content)(nil),
+		&ChangeRewardDenomsProposal{},
+	)
 
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }