From 133cc1fe40668163f37cb636e7246f1769a163d8 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Sun, 26 Nov 2023 12:35:06 +0200 Subject: [PATCH 1/2] chore(v2.8): prepare release --- app/config/const.go | 1 + app/modules.go | 5 +++++ app/upgrade_handler.go | 9 +++++++++ app/upgrades/v2.8/upgrade.go | 18 ++++++++++++++++++ client/docs/config.json | 4 ++-- client/docs/swagger-ui/swagger.yaml | 4 ++-- integration-tests/package-lock.json | 4 ++-- integration-tests/package.json | 2 +- scripts/tests/chain-upgrade/chain-upgrade.sh | 2 +- 9 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 app/upgrades/v2.8/upgrade.go diff --git a/app/config/const.go b/app/config/const.go index 06ccd51e..e25af1d1 100644 --- a/app/config/const.go +++ b/app/config/const.go @@ -218,4 +218,5 @@ const ( Upgrade2_5 = "v2.5" Upgrade2_6 = "v2.6" Upgrade2_7 = "v2.7" + Upgrade2_8 = "v2.8" ) diff --git a/app/modules.go b/app/modules.go index 29d7767d..13fb70d3 100644 --- a/app/modules.go +++ b/app/modules.go @@ -162,6 +162,11 @@ func appModules(app *TerraApp, encodingConfig terrappsparams.EncodingConfig, ski } } +// NOTE: The genutils module must occur after staking so that pools are +// properly initialized with tokens from genesis accounts. +// NOTE: Capability module must occur first so that it can initialize any capabilities +// so that other modules that want to create or claim capabilities afterwards in InitChain +// can do so safely. var initGenesisOrder = []string{ capabilitytypes.ModuleName, authtypes.ModuleName, diff --git a/app/upgrade_handler.go b/app/upgrade_handler.go index 47966114..ab3bce97 100644 --- a/app/upgrade_handler.go +++ b/app/upgrade_handler.go @@ -13,6 +13,7 @@ import ( v2_5 "github.com/terra-money/core/v2/app/upgrades/v2.5" v2_6 "github.com/terra-money/core/v2/app/upgrades/v2.6" v2_7 "github.com/terra-money/core/v2/app/upgrades/v2.7" + v2_8 "github.com/terra-money/core/v2/app/upgrades/v2.8" feesharetypes "github.com/terra-money/core/v2/x/feeshare/types" tokenfactorytypes "github.com/terra-money/core/v2/x/tokenfactory/types" @@ -75,6 +76,14 @@ func (app *TerraApp) RegisterUpgradeHandlers() { app.Keepers.ICQKeeper, ), ) + app.Keepers.UpgradeKeeper.SetUpgradeHandler( + terraappconfig.Upgrade2_8, + v2_8.CreateUpgradeHandler( + app.GetModuleManager(), + app.GetConfigurator(), + app.GetAppCodec(), + ), + ) } func (app *TerraApp) RegisterUpgradeStores() { diff --git a/app/upgrades/v2.8/upgrade.go b/app/upgrades/v2.8/upgrade.go new file mode 100644 index 00000000..6881dbd4 --- /dev/null +++ b/app/upgrades/v2.8/upgrade.go @@ -0,0 +1,18 @@ +package v2_8 + +import ( + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + cdc codec.Codec, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + return mm.RunMigrations(ctx, cfg, fromVM) + } +} diff --git a/client/docs/config.json b/client/docs/config.json index 45d84994..d289fb3a 100644 --- a/client/docs/config.json +++ b/client/docs/config.json @@ -1,8 +1,8 @@ { "swagger": "2.0", "info": { - "description": "Source code for Terra Core v2.7
UI to interact with the blockchain Station
Create a DAO on Terra using Enterprise
Run on-chain automted jobs Wrap
Explore the network using TerraScope
Anything you need to know about shared security on Alliance Docs
More info about the protocol on Terra Docs", - "version": "2.7" + "description": "Source code for Terra Core v2.8
UI to interact with the blockchain Station
Create a DAO on Terra using Enterprise
Run on-chain automted jobs Wrap
Explore the network using TerraScope
Anything you need to know about shared security on Alliance Docs
More info about the protocol on Terra Docs", + "version": "v2.8" }, "apis": [ { diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml index 0d6c1f05..9e7629f5 100644 --- a/client/docs/swagger-ui/swagger.yaml +++ b/client/docs/swagger-ui/swagger.yaml @@ -2,7 +2,7 @@ swagger: '2.0' info: description: >- Source code for Terra Core v2.7
UI to + href='https://github.com/terra-money/core'>Terra Core v2.8
UI to interact with the blockchain Station
Create a DAO on Terra using Alliance Docs
More info about the protocol on Terra Docs - version: '2.7' + version: 'v2.8' paths: /terra/alliances: get: diff --git a/integration-tests/package-lock.json b/integration-tests/package-lock.json index 31a99be5..3054972b 100644 --- a/integration-tests/package-lock.json +++ b/integration-tests/package-lock.json @@ -1,12 +1,12 @@ { "name": "@terra-money/core-integration-tests", - "version": "v2.7.0", + "version": "v2.8.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@terra-money/core-integration-tests", - "version": "v2.7.0", + "version": "v2.8.0", "license": "MIT", "dependencies": { "@terra-money/feather.js": "^2.0.0-beta.12", diff --git a/integration-tests/package.json b/integration-tests/package.json index c0085c73..0c47fe39 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "@terra-money/core-integration-tests", - "version": "v2.7.0", + "version": "v2.8.0", "description": "Integration tests for Core using feather.js", "main": "index.ts", "scripts": { diff --git a/scripts/tests/chain-upgrade/chain-upgrade.sh b/scripts/tests/chain-upgrade/chain-upgrade.sh index 503664ed..16859ed4 100755 --- a/scripts/tests/chain-upgrade/chain-upgrade.sh +++ b/scripts/tests/chain-upgrade/chain-upgrade.sh @@ -6,7 +6,7 @@ CHAIN_ID=pisco-1 ROOT=$(pwd) CHAIN_HOME=$ROOT/_build/.testnet DENOM=uluna -SOFTWARE_UPGRADE_NAME="v2.7" +SOFTWARE_UPGRADE_NAME="v2.8" GOV_PERIOD="10s" VAL_MNEMONIC_1="clock post desk civil pottery foster expand merit dash seminar song memory figure uniform spice circle try happy obvious trash crime hybrid hood cushion" From f09e6401eb7329872c088e547df0c592140f60d3 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Sun, 26 Nov 2023 12:39:43 +0200 Subject: [PATCH 2/2] fix: upgrade script --- scripts/tests/chain-upgrade/chain-upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chain-upgrade/chain-upgrade.sh b/scripts/tests/chain-upgrade/chain-upgrade.sh index 16859ed4..ce7b78be 100755 --- a/scripts/tests/chain-upgrade/chain-upgrade.sh +++ b/scripts/tests/chain-upgrade/chain-upgrade.sh @@ -1,6 +1,6 @@ #!/bin/bash -OLD_VERSION=release/v2.6 +OLD_VERSION=release/v2.7 UPGRADE_HEIGHT=30 CHAIN_ID=pisco-1 ROOT=$(pwd)