Problem: sdk 0.50 is not used (#1061)

* Problem: sdk 0.50 is not used * fix build * fix build * fix gomod2nix * fix rocksdb build * fix build * fix module basic manager * remove ModuleBasics * fix encode * fix keyring * fix staking * Problem: latest hermes is not used in integration tests * wait decimal fix cosmos/cosmos-sdk#18546 * fix tests * fix pystarport * set mempool * test ci * skip priority * fix ibc * fix ibc * cleanup * Revert "set mempool" This reverts commit a56a4d0. * fix hardware * fix test * fix upgrade * fix swagger * fix sim * subspace * fix nft test * fix lint * ignore .direnv * ibc-go 8.3 * use upstream sdk * update deps * fix build * fix lint * lint * update pystarport * update pystarport --------- Co-authored-by: huangyi <[email protected]>
crypto-org-chain · Jul 22, 2024 · b325d1e · b325d1e
1 parent 7598bc4
commit b325d1e
Show file tree

Hide file tree

Showing 110 changed files with 25,246 additions and 15,037 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -115,7 +115,7 @@ jobs:
         run: make test
         if: "steps.changed-files.outputs.any_changed == 'true' || github.event_name == 'issue_comment'"
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -31,7 +31,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
 
       # - name: Upload coverage report
-      #   uses: codecov/codecov-action@v3
+      #   uses: codecov/codecov-action@v4
       #   with:
       #     token: ${{ secrets.CODECOV_TOKEN }}
       #     file: ./coverage.txt

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -53,7 +53,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -112,7 +112,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -147,7 +147,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -182,7 +182,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -217,7 +217,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -252,7 +252,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -287,7 +287,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -322,7 +322,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt
@@ -358,7 +358,7 @@ jobs:
            nix profile install nixpkgs#go_1_22
            go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./profile.txt

diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,6 @@ pystarport/proto_python/cosmos_proto
 pystarport/proto_python/gogoproto
 pystarport/proto_python/google
 pystarport/proto_python/tendermint
+
+# direnv
+/.direnv
diff --git a/.golangci.yml b/.golangci.yml
@@ -37,8 +37,6 @@ issues:
 
 linters-settings:
   exclude: ./pystarport/*
-  govet:
-    check-shadowing: true
   errcheck:
     # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
     # default is false: such cases aren't reported by default.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [#1023](https://github.com/crypto-org-chain/chain-main/pull/1023) Integrate sdk 0.47
 - [#1044](https://github.com/crypto-org-chain/chain-main/pull/1044) Revert the protobuf package name changes introduced in #1023.
 - [#1060](https://github.com/crypto-org-chain/chain-main/pull/1060) Upgrade rocksdb to `v9.2.1` and bump versiondb.
+- [#1061](https://github.com/crypto-org-chain/chain-main/pull/1061) Integrate sdk 0.50.
 
 *Dec 6, 2023*
 

diff --git a/MakefileDoc b/MakefileDoc
@@ -6,45 +6,28 @@
 # include third_party/cosmos-sdk/contrib/devtools/Makefile
 
 DOCKER := $(shell which docker)
-protoVer=0.11.6
+protoVer=0.14.0
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
-BINDIR ?= ~/go/bin
 
 all:  update-swagger-docs
 
 proto-swagger-gen:
 	@echo "Generating Protobuf Swagger"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGenSwagger}$$"; then docker start -a $(containerProtoGenSwagger); else docker run --name $(containerProtoGenSwagger) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
-		sh ./scripts/protoc-swagger-gen.sh; fi
-	@echo "Patch swagger documentations"
-	@sed -i".bak" "s/cosmosvaloper16xyempempp92x9hyzz9wrgf94r6j9h5f2w4n2l/crocncl16xyempempp92x9hyzz9wrgf94r6j9h5f2w4n2l/" app/docs/swagger-ui/swagger.yaml
-	@sed -i".bak" "s/cosmos16xyempempp92x9hyzz9wrgf94r6j9h5f06pxxv/cro16xyempempp92x9hyzz9wrgf94r6j9h5f06pxxv/" app/docs/swagger-ui/swagger.yaml
-	@sed -i".bak" "s/cosmosvalconspub1zcjduepq0vu2zgkgk49efa0nqwzndanq5m4c7pa3u4apz4g2r9gspqg6g9cs3k9cuf/crocnclconspub1zcjduepq0vu2zgkgk49efa0nqwzndanq5m4c7pa3u4apz4g2r9gspqg6g9cs3k9cuf/" app/docs/swagger-ui/swagger.yaml
-	@sed -i".bak" "s/example: Cosmos-Hub/example: crypto-org-chain-mainnet/" app/docs/swagger-ui/swagger.yaml
-	@rm app/docs/swagger-ui/swagger.yaml.bak
+	$(protoImage) sh ./scripts/protoc-swagger-gen.sh
 
 proto-gen:
 	@echo "Generating Protobuf files"
 	$(protoImage) sh ./scripts/protocgen.sh
 
 proto-lint:
 	@echo "Linting Protobuf files"
-	@$(protoImage) buf lint --error-format=json
+	@$(protoImage) buf lint ./proto --error-format=json
 
 proto-format:
 	@echo "Formatting Protobuf files"
 	@$(protoImage) find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \;
 
 proto-all: proto-format proto-gen proto-swagger-gen
 
-update-swagger-docs: statik
-	$(BINDIR)/statik -src=app/docs/swagger-ui -dest=app/docs -f -m
-	@if [ -n "$(git status --porcelain)" ]; then \
-        echo "\033[91mSwagger docs are out of sync!!!\033[0m";\
-        exit 1;\
-    else \
-        echo "\033[92mSwagger docs are in sync\033[0m";\
-    fi
-
-.PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint update-swagger-docs
+.PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint
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/v7/modules/core/ante"
-	"github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	"github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	nfttypes "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types"
 )