Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: sdk 0.50 is not used #1061

Merged
merged 42 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
92494a6
Problem: sdk 0.50 is not used
mmsqe Jul 18, 2024
18063b9
fix build
yihuang Jul 18, 2024
f37b91d
fix build
yihuang Jul 18, 2024
a9be0f5
fix gomod2nix
yihuang Jul 18, 2024
e103091
fix rocksdb build
yihuang Jul 18, 2024
ed87c00
fix build
yihuang Jul 18, 2024
edacdde
fix module basic manager
yihuang Jul 18, 2024
456b40e
remove ModuleBasics
yihuang Jul 18, 2024
d5bbb72
fix encode
mmsqe Jul 18, 2024
ae7448c
fix keyring
mmsqe Jul 18, 2024
530fb3b
fix staking
mmsqe Jul 18, 2024
dc3b1c4
Problem: latest hermes is not used in integration tests
mmsqe Jul 18, 2024
b2150cf
Merge remote-tracking branch 'origin/master' into bump_hermes
mmsqe Jul 18, 2024
4832a7d
Merge remote-tracking branch 'origin/master' into sdk50
mmsqe Jul 18, 2024
9c92484
wait decimal fix
mmsqe Jul 18, 2024
6229313
fix tests
mmsqe Jul 18, 2024
5cf003e
fix pystarport
mmsqe Jul 18, 2024
a56a4d0
set mempool
mmsqe Jul 19, 2024
19640c1
test ci
mmsqe Jul 19, 2024
7ef4e44
skip priority
mmsqe Jul 19, 2024
c2f48fe
fix ibc
mmsqe Jul 19, 2024
dec8b69
Merge remote-tracking branch 'origin/bump_hermes' into sdk50
mmsqe Jul 19, 2024
ca5f855
fix ibc
mmsqe Jul 19, 2024
cf56991
cleanup
mmsqe Jul 19, 2024
e2df442
Revert "set mempool"
mmsqe Jul 19, 2024
cd73a77
fix hardware
mmsqe Jul 19, 2024
de29a5e
fix test
mmsqe Jul 19, 2024
86a444e
fix upgrade
mmsqe Jul 19, 2024
f48adb1
fix swagger
mmsqe Jul 20, 2024
8a1d7d6
fix sim
mmsqe Jul 20, 2024
f1ca537
subspace
mmsqe Jul 20, 2024
8062337
fix nft test
mmsqe Jul 20, 2024
a0c00b2
fix lint
yihuang Jul 22, 2024
7b0a4dd
ignore .direnv
yihuang Jul 22, 2024
0269a97
ibc-go 8.3
yihuang Jul 22, 2024
26ac3cc
use upstream sdk
yihuang Jul 22, 2024
3cb6395
update deps
yihuang Jul 22, 2024
e4a1e7b
fix build
yihuang Jul 22, 2024
e78e0a7
fix lint
yihuang Jul 22, 2024
5b45dc5
lint
mmsqe Jul 22, 2024
4ecb497
update pystarport
yihuang Jul 22, 2024
ea539c1
update pystarport
mmsqe Jul 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
25 changes: 4 additions & 21 deletions MakefileDoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading
Loading