Skip to content

feat: better upgrade registration #2024

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

Merged
robert-zaremba merged 1 commit into from
May 5, 2023
Merged

feat: better upgrade registration #2024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 16 additions & 45 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,16 @@ func (app UmeeApp) RegisterUpgradeHandlers(bool) {
}

app.registerUpgrade3_0(upgradeInfo)
app.registerUpgrade3_1(upgradeInfo)
app.registerUpgrade("v3.1.0", upgradeInfo)
app.registerUpgrade3_1to3_3(upgradeInfo)
app.registerUpgrade3_2to3_3(upgradeInfo)
app.registerUpgrade3_3to4_0(upgradeInfo)
app.registerUpgrade4_0_1(upgradeInfo)
app.registerUpgrade("v4.0.1", upgradeInfo)
app.registerUpgrade4_1(upgradeInfo)
app.registerUpgrade4_2(upgradeInfo)
app.registerUpgrade("v4.2", upgradeInfo, uibc.ModuleName)
app.registerUpgrade4_3(upgradeInfo)
app.registerUpgrade4_4(upgradeInfo)
app.registerUpgrade4_5(upgradeInfo)
}

// performs upgrade from v4.4 to v4.5
func (app *UmeeApp) registerUpgrade4_5(upgradeInfo upgradetypes.Plan) {
const planName = "v4.5-alpha1" // TODO: set correct name
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
app.storeUpgrade(planName, upgradeInfo, storetypes.StoreUpgrades{
Added: []string{
incentive.ModuleName,
},
})
}

// performs upgrade from v4.3 to v4.4
func (app *UmeeApp) registerUpgrade4_4(_ upgradetypes.Plan) {
const planName = "v4.4"
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
app.registerUpgrade("v4.4", upgradeInfo)
app.registerUpgrade("v4.5-alpha1", upgradeInfo, incentive.ModuleName) // TODO: set correct name
}

// performs upgrade from v4.2 to v4.3
Expand Down Expand Up @@ -119,17 +102,6 @@ func (app *UmeeApp) registerUpgrade4_3(upgradeInfo upgradetypes.Plan) {
})
}

// performs upgrade from v4.1 to v4.2
func (app *UmeeApp) registerUpgrade4_2(upgradeInfo upgradetypes.Plan) {
const planName = "v4.2"
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
app.storeUpgrade(planName, upgradeInfo, storetypes.StoreUpgrades{
Added: []string{
uibc.ModuleName,
},
})
}

// performs upgrade from v4.0 to v4.1
func (app *UmeeApp) registerUpgrade4_1(_ upgradetypes.Plan) {
const planName = "v4.1.0"
Expand All @@ -152,12 +124,6 @@ func (app *UmeeApp) registerUpgrade4_1(_ upgradetypes.Plan) {
)
}

// performs upgrade from v4.0.0 to v4.0.1
func (app *UmeeApp) registerUpgrade4_0_1(_ upgradetypes.Plan) {
const planName = "v4.0.1"
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
}

// performs upgrade from v3.3 -> v4
func (app *UmeeApp) registerUpgrade3_3to4_0(_ upgradetypes.Plan) {
const planName = "v4.0"
Expand Down Expand Up @@ -215,12 +181,6 @@ func (app *UmeeApp) registerUpgrade3_2to3_3(_ upgradetypes.Plan) {
})
}

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

// performs upgrade from v1->v3
func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) {
const planName = "v1.1-v3.0"
Expand Down Expand Up @@ -287,3 +247,14 @@ func (app *UmeeApp) storeUpgrade(planName string, ui upgradetypes.Plan, stores s
upgradetypes.UpgradeStoreLoader(ui.Height, &stores))
}
}

// registerUpgrade sets an upgrade handler which only runs module migrations
// and adds new storages storages
func (app *UmeeApp) registerUpgrade(planName string, upgradeInfo upgradetypes.Plan, newStores ...string) {
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))

if len(newStores) > 0 {
app.storeUpgrade(planName, upgradeInfo, storetypes.StoreUpgrades{
Added: newStores})
}
}