Skip to content

Commit

Permalink
chore: prepare release 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
emidev98 committed Oct 23, 2023
1 parent d901b7b commit e06dc4f
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 10 deletions.
13 changes: 13 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ import (
v2_4 "github.com/terra-money/core/v2/app/upgrades/v2.4"
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"

// unnamed import of statik for swagger UI support
_ "github.com/terra-money/core/v2/client/docs/statik"
Expand Down Expand Up @@ -999,6 +1000,11 @@ func NewTerraApp(
},
}
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
} else if upgradeInfo.Name == terraappconfig.Upgrade2_7 && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{},
}
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
}

if loadLatest {
Expand Down Expand Up @@ -1204,6 +1210,13 @@ func (app *TerraApp) RegisterUpgradeHandlers(cfg module.Configurator) {
app.FeeShareKeeper,
),
)
app.UpgradeKeeper.SetUpgradeHandler(
terraappconfig.Upgrade2_7,
v2_7.CreateUpgradeHandler(app.mm,
app.configurator,
app.appCodec,
),
)
}

// RegisterSwaggerAPI registers swagger route with API Server
Expand Down
1 change: 1 addition & 0 deletions app/config/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ const (
Upgrade2_4 = "v2.4"
Upgrade2_5 = "v2.5"
Upgrade2_6 = "v2.6"
Upgrade2_7 = "v2.7"
)
18 changes: 18 additions & 0 deletions app/upgrades/v2.7/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package v2_7

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)
}
}
4 changes: 2 additions & 2 deletions client/docs/config.json
Original file line number Diff line number Diff line change
@@ -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.6</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.6"
"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"
},
"apis": [
{
Expand Down
2 changes: 1 addition & 1 deletion client/docs/statik/statik.go

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/docs/swagger-ui/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6</a><br/>UI to
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'
Expand All @@ -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.6'
version: '2.7'
paths:
/terra/alliances:
get:
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@terra-money/core-integration-tests",
"version": "v2.6.2",
"version": "v2.7.0",
"description": "Integration tests for Core using feather.js",
"main": "index.ts",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/tests/chain-upgrade/chain-upgrade.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

OLD_VERSION=release/v2.5
OLD_VERSION=release/v2.6
UPGRADE_HEIGHT=30
CHAIN_ID=pisco-1
ROOT=$(pwd)
CHAIN_HOME=$ROOT/_build/.testnet
DENOM=uluna
SOFTWARE_UPGRADE_NAME="v2.6"
SOFTWARE_UPGRADE_NAME="v2.7"
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"
Expand Down

0 comments on commit e06dc4f

Please sign in to comment.