updating logic for add collateral and close position

Author: avkr003

x/perpetual/keeper/close_position.go

@@ -18,6 +18,14 @@ func (k Keeper) ClosePosition(ctx sdk.Context, msg *types.MsgClose) (types.MTP,
 		return types.MTP{}, math.ZeroInt(), math.LegacyZeroDec(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), false, false, zeroPerpFees, math.LegacyZeroDec(), sdk.Coin{}, math.ZeroInt(), math.ZeroInt(), err
 	}
 
+	userClosingRatio := msg.Amount.ToLegacyDec().Quo(mtp.Custody.ToLegacyDec())
+	if mtp.Position == types.Position_SHORT {
+		userClosingRatio = msg.Amount.ToLegacyDec().Quo(mtp.Liabilities.ToLegacyDec())
+	}
+	if userClosingRatio.GT(math.LegacyOneDec()) {
+		userClosingRatio = math.LegacyOneDec()
+	}
+
 	initialCollateral := sdk.NewCoin(mtp.CollateralAsset, mtp.Collateral)
 	initialCustody := mtp.Custody
 	initialLiabilities := mtp.Liabilities
@@ -39,18 +47,13 @@ func (k Keeper) ClosePosition(ctx sdk.Context, msg *types.MsgClose) (types.MTP,
 		return types.MTP{}, math.ZeroInt(), math.LegacyZeroDec(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), math.ZeroInt(), false, false, zeroPerpFees, math.LegacyZeroDec(), initialCollateral, initialCustody, initialLiabilities, err
 	}
 
-	if forceClosed {
+	// user didn't want close position fully & it got only partially closed, we return as the value user wanted to close is different now
+	if !userClosingRatio.Equal(math.LegacyOneDec()) && forceClosed && !closingRatio.Equal(math.LegacyOneDec()) {
 		return mtp, repayAmt, closingRatio, returnAmt, fundingFeeAmt, fundingAmtDistributed, interestAmt, insuranceAmt, allInterestsPaid, forceClosed, perpetualFeesCoins, closingPrice, initialCollateral, initialCustody, initialLiabilities, nil
 	}
 
 	// Should be reset after MTPTriggerChecksAndUpdates
-	closingRatio = msg.Amount.ToLegacyDec().Quo(mtp.Custody.ToLegacyDec())
-	if mtp.Position == types.Position_SHORT {
-		closingRatio = msg.Amount.ToLegacyDec().Quo(mtp.Liabilities.ToLegacyDec())
-	}
-	if closingRatio.GT(math.LegacyOneDec()) {
-		closingRatio = math.LegacyOneDec()
-	}
+	closingRatio = userClosingRatio
 
 	// Estimate swap and repay
 	repayAmt, returnAmt, perpFees, closingPrice, _, err := k.EstimateAndRepay(ctx, &mtp, &pool, &ammPool, closingRatio, false)

x/perpetual/keeper/msg_server_add_collateral.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"cosmossdk.io/math"
 	"errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/v7/x/perpetual/types"
@@ -52,6 +53,9 @@ func (k msgServer) AddCollateral(goCtx context.Context, msg *types.MsgAddCollate
 		}
 		k.EmitForceClose(ctx, "add_collateral", mtp, repayAmt, returnAmt, fundingFeeAmt, fundingAmtDistributed, interestAmt, insuranceAmt, msg.Creator, allInterestsPaid, tradingAssetPrice, totalPerpetualFeesCoins, closingPrice, initialCollateralCoin, initialCustody, initialLiabilities, usdcPrice, closingRatio)
 		// hooks are being called inside MTPTriggerChecksAndUpdates
+	}
+
+	if forceClosed && closingRatio.Equal(math.LegacyOneDec()) {
 		return &types.MsgAddCollateralResponse{}, nil
 	}