Merge pull request #146 from PeggyJV/bolten/reorder-v4-upgrade

Delete populated module account first

Author: zmanian

app/upgrades/v4/upgrades.go

@@ -35,12 +35,12 @@ func CreateUpgradeHandler(
 		// Overwrite the gravity module's version back to 1 so the migration will run to v2
 		fromVM[gravitytypes.ModuleName] = 1
 
-		ctx.Logger().Info("v4 upgrade: normalizing gravity denoms in bank balances")
-		normalizeGravityDenoms(ctx, bankKeeper)
-
 		ctx.Logger().Info("v4 upgrade: removing existing account with module address overlap")
 		removeModuleAccountOverlap(ctx, accountKeeper, bankKeeper)
 
+		ctx.Logger().Info("v4 upgrade: normalizing gravity denoms in bank balances")
+		normalizeGravityDenoms(ctx, bankKeeper)
+
 		ctx.Logger().Info("v4 upgrade: running migrations and exiting handler")
 		return mm.RunMigrations(ctx, configurator, fromVM)
 	}