Added storeLoader while upgrading

app.go

@@ -82,6 +82,7 @@ import (
 
 	hubparams "github.com/sentinel-official/hub/params"
 	upgrade1 "github.com/sentinel-official/hub/upgrades/upgrade-1"
+	upgrade2 "github.com/sentinel-official/hub/upgrades/upgrade-2"
 	deposittypes "github.com/sentinel-official/hub/x/deposit/types"
 	custommint "github.com/sentinel-official/hub/x/mint"
 	custommintkeeper "github.com/sentinel-official/hub/x/mint/keeper"
@@ -161,7 +162,7 @@ type App struct {
 	slashingKeeper     slashingkeeper.Keeper
 	stakingKeeper      stakingkeeper.Keeper
 	upgradeKeeper      upgradekeeper.Keeper
-	custommintKeeper   custommintkeeper.Keeper
+	customMintKeeper   custommintkeeper.Keeper
 	swapKeeper         swapkeeper.Keeper
 	vpnKeeper          vpnkeeper.Keeper
 
@@ -365,9 +366,7 @@ func NewApp(
 	)
 	app.evidenceKeeper.SetRouter(evidenceRouter)
 
-	app.upgradeKeeper.SetUpgradeHandler(upgrade1.Name, upgrade1.Handler(app.accountKeeper))
-
-	app.custommintKeeper = custommintkeeper.NewKeeper(
+	app.customMintKeeper = custommintkeeper.NewKeeper(
 		app.cdc,
 		app.keys[customminttypes.StoreKey],
 		app.mintKeeper,
@@ -413,7 +412,7 @@ func NewApp(
 		staking.NewAppModule(app.cdc, app.stakingKeeper, app.accountKeeper, app.bankKeeper),
 		upgrade.NewAppModule(app.upgradeKeeper),
 		transferModule,
-		custommint.NewAppModule(cdc, app.custommintKeeper),
+		custommint.NewAppModule(cdc, app.customMintKeeper),
 		swap.NewAppModule(app.cdc, app.swapKeeper),
 		vpn.NewAppModule(app.cdc, app.accountKeeper, app.bankKeeper, app.vpnKeeper),
 	)
@@ -453,7 +452,7 @@ func NewApp(
 		slashing.NewAppModule(app.cdc, app.slashingKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper),
 		staking.NewAppModule(app.cdc, app.stakingKeeper, app.accountKeeper, app.bankKeeper),
 		transferModule,
-		custommint.NewAppModule(cdc, app.custommintKeeper),
+		custommint.NewAppModule(cdc, app.customMintKeeper),
 		swap.NewAppModule(app.cdc, app.swapKeeper),
 		vpn.NewAppModule(app.cdc, app.accountKeeper, app.bankKeeper, app.vpnKeeper),
 	)
@@ -475,6 +474,15 @@ func NewApp(
 	)
 	app.SetEndBlocker(app.EndBlocker)
 
+	app.upgradeKeeper.SetUpgradeHandler(
+		upgrade1.Name,
+		upgrade1.Handler(app.accountKeeper),
+	)
+	app.upgradeKeeper.SetUpgradeHandler(
+		upgrade2.Name,
+		upgrade2.Handler(app.SetStoreLoader, app.upgradeKeeper, app.customMintKeeper),
+	)
+
 	if loadLatest {
 		if err := app.LoadLatestVersion(); err != nil {
 			tmos.Exit(err.Error())

upgrades/upgrade-2/handler.go

@@ -0,0 +1,99 @@
+package upgrade2
+
+import (
+	"time"
+
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	custommintkeeper "github.com/sentinel-official/hub/x/mint/keeper"
+	customminttypes "github.com/sentinel-official/hub/x/mint/types"
+)
+
+func Handler(
+	setStoreLoader func(baseapp.StoreLoader),
+	upgradeKeeper upgradekeeper.Keeper,
+	customMintKeeper custommintkeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	info, err := upgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		panic(err)
+	}
+
+	if info.Name == Name && !upgradeKeeper.IsSkipHeight(info.Height) {
+		upgrades := &storetypes.StoreUpgrades{
+			Added: []string{customminttypes.ModuleName},
+		}
+
+		setStoreLoader(
+			upgradetypes.UpgradeStoreLoader(
+				info.Height,
+				upgrades,
+			),
+		)
+	}
+
+	return func(ctx sdk.Context, _ upgradetypes.Plan) {
+		if err := updateInflations(ctx, customMintKeeper); err != nil {
+			panic(err)
+		}
+	}
+}
+
+func updateInflations(ctx sdk.Context, k custommintkeeper.Keeper) error {
+	var (
+		inflations = []customminttypes.Inflation{
+			{
+				Max:        sdk.NewDecWithPrec(49, 2),
+				Min:        sdk.NewDecWithPrec(43, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2021, 9, 27, 0, 0, 0, 0, time.UTC),
+			},
+			{
+				Max:        sdk.NewDecWithPrec(43, 2),
+				Min:        sdk.NewDecWithPrec(37, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2022, 3, 27, 0, 0, 0, 0, time.UTC),
+			},
+			{
+				Max:        sdk.NewDecWithPrec(37, 2),
+				Min:        sdk.NewDecWithPrec(31, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2022, 9, 27, 0, 0, 0, 0, time.UTC),
+			},
+			{
+				Max:        sdk.NewDecWithPrec(31, 2),
+				Min:        sdk.NewDecWithPrec(25, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2023, 3, 27, 0, 0, 0, 0, time.UTC),
+			},
+			{
+				Max:        sdk.NewDecWithPrec(25, 2),
+				Min:        sdk.NewDecWithPrec(19, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2023, 9, 27, 0, 0, 0, 0, time.UTC),
+			},
+			{
+				Max:        sdk.NewDecWithPrec(19, 2),
+				Min:        sdk.NewDecWithPrec(13, 2),
+				RateChange: sdk.NewDecWithPrec(6, 2),
+				Timestamp:  time.Date(2024, 3, 27, 0, 0, 0, 0, time.UTC),
+			},
+		}
+	)
+
+	for _, inflation := range inflations {
+		if err := inflation.Validate(); err != nil {
+			return err
+		}
+	}
+
+	for _, inflation := range inflations {
+		k.SetInflation(ctx, inflation)
+	}
+
+	return nil
+}

upgrades/upgrade-2/keys.go

@@ -0,0 +1,5 @@
+package upgrade2
+
+const (
+	Name = "upgrade-2"
+)