From 2eac528aa11f0c66a957007b85fb8419fd57bdd6 Mon Sep 17 00:00:00 2001
From: William Chong <me@williamchong.cloud>
Date: Thu, 9 Nov 2023 00:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Setup=20upgrade=20handler=20for=20v?=
 =?UTF-8?q?4.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md |  1 +
 app/app.go   | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10672c8c9..f052d83d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+- Fix missing upgrade handler for 4.1.x upgrade
 
 ## [v4.1.0](https://github.com/likecoin/likecoin-chain/releases/v4.1.0)
 - Upgrade cosmovisor included in docker image to 1.5.0
diff --git a/app/app.go b/app/app.go
index 3239e996d..f3e9dbe05 100644
--- a/app/app.go
+++ b/app/app.go
@@ -111,7 +111,7 @@ import (
 )
 
 const (
-	UpgradeName = "v4.0.0"
+	UpgradeName = "v4.1.1"
 )
 
 var (
@@ -344,7 +344,6 @@ func NewLikeApp(
 		skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath,
 		app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-	app.setupUpgradeStoreLoaders()
 	app.registerUpgradeHandlers()
 	app.IscnKeeper = iscnkeeper.NewKeeper(appCodec, keys[iscntypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, iscnSubspace)
 
@@ -573,19 +572,6 @@ func (app *LikeApp) registerUpgradeHandlers() {
 	})
 }
 
-func (app *LikeApp) setupUpgradeStoreLoaders() {
-	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
-	if err != nil {
-		panic(err)
-	}
-	if upgradeInfo.Name == UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		storeUpgrades := storetypes.StoreUpgrades{
-			Added: []string{"group"},
-		}
-		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
-	}
-}
-
 func (app *LikeApp) Name() string {
 	return app.BaseApp.Name()
 }