Problem: sdk 47 is not integrated

.github/workflows/nix.yml

@@ -128,7 +128,7 @@ jobs:
           flags: integration_tests_upgrade
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_upgrade.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_upgrade.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -166,7 +166,7 @@ jobs:
           flags: integration_tests_ledger
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_ledger.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_ledger.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -204,7 +204,7 @@ jobs:
           flags: integration_tests_solomachine
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_solomachine.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_solomachine.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -242,7 +242,7 @@ jobs:
           flags: integration_tests_slow
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_slow.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_slow.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -280,7 +280,7 @@ jobs:
           flags: integration_tests_ibc
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_ibc.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_ibc.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -318,7 +318,7 @@ jobs:
           flags: integration_tests_byzantine
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_byzantine.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_byzantine.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -356,7 +356,7 @@ jobs:
           flags: integration_tests_gov
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_gov.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_gov.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -395,7 +395,7 @@ jobs:
           flags: integration_tests_grpc
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files_grpc.tar.gz -C /tmp/pytest-of-runner .
+        run: tar cfz debug_files_grpc.tar.gz -C $TMPDIR/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## UNRELEASED
+
+- [#1023](https://github.com/crypto-org-chain/chain-main/pull/1023) Integrate sdk 0.47
+
 *Dec 6, 2023*
 
 ## v4.2.8

Makefile

@@ -4,7 +4,7 @@ GOLANG_CROSS_VERSION  = v1.20.1
 
 
 VERSION := $(shell echo $(shell git describe --tags 2>/dev/null ) | sed 's/^v//')
-TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
+TMVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 COMMIT := $(shell git log -1 --format='%H')
 NETWORK ?= mainnet
 COVERAGE ?= coverage.txt

MakefileDoc

@@ -3,13 +3,12 @@
 ###                              Documentation                              ###
 ###############################################################################
 
-include third_party/cosmos-sdk/contrib/devtools/Makefile
+# include third_party/cosmos-sdk/contrib/devtools/Makefile
 
-containerProtoVer=v0.7
-containerProtoImage=tendermintdev/sdk-proto-gen:$(containerProtoVer)
-containerProtoGen=cosmos-sdk-proto-gen-$(containerProtoVer)
-containerProtoGenSwagger=cosmos-sdk-proto-gen-swagger-$(containerProtoVer)
-containerProtoFmt=cosmos-sdk-proto-fmt-$(containerProtoVer)
+DOCKER := $(shell which docker)
+protoVer=0.11.6
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 BINDIR ?= ~/go/bin
 
 all:  update-swagger-docs
@@ -27,13 +26,15 @@ proto-swagger-gen:
 
 proto-gen:
 	@echo "Generating Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
-		sh ./scripts/protocgen.sh; fi
+	$(protoImage) sh ./scripts/protocgen.sh
+
+proto-lint:
+	@echo "Linting Protobuf files"
+	@$(protoImage) buf lint --error-format=json
 
 proto-format:
 	@echo "Formatting Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \
-		find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi
+	@$(protoImage) find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \;
 
 proto-all: proto-format proto-gen proto-swagger-gen
 

app/ante.go

@@ -5,8 +5,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	ibcante "github.com/cosmos/ibc-go/v5/modules/core/ante"
-	"github.com/cosmos/ibc-go/v5/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	"github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	nfttypes "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types"
 )