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, cometbft v0.38.x #53

Merged
merged 98 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
56013ce
feat: canto cosmos-sdk v0.50.1 bump up - 1
dudong2 Dec 4, 2023
f066fec
feat: fix protobuf
dudong2 Dec 4, 2023
0e79cef
fix: simulation for coinswap module
poorphd Dec 5, 2023
5af5df3
build: fix app
dudong2 Dec 6, 2023
8294ab2
build: fix ibc
dudong2 Dec 6, 2023
2349d1c
chore: fix csr, epochs modules begin/endblcoker
dudong2 Dec 7, 2023
ef9937b
wip: error fix in Canto modules
poorphd Dec 7, 2023
081b7ea
update ethermint dependecny to hotfix version
zsystm Dec 11, 2023
20a1287
wip: error fix in Canto modules
poorphd Dec 15, 2023
da1936f
chore: fix staking keeper in app.go, fix proto files
dudong2 Dec 18, 2023
bd97a70
chore: add chainid for test_helper newcanto func
dudong2 Dec 18, 2023
e04433c
test: fix consensus params store type in app.go
dudong2 Dec 18, 2023
2e7a553
test: fix account number, finalize block in suite.commit
dudong2 Dec 18, 2023
f01ad22
feat: match begin block func with interface
dudong2 Dec 18, 2023
c9aef01
wip: error fix in Canto modules
poorphd Dec 19, 2023
ac99f12
Merge pull request #117 from b-harvest/ethermint-rpc-hotfix
tkkwon1998 Dec 19, 2023
f2ad9c5
wip: error fix in Canto modules
poorphd Dec 20, 2023
a1990b3
test: fix tests(finalize block, chain id, check inv)
dudong2 Dec 22, 2023
f173484
feat: fix msgs, proto, swagger
dudong2 Dec 22, 2023
d684e37
revert: feat: msgs
dudong2 Dec 22, 2023
8076ae1
test: fix integration test - remove deliver tx
dudong2 Dec 22, 2023
4f9b600
wip: error fix in Canto modules
poorphd Jan 3, 2024
3fbe31a
chore: remove ante test tx fee checker
dudong2 Jan 3, 2024
a996e68
wip: error fix in Canto modules
poorphd Jan 4, 2024
942369b
wip: error fix in Canto modules
poorphd Jan 5, 2024
40cf33e
fix: fix ibc middleware register from app.go
dudong2 Jan 8, 2024
1bf8d5a
fix: modify SignAndDeliver for ProposalAddress
dudong2 Jan 8, 2024
b02883a
test: fix ibc module test error string
dudong2 Jan 8, 2024
703e989
wip: error fix in Canto modules
poorphd Jan 8, 2024
1f19e00
test: modify epoch compared info
dudong2 Jan 8, 2024
fdfb629
test: fix x/inflation CommitAfter for epoch
dudong2 Jan 8, 2024
8c4da07
feat: fix chain id
dudong2 Jan 9, 2024
bf78867
feat: update ethermint
dudong2 Jan 9, 2024
6c7b232
feat: add tx, query module command
dudong2 Jan 10, 2024
b77f117
wip: MsgUpdateParams for coinswap module
poorphd Jan 12, 2024
e050c96
feat: MsgUpdateParams for erc20 module
poorphd Jan 15, 2024
55bb101
wip: proposals for erc20 module
poorphd Jan 15, 2024
183fe43
feat: proposals for erc20 module
poorphd Jan 16, 2024
9cd30c9
chore: fix consensus_params
dudong2 Jan 16, 2024
9c374c1
chore: ethermint update
dudong2 Jan 23, 2024
d0b8d53
wip: fuzz test determinism
poorphd Jan 25, 2024
c16284e
chore: remove todo comments, implements upgrade codes
dudong2 Jan 26, 2024
52b2753
test: fix setAnteHandler(pass appCodec, simulation args)
dudong2 Jan 26, 2024
c4df33d
fix: TestDeterminism simulation
poorphd Jan 26, 2024
f06e025
chore: remove swagger check todo comment
dudong2 Jan 26, 2024
e4dd4ac
refactor: use KVStoreService in x/coinswap
dudong2 Jan 26, 2024
f419b72
refactor: use KVStoreService in x/inflation
dudong2 Jan 26, 2024
ba522ce
refactor: use KVStoreService in x/erc20
dudong2 Jan 26, 2024
263b960
refactor: use KVStoreService in x/govshuttle
dudong2 Jan 26, 2024
8aa615c
refactor: use KVStoreService in x/csr
dudong2 Jan 26, 2024
f8cef06
test: fix AppStateFromGenesisFileFn
dudong2 Jan 26, 2024
676ff72
chore: add config, purning, snapshot commands
dudong2 Jan 26, 2024
5c9651c
test: fix sim-custom-genesis-fast
dudong2 Jan 26, 2024
3ce6388
wip: TestAppExportImport simulation
poorphd Jan 26, 2024
265ed92
feat: TestAppExportImport & TestAppSimulationAfterImport simulation
poorphd Jan 29, 2024
3f2d25f
wip: upgrade handler
poorphd Jan 31, 2024
99267ee
wip: upgrade handler
poorphd Feb 2, 2024
a72ac05
feat: upgrade handler for v8.0.0
poorphd Feb 2, 2024
a23d849
feat: set ibc fee keeper in app.go
dudong2 Feb 4, 2024
2cfa973
chore: remove x/nft, x/group, x/circuit
dudong2 Feb 7, 2024
4d5c921
feat: legacy proposal
poorphd Feb 7, 2024
f1eaf61
fix: govshuttle proposal
poorphd Feb 7, 2024
81ac177
fix: upgrade handler
poorphd Feb 7, 2024
d6d1b64
fix: proposal
poorphd Feb 8, 2024
8f1c7bf
feat: bump up cosmos-sdk v0.50.5
dudong2 Mar 26, 2024
4c1059c
feat: Add update params for csr, inflation, onboarding modules
dudong2 Apr 22, 2024
27731d7
test: Bump go version from 1.18 to 1.21
dudong2 Apr 22, 2024
2ac54ac
chore: Update gov config - MaxMetadataLen from default value(255) to …
dudong2 Apr 22, 2024
833ee79
docs: update swagger docs for cosmos, ethermint
dudong2 Apr 24, 2024
21d14f9
feat: Move ValidateBasic logic from method func of msg to msg handler
dudong2 Apr 26, 2024
9af7a83
chore: Revert Network/****/genesis.json
dudong2 Apr 26, 2024
8d49df1
test: Fix sim test to not run on normal test
dudong2 Apr 26, 2024
3ec4b10
feat: Apply ethermint changes(remove cutsom GetSignerFunc from MsgUpd…
dudong2 Apr 29, 2024
722fb25
chore: Revert Network/****/genesis.json
dudong2 Apr 30, 2024
9cafddf
test: Add MsgUpdateParams test
dudong2 May 9, 2024
44cef59
chore: bump cosmos-sdk v0.50.6
dudong2 May 9, 2024
62ea35b
feat: remove ibcfee module
dudong2 May 9, 2024
79c99d1
feat: add new vesting account msg to disabled authz msgs
dudong2 May 9, 2024
23516e5
feat: enable gov module to receive external tokens
dudong2 May 9, 2024
5afc5c9
test: fix TestHandleMsgTransfer
dudong2 May 9, 2024
354fb4c
test: Add prooposal test
dudong2 May 9, 2024
a263595
test: Add update params test for coinswap module
dudong2 May 9, 2024
fad4908
feat: Apply autocli
dudong2 May 9, 2024
aa940e9
chore: bump up ethermint
dudong2 May 10, 2024
c786515
feat: Remove UpdateParams from govshuttle module
dudong2 May 10, 2024
df065d9
feat: Block all module addr to receive external tokens
dudong2 May 10, 2024
02e21b1
feat: Bump up ibc-go v8.2.1feat: Add ibc-go upgrade handler codes
dudong2 May 10, 2024
9ef58a0
chore: Remove unnecessary comments and fix ide warnings
dudong2 May 12, 2024
36053ab
chore: Bump up ethermint
dudong2 May 12, 2024
38a6092
feat: Remove NewValidatorCommissionDecorator and set min_commission_r…
dudong2 May 13, 2024
e2b7df2
test: Add v7 -> v8 upgrade unit test
dudong2 May 13, 2024
37b9b93
Revert "feat: Apply autocli"
dudong2 May 13, 2024
08a4022
fix: Upgrade handler bug fix
dudong2 May 21, 2024
cf253a9
feat: bump up ethermint
dudong2 May 21, 2024
12b84ac
Merge branch 'main' into dudong2/feat/[email protected]
dudong2 May 21, 2024
eb41c9f
docs: changelog
dudong2 May 22, 2024
f579193
docs: changelog
dudong2 May 22, 2024
f982413
test: Fix sim_test using TestFullAppSimulation func
dudong2 May 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 24 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
DIFF_TAG=$(shell git rev-list --tags="v*" --max-count=1 --not $(shell git rev-list --tags="v*" "HEAD..origin"))
DEFAULT_TAG=$(shell git rev-list --tags="v*" --max-count=1)
VERSION ?= $(shell echo $(shell git describe --tags $(or $(DIFF_TAG), $(DEFAULT_TAG))) | 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
GOPATH ?= $(shell $(GO) env GOPATH)
Expand Down Expand Up @@ -91,7 +91,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=canto \
-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)

# DB backend selection
ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
Expand Down Expand Up @@ -390,8 +390,7 @@ test-sim-nondeterminism-long:
test-sim-custom-genesis-fast:
@echo "Running custom genesis simulation..."
@echo "By default, ${HOME}/.$(canto_DIR)/config/genesis.json will be used."
@go test -mod=readonly $(SIMAPP) -run TestFullAppSimulation -Genesis=${HOME}/.$(canto_DIR)/config/genesis.json \
-Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=5 -Period=1 -v -timeout 1h
@go test -mod=readonly $(SIMAPP) -run TestFullAppSimulation -Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Seed=5 -Period=1 -v -timeout 1h

test-sim-import-export: runsim
@echo "Running application import/export simulation. This may take several minutes..."
Expand Down Expand Up @@ -478,33 +477,37 @@ format:
### Protobuf ###
###############################################################################

containerProtoVer=v0.2
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)
protoVer=0.14.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

proto-all: proto-format proto-gen proto-swagger-gen update-swagger-docs
# ------
# NOTE: If you are experiencing problems running these commands, try deleting
# the docker images and execute the desired command again.
#
proto-all: proto-format proto-lint proto-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-check-breaking:
@echo "Checking Protobuf files for breaking changes"
@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main

# TODO: Rethink API docs generation
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
$(protoImage) sh ./scripts/protoc-swagger-gen.sh

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

proto-lint:
@$(DOCKER_BUF) lint --error-format=json
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;

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


TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.15/proto/tendermint
Expand Down Expand Up @@ -532,7 +535,7 @@ proto-update-deps:
## Importing of tendermint protobuf definitions currently requires the
## use of `sed` in order to build properly with cosmos-sdk's proto file layout
## (which is the standard Buf.build FILE_LAYOUT)
## Issue link: https://github.com/tendermint/tendermint/issues/5021
## Issue link: https://github.com/cometbft/cometbft/issues/5021
@mkdir -p $(TM_ABCI_TYPES)
@curl -sSL $(TM_URL)/abci/types.proto > $(TM_ABCI_TYPES)/types.proto

Expand Down
36 changes: 19 additions & 17 deletions Networks/Mainnet/genesis.json
dongsam marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
"genesis_time": "2022-07-26T17:27:56.407386144Z",
"chain_id": "canto_7700-1",
"initial_height": "1",
"consensus_params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
"consensus": {
"params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
}
},
"app_hash": "",
"app_state": {
Expand Down
36 changes: 19 additions & 17 deletions Networks/Testnet/genesis-files/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
"genesis_time": "2022-07-26T04:07:10.395216142Z",
"chain_id": "canto_740-1",
"initial_height": "1",
"consensus_params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
"consensus": {
"params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
}
},
"app_hash": "",
"app_state": {
Expand Down
36 changes: 19 additions & 17 deletions Networks/Testnet/genesis-files/plex-genesis/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
"genesis_time": "2022-07-26T04:07:10.395216142Z",
"chain_id": "canto_740-1",
"initial_height": "1",
"consensus_params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
"consensus": {
"params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
}
},
"app_hash": "",
"app_state": {
Expand Down
36 changes: 19 additions & 17 deletions Networks/Testnet/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
"genesis_time": "2022-07-26T04:07:10.395216142Z",
"chain_id": "canto_740-1",
"initial_height": "1",
"consensus_params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
"consensus": {
"params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "1000"
},
"evidence": {
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000",
"max_bytes": "1048576"
},
"validator": {
"pub_key_types": [
"ed25519"
]
},
"version": {}
}
},
"app_hash": "",
"app_state": {
Expand Down
Loading
Loading