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

fix: leverage gov proposal migrations #1640

Merged
merged 18 commits into from
Dec 5, 2022
Merged

fix: leverage gov proposal migrations #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c7d5164
regenerate proto
robert-zaremba Nov 29, 2022
261542d
fix: add proposal interfaces to leverage MsgGovUpdateRegistry
robert-zaremba Nov 30, 2022
6907b4c
re-adding UpdateRegistryProposal
robert-zaremba Nov 30, 2022
d60c764
re-add legacy types
robert-zaremba Nov 30, 2022
be69eed
adding migration
robert-zaremba Dec 1, 2022
b2156c2
add leverage gov migration
robert-zaremba Dec 1, 2022
0055f57
remove test migration from endblocker
robert-zaremba Dec 1, 2022
e6bcdf6
add v3.3 upgrades
robert-zaremba Dec 2, 2022
46dea3b
move migrations to app/upgrades
robert-zaremba Dec 2, 2022
fbf5db8
logs cleanup
robert-zaremba Dec 2, 2022
d596d56
rename upgrade name
robert-zaremba Dec 2, 2022
4fb54d5
Merge remote-tracking branch 'origin/main' into robert/fix-leverage-gov
robert-zaremba Dec 2, 2022
9663df7
sp
toteki Dec 2, 2022
94d8876
Merge branch 'main' into robert/fix-leverage-gov
toteki Dec 2, 2022
ba26536
Merge remote-tracking branch 'origin/main' into robert/fix-leverage-gov
robert-zaremba Dec 5, 2022
688cd93
update package name
robert-zaremba Dec 5, 2022
85bd48f
linter: function names
robert-zaremba Dec 5, 2022
776d449
Merge branch 'main' into robert/fix-leverage-gov
robert-zaremba Dec 5, 2022
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
49 changes: 38 additions & 11 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"

"github.com/umee-network/umee/v3/app/upgradev3"
"github.com/umee-network/umee/v3/app/upgradev3x3"
leveragetypes "github.com/umee-network/umee/v3/x/leverage/types"
oracletypes "github.com/umee-network/umee/v3/x/oracle/types"
)
Expand All @@ -22,34 +23,60 @@ func (app UmeeApp) RegisterUpgradeHandlers(experimental bool) {
panic(err)
}

app.registerV3_0Upgrade(upgradeInfo)
app.registerV3_1Upgrade(upgradeInfo)
app.registerV3_2Upgrade(upgradeInfo)
app.registerUpgrade3_0(upgradeInfo)
app.registerUpgrade3_1(upgradeInfo)

app.registerUpgrade3_1to3_3(upgradeInfo)
app.registerUpgrade3_2to3_3(upgradeInfo)
}

// performs upgrade from v3.1 -> v3.3 (including the v3.2 chanages)
func (app *UmeeApp) registerUpgrade3_1to3_3(_ upgradetypes.Plan) {
const planName = "v3.1-v3.3"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
ctx.Logger().Info("Run v3.3 migrator")
err := upgradev3x3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run x/bank v0.46.5 migration")
err = bankkeeper.NewMigrator(app.BankKeeper).Migrate3_V046_4_To_V046_5(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run module migrations")
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
}

// performs upgrade from v3.1 -> v3.2
func (app *UmeeApp) registerV3_2Upgrade(_ upgradetypes.Plan) {
const planName = "v3.2"
// performs upgrade from v3.2 -> v3.3
func (app *UmeeApp) registerUpgrade3_2to3_3(_ upgradetypes.Plan) {
const planName = "v3.2-v3.3"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
err := bankkeeper.NewMigrator(app.BankKeeper).Migrate3_V046_4_To_V046_5(ctx)
ctx.Logger().Info("Run v3.3 migrator")
err := upgradev3x3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run module migrations")
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
}

// performs upgrade from v3.0 -> v3.1
func (app *UmeeApp) registerV3_1Upgrade(_ upgradetypes.Plan) {
func (app *UmeeApp) registerUpgrade3_1(_ upgradetypes.Plan) {
const planName = "v3.1.0"
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyRunMigrations(app, planName))
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
}

// performs upgrade from v1->v3
func (app *UmeeApp) registerV3_0Upgrade(upgradeInfo upgradetypes.Plan) {
func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) {
const planName = "v1.1-v3.0"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
Expand Down Expand Up @@ -101,7 +128,7 @@ func (app *UmeeApp) registerV3_0Upgrade(upgradeInfo upgradetypes.Plan) {
}})
}

func onlyRunMigrations(app *UmeeApp, planName string) upgradetypes.UpgradeHandler {
func onlyModuleMigrations(app *UmeeApp, planName string) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
Expand Down
Loading