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

feat: bump up cosmos sdk v0.50.x and cometbft v0.38.0 #2

Merged
merged 122 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from 111 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
d231c75
feat: update go.mod
dudong2 Nov 13, 2023
f6e0bfd
build: go mod tidy
dudong2 Nov 13, 2023
4e7b8e9
build: fix build errors
dudong2 Nov 13, 2023
5f71660
test: fix tests
dudong2 Nov 14, 2023
5b35e32
test: fix lint
dudong2 Nov 15, 2023
d190c74
feat: cherry-pick crypto-org-chain/ethermint v47 integration pr
dudong2 Nov 15, 2023
bb69d1b
feat: apply cosmos-sdk v0.47.x upgrade docs
dudong2 Nov 15, 2023
04f032b
docs: update gomod2nix.toml
dudong2 Nov 15, 2023
caf3d78
Problem: localhost client param is not migrated (#306)
mmsqe Aug 14, 2023
2ac0e19
Problem: recent version of SetPreBlocker is not used (#326)
mmsqe Sep 5, 2023
1533fc1
feat: support blocking list of addresses in mempool and disable vesti…
mmsqe Sep 6, 2023
6a8ad57
Revert blocking list feature from "feat: support blocking list of add…
dudong2 Nov 15, 2023
f0c4147
Problem: performance regression because of un-cached sender recovery …
yihuang Sep 14, 2023
14d731b
Revert antehandler ordering from "Problem: performance regression bec…
dudong2 Nov 15, 2023
15326be
fix negative dynamic fee (#351)
yihuang Sep 15, 2023
a1390fc
test: fix lint
dudong2 Nov 15, 2023
95047e7
feat: update go.mod
dudong2 Nov 15, 2023
9dcb497
build: fix build
dudong2 Nov 20, 2023
8f588a0
test: fix tests
dudong2 Nov 28, 2023
77d8f0f
test: fix lint
dudong2 Nov 29, 2023
71c8a78
build: bump up golang ver to 1.21
dudong2 Nov 29, 2023
a9803b2
test: update nix go ver to 1.21
dudong2 Nov 29, 2023
eb8e32e
Revert "test: update nix go ver to 1.21"
dudong2 Nov 29, 2023
693e2ad
Revert "build: bump up golang ver to 1.21"
dudong2 Nov 29, 2023
c05ad8f
test: fix test-import
dudong2 Nov 29, 2023
85e716d
test: bump up golang ver to 1.21
dudong2 Nov 29, 2023
91c9611
test: fix deploy-contract, lint checker
dudong2 Nov 29, 2023
d72d2b5
test: debug go ver for deploy-contract, fix lint checker
dudong2 Nov 29, 2023
75b76a5
test: debug go ver for deploy-contract
dudong2 Nov 29, 2023
0fac401
test: go version order change
dudong2 Nov 29, 2023
b1ada74
test: change go version from makefile-release, fix lint
dudong2 Nov 29, 2023
0249796
chore: remove todo comments
dudong2 Nov 29, 2023
57b520b
feat: fix add prefix, replace test-contract to test-solidity
dudong2 Nov 30, 2023
7add7e7
feat: fix genesis doc type error
dudong2 Nov 30, 2023
4e27a51
test: fix test-rpc
dudong2 Nov 30, 2023
56d646e
test: fix test-solidity
dudong2 Nov 30, 2023
0016b23
test: fix test-solidity re-add export gopath, path
dudong2 Nov 30, 2023
bdf18f1
test: fix test-solidity replace goroot too
dudong2 Nov 30, 2023
1a38933
test: fix test-solidity add debug go env
dudong2 Nov 30, 2023
81c9aa3
test: fix test-solidity remove debug test, add go version command
dudong2 Dec 1, 2023
cc02280
test: fix test-solidity, split tools and test
dudong2 Dec 1, 2023
3f750f0
test: fix test-solidity, add go version debug
dudong2 Dec 1, 2023
e9241e5
test: fix test-solidity, add go env, remove sudo
dudong2 Dec 1, 2023
70a085b
test: fix test-solidity, add -E option to sudo
dudong2 Dec 1, 2023
99774fa
test: fix test-solidity, add env path
dudong2 Dec 1, 2023
547ac13
test: fix test-solidity, remove debug lines, add path
dudong2 Dec 1, 2023
1d48007
bug: fix tx, query commands
dudong2 Dec 4, 2023
aa436e8
feat: match app.go with original code(cosmos-sdk v0.50.1)
dudong2 Dec 5, 2023
59e77ef
test: fix lint
dudong2 Dec 5, 2023
471829b
test: fix lint
dudong2 Dec 5, 2023
2efe580
test: fix lint
dudong2 Dec 5, 2023
b04d930
test: fix lint
dudong2 Dec 5, 2023
c432160
test: fix lint
dudong2 Dec 5, 2023
1b29dbd
chore: re-enable resetta
dudong2 Dec 7, 2023
8fa6a73
test: update nix
dudong2 Dec 7, 2023
092150e
test: update nix
dudong2 Dec 7, 2023
3edd6e1
test: update nix go ver to 1.21
dudong2 Dec 7, 2023
3e98488
test: revert nix changes
dudong2 Dec 7, 2023
6a8d995
test: update nix go ver to 1.21
dudong2 Dec 7, 2023
a45f9c9
test: update gomod2nix.toml, add poetry2nix
dudong2 Dec 8, 2023
9e42966
test: fix poetry
dudong2 Dec 8, 2023
88f9af4
test: fix integration test(env, cosmovisor, ...)
dudong2 Dec 8, 2023
726aa6f
test: fix tests(finalize block, commit)
dudong2 Dec 16, 2023
ae8fb22
test: fix consensus-params-block-max_gas path in json
dudong2 Dec 19, 2023
2d37695
test: fix integration test(broken test - patch file, SyncInfo -> sync…
dudong2 Dec 20, 2023
4fb85b4
test: fix integration test - test_account
dudong2 Dec 20, 2023
3c9ca0e
test: fix test_account.py lint
dudong2 Dec 21, 2023
6d26495
test: fix warning
dudong2 Dec 21, 2023
d0facf3
test: fix integration test - remove tx priority test
dudong2 Jan 2, 2024
702808d
test: fix integration test - comment test_priority.py
dudong2 Jan 2, 2024
ad3c976
test: fix integration test lint
dudong2 Jan 3, 2024
915ed04
test: fix base fee test
dudong2 Jan 8, 2024
5bbc773
chore: uncomment or fix necessary parts
dudong2 Jan 15, 2024
a2ebdd2
chore: change migrate funcs
dudong2 Jan 15, 2024
aa5a061
chore: fix migration tests
dudong2 Jan 15, 2024
36d050f
feat: remove handler.go
dudong2 Jan 15, 2024
aa20167
test: fix lint
dudong2 Jan 15, 2024
f7059a0
chore: fix get proof and signmode
dudong2 Jan 15, 2024
56597b2
chore: remove double-quote from go ver
dudong2 Jan 15, 2024
d2d56aa
chore: rename log and import
dudong2 Jan 15, 2024
a99c931
refactor: get signers from msg v2
dudong2 Jan 15, 2024
79ac551
test: revert changed num
dudong2 Jan 15, 2024
999e93e
chore: update upgrades.go
dudong2 Jan 16, 2024
47b2ad5
chore: refactor testutil/network codes
dudong2 Jan 16, 2024
6d0df18
refactor: split cmd/root.go to cmd/commands.go and cmd/root.go
dudong2 Jan 17, 2024
9395e7d
test: fix lint
dudong2 Jan 17, 2024
c4ccd6c
chore: remove nil check of consensusparam.abci, fix eip1559 base fee …
dudong2 Jan 22, 2024
a91d782
refactor: testutil/network codes
dudong2 Jan 22, 2024
6fd2e54
refactor: server/start file
dudong2 Jan 22, 2024
455d651
chore: remove gitleaksignore
dudong2 Jan 22, 2024
10f4c55
test: fix lint
dudong2 Jan 22, 2024
4ac4d0f
test: fix integration test purned node error message
dudong2 Jan 22, 2024
d654db4
chore: modify comments
dudong2 Jan 23, 2024
3a770ab
chore: fix python lint
dudong2 Jan 23, 2024
8bdca1a
chore: add config, purning, snapshot commands
dudong2 Jan 26, 2024
31b1409
test: fix python lint, gomod2nix
dudong2 Jan 26, 2024
9ad5d16
chore: apply simple reviews
dudong2 Jan 30, 2024
4ec1412
feat: apply autocli.go
dudong2 Feb 3, 2024
e3b2a47
feat: set ibc fee keeper in app.go
dudong2 Feb 4, 2024
11d7b33
fix: evm query store, code use custom query args
dudong2 Feb 4, 2024
f996886
chore: fix ethereum rpc PUblicFilterAPI.NewHeads
dudong2 Feb 4, 2024
6cade60
chore: change EnhanceCusomCommand from false to true to restore Param…
dudong2 Feb 5, 2024
e1c4108
test: revert test_account.py
dudong2 Feb 5, 2024
e35b6b2
chore: remove x/nft, x/group, x/circuit
dudong2 Feb 7, 2024
ff3ff70
feat: fix subscribeNewHeads to use baseFee of block event
dudong2 Feb 7, 2024
f34d6fa
fix: testnet keyring option
dudong2 Feb 7, 2024
7c4fb92
test: restore multi send test
dudong2 Feb 7, 2024
fcaf830
test: debug trace
dudong2 Feb 7, 2024
550365d
chore: apply zsystem comments
dudong2 Feb 7, 2024
4ae15fe
feat: bump up cosmos-sdk v0.50.5
dudong2 Mar 26, 2024
b156e23
feat: Move ValidateBasic logic from method func of msg to msg handler
dudong2 Apr 26, 2024
fadfc6b
feat: remove ibcfee module
dudong2 May 10, 2024
28113eb
feat: add new vesting account msg to disabled authz msgs
dudong2 May 10, 2024
788a6d8
feat: enable gov module to receive external tokens
dudong2 May 10, 2024
b7b8b91
chore: bump cosmos-sdk v0.50.6
dudong2 May 10, 2024
1568452
chore: update gomod2nix.toml
dudong2 May 10, 2024
2e522a4
chore: update gomod2nix.toml for cosmos-sdk v0.50.6
dudong2 May 10, 2024
2bfcbf4
test: fix lint
dudong2 May 10, 2024
0f395e7
chore: Remove RegisterRESTRoutes from module.go
dudong2 May 12, 2024
1346a66
feat: bump ibc-go up from v8.0.0 to v8.2.1
dudong2 May 21, 2024
c1afd13
fix: Upgrade handler bug fix
dudong2 May 21, 2024
141696a
docs: changelog
dudong2 May 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 @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- uses: technote-space/[email protected]
id: git_diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- name: "Checkout Repository"
uses: actions/checkout@v3
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/deploy-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.21
check-latest: true
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '12.x'
- name: Install dependencies
run: npm install
run: |
npm install
- uses: technote-space/[email protected]
id: git_diff
with:
Expand All @@ -33,6 +38,6 @@ jobs:
go.sum
- name: Test contract
run: |
sudo make contract-tools
sudo make test-contract
sudo env "PATH=$PATH" make contract-tools
sudo env "PATH=$PATH" make test-solidity
if: env.GIT_DIFF
4 changes: 2 additions & 2 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- name: release dry run
run: make release-dry-run
Expand All @@ -25,4 +25,4 @@ jobs:
run: |-
echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
- name: release publish
run: make release
run: make release
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Required: setup-go, for all versions v3.0.0+ of golangci-lint
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand All @@ -47,7 +47,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand All @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.21
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand Down
15 changes: 7 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ run:
linters:
enable:
- bodyclose
- depguard
- dogsled
- dupl
- errcheck
Expand Down Expand Up @@ -63,13 +62,13 @@ linters-settings:
require-explanation: false
require-specific: false
gofumpt:
lang-version: "1.19"
lang-version: "1.21"
gomodguard:
blocked:
versions: # List of blocked module version constraints
- https://github.com/etcd-io/etcd: # Blocked module with version constraint
version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional)
- https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional)
- https://github.com/etcd-io/etcd: # Blocked module with version constraint
version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional)
- https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional)
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ build, in which case we can fall back on `go mod tidy -v`.

## Protobuf

We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/gogo/protobuf) to generate code for use in Ethermint.
We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/cosmos/gogoproto) to generate code for use in Ethermint.

For determinstic behavior around Protobuf tooling, everything is containerized using Docker. Make sure to have Docker installed on your machine, or head to [Docker's website](https://docs.docker.com/get-docker/) to install it.

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine AS build-env
FROM golang:1.21-alpine AS build-env

# Set up dependencies
ENV PACKAGES git build-base
Expand Down
65 changes: 20 additions & 45 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
VERSION ?= $(shell echo $(shell git describe --tags `git rev-list --tags="v*" --max-count=1`) | 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')
LEDGER_ENABLED ?= true
BINDIR ?= $(GOPATH)/bin
Expand Down Expand Up @@ -72,7 +72,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=ethermint \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION)
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TMVERSION)

ifeq ($(ENABLE_ROCKSDB),true)
BUILD_TAGS += rocksdb_build
Expand Down Expand Up @@ -176,7 +176,7 @@ build-all: tools build lint test vulncheck
###############################################################################

PACKAGE_NAME:=github.com/evmos/ethermint
GOLANG_CROSS_VERSION = v1.19
GOLANG_CROSS_VERSION = v1.21
GOPATH ?= '$(HOME)/go'
release-dry-run:
docker run \
Expand Down Expand Up @@ -241,7 +241,7 @@ endif

ifeq (, $(shell which go-bindata))
@echo "Installing go-bindata..."
@go get github.com/kevinburke/go-bindata/go-bindata
@go get github.com/kevinburke/go-bindata
else
@echo "go-bindata already installed; skipping..."
endif
Expand All @@ -255,7 +255,7 @@ endif

ifeq (, $(shell which protoc-gen-go))
@echo "Installing protoc-gen-go..."
@go get github.com/fjl/gencodec github.com/golang/protobuf/protoc-gen-go
@go get github.com/fjl/gencodec google.golang.org/protobuf/cmd/protoc-gen-go
else
@echo "protoc-gen-go already installed; skipping..."
endif
Expand Down Expand Up @@ -357,7 +357,7 @@ test-solidity:
./scripts/run-solidity-tests.sh


.PHONY: run-tests test test-all test-import test-rpc test-contract test-solidity $(TEST_TARGETS)
.PHONY: run-tests test test-all test-import test-rpc test-solidity $(TEST_TARGETS)


benchmark:
Expand Down Expand Up @@ -392,30 +392,9 @@ format-fix:
### Protobuf ###
###############################################################################

# ------
# NOTE: Link to the tendermintdev/sdk-proto-gen docker images:
# https://hub.docker.com/r/tendermintdev/sdk-proto-gen/tags
#
protoVer=v0.7
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
protoImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
# ------
# NOTE: cosmos/proto-builder image is needed because clang-format is not installed
# on the tendermintdev/sdk-proto-gen docker image.
# Link to the cosmos/proto-builder docker images:
# https://github.com/cosmos/cosmos-sdk/pkgs/container/proto-builder
#
protoCosmosVer=0.11.2
protoCosmosName=ghcr.io/cosmos/proto-builder:$(protoCosmosVer)
protoCosmosImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /workspace $(protoCosmosName)
# ------
# NOTE: Link to the yoheimuta/protolint docker images:
# https://hub.docker.com/r/yoheimuta/protolint/tags
#
protolintVer=0.42.2
protolintName=yoheimuta/protolint:$(protolintVer)
protolintImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /workspace $(protolintName)

protoVer=0.14.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

# ------
# NOTE: If you are experiencing problems running these commands, try deleting
Expand All @@ -426,28 +405,24 @@ proto-all: proto-format proto-lint proto-gen
proto-gen:
@echo "Generating Protobuf files"
$(protoImage) sh ./scripts/protocgen.sh


# TODO: Rethink API docs generation
# proto-swagger-gen:
# @echo "Generating Protobuf Swagger"
# $(protoImage) sh ./scripts/protoc-swagger-gen.sh

proto-format:
@echo "Formatting Protobuf files"
$(protoCosmosImage) find ./ -name *.proto -exec clang-format -i {} \;

# NOTE: The linter configuration lives in .protolint.yaml
proto-lint:
@echo "Linting Protobuf files"
$(protolintImage) lint ./proto
@$(protoImage) buf lint --error-format=json

proto-check-breaking:
@echo "Checking Protobuf files for breaking changes"
$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main

# TODO: Rethink API docs generation
proto-swagger-gen:
@echo "Generating Protobuf Swagger"
$(protoImage) sh ./scripts/protoc-swagger-gen.sh

proto-format:
@echo "Formatting Protobuf files"
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;

.PHONY: proto-all proto-gen proto-gen-any proto-format proto-lint proto-check-breaking
.PHONY: proto-all proto-gen proto-format proto-lint proto-check-breaking

###############################################################################
### Localnet ###
Expand Down
Loading
Loading