diff --git a/CHANGELOG.md b/CHANGELOG.md index c8587607d..6dbb2af08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ ### Improvements - [#1169](https://github.com/crypto-org-chain/chain-main/pull/1169) Update linter and tidy up code +*July 9, 2025* + +## v6.0.0-2 +- [#1174](https://github.com/crypto-org-chain/chain-main/pull/1174) Replace cosmos sdk fork with official version. + *May 26, 2025* ## v6.0.0 diff --git a/app/upgrades.go b/app/upgrades.go index 69ce99ebf..38a6851ea 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -179,6 +179,13 @@ func (app *ChainApp) RegisterUpgradeHandlers(cdc codec.BinaryCodec) { // configure store loader that checks if version == upgradeHeight and applies store upgrades app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) } + + // Dummy upgrade handler for testnet as it has already been upgraded + testnetPlanName := "v6.0.0-testnet" + app.UpgradeKeeper.SetUpgradeHandler(testnetPlanName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // All the module should be at their latest version already, this method should return without doing anything + return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM) + }) } func UpdateExpeditedParams(ctx context.Context, gov govkeeper.Keeper) error { diff --git a/default.nix b/default.nix index 61ebbfbec..97455f8d5 100644 --- a/default.nix +++ b/default.nix @@ -39,7 +39,7 @@ let in buildGoApplication rec { pname = "chain-maind"; - version = "v6.0.0"; + version = "v6.0.0-2"; go = buildPackages.go_1_23; src = lib.cleanSourceWith { name = "src"; diff --git a/go.mod b/go.mod index 0fd4b1eea..d89e99b81 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( cosmossdk.io/x/upgrade v0.1.4 github.com/cometbft/cometbft v0.38.17 github.com/cosmos/cosmos-db v1.1.1 - github.com/cosmos/cosmos-sdk v0.50.13 + github.com/cosmos/cosmos-sdk v0.50.14 github.com/cosmos/gogoproto v1.7.0 github.com/cosmos/ibc-go/modules/capability v1.0.1 github.com/cosmos/ibc-go/v8 v8.7.0 @@ -229,9 +229,6 @@ replace ( replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - - // release/chain-main/v0.50.x - github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250515092613-f67eec43305b // dgrijalva/jwt-go is deprecated and doesn't receive security updates. // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index cd090087b..c1cac7256 100644 --- a/go.sum +++ b/go.sum @@ -421,6 +421,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= +github.com/cosmos/cosmos-sdk v0.50.14 h1:G8CtGHFWbExa+ZpVOVAb4kFmko/R30igsYOwyzRMtgY= +github.com/cosmos/cosmos-sdk v0.50.14/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= @@ -453,8 +455,6 @@ github.com/creachadair/tomledit v0.0.24 h1:5Xjr25R2esu1rKCbQEmjZYlrhFkDspoAbAKb6 github.com/creachadair/tomledit v0.0.24/go.mod h1:9qHbShRWQzSCcn617cMzg4eab1vbLCOjOshAWSzWr8U= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250515092613-f67eec43305b h1:gIBPJumFHfzuwmdReRANQTyWQKK/Vh2LHlpKdSrlqeA= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250515092613-f67eec43305b/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw= github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20241028093154-0f94930c27ce h1:yRF9Zsk4fzVBhBQEjkA4oE+Q3Q/Kgaj/UX4gK+xwaAs= github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20241028093154-0f94930c27ce/go.mod h1:IyRvgFKOQPC/Qdx543PGl6WgeDOU+hWdv+xLz3stotc= github.com/crypto-org-chain/cronos/store v0.0.5-0.20241028093154-0f94930c27ce h1:g6ltW2J6W10pp8poYCfjUwVkzHy2izh7/71EvUXRgjM= diff --git a/gomod2nix.toml b/gomod2nix.toml index 5da82a0cd..ea42b6296 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -153,9 +153,8 @@ schema = 3 version = "v1.0.0-beta.5" hash = "sha256-Fy/PbsOsd6iq0Njy3DVWK6HqWsogI+MkE8QslHGWyVg=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.50.6-0.20250515092613-f67eec43305b" - hash = "sha256-l+hjQshLCgptTxAxZWXAN6lZ02mjMifEHkaDmElkukg=" - replaced = "github.com/crypto-org-chain/cosmos-sdk" + version = "v0.50.14" + hash = "sha256-IChk3/9KRGlUFPRJvA3fFBsGkKDKImE5FSv4jRlJyFg=" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="