Merge pull request #3362 from Sifchain/feature/dlp-discounted-sent-amount

fix: 🐛 DLP discounted sent amount

Author: canercandan

x/clp/keeper/calculations.go

@@ -598,3 +598,9 @@ func GetSwapFee(sentAmount sdk.Uint,
 	}
 	return swapResult
 }
+
+func CalculateDiscountedSentAmount(sentAmount sdk.Uint, swapFeeRate sdk.Dec) sdk.Uint {
+	discountedSentAmount := sentAmount.Sub(sdk.Uint(sdk.NewDecFromBigInt(sentAmount.BigInt()).Mul(swapFeeRate).RoundInt()))
+
+	return discountedSentAmount
+}

x/clp/keeper/msg_server.go

@@ -615,7 +615,8 @@ func (k msgServer) Swap(goCtx context.Context, msg *types.MsgSwap) (*types.MsgSw
 	if k.GetLiquidityProtectionParams(ctx).IsActive {
 		if types.StringCompare(sAsset.Denom, types.NativeSymbol) {
 			// selling rowan
-			k.MustUpdateLiquidityProtectionThreshold(ctx, true, msg.SentAmount, price)
+			discountedSentAmount := CalculateDiscountedSentAmount(msg.SentAmount, swapFeeRate)
+			k.MustUpdateLiquidityProtectionThreshold(ctx, true, discountedSentAmount, price)
 		}
 
 		if types.StringCompare(rAsset.Denom, types.NativeSymbol) {
@@ -705,7 +706,8 @@ func (k msgServer) AddLiquidity(goCtx context.Context, msg *types.MsgAddLiquidit
 				return nil, types.ErrReachedMaxRowanLiquidityThreshold
 			}
 
-			k.MustUpdateLiquidityProtectionThreshold(ctx, true, swapAmount, price)
+			discountedSentAmount := CalculateDiscountedSentAmount(swapAmount, sellNativeSwapFeeRate)
+			k.MustUpdateLiquidityProtectionThreshold(ctx, true, discountedSentAmount, price)
 		}
 
 	case BuyNative:

x/clp/keeper/msg_server_test.go

@@ -667,7 +667,7 @@ func TestMsgServer_Swap(t *testing.T) {
 			poolAssetPermissions:            []tokenregistrytypes.Permission{tokenregistrytypes.Permission_CLP},
 			nativeAssetPermissions:          []tokenregistrytypes.Permission{tokenregistrytypes.Permission_CLP},
 			currentRowanLiquidityThreshold:  sdk.NewUint(1000),
-			expectedRunningThresholdEnd:     sdk.NewUint(900),
+			expectedRunningThresholdEnd:     sdk.NewUint(910),
 			maxRowanLiquidityThresholdAsset: "rowan",
 			maxRowanLiquidityThreshold:      sdk.NewUint(2000),
 			swapFeeParams: types.SwapFeeParams{
@@ -1606,7 +1606,7 @@ func TestMsgServer_AddLiquidity(t *testing.T) {
 			liquidityProtectionActive:              true,
 			maxRowanLiquidityThreshold:             sdk.NewUint(1336005328924242545),
 			currentRowanLiquidityThreshold:         sdk.NewUint(1336005328924242544),
-			expectedUpdatedRowanLiquidityThreshold: sdk.NewUint(0),
+			expectedUpdatedRowanLiquidityThreshold: sdk.NewUint(4008015986772728),
 			expectedPoolUnits:                      sdk.NewUintFromString("23662660951949037742990437"),
 			expectedLPUnits:                        sdk.NewUintFromString("401491654050052483"),
 		},