mv11 handler added

comdex-official · May 9, 2023 · 3cb30f0 · 3cb30f0
1 parent 0f9caf7
commit 3cb30f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/app/app.go b/app/app.go
@@ -178,6 +178,7 @@ import (
 	cwasm "github.com/comdex-official/comdex/app/wasm"
 
 	tv11 "github.com/comdex-official/comdex/app/upgrades/testnet/v11"
+	mv11 "github.com/comdex-official/comdex/app/upgrades/mainnet/v11"
 )
 
 const (
@@ -1342,17 +1343,24 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {
 }
 
 func (a *App) registerUpgradeHandlers() {
-	a.UpgradeKeeper.SetUpgradeHandler(
-		tv11.UpgradeName,
-		tv11.CreateUpgradeHandlerV11(a.mm, a.configurator),
-	)
 	// When a planned update height is reached, the old binary will panic
 	// writing on disk the height and name of the update that triggered it
 	// This will read that value, and execute the preparations for the upgrade.
 	upgradeInfo, err := a.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(err)
 	}
+	if upgradeInfo.Name == tv11.UpgradeName {
+		a.UpgradeKeeper.SetUpgradeHandler(
+			tv11.UpgradeName,
+			tv11.CreateUpgradeHandlerV11(a.mm, a.configurator),
+		)
+	} else if upgradeInfo.Name == mv11.UpgradeName {
+		a.UpgradeKeeper.SetUpgradeHandler(
+			mv11.UpgradeName,
+			mv11.CreateUpgradeHandlerV11(a.mm, a.configurator, a.LiquidityKeeper, a.AssetKeeper, a.BankKeeper, a.AccountKeeper, a.Rewardskeeper, a.ICAHostKeeper),
+		)
+	}
 
 	var storeUpgrades *storetypes.StoreUpgrades
 
@@ -1370,6 +1378,10 @@ func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Added: []string{ibchookstypes.StoreKey},
 		}
+	case upgradeInfo.Name == mv11.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{ibchookstypes.StoreKey},
+		}
 	}
 	return storeUpgrades
 }
diff --git a/app/upgrades/mainnet/v11/upgrades.go b/app/upgrades/mainnet/v11/upgrades.go
@@ -78,7 +78,7 @@ func RefundFeeForAccidentallyCreatedPirToOwner(
 	}
 }
 
-func CreateUpgradeHandlerV10(
+func CreateUpgradeHandlerV11(
 	mm *module.Manager,
 	configurator module.Configurator,
 	liquidityKeeper liquiditykeeper.Keeper,