fix: v6.0 migration (#2218)

* fix: v6.0 migration

* remove todo: set inflation params

* remove proposal migration

README.md

@@ -57,6 +57,7 @@ See [Release procedure](CONTRIBUTING.md#release-procedure) for more information
 |    v4.4.x    |    ✓    | v0.46.11+  | v6.1.x | v1.3.x+ | umee/v2.1.4+ |   umee/v4 v1.5.3-umee-6    |  v1.2.3   |
 |    v5.0.x    |    ✓    | v0.46.13+  | v6.2.x | v1.3.x+ | umee/v2.1.4+ |   umee/v4 v1.5.3-umee-8    |  v1.2.4   |
 |    v5.1.x    |    ✓    | v0.46.13+  | v6.2.x |   ---   | umee/v2.1.6+ |   umee/v4 v1.5.3-umee-10   |  v1.2.4   |
+|    v5.2.x    |    ✓    | v0.46.13+  | v6.2.x |   ---   | umee/v2.1.6+ |   umee/v4 v1.5.3-umee-10   |  v1.2.4   |
 |    v6.0.x    |    ✓    | v0.46.14+  | v6.2.x |   ---   | umee/v2.1.6+ |            ---             |  v1.3.0   |
 
 #### Price Feeder
@@ -79,7 +80,7 @@ You don't need to do anything if you are using our Docker image.
 Public:
 
 - [umee-1](networks/umee-1) (mainnet)
-- [canon-2](networks/canon-2) (testnet)
+- canon-3 (testnet)
 
 ## Build
 

app/upgrades.go

@@ -29,7 +29,6 @@ import (
 	leveragekeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
 	leveragetypes "github.com/umee-network/umee/v6/x/leverage/types"
 
-	"github.com/umee-network/umee/v6/app/upgradev6x0"
 	oraclekeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
 	oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
 	"github.com/umee-network/umee/v6/x/ugov"
@@ -55,6 +54,7 @@ func (app UmeeApp) RegisterUpgradeHandlers() {
 	app.registerUpgrade("v4.4", upgradeInfo)
 	app.registerUpgrade("v5.0", upgradeInfo, ugov.ModuleName, wasm.ModuleName)
 	app.registerUpgrade5_1(upgradeInfo)
+	app.registerUpgrade("v5.2", upgradeInfo) // v5.2 migration is not compatible with v6, so leaving default here.
 	app.registerUpgrade6(upgradeInfo)
 }
 
@@ -64,14 +64,11 @@ func (app *UmeeApp) registerUpgrade6(upgradeInfo upgradetypes.Plan) {
 
 	app.UpgradeKeeper.SetUpgradeHandler(planName,
 		func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-			if err := upgradev6x0.Migrate(ctx, app.GovKeeper); err != nil {
-				return fromVM, err
-			}
+			ctx.Logger().Info("-----------------------------\n---------------")
 			if err := app.LeverageKeeper.SetParams(ctx, leveragetypes.DefaultParams()); err != nil {
 				return fromVM, err
 			}
 			// TODO: need to register emergency group
-			// TODO: set new inflation params
 
 			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
 		},