move

elys-network · Sep 19, 2024 · a944f6f · a944f6f
1 parent 8d12af6
commit a944f6f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/x/perpetual/keeper/begin_blocker.go b/x/perpetual/keeper/begin_blocker.go
@@ -69,37 +69,4 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) {
 		}
 		k.SetPool(ctx, pool)
 	}
-
-	// Handle toPay
-	err := k.HandleToPay(ctx)
-	if err != nil {
-		ctx.Logger().Error(err.Error())
-	}
-}
-
-func (k Keeper) HandleToPay(ctx sdk.Context) error {
-	toPays := k.GetAllToPayStore(ctx)
-
-	if len(toPays) == 0 {
-		return nil
-	}
-	// get funding fee collection address
-	fundingFeeCollectionAddress := k.GetFundingFeeCollectionAddress(ctx)
-
-	for _, toPay := range toPays {
-		balance := k.bankKeeper.GetBalance(ctx, fundingFeeCollectionAddress, toPay.AssetDenom)
-		if balance.Amount.LT(toPay.AssetBalance) {
-			break
-		} else {
-			// transfer funding fee amount to mtp address
-			if err := k.bankKeeper.SendCoins(ctx, fundingFeeCollectionAddress, sdk.MustAccAddressFromBech32(toPay.Address), sdk.NewCoins(sdk.NewCoin(toPay.AssetDenom, toPay.AssetBalance))); err != nil {
-				return err
-			}
-			err := k.DeleteToPay(ctx, sdk.MustAccAddressFromBech32(toPay.Address), toPay.Id)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
 }
diff --git a/x/perpetual/keeper/process_mtp.go b/x/perpetual/keeper/process_mtp.go
@@ -16,6 +16,12 @@ import (
 
 func (k Keeper) CheckAndLiquidateUnhealthyPosition(ctx sdk.Context, mtp *types.MTP, pool types.Pool, ammPool ammtypes.Pool, baseCurrency string, baseCurrencyDecimal uint64) error {
 	var err error
+	// Handle toPay
+	err = k.HandleToPay(ctx)
+	if err != nil {
+		ctx.Logger().Error(err.Error())
+	}
+
 	// update mtp take profit liabilities
 	// calculate mtp take profit liabilities, delta x_tp_l = delta y_tp_c * current price (take profit liabilities = take profit custody * current price)
 	mtp.TakeProfitLiabilities, err = k.CalcMTPTakeProfitLiability(ctx, mtp, baseCurrency)
@@ -166,3 +172,30 @@ func (k Keeper) CheckAndCloseAtStopLoss(ctx sdk.Context, mtp *types.MTP, pool ty
 
 	return nil
 }
+
+func (k Keeper) HandleToPay(ctx sdk.Context) error {
+	toPays := k.GetAllToPayStore(ctx)
+
+	if len(toPays) == 0 {
+		return nil
+	}
+	// get funding fee collection address
+	fundingFeeCollectionAddress := k.GetFundingFeeCollectionAddress(ctx)
+
+	for _, toPay := range toPays {
+		balance := k.bankKeeper.GetBalance(ctx, fundingFeeCollectionAddress, toPay.AssetDenom)
+		if balance.Amount.LT(toPay.AssetBalance) {
+			break
+		} else {
+			// transfer funding fee amount to mtp address
+			if err := k.bankKeeper.SendCoins(ctx, fundingFeeCollectionAddress, sdk.MustAccAddressFromBech32(toPay.Address), sdk.NewCoins(sdk.NewCoin(toPay.AssetDenom, toPay.AssetBalance))); err != nil {
+				return err
+			}
+			err := k.DeleteToPay(ctx, sdk.MustAccAddressFromBech32(toPay.Address), toPay.Id)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}