Upgrade to sdk 47

.dockerignore

@@ -0,0 +1,9 @@
+.git/
+Dockerfile
+*.md
+.gitignore
+.gitattributes
+scripts/
+.vscode/
+.github/
+proto/

.github/workflows/automated-tests.yml

@@ -1,4 +1,4 @@
-name: Automated Tests
+name: E2E Tests
 on:
   push:
     branches:
@@ -9,7 +9,7 @@ on:
       - main
       - release/v*
 jobs:
-  Automated_Tests:
+  E2E_Tests:
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -23,8 +23,5 @@ jobs:
         with:
           go-version: "1.19" # The Go version to download (if necessary) and use.
 
-      - name: Unit, integration and difference tests
-        run: go test ./...
-
       - name: E2E tests
-        run: make test-e2e-short
+        run: go run ./tests/e2e/... --happy-path-only --verbose

.github/workflows/go-tests.yml

@@ -0,0 +1,15 @@
+on: [push, pull_request]
+name: Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.19.x, 1.20.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/setup-go@v3
+      with:
+        go-version: ${{ matrix.go-version }}
+    - uses: actions/checkout@v3
+    - run: go test ./...

Dockerfile

@@ -1,6 +1,7 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.19-alpine AS is-builder
+
+FROM golang:1.20-alpine AS is-builder
 
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers
 RUN apk add --no-cache $PACKAGES
@@ -28,7 +29,7 @@ RUN go mod tidy
 RUN make install
 
 # Get Hermes build
-FROM informalsystems/hermes:1.2.0 AS hermes-builder
+FROM informalsystems/hermes:1.4.1 AS hermes-builder
 
 FROM --platform=linux/amd64 fedora:36
 RUN dnf update -y

Dockerfile.gaia

@@ -61,7 +61,7 @@ WORKDIR /interchain-security
 RUN make install
 
 # Get Hermes build
-FROM informalsystems/hermes:1.2.0 AS hermes-builder
+FROM informalsystems/hermes:1.4.1 AS hermes-builder
 
 FROM --platform=linux/amd64 fedora:36
 RUN dnf update -y

Makefile

@@ -12,6 +12,10 @@ install: go.sum
 test: 
 	go test ./... && go run ./tests/e2e/... 
 
+# run all unit tests
+test-unit:
+	go test ./...
+
 # run unit and integration tests
 test-short:
 	go test ./x/... ./app/... ./tests/integration/...
@@ -101,7 +105,7 @@ $(BUILDDIR)/:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-containerProtoVer=0.9.0
+containerProtoVer=0.13.0
 containerProtoImage=ghcr.io/cosmos/proto-builder:$(containerProtoVer)
 containerProtoGen=cosmos-sdk-proto-gen-$(containerProtoVer)
 containerProtoGenSwagger=cosmos-sdk-proto-gen-swagger-$(containerProtoVer)
@@ -130,11 +134,11 @@ proto-lint:
 proto-check-breaking:
 	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
 
-TM_URL              = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.5/proto/tendermint
+TM_URL              = https://raw.githubusercontent.com/cometbft/cometbft/v0.37.0/proto/tendermint
 GOGO_PROTO_URL      = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
-CONFIO_URL          = https://raw.githubusercontent.com/confio/ics23/v0.7.1
+CONFIO_URL          = https://raw.githubusercontent.com/confio/ics23/v0.9.0
 COSMOS_PROTO_URL    = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
-SDK_PROTO_URL 		= https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.45.13-ics/proto/cosmos
+SDK_PROTO_URL		= https://raw.githubusercontent.com/notional-labs/cosmos-sdk/sdkv47-ics/proto/cosmos
 
 TM_CRYPTO_TYPES     = third_party/proto/tendermint/crypto
 TM_ABCI_TYPES       = third_party/proto/tendermint/abci
@@ -175,7 +179,7 @@ proto-update-deps:
 ## Importing of tendermint protobuf definitions currently requires the
 ## use of `sed` in order to build properly with cosmos-sdk's proto file layout
 ## (which is the standard Buf.build FILE_LAYOUT)
-## Issue link: https://github.com/tendermint/tendermint/issues/5021
+## Issue link: https://github.com/cometbft/cometbft/issues/5021
 	@mkdir -p $(TM_TYPES)
 	@curl -sSL $(TM_URL)/types/types.proto > $(TM_TYPES)/types.proto
 	@curl -sSL $(TM_URL)/types/params.proto > $(TM_TYPES)/params.proto

app/consumer-democracy/ante/forbidden_proposals_ante.go

@@ -4,25 +4,117 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
+	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	ccvgov "github.com/cosmos/interchain-security/x/ccv/democracy/governance"
 )
 
 type ForbiddenProposalsDecorator struct {
-	IsProposalWhitelisted func(govtypes.Content) bool
+	keeperMap                   map[string]interface{}
+	isLegacyProposalWhitelisted func(govv1beta1.Content) bool
+	isParamChangeWhitelisted    func(map[ccvgov.ParamChangeKey]struct{}) bool
+	isModuleWhiteList           func(string) bool
 }
 
-func NewForbiddenProposalsDecorator(whiteListFn func(govtypes.Content) bool) ForbiddenProposalsDecorator {
-	return ForbiddenProposalsDecorator{IsProposalWhitelisted: whiteListFn}
+func NewForbiddenProposalsDecorator(
+	whiteListFn func(govv1beta1.Content) bool,
+	isParamChangeWhitelisted func(map[ccvgov.ParamChangeKey]struct{}) bool,
+	keeperMap map[string]interface{},
+	isModuleWhiteList func(string) bool,
+) ForbiddenProposalsDecorator {
+	return ForbiddenProposalsDecorator{
+		isLegacyProposalWhitelisted: whiteListFn,
+		keeperMap:                   keeperMap,
+		isParamChangeWhitelisted:    isParamChangeWhitelisted,
+		isModuleWhiteList:           isModuleWhiteList,
+	}
 }
 
 func (decorator ForbiddenProposalsDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
 	currHeight := ctx.BlockHeight()
 
 	for _, msg := range tx.GetMsgs() {
-		submitProposalMgs, ok := msg.(*govtypes.MsgSubmitProposal)
+		submitProposalMgs, ok := msg.(*govv1.MsgSubmitProposal)
 		// if the message is MsgSubmitProposal, check if proposal is whitelisted
 		if ok {
-			if !decorator.IsProposalWhitelisted(submitProposalMgs.GetContent()) {
+			messages := submitProposalMgs.GetMessages()
+			checkFlag := true
+
+			for _, message := range messages {
+
+				sdkMsg, ok := message.GetCachedValue().(*govv1.MsgExecLegacyContent)
+				if !ok {
+					if decorator.isModuleWhiteList(message.TypeUrl) {
+						m := message.GetCachedValue()
+						switch m := m.(type) {
+						case *minttypes.MsgUpdateParams:
+							if keeper, ok := decorator.keeperMap[message.TypeUrl].(mintkeeper.Keeper); ok {
+								newParam := m.Params
+								currentParam := keeper.GetParams(ctx)
+								ccvgov.CheckIfParamKeyIsWhitelisted(&checkFlag, message.TypeUrl, currentParam, newParam, decorator.isParamChangeWhitelisted)
+							} else {
+								checkFlag = false
+							}
+						case *banktypes.MsgUpdateParams:
+							if keeper, ok := decorator.keeperMap[message.TypeUrl].(bankkeeper.Keeper); ok {
+								newParam := m.Params
+								currentParam := keeper.GetParams(ctx)
+								ccvgov.CheckIfParamKeyIsWhitelisted(&checkFlag, message.TypeUrl, currentParam, newParam, decorator.isParamChangeWhitelisted)
+							} else {
+								checkFlag = false
+							}
+						case *distrtypes.MsgUpdateParams:
+							if keeper, ok := decorator.keeperMap[message.TypeUrl].(distrkeeper.Keeper); ok {
+								newParam := m.Params
+								currentParam := keeper.GetParams(ctx)
+								ccvgov.CheckIfParamKeyIsWhitelisted(&checkFlag, message.TypeUrl, currentParam, newParam, decorator.isParamChangeWhitelisted)
+							} else {
+								checkFlag = false
+							}
+						case *stakingtypes.MsgUpdateParams:
+							if keeper, ok := decorator.keeperMap[message.TypeUrl].(stakingkeeper.Keeper); ok {
+								newParam := m.Params
+								currentParam := keeper.GetParams(ctx)
+								ccvgov.CheckIfParamKeyIsWhitelisted(&checkFlag, message.TypeUrl, currentParam, newParam, decorator.isParamChangeWhitelisted)
+							} else {
+								checkFlag = false
+							}
+						case *govv1.MsgUpdateParams:
+							if keeper, ok := decorator.keeperMap[message.TypeUrl].(govkeeper.Keeper); ok {
+								newParam := m.Params
+								currentParam := keeper.GetParams(ctx)
+								ccvgov.CheckIfParamKeyIsWhitelisted(&checkFlag, message.TypeUrl, currentParam, newParam, decorator.isParamChangeWhitelisted)
+							} else {
+								checkFlag = false
+							}
+						default:
+							checkFlag = false
+						}
+					} else {
+						checkFlag = false
+					}
+				} else {
+					content, err := govv1.LegacyContentFromMessage(sdkMsg)
+					if err != nil {
+						continue
+					}
+					if !decorator.isLegacyProposalWhitelisted(content) {
+						checkFlag = false
+					}
+				}
+			}
+
+			if !checkFlag {
 				return ctx, fmt.Errorf("tx contains unsupported proposal message types at height %d", currHeight)
 			}
 		}