feat: cosmos v0.47 upgrade #2039

skosito · 2024-04-17T15:27:02Z

Description

NOTE: a lot of files changed in the diff, but most are cli docs md files changes from auto generation, and things like moving files and changing imports, so PR is not that big.

Ethermint commit used here is in this PR: zeta-chain/ethermint#2

Closes all issues from epic: #1928

Going through this doc: https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#migration-to-cometbft-part-1

Migration to comet bft is done, but tendermint dependency is still there because go-tss is using it in zetaclient, but upgrade doc suggest to remove it everywhere. Can we migrate in go-tss too?

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#simulation

RandomizedParams is cleaned up and empty implementation of ProposalMsgs is added (even though not needed).

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#grpc

This is added in app.go RegisterAPIRoutes.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#appmodule-interface

These methods are removed.

Updated, also network tests are a bit updated with changes from cosmos 0.47 codebase.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#app-wiring

Not sure app wiring is used, so this is not relevant.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#constructor

Constructor is simplified, and also base app opts method is used, overriding mempool like this:

baseappOptions := server.DefaultBaseappOptions(appOpts)
	baseappOptions = append(baseappOptions, func(app *baseapp.BaseApp) {
		app.SetMempool(mempool.NoOpMempool{})
	})

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#export

Added modulesToExport argument as suggested.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#replaces

This was already done.

Proto updates:

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#replaces

This is updated, and also using docker as suggested in makefile for proto gen.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#gogoproto-import-paths

Added zetachain/zetacore subdirectories to proto folder to be inline with this.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#acceptsimplements_interface-proto-annotations

Nothing needed here.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#broadcast-mode

Done in separate PR: #2001

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#all

This is not changed, as suggested when module name is not second in message route.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#xparams

Done in separate PR: #2014 , but here relevant handler upgrade is added.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#xgov

No code changes needed here it seems.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#new-proposalproposer-field

Optional migration for existing proposals, skipped at the moment.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#xconsensus

Added to upgrade handler.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#appgo-changes

This is updated.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#xnft

Not relevant.

https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#ledger

Looks not relevant.
Closes:

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

Important: tested also with upgrade e2e tests, by using current develop as OLD_VERSION.

Please describe the tests that you ran to verify your changes. Include instructions and any relevant details so others can reproduce.

Checklist:

I have added unit tests that prove my fix feature works

go.mod

kingpinXD · 2024-04-24T18:40:55Z

app/setup_handlers.go

@@ -40,7 +82,7 @@ func SetupHandlers(app *App) {
 	}
 	if upgradeInfo.Name == releaseVersion && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
-			Added: []string{authoritytypes.ModuleName, lightclienttypes.ModuleName},
+			Added: []string{authoritytypes.ModuleName, lightclienttypes.ModuleName, consensustypes.ModuleName, crisistypes.ModuleName},


Should crisis be added here ?

i think so, saw it in simapp example in 0.47 codebase, but maybe there is a reason to not add it?

Hmm , checked on develop the crisis module is already present .
https://github.com/zeta-chain/zeta-node/blob/022ea57e25b4e0cb338b99bbd1c9e235f41ae954/app/app.go#L514-L514

Adding it again might result in a consensus version mismatch because the initial version has already been set . I am not sure though if there is a special reason for adding crisis again , the upgrade test might help when we run it

we still need to add this, because crisis module only has store now when params are migrated
this is when i tested upgrade without it:

failed to load latest version: version of store crisis mismatch root store's version; expected 89 got 0; new stores should be added using StoreUpgrades

and also from upgrading to 0.47 docs: https://github.com/cosmos/cosmos-sdk/blob/v0.47.10/UPGRADING.md#xcrisis

app/setup_handlers.go

cmd/zetacored/root.go

lumtis

Looks good, some small comments

app/app.go

changelog.md

lumtis · 2024-04-26T08:05:35Z

go.mod

 	github.com/nanmu42/etherscan-api v1.10.0
 	github.com/onrik/ethrpc v1.2.0
+	github.com/tendermint/tendermint v0.34.14


Yes, let's create a tag in go-tss?

x/emissions/types/message_update_params_test.go

x/emissions/types/params.go

x/emissions/types/params_legacy.go

* Remove broadcast mode block wip * Fixes * Changelog * PR comments * Lint fix * refactor: remove fungible params (#2004) * Remove unused params from fungible module * Make generate * Changelog * Lint fix * Lint fix * Fix changelog * Revert proto indexes * Make generate * refactor: deprecate x/params (#2014) * Remove unused params from fungible module * Make generate * Changelog * Lint fix * Lint fix * Migrate emissions params to store * Migrate observer params to its own store * Make generate * Changelog * Lint fixes * Add observer slash amount param to migrate script * Fix tests * Lint fixes * Fixes * Lint fixes * Fixes * Tests * Small cleanup * Remove not needed params store mock * Fixes after merge * Add found flag to get params method * Move ballot maturity blocks param to emissions module * Remove params from observer module * Fix build * PR comments * PR comment * PR comments * PR comments * feat: cosmos v0.47 upgrade (#2039) * proto fixes after merge * Fix tx proto emissions * fixes * make generate * remove tendermint usage * Update changelog * fix test * add some logs to proto gen script * permissions * add more logs * test * test * test * test * test * test * test * test * test * test * cleanup * cleanup * always format proto before generation * generate explicit format deps * set docker username to fix permissions in CI * dummy proto change to test formatting * set buf cache directory * Revert "dummy proto change to test formatting" This reverts commit 7e5c0dc. * refactor: update go-tss (#2094) * Remove unused params from fungible module * Make generate * Changelog * Lint fix * Lint fix * Migrate emissions params to store * Migrate observer params to its own store * Make generate * Changelog * Lint fixes * Add observer slash amount param to migrate script * Fix tests * Lint fixes * Fixes * Lint fixes * Fixes * Tests * Small cleanup * Try upgrade with simapp change * Remove not needed params store mock * fix compile errors * proto changes * Fixes * Upgrade handler changes * Fixes * Fix e2e test * Fixes after merge * Add found flag to get params method * Move ballot maturity blocks param to emissions module * Remove params from observer module * Fix build * Regen proto * Fixes for e2e tests * Fix some unit tests * Fix some lint errors * Fix more unit tests * PR comments * Proto paths fixes * Linters * make typescript * proto format * make specs * make docs * make gen * lint * Fix some unit tests * Fix cli test suites * Fix lints * Tmp comment unit test * lint * Use latest ethermint change and fix test * PR comment * PR comments * Fix one more import * Cleanup * Lint fix * Bump zetachain ethermint * Remove cometbft replace * go mod tidy * bump ethermint * Revert replace * Bump ethermint * Proto files updates after merge * Make generate * Bump ethermint * Fix PR comments * Formatting * Mention observer params removal in breaking changes in changelog * bump ethermint * Remove tendermint dep after go-tss upgrade * go mod tidy * bump go-tss * changelog * changelog --------- Co-authored-by: Alex Gartner <[email protected]> Co-authored-by: Lucas Bertrand <[email protected]>

skosito added 27 commits April 9, 2024 23:15

Remove unused params from fungible module

faf57e9

Make generate

39d8eeb

Changelog

ec1cbec

Lint fix

697395e

Lint fix

3ad1bc3

Migrate emissions params to store

5b7e6ca

Migrate observer params to its own store

c4a7328

Merge branch 'remove-broadcastmode-block' into params-upgrade

59326cb

Make generate

c3e0ce6

Changelog

5c311a8

Lint fixes

cdbd412

Add observer slash amount param to migrate script

c185179

Fix tests

d32aa34

Lint fixes

dbfb052

Fixes

6aad8db

Lint fixes

90d99d3

Fixes

e146fc5

Tests

6eb076b

Small cleanup

4edfbd0

Try upgrade with simapp change

54c26d0

Remove not needed params store mock

dc97a25

fix compile errors

802e51b

proto changes

b306a42

Fixes

a7f8db7

Upgrade handler changes

e69aaa5

Fixes

821c027

Merge branch 'remove-broadcastmode-block' into params-upgrade

d04c043

github-actions bot added breaking:proto breaking:cli labels Apr 17, 2024

Fix e2e test

b8565ce

skosito mentioned this pull request Apr 23, 2024

sdk0.47 update zeta-chain/ethermint-fork#2

Merged

skosito added 2 commits April 23, 2024 02:18

Bump zetachain ethermint

7918ddc

Remove cometbft replace

eb4b62c

skosito commented Apr 23, 2024

View reviewed changes

go.mod Show resolved Hide resolved

skosito added 4 commits April 23, 2024 02:22

go mod tidy

4a8fee0

bump ethermint

f376b74

Revert replace

b1f4ef1

Bump ethermint

a6baf2e

kingpinXD reviewed Apr 24, 2024

View reviewed changes

app/setup_handlers.go Show resolved Hide resolved

kingpinXD reviewed Apr 24, 2024

View reviewed changes

cmd/zetacored/root.go Show resolved Hide resolved

Base automatically changed from params-upgrade to feat-cosmos-sdk-0.47.10-upgrade April 25, 2024 12:38

skosito mentioned this pull request Apr 25, 2024

zetacored migrations run twice #2077

Closed

lumtis reviewed Apr 26, 2024

View reviewed changes

skosito mentioned this pull request Apr 26, 2024

feat: cosmos-sdk 0.47 upgrade zeta-chain/ethermint#22

Merged

skosito added 6 commits April 26, 2024 16:42

Merge branch 'feat-cosmos-sdk-0.47.10-upgrade' into cosmos-v0.47-upgrade

0c679ff

Proto files updates after merge

fbe40f5

Make generate

70eec6f

Bump ethermint

79a7d2e

Fix PR comments

0d7c4b8

Formatting

49802da

lumtis approved these changes Apr 29, 2024

View reviewed changes

skosito added 2 commits April 29, 2024 13:39

Mention observer params removal in breaking changes in changelog

6aa34c5

bump ethermint

519fb01

skosito requested a review from kingpinXD April 29, 2024 12:43

kingpinXD approved these changes Apr 29, 2024

View reviewed changes

skosito merged commit 5a410a4 into feat-cosmos-sdk-0.47.10-upgrade Apr 29, 2024
18 checks passed

skosito deleted the cosmos-v0.47-upgrade branch April 29, 2024 18:44

skosito mentioned this pull request Apr 30, 2024

feat: cosmos sdk 0.47.10 upgrade #2100

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: cosmos v0.47 upgrade #2039

feat: cosmos v0.47 upgrade #2039

skosito commented Apr 17, 2024 •

edited

Loading

kingpinXD Apr 24, 2024

skosito Apr 24, 2024

kingpinXD Apr 25, 2024

skosito Apr 26, 2024

lumtis left a comment

lumtis Apr 26, 2024

feat: cosmos v0.47 upgrade #2039

feat: cosmos v0.47 upgrade #2039

Conversation

skosito commented Apr 17, 2024 • edited Loading

Description

Type of change

How Has This Been Tested?

Checklist:

kingpinXD Apr 24, 2024

Choose a reason for hiding this comment

skosito Apr 24, 2024

Choose a reason for hiding this comment

kingpinXD Apr 25, 2024

Choose a reason for hiding this comment

skosito Apr 26, 2024

Choose a reason for hiding this comment

lumtis left a comment

Choose a reason for hiding this comment

lumtis Apr 26, 2024

Choose a reason for hiding this comment

skosito commented Apr 17, 2024 •

edited

Loading