Merge pull request #219 from terra-money/chore/v2.8/prepare

chore(v2.8): prepare release
terra-money · Nov 28, 2023 · cfad36a · cfad36a
2 parents 6f042a4 + f09e640
commit cfad36a
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,8 +1,8 @@
 {
   "swagger": "2.0",
   "info": {
-    "description": "Source code for <a target='_blank' href='https://github.com/terra-money/core'>Terra Core v2.7</a><br/>UI to interact with the blockchain <a target='_blank' href='https://station.terra.money/'>Station</a><br/>Create a DAO on Terra using <a target='_blank' href='https://enterprise.money/'>Enterprise</a><br/>Run on-chain automted jobs <a target='_blank' href='https://warp.money/'>Wrap</a><br/>Explore the network using <a target='_blank' href='https://terrasco.pe/'>TerraScope</a><br/>Anything you need to know about shared security on <a target='_blank' href='https://alliance.terra.money/'>Alliance Docs</a><br/>More info about the protocol on <a target='_blank' href='https://docs.terra.money/'>Terra Docs</a>",
-    "version": "2.7"
+    "description": "Source code for <a target='_blank' href='https://github.com/terra-money/core'>Terra Core v2.8</a><br/>UI to interact with the blockchain <a target='_blank' href='https://station.terra.money/'>Station</a><br/>Create a DAO on Terra using <a target='_blank' href='https://enterprise.money/'>Enterprise</a><br/>Run on-chain automted jobs <a target='_blank' href='https://warp.money/'>Wrap</a><br/>Explore the network using <a target='_blank' href='https://terrasco.pe/'>TerraScope</a><br/>Anything you need to know about shared security on <a target='_blank' href='https://alliance.terra.money/'>Alliance Docs</a><br/>More info about the protocol on <a target='_blank' href='https://docs.terra.money/'>Terra Docs</a>",
+    "version": "v2.8"
   },
   "apis": [
     {

diff --git 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 <a target='_blank'
-    href='https://github.com/terra-money/core'>Terra Core v2.7</a><br/>UI to
+    href='https://github.com/terra-money/core'>Terra Core v2.8</a><br/>UI to
     interact with the blockchain <a target='_blank'
     href='https://station.terra.money/'>Station</a><br/>Create a DAO on Terra
     using <a target='_blank'
@@ -14,7 +14,7 @@ info:
     href='https://alliance.terra.money/'>Alliance Docs</a><br/>More info about
     the protocol on <a target='_blank' href='https://docs.terra.money/'>Terra
     Docs</a>
-  version: '2.7'
+  version: 'v2.8'
 paths:
   /terra/alliances:
     get:

diff --git a/integration-tests/package-lock.json b/integration-tests/package-lock.json
diff --git 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
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-OLD_VERSION=release/v2.6
+OLD_VERSION=release/v2.7
 UPGRADE_HEIGHT=30
 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"