chore: rm misbehaviour endpoint (#8516)

Co-authored-by: Gjermund Garaba <[email protected]>

Author: johnnylarner

CHANGELOG.md

@@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### API Breaking
 * (apps) [\#8476](https://github.com/cosmos/ibc-go/pull/8476) Remove `ParamSubspace` from all `Keeper` constructors
 * (light-clients/08-wasm) [\#8511](https://github.com/cosmos/ibc-go/pull/8511) Remove deprecated `Checksums` type
+* (core/02-client) [\#8516](https://github.com/cosmos/ibc-go/pull/8516) Remove deprecated `SubmitMisbehaviour` message handler
 
 ### State Machine Breaking
 

modules/core/02-client/client/cli/cli.go

@@ -51,7 +51,6 @@ func NewTxCmd() *cobra.Command {
 		newCreateClientCmd(),
 		newAddCounterpartyCmd(),
 		newUpdateClientCmd(),
-		newSubmitMisbehaviourCmd(), // Deprecated
 		newUpgradeClientCmd(),
 		newSubmitRecoverClientProposalCmd(),
 		newScheduleIBCUpgradeProposalCmd(),

modules/core/02-client/client/cli/tx.go

@@ -226,53 +226,6 @@ func newUpdateClientCmd() *cobra.Command {
 	return cmd
 }
 
-// newSubmitMisbehaviourCmd defines the command to submit a misbehaviour to prevent
-// future updates.
-// Deprecated: NewSubmitMisbehaviourCmd is deprecated and will be removed in a future release.
-// Please use NewUpdateClientCmd instead.
-func newSubmitMisbehaviourCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "misbehaviour [clientID] [path/to/misbehaviour.json]",
-		Short:   "submit a client misbehaviour",
-		Long:    "submit a client misbehaviour to prevent future updates",
-		Example: fmt.Sprintf("%s tx ibc %s misbehaviour [clientID] [path/to/misbehaviour.json] --from node0 --home ../node0/<app>cli --chain-id $CID", version.AppName, types.SubModuleName),
-		Args:    cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx, err := client.GetClientTxContext(cmd)
-			if err != nil {
-				return err
-			}
-			cdc := codec.NewProtoCodec(clientCtx.InterfaceRegistry)
-
-			var misbehaviour exported.ClientMessage
-			clientID := args[0]
-			misbehaviourContentOrFileName := args[1]
-			if err := cdc.UnmarshalInterfaceJSON([]byte(misbehaviourContentOrFileName), &misbehaviour); err != nil {
-
-				// check for file path if JSON input is not provided
-				contents, err := os.ReadFile(misbehaviourContentOrFileName)
-				if err != nil {
-					return fmt.Errorf("neither JSON input nor path to .json file for misbehaviour were provided: %w", err)
-				}
-
-				if err := cdc.UnmarshalInterfaceJSON(contents, &misbehaviour); err != nil {
-					return fmt.Errorf("error unmarshalling misbehaviour file: %w", err)
-				}
-			}
-
-			msg, err := types.NewMsgSubmitMisbehaviour(clientID, misbehaviour, clientCtx.GetFromAddress().String())
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-		},
-	}
-
-	flags.AddTxFlagsToCmd(cmd)
-	return cmd
-}
-
 // newUpgradeClientCmd defines the command to upgrade an IBC light client.
 func newUpgradeClientCmd() *cobra.Command {
 	cmd := &cobra.Command{

modules/core/02-client/types/codec.go

@@ -50,7 +50,6 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 		&MsgCreateClient{},
 		&MsgUpdateClient{},
 		&MsgUpgradeClient{},
-		&MsgSubmitMisbehaviour{},
 		&MsgRecoverClient{},
 		&MsgIBCSoftwareUpgrade{},
 		&MsgUpdateParams{},

modules/core/02-client/types/codec_test.go

@@ -191,11 +191,6 @@ func (suite *TypesTestSuite) TestCodecTypeRegistration() {
 			sdk.MsgTypeURL(&types.MsgUpgradeClient{}),
 			nil,
 		},
-		{
-			"success: MsgSubmitMisbehaviour",
-			sdk.MsgTypeURL(&types.MsgSubmitMisbehaviour{}),
-			nil,
-		},
 		{
 			"success: MsgRecoverClient",
 			sdk.MsgTypeURL(&types.MsgRecoverClient{}),

modules/core/02-client/types/msgs.go

@@ -15,7 +15,6 @@ import (
 var (
 	_ sdk.Msg = (*MsgCreateClient)(nil)
 	_ sdk.Msg = (*MsgUpdateClient)(nil)
-	_ sdk.Msg = (*MsgSubmitMisbehaviour)(nil)
 	_ sdk.Msg = (*MsgUpgradeClient)(nil)
 	_ sdk.Msg = (*MsgUpdateParams)(nil)
 	_ sdk.Msg = (*MsgIBCSoftwareUpgrade)(nil)
@@ -24,7 +23,6 @@ var (
 
 	_ sdk.HasValidateBasic = (*MsgCreateClient)(nil)
 	_ sdk.HasValidateBasic = (*MsgUpdateClient)(nil)
-	_ sdk.HasValidateBasic = (*MsgSubmitMisbehaviour)(nil)
 	_ sdk.HasValidateBasic = (*MsgUpgradeClient)(nil)
 	_ sdk.HasValidateBasic = (*MsgUpdateParams)(nil)
 	_ sdk.HasValidateBasic = (*MsgIBCSoftwareUpgrade)(nil)
@@ -33,7 +31,6 @@ var (
 
 	_ codectypes.UnpackInterfacesMessage = (*MsgCreateClient)(nil)
 	_ codectypes.UnpackInterfacesMessage = (*MsgUpdateClient)(nil)
-	_ codectypes.UnpackInterfacesMessage = (*MsgSubmitMisbehaviour)(nil)
 	_ codectypes.UnpackInterfacesMessage = (*MsgUpgradeClient)(nil)
 	_ codectypes.UnpackInterfacesMessage = (*MsgIBCSoftwareUpgrade)(nil)
 )
@@ -200,43 +197,6 @@ func (msg MsgUpgradeClient) UnpackInterfaces(unpacker codectypes.AnyUnpacker) er
 	return unpacker.UnpackAny(msg.ConsensusState, &consState)
 }
 
-// NewMsgSubmitMisbehaviour creates a new MsgSubmitMisbehaviour instance.
-func NewMsgSubmitMisbehaviour(clientID string, misbehaviour exported.ClientMessage, signer string) (*MsgSubmitMisbehaviour, error) {
-	anyMisbehaviour, err := PackClientMessage(misbehaviour)
-	if err != nil {
-		return nil, err
-	}
-
-	return &MsgSubmitMisbehaviour{
-		ClientId:     clientID,
-		Misbehaviour: anyMisbehaviour,
-		Signer:       signer,
-	}, nil
-}
-
-// ValidateBasic performs basic (non-state-dependant) validation on a MsgSubmitMisbehaviour.
-func (msg MsgSubmitMisbehaviour) ValidateBasic() error {
-	_, err := sdk.AccAddressFromBech32(msg.Signer)
-	if err != nil {
-		return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
-	}
-	misbehaviour, err := UnpackClientMessage(msg.Misbehaviour)
-	if err != nil {
-		return err
-	}
-	if err := misbehaviour.ValidateBasic(); err != nil {
-		return err
-	}
-
-	return host.ClientIdentifierValidator(msg.ClientId)
-}
-
-// UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces
-func (msg MsgSubmitMisbehaviour) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
-	var misbehaviour exported.ClientMessage
-	return unpacker.UnpackAny(msg.Misbehaviour, &misbehaviour)
-}
-
 // NewMsgRecoverClient creates a new MsgRecoverClient instance
 func NewMsgRecoverClient(signer, subjectClientID, substituteClientID string) *MsgRecoverClient {
 	return &MsgRecoverClient{

modules/core/02-client/types/msgs_test.go

@@ -3,7 +3,6 @@ package types_test
 import (
 	"errors"
 	"testing"
-	"time"
 
 	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	"github.com/stretchr/testify/require"
@@ -470,155 +469,6 @@ func (suite *TypesTestSuite) TestMsgUpgradeClient_ValidateBasic() {
 	}
 }
 
-// tests that different misbehaviours within MsgSubmitMisbehaviour can be marshaled
-// and unmarshaled.
-func (suite *TypesTestSuite) TestMarshalMsgSubmitMisbehaviour() {
-	var (
-		msg *types.MsgSubmitMisbehaviour
-		err error
-	)
-
-	testCases := []struct {
-		name     string
-		malleate func()
-	}{
-		{
-			"solo machine client", func() {
-				soloMachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 2)
-				msg, err = types.NewMsgSubmitMisbehaviour(soloMachine.ClientID, soloMachine.CreateMisbehaviour(), suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-		},
-		{
-			"tendermint client", func() {
-				height := types.NewHeight(0, uint64(suite.chainA.ProposedHeader.Height))
-				heightMinus1 := types.NewHeight(0, uint64(suite.chainA.ProposedHeader.Height)-1)
-				header1 := suite.chainA.CreateTMClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.ProposedHeader.Time, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
-				header2 := suite.chainA.CreateTMClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.ProposedHeader.Time.Add(time.Minute), suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
-
-				misbehaviour := ibctm.NewMisbehaviour("tendermint", header1, header2)
-				msg, err = types.NewMsgSubmitMisbehaviour("tendermint", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		suite.Run(tc.name, func() {
-			suite.SetupTest()
-
-			tc.malleate()
-
-			cdc := suite.chainA.App.AppCodec()
-
-			// marshal message
-			bz, err := cdc.MarshalJSON(msg)
-			suite.Require().NoError(err)
-
-			// unmarshal message
-			newMsg := &types.MsgSubmitMisbehaviour{}
-			err = cdc.UnmarshalJSON(bz, newMsg)
-			suite.Require().NoError(err)
-
-			suite.Require().True(proto.Equal(msg, newMsg))
-		})
-	}
-}
-
-func (suite *TypesTestSuite) TestMsgSubmitMisbehaviour_ValidateBasic() {
-	var (
-		msg = &types.MsgSubmitMisbehaviour{}
-		err error
-	)
-
-	cases := []struct {
-		name     string
-		malleate func()
-		expErr   error
-	}{
-		{
-			"invalid client-id",
-			func() {
-				msg.ClientId = ""
-			},
-			errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: empty address string is not allowed"),
-		},
-		{
-			"valid - tendermint misbehaviour",
-			func() {
-				height := types.NewHeight(0, uint64(suite.chainA.ProposedHeader.Height))
-				heightMinus1 := types.NewHeight(0, uint64(suite.chainA.ProposedHeader.Height)-1)
-				header1 := suite.chainA.CreateTMClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.ProposedHeader.Time, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
-				header2 := suite.chainA.CreateTMClientHeader(suite.chainA.ChainID, int64(height.RevisionHeight), heightMinus1, suite.chainA.ProposedHeader.Time.Add(time.Minute), suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Vals, suite.chainA.Signers)
-
-				misbehaviour := ibctm.NewMisbehaviour("tendermint", header1, header2)
-				msg, err = types.NewMsgSubmitMisbehaviour("tendermint", misbehaviour, suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-			nil,
-		},
-		{
-			"invalid tendermint misbehaviour",
-			func() {
-				msg, err = types.NewMsgSubmitMisbehaviour("tendermint", &ibctm.Misbehaviour{}, suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-			errorsmod.Wrap(ibctm.ErrInvalidHeader, "misbehaviour Header1 cannot be nil"),
-		},
-		{
-			"failed to unpack misbehaviourt",
-			func() {
-				msg.Misbehaviour = nil
-			},
-			errorsmod.Wrap(ibcerrors.ErrUnpackAny, "protobuf Any message cannot be nil"),
-		},
-		{
-			"invalid signer",
-			func() {
-				msg.Signer = ""
-			},
-			errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address:  empty address string is not allowed"),
-		},
-		{
-			"valid - solomachine misbehaviour",
-			func() {
-				soloMachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 2)
-				msg, err = types.NewMsgSubmitMisbehaviour(soloMachine.ClientID, soloMachine.CreateMisbehaviour(), suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-			nil,
-		},
-		{
-			"invalid solomachine misbehaviour",
-			func() {
-				msg, err = types.NewMsgSubmitMisbehaviour("solomachine", &solomachine.Misbehaviour{}, suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-			errorsmod.Wrapf(types.ErrInvalidMisbehaviour, "sequence cannot be 0"),
-		},
-		{
-			"client-id too short",
-			func() {
-				soloMachineMisbehaviour := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 2).CreateMisbehaviour()
-				msg, err = types.NewMsgSubmitMisbehaviour("ext", soloMachineMisbehaviour, suite.chainA.SenderAccount.GetAddress().String())
-				suite.Require().NoError(err)
-			},
-			errorsmod.Wrapf(host.ErrInvalidID, "identifier external has invalid length: 3, must be between 4-64 characters"),
-		},
-	}
-
-	for _, tc := range cases {
-		tc.malleate()
-		err = msg.ValidateBasic()
-		if tc.expErr == nil {
-			suite.Require().NoError(err, tc.name)
-		} else {
-			suite.Require().Error(err, tc.name)
-			suite.Require().ErrorIs(err, tc.expErr)
-		}
-	}
-}
-
 // TestMsgRecoverClientValidateBasic tests ValidateBasic for MsgRecoverClient
 func (suite *TypesTestSuite) TestMsgRecoverClientValidateBasic() {
 	var msg *types.MsgRecoverClient