feat!: use cosmos-sdk v50 and IBC v8.1

Dockerfile

@@ -32,7 +32,7 @@ RUN make install
 FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder
 
 # Get CometMock
-FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder
+FROM ghcr.io/informalsystems/cometmock:v0.38.x as cometmock-builder
 
 # Get GoRelayer
 FROM ghcr.io/informalsystems/relayer-no-gas-sim:v2.3.0-rc4-no-gas-sim AS gorelayer-builder

Makefile

@@ -186,7 +186,7 @@ $(BUILDDIR)/:
 DOCKER := $(shell which docker)
 HTTPS_GIT := https://github.com/cosmos/interchain-security.git
 
-containerProtoVer=0.13.0
+containerProtoVer=0.14.0
 containerProtoImage=ghcr.io/cosmos/proto-builder:$(containerProtoVer)
 
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage)

app/consumer-democracy/abci.go

@@ -0,0 +1,84 @@
+package app
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/json"
+	"fmt"
+
+	abci "github.com/cometbft/cometbft/abci/types"
+
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+type (
+	// VoteExtensionHandler defines a dummy vote extension handler for SimApp.
+	//
+	// NOTE: This implementation is solely used for testing purposes. DO NOT use
+	// in a production application!
+	VoteExtensionHandler struct{}
+
+	// VoteExtension defines the structure used to create a dummy vote extension.
+	VoteExtension struct {
+		Hash   []byte
+		Height int64
+		Data   []byte
+	}
+)
+
+func NewVoteExtensionHandler() *VoteExtensionHandler {
+	return &VoteExtensionHandler{}
+}
+
+func (h *VoteExtensionHandler) SetHandlers(bApp *baseapp.BaseApp) {
+	bApp.SetExtendVoteHandler(h.ExtendVote())
+	bApp.SetVerifyVoteExtensionHandler(h.VerifyVoteExtension())
+}
+
+func (h *VoteExtensionHandler) ExtendVote() sdk.ExtendVoteHandler {
+	return func(_ sdk.Context, req *abci.RequestExtendVote) (*abci.ResponseExtendVote, error) {
+		buf := make([]byte, 1024)
+
+		_, err := rand.Read(buf)
+		if err != nil {
+			return nil, fmt.Errorf("failed to generate random vote extension data: %w", err)
+		}
+
+		ve := VoteExtension{
+			Hash:   req.Hash,
+			Height: req.Height,
+			Data:   buf,
+		}
+
+		bz, err := json.Marshal(ve)
+		if err != nil {
+			return nil, fmt.Errorf("failed to encode vote extension: %w", err)
+		}
+
+		return &abci.ResponseExtendVote{VoteExtension: bz}, nil
+	}
+}
+
+func (h *VoteExtensionHandler) VerifyVoteExtension() sdk.VerifyVoteExtensionHandler {
+	return func(ctx sdk.Context, req *abci.RequestVerifyVoteExtension) (*abci.ResponseVerifyVoteExtension, error) {
+		var ve VoteExtension
+
+		if err := json.Unmarshal(req.VoteExtension, &ve); err != nil {
+			return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
+		}
+
+		switch {
+		case req.Height != ve.Height:
+			return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
+
+		case !bytes.Equal(req.Hash, ve.Hash):
+			return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
+
+		case len(ve.Data) != 1024:
+			return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
+		}
+
+		return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_ACCEPT}, nil
+	}
+}

app/consumer-democracy/ante/forbidden_proposals_ante_test.go

@@ -3,19 +3,18 @@ package ante_test
 import (
 	"testing"
 
-	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 
-	app "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
-	"github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
+	app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
+	"github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
 )
 
 // in SDKv47 parameter updates full params object is required
@@ -98,8 +97,9 @@ func TestForbiddenProposalsDecorator(t *testing.T) {
 	}
 }
 
-// Only ibctransfertypes.SendEnabled/ReceiveEnabled support legacy proposals for changing params
-// Note: see LegacyWhitelistedParams in proposals_whitelisting.go
+// Legacy parameter proposals are not supported in cosmos-sdk v0.50
+// since modules parameters were moved to their respective modules
+// this test is to ensure that legacy parameter proposals are not allowed
 func TestForbiddenLegacyProposalsDecorator(t *testing.T) {
 	txCfg := app.MakeTestEncodingConfig().TxConfig
 
@@ -109,17 +109,6 @@ func TestForbiddenLegacyProposalsDecorator(t *testing.T) {
 		msgs      []sdk.Msg
 		expectErr bool
 	}{
-		{
-			name: "Allowed legacy param change -- only for ibctransfertypes.SendEnabled/ReceiveEnabled",
-			ctx:  sdk.Context{},
-			msgs: []sdk.Msg{
-				newLegacyParamChangeProposalMsg([]proposal.ParamChange{
-					// only subspace and key are relevant for testing
-					{Subspace: ibctransfertypes.ModuleName, Key: "SendEnabled", Value: "true"},
-				}),
-			},
-			expectErr: false,
-		},
 		{
 			name: "Forbidden param change",
 			ctx:  sdk.Context{},
@@ -131,33 +120,16 @@ func TestForbiddenLegacyProposalsDecorator(t *testing.T) {
 			expectErr: true,
 		},
 		{
-			name: "Allowed and forbidden param changes in the same msg",
+			name: "Multiple forbidden param changes in the same msg",
 			ctx:  sdk.Context{},
 			msgs: []sdk.Msg{
 				newLegacyParamChangeProposalMsg([]proposal.ParamChange{
-					// allowed
 					{Subspace: ibctransfertypes.ModuleName, Key: "SendEnabled", Value: "true"},
-					// disallowed
 					{Subspace: authtypes.ModuleName, Key: "MaxMemoCharacters", Value: ""},
 				}),
 			},
 			expectErr: true,
 		},
-		{
-			name: "Allowed and forbidden param changes in different msg",
-			ctx:  sdk.Context{},
-			msgs: []sdk.Msg{
-				newLegacyParamChangeProposalMsg([]proposal.ParamChange{
-					// disallowed
-					{Subspace: banktypes.ModuleName, Key: "SendEnabled", Value: ""},
-				}),
-				newLegacyParamChangeProposalMsg([]proposal.ParamChange{
-					// allowed
-					{Subspace: ibctransfertypes.ModuleName, Key: "SendEnabled", Value: "true"},
-				}),
-			},
-			expectErr: true,
-		},
 	}
 
 	for _, tc := range testCases {
@@ -187,11 +159,11 @@ func newLegacyParamChangeProposalMsg(changes []proposal.ParamChange) *govv1.MsgS
 	if err != nil {
 		return nil
 	}
-	msg, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, sdk.NewCoins(), sdk.AccAddress{}.String(), "", "", "")
+	msg, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, sdk.NewCoins(), sdk.AccAddress{}.String(), "", "", "", false)
 	return msg
 }
 
 func newParamChangeProposalMsg(msgs []sdk.Msg) *govv1.MsgSubmitProposal {
-	msg, _ := govv1.NewMsgSubmitProposal(msgs, sdk.NewCoins(), sdk.AccAddress{}.String(), "", "", "")
+	msg, _ := govv1.NewMsgSubmitProposal(msgs, sdk.NewCoins(), sdk.AccAddress{}.String(), "", "", "", false)
 	return msg
 }

app/consumer-democracy/ante_handler.go

@@ -1,18 +1,18 @@
 package app
 
 import (
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 
 	errorsmod "cosmossdk.io/errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	democracyante "github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
-	consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
+	democracyante "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
+	consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC