time value fix and upgrade handler

app/upgrades.go

@@ -50,6 +50,7 @@ func (app App) RegisterUpgradeHandlers() {
 	app.registerUpgrade0_4_1(upgradeInfo)
 	app.registerUpgrade0_5_0(upgradeInfo)
 	app.registerUpgrade0_5_1(upgradeInfo)
+	app.registerUpgrade0_5_2(upgradeInfo)
 }
 
 // performs upgrade from v0.1.3 to v0.1.4
@@ -374,6 +375,23 @@ func (app *App) registerUpgrade0_5_1(_ upgradetypes.Plan) {
 	)
 }
 
+func (app *App) registerUpgrade0_5_2(_ upgradetypes.Plan) {
+	const planName = "v0.5.2"
+	app.UpgradeKeeper.SetUpgradeHandler(planName,
+		func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+			sdkCtx := sdk.UnwrapSDKContext(ctx)
+			sdkCtx.Logger().Info("Upgrade handler execution", "name", planName)
+
+			// delete all payments in the store before upgrade
+			payments := app.GmpKeeper.GetAllPayments(sdkCtx)
+			for _, payment := range payments {
+				app.GmpKeeper.DeletePayment(sdkCtx, payment)
+			}
+			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		},
+	)
+}
+
 // helper function to check if the store loader should be upgraded
 func (app *App) storeUpgrade(planName string, ui upgradetypes.Plan, stores storetypes.StoreUpgrades) {
 	if ui.Name == planName && !app.UpgradeKeeper.IsSkipHeight(ui.Height) {

x/gmp/keeper/keeper.go

@@ -299,7 +299,7 @@ func (k Keeper) ProcessPayment(
 		[]string{payment.Denom},
 		types.EmptyByteSlice,
 		types.EmptyByteSlice,
-		time.Now().Unix(),
+		ctx.BlockTime().Unix(),
 	)
 	_, err = k.RelayPrice(goCtx, msg)
 	if err != nil {