feat: cosmos sdk 0.47.10 upgrade

.github/workflows/generate-files.yml

@@ -18,7 +18,9 @@ jobs:
           echo "$HOME/go/bin" >> $GITHUB_PATH
 
       - name: Generate Go code, docs and specs
-        run: make generate
+        env:
+          TEST_ENV: ${{ github.workspace }}
+        run: make generate-ci
 
       - name: Check for changes
         run: |

Makefile

@@ -6,6 +6,7 @@ BUILDTIME := $(shell date -u +"%Y%m%d.%H%M%S" )
 DOCKER ?= docker
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
 GOFLAGS:=""
+REPOSITORY_ROOT := $(dir $(abspath $(MAKEFILE_LIST)))
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \
 	-X github.com/cosmos/cosmos-sdk/version.ServerName=zetacored \
@@ -144,21 +145,26 @@ gosec:
 ###                           Generation commands  		                    ###
 ###############################################################################
 
-proto:
-	@echo "--> Removing old Go types "
-	@find . -name '*.pb.go' -type f -delete
-	@echo "--> Generating new Go types from protocol buffer files"
-	@bash ./scripts/protoc-gen-go.sh
-	@buf format -w
-.PHONY: proto
-
 typescript:
 	@echo "--> Generating TypeScript bindings"
 	@bash ./scripts/protoc-gen-typescript.sh
 .PHONY: typescript
 
+protoVer=0.13.0
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+protoImageCi=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace --user root $(protoImageName)
+
+proto-gen:
+	@echo "Generating Protobuf files"
+	@$(protoImage) sh ./scripts/protoc-gen-go.sh
+
+proto-gen-ci:
+	@echo "Generating Protobuf files"
+	@$(protoImageCi) sh ./scripts/protoc-gen-go.sh
+
 proto-format:
-	@bash ./scripts/proto-format.sh
+	@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
 
 openapi:
 	@echo "--> Generating OpenAPI specs"
@@ -180,9 +186,12 @@ mocks:
 	@bash ./scripts/mocks-generate.sh
 .PHONY: mocks
 
-generate: proto openapi specs typescript docs-zetacored
+generate: proto-gen openapi specs typescript docs-zetacored
 .PHONY: generate
 
+generate-ci: proto-gen-ci openapi specs typescript docs-zetacored
+.PHONY: generate-ci
+
 ###############################################################################
 ###                         E2E tests and localnet                          ###
 ###############################################################################

app/ante/ante.go

@@ -20,12 +20,12 @@ import (
 	"runtime/debug"
 
 	errorsmod "cosmossdk.io/errors"
+	tmlog "github.com/cometbft/cometbft/libs/log"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	tmlog "github.com/tendermint/tendermint/libs/log"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )

app/ante/handler_options.go

@@ -29,8 +29,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	ethante "github.com/evmos/ethermint/app/ante"
 	ethermint "github.com/evmos/ethermint/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"

app/ante/vesting_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/simapp/helpers"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -73,14 +73,14 @@ func TestVesting_AnteHandle(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tx, err := helpers.GenSignedMockTx(
+			tx, err := simtestutil.GenSignedMockTx(
 				rand.New(rand.NewSource(time.Now().UnixNano())),
 				txConfig,
 				[]sdk.Msg{
 					tt.msg,
 				},
 				sdk.NewCoins(),
-				helpers.DefaultGenTxGas,
+				simtestutil.DefaultGenTxGas,
 				"testing-chain-id",
 				[]uint64{0},
 				[]uint64{0},