Merge pull request #2 from ComputerKeeda/feature/external-seq/espresso/v1/patch-2

Add upgrade handler for "jip-2" and handle store upgrades

Author: ComputerKeeda

app/app.go

@@ -1,6 +1,8 @@
 package app
 
 import (
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	trackgatemoduletypes "github.com/airchains-network/junction/x/trackgate/types"
 	"io"
 	"os"
 	"path/filepath"
@@ -354,15 +356,28 @@ func New(
 	// 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap())
 	// 	return app.App.InitChainer(ctx, req)
 	// })
+	// Handle store upgrades
+	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		panic(err)
+	}
+
+	if upgradeInfo.Name == "jip-2" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		storeUpgrades := storetypes.StoreUpgrades{
+			Added: []string{trackgatemoduletypes.StoreKey},
+		}
+
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
+	}
 
 	if err := app.Load(loadLatest); err != nil {
 		return nil, err
 	}
 
 	configurator := app.Configurator()
-	UpgradeHandleFunc := CreateDefaultUpgradeHandler(app.ModuleManager, configurator)
+	UpgradeHandleFunc := CreateDefaultUpgradeHandler(app.ModuleManager, configurator, app)
 	app.UpgradeKeeper.SetUpgradeHandler(
-		"jip-1",
+		"jip-2",
 		UpgradeHandleFunc, // Upgrade handler function
 	)
 

app/upgrade.go

@@ -2,6 +2,8 @@ package app
 
 import (
 	"context"
+	storetypes "cosmossdk.io/store/types"
+	trackgatemoduletypes "github.com/airchains-network/junction/x/trackgate/types"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -11,12 +13,16 @@ import (
 func CreateDefaultUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
+	app *App,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		versionMap := module.VersionMap{
-			"junction": 100, // version 1.0.0
+		storeUpgrades := storetypes.StoreUpgrades{
+			Added: []string{trackgatemoduletypes.StoreKey},
 		}
 
-		return versionMap, nil
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(plan.Height, &storeUpgrades))
+
+		//return versionMap, nil
+		return app.ModuleManager.RunMigrations(ctx, configurator, fromVM)
 	}
 }