allow software upgrades and cancel proposals

app/consumer-democracy/consumer-democracy-ante/forbidden_proposals_ante_test.go

@@ -8,8 +8,9 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	app "github.com/onomyprotocol/multiverse/app/consumer-democracy"
-	"github.com/onomyprotocol/multiverse/app/consumer-democracy/consumer-democracy-ante"
+	ante "github.com/onomyprotocol/multiverse/app/consumer-democracy/consumer-democracy-ante"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/spm/cosmoscmd"
 )
@@ -68,6 +69,22 @@ func TestForbiddenProposalsDecorator(t *testing.T) {
 			},
 			expectErr: true,
 		},
+		{
+			name: "Upgrade Proposal",
+			ctx:  sdk.Context{},
+			msgs: []sdk.Msg{
+				newUpgradeProposalMsg(),
+			},
+			expectErr: false,
+		},
+		{
+			name: "Cancel Upgrade Proposal",
+			ctx:  sdk.Context{},
+			msgs: []sdk.Msg{
+				newCancelUpgradeProposalMsg(),
+			},
+			expectErr: false,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -95,3 +112,15 @@ func newParamChangeProposalMsg(changes []proposal.ParamChange) *govtypes.MsgSubm
 	msg, _ := govtypes.NewMsgSubmitProposal(&paramChange, sdk.NewCoins(), sdk.AccAddress{})
 	return msg
 }
+
+func newUpgradeProposalMsg() *govtypes.MsgSubmitProposal {
+	upgrade := upgradetypes.SoftwareUpgradeProposal{}
+	msg, _ := govtypes.NewMsgSubmitProposal(&upgrade, sdk.NewCoins(), sdk.AccAddress{})
+	return msg
+}
+
+func newCancelUpgradeProposalMsg() *govtypes.MsgSubmitProposal {
+	upgrade := upgradetypes.CancelSoftwareUpgradeProposal{}
+	msg, _ := govtypes.NewMsgSubmitProposal(&upgrade, sdk.NewCoins(), sdk.AccAddress{})
+	return msg
+}

app/consumer-democracy/proposals_whitelisting.go

@@ -8,6 +8,7 @@ import (
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 	consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
 	marketmoduletypes "github.com/pendulum-labs/market/x/market/types"
@@ -17,6 +18,10 @@ func IsProposalWhitelisted(content govtypes.Content) bool {
 	switch c := content.(type) {
 	case *proposal.ParameterChangeProposal:
 		return isParamChangeWhitelisted(c.Changes)
+	case *upgradetypes.SoftwareUpgradeProposal:
+		return true
+	case *upgradetypes.CancelSoftwareUpgradeProposal:
+		return true
 
 	default:
 		return false