Problem: sdk 47 is not integrated (crypto-org-chain#1023)

* Problem: sdk 47 is not integrated * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> * fix test * fix test * fix build * fix config * update pystarport * fix proto * fix sync * fix basic * fix fee_payer * fix feegrant * fix rocksdb * fix group * fix ledger * fix ibctm * fix solomachine * fix transfer * fix slash * fix staking * fix authz * fix offline * fix gov * fix gov_propose_legacy * update hermes * fix ibc * icaauth route is not registered correctly rm dup claim capability handle in https://github.com/cosmos/ibc-go/blob/v7.3.1/modules/apps/27-interchain-accounts/controller/ibc_middleware.go#L63 * fix app * fix nft * fix nft transfer * fix priority wip * fix ibc_extended * pass lint * fix lint * set mempool * fix gov * fix test artifacts * fix lint * fix upgrade * Update x/nft-transfer/keeper/relay.go Co-authored-by: Devashish Dixit <[email protected]> Signed-off-by: mmsqe <[email protected]> * keep gov param for upgrade * fix priority * fix upgrade * update pystarport * fix chainId * fix sim * add aarch64-darwin * add eventQueryTxFor nft * fix lint * fix mode * debug vesting * fix create_nft * fix mode * create_nft * update sdk * update pystarport * debug sdk47-upgrade * fix tmpdir * fix upgrade * update pystarport * wait less * migrate ICS27 channel capability * bump ibc-go * cleanup ica test * test cb error * update solo * cleanup * fix lint * Apply suggestions from code review * Apply suggestions from code review * Update nix/rocksdb.nix Co-authored-by: yihuang <[email protected]> Signed-off-by: mmsqe <[email protected]> * Update nix/rocksdb.nix Co-authored-by: yihuang <[email protected]> Signed-off-by: mmsqe <[email protected]> * fix version --------- Signed-off-by: yihuang <[email protected]> Signed-off-by: mmsqe <[email protected]> Co-authored-by: mmsqe <[email protected]> Co-authored-by: Devashish Dixit <[email protected]>
devashishdxt · Feb 26, 2024 · 2dcfd5d · 2dcfd5d
1 parent 911b8a5
commit 2dcfd5d
Show file tree

Hide file tree

Showing 121 changed files with 2,220 additions and 2,722 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -60,7 +60,7 @@ jobs:
           flags: integration_tests
       - name: Tar debug files
         if: failure()
-        run: tar cfz debug_files.tar.gz -C "$TMPDIR/pytest-of-runner" .
+        run: tar cfz debug_files.tar.gz -C "${TMPDIR-/tmp}/pytest-of-runner" .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -119,7 +119,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -154,7 +154,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -189,7 +189,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -224,7 +224,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -259,7 +259,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -294,7 +294,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -329,7 +329,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -365,7 +365,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-/tmp}/pytest-of-runner .
       - uses: actions/upload-artifact@v2
         if: failure()
         with:

diff --git a/CHANGELOG.md b/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

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ PACKAGE_NAME:=github.com/crypto-org-chain/chain-main
 
 
 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

diff --git a/MakefileDoc b/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
 

diff --git a/app/ante.go b/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"
 )