Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(v2.8): prepare release #219

Merged
merged 2 commits into from
Nov 28, 2023
Merged

chore(v2.8): prepare release #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
133cc1f
chore(v2.8): prepare release
emidev98 Nov 26, 2023
f09e640
fix: upgrade script
emidev98 Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/config/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,5 @@ const (
Upgrade2_5 = "v2.5"
Upgrade2_6 = "v2.6"
Upgrade2_7 = "v2.7"
Upgrade2_8 = "v2.8"
)
5 changes: 5 additions & 0 deletions app/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 9 additions & 0 deletions app/upgrade_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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() {
Expand Down
18 changes: 18 additions & 0 deletions app/upgrades/v2.8/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
}
}
4 changes: 2 additions & 2 deletions client/docs/config.json
View file
Open in desktop
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.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": [
{
Expand Down
4 changes: 2 additions & 2 deletions client/docs/swagger-ui/swagger.yaml
View file
Open in desktop
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.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'
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.7'
version: 'v2.8'
paths:
/terra/alliances:
get:
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/tests/chain-upgrade/chain-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading