From b0fb3a0313330e1707bb64979091f9fa899d7b7f Mon Sep 17 00:00:00 2001
From: Youngjoon Lee <yjlee@medibloc.org>
Date: Mon, 13 Jun 2022 14:49:17 +0900
Subject: [PATCH 1/2] feat: fix upgradeHander issue

---
 app/app.go | 31 +++++++++++++++++++++++++++----
 go.mod     |  1 -
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/app.go b/app/app.go
index a2df1cce..8dbca601 100644
--- a/app/app.go
+++ b/app/app.go
@@ -36,6 +36,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/version"
@@ -590,6 +591,11 @@ func New(
 	)
 	app.SetEndBlocker(app.EndBlocker)
 
+	err = app.registerUpgradeHandlers()
+	if err != nil {
+		panic("Failed to register upgradeHandler: " + err.Error())
+	}
+
 	if loadLatest {
 		if err := app.LoadLatestVersion(); err != nil {
 			tmos.Exit(err.Error())
@@ -615,8 +621,6 @@ func New(
 	app.ScopedTransferKeeper = scopedTransferKeeper
 	app.ScopedWasmKeeper = scopedWasmKeeper
 
-	app.registerUpgradeHandlers()
-
 	return app
 }
 
@@ -785,7 +789,10 @@ func initParamsKeeper(appCodec codec.BinaryMarshaler, legacyAmino *codec.LegacyA
 	return paramsKeeper
 }
 
-func (app *App) registerUpgradeHandlers() {
+// registerUpgradeHandlers registers upgrade handlers, and sets the storetypes loader if necessary.
+// This function must be called before sealing the BaseApp (i.e. by app.LoadLatestVersion())
+// because the storetypes loader cannot be set if BaseApp is already sealed.
+func (app *App) registerUpgradeHandlers() error {
 	app.UpgradeKeeper.SetUpgradeHandler("v2.0.2", func(ctx sdk.Context, plan upgradetypes.Plan) {})
 
 	app.UpgradeKeeper.SetUpgradeHandler("v2.0.3", func(ctx sdk.Context, plan upgradetypes.Plan) {
@@ -819,9 +826,25 @@ func (app *App) registerUpgradeHandlers() {
 		}
 	})
 
-	app.UpgradeKeeper.SetUpgradeHandler("v2.1.0-alpha1", func(ctx sdk.Context, plan upgradetypes.Plan) {
+	app.UpgradeKeeper.SetUpgradeHandler("v2.1.0-alpha2", func(ctx sdk.Context, plan upgradetypes.Plan) {
 		datadeal.InitGenesis(ctx, app.dataDealKeeper, *datadealtypes.DefaultGenesis())
 		datapool.InitGenesis(ctx, app.dataPoolKeeper, *datapooltypes.DefaultGenesis())
 		oracle.InitGenesis(ctx, app.oracleKeeper, *oracletypes.DefaultGenesis())
 	})
+
+	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		return err
+	}
+
+	if upgradeInfo.Name == "v2.1.0-alpha2" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		storeUpgrades := storetypes.StoreUpgrades{
+			Added: []string{datadealtypes.ModuleName, datapooltypes.ModuleName, oracletypes.ModuleName},
+		}
+
+		// configure storetypes loader that checks if version == upgradeHeight and applies storetypes upgrades
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
+	}
+
+	return nil
 }
diff --git a/go.mod b/go.mod
index 9f85f08d..8462892c 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,6 @@ require (
 	github.com/pborman/uuid v1.2.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/rakyll/statik v0.1.7
-	github.com/regen-network/cosmos-proto v0.3.1 // indirect
 	github.com/spf13/cast v1.4.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5

From df97cffac5bd74ed19cc49d9eb3fb60de988ddd6 Mon Sep 17 00:00:00 2001
From: gyuguen <gyuguen.jang@medibloc.org>
Date: Tue, 14 Jun 2022 15:12:31 +0900
Subject: [PATCH 2/2] Update app/app.go

Co-authored-by: Youngjoon Lee <yjlee@medibloc.org>
---
 app/app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/app.go b/app/app.go
index 8dbca601..0307a058 100644
--- a/app/app.go
+++ b/app/app.go
@@ -789,7 +789,7 @@ func initParamsKeeper(appCodec codec.BinaryMarshaler, legacyAmino *codec.LegacyA
 	return paramsKeeper
 }
 
-// registerUpgradeHandlers registers upgrade handlers, and sets the storetypes loader if necessary.
+// registerUpgradeHandlers registers upgrade handlers, and sets the store loader if necessary.
 // This function must be called before sealing the BaseApp (i.e. by app.LoadLatestVersion())
 // because the storetypes loader cannot be set if BaseApp is already sealed.
 func (app *App) registerUpgradeHandlers() error {