From 7580950d3d80eb3bfe392924901755a621e42531 Mon Sep 17 00:00:00 2001 From: ryanbajollari <54822716+rbajollari@users.noreply.github.com> Date: Tue, 16 Jul 2024 01:10:39 -0400 Subject: [PATCH 1/2] fix: Add gov proposal migration in v0.3.1 upgrade handler (#478) (cherry picked from commit 2965d45976ea63053dc84b910b37ea46a06730b5) # Conflicts: # app/upgrades.go --- app/upgrades.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/upgrades.go b/app/upgrades.go index 7b3b0ba2..89e03928 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -10,6 +10,7 @@ import ( consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" @@ -186,9 +187,24 @@ func (app *App) registerUpgrade0_3_1Rc2(_ upgradetypes.Plan) { func (app *App) registerUpgrade0_3_1(_ upgradetypes.Plan) { const planName = "v0.3.1" + app.UpgradeKeeper.SetUpgradeHandler(planName, +<<<<<<< HEAD func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Upgrade handler execution", "name", planName) +======= + func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + sdkCtx := sdk.UnwrapSDKContext(ctx) + + // migrate old proposals + govMigrator := govkeeper.NewMigrator(&app.GovKeeper, app.GetSubspace(govtypes.ModuleName)) + err := govMigrator.Migrate2to3(sdkCtx) + if err != nil { + panic("failed to migrate governance module") + } + + sdkCtx.Logger().Info("Upgrade handler execution", "name", planName) +>>>>>>> 2965d45 (fix: Add gov proposal migration in v0.3.1 upgrade handler (#478)) return app.mm.RunMigrations(ctx, app.configurator, fromVM) }, ) From 97033a0625f5bf17d5a1a5cec24e4690f8c1d84a Mon Sep 17 00:00:00 2001 From: rbajollari Date: Tue, 16 Jul 2024 07:58:41 +0200 Subject: [PATCH 2/2] fix conflict --- app/upgrades.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 89e03928..74fb4e00 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -189,22 +189,15 @@ func (app *App) registerUpgrade0_3_1(_ upgradetypes.Plan) { const planName = "v0.3.1" app.UpgradeKeeper.SetUpgradeHandler(planName, -<<<<<<< HEAD func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Upgrade handler execution", "name", planName) -======= - func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - sdkCtx := sdk.UnwrapSDKContext(ctx) - // migrate old proposals govMigrator := govkeeper.NewMigrator(&app.GovKeeper, app.GetSubspace(govtypes.ModuleName)) - err := govMigrator.Migrate2to3(sdkCtx) + err := govMigrator.Migrate2to3(ctx) if err != nil { panic("failed to migrate governance module") } - sdkCtx.Logger().Info("Upgrade handler execution", "name", planName) ->>>>>>> 2965d45 (fix: Add gov proposal migration in v0.3.1 upgrade handler (#478)) + ctx.Logger().Info("Upgrade handler execution", "name", planName) return app.mm.RunMigrations(ctx, app.configurator, fromVM) }, )