Add zero fee check before emitting swap fee event (#1275)

add checks for zero fees before emmitting events

Author: 99adarsh

x/amm/keeper/apply_exit_pool_state_change.go

@@ -85,13 +85,24 @@ func (k Keeper) ApplyExitPoolStateChange(
 	}
 
 	// convert the fees into USD
-	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins).String()
-	slippageAmountInUSD := k.CalculateCoinsUSDValue(ctx, slippageCoins).String()
+	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins)
+	slippageAmountInUSD := k.CalculateCoinsUSDValue(ctx, slippageCoins)
 
-	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins).String()
+	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins)
 
 	// emit swap fees event
-	types.EmitSwapFeesCollectedEvent(ctx, swapFeeValueInUSD, slippageAmountInUSD, "0", "0", takerFeesAmountInUSD)
+	if !(swapFeeValueInUSD.IsZero() &&
+		slippageAmountInUSD.IsZero() &&
+		takerFeesAmountInUSD.IsZero()) {
+		types.EmitSwapFeesCollectedEvent(
+			ctx,
+			swapFeeValueInUSD.String(),
+			slippageAmountInUSD.String(),
+			"0",
+			"0",
+			takerFeesAmountInUSD.String(),
+		)
+	}
 
 	types.EmitRemoveLiquidityEvent(ctx, exiter, pool.GetPoolId(), exitCoins)
 	if k.hooks != nil {

x/amm/keeper/apply_join_pool_state_change.go

@@ -150,14 +150,27 @@ func (k Keeper) ApplyJoinPoolStateChange(
 	}
 
 	// convert the fees into USD
-	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins).String()
-	slippageAmountInUSD := k.CalculateCoinsUSDValue(ctx, slippageCoins).String()
-	weightRecoveryFeeAmountInUSD := k.CalculateCoinsUSDValue(ctx, weightRecoveryFeeCoins).String()
-	bonusTokenAmountInUSD := k.CalculateCoinsUSDValue(ctx, weightBalanceBonusCoins).String()
-	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins).String()
+	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins)
+	slippageAmountInUSD := k.CalculateCoinsUSDValue(ctx, slippageCoins)
+	weightRecoveryFeeAmountInUSD := k.CalculateCoinsUSDValue(ctx, weightRecoveryFeeCoins)
+	bonusTokenAmountInUSD := k.CalculateCoinsUSDValue(ctx, weightBalanceBonusCoins)
+	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins)
 
 	// emit swap fees event
-	types.EmitSwapFeesCollectedEvent(ctx, swapFeeValueInUSD, slippageAmountInUSD, weightRecoveryFeeAmountInUSD, bonusTokenAmountInUSD, takerFeesAmountInUSD)
+	if !(swapFeeValueInUSD.IsZero() &&
+		slippageAmountInUSD.IsZero() &&
+		weightRecoveryFeeAmountInUSD.IsZero() &&
+		bonusTokenAmountInUSD.IsZero() &&
+		takerFeesAmountInUSD.IsZero()) {
+		types.EmitSwapFeesCollectedEvent(
+			ctx,
+			swapFeeValueInUSD.String(),
+			slippageAmountInUSD.String(),
+			weightRecoveryFeeAmountInUSD.String(),
+			bonusTokenAmountInUSD.String(),
+			takerFeesAmountInUSD.String(),
+		)
+	}
 
 	types.EmitAddLiquidityEvent(ctx, joiner, pool.GetPoolId(), joinCoins)
 	if k.hooks != nil {

x/amm/keeper/update_pool_for_swap.go

@@ -194,14 +194,27 @@ func (k Keeper) UpdatePoolForSwap(
 	k.SetPool(ctx, pool)
 
 	// convert the fees into USD
-	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins).String()
-	slippageAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, slippageAmount.Dec().TruncateInt()).String()
-	weightRecoveryFeeAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, weightRecoveryFeeAmount).String()
-	bonusTokenAmountInUSD := k.CalculateUSDValue(ctx, tokenOut.Denom, bonusTokenAmount).String()
-	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins).String()
+	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins)
+	slippageAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, slippageAmount.Dec().TruncateInt())
+	weightRecoveryFeeAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, weightRecoveryFeeAmount)
+	bonusTokenAmountInUSD := k.CalculateUSDValue(ctx, tokenOut.Denom, bonusTokenAmount)
+	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins)
 
 	// emit swap fees event
-	types.EmitSwapFeesCollectedEvent(ctx, swapFeeValueInUSD, slippageAmountInUSD, weightRecoveryFeeAmountInUSD, bonusTokenAmountInUSD, takerFeesAmountInUSD)
+	if !(swapFeeValueInUSD.IsZero() &&
+		slippageAmountInUSD.IsZero() &&
+		weightRecoveryFeeAmountInUSD.IsZero() &&
+		bonusTokenAmountInUSD.IsZero() &&
+		takerFeesAmountInUSD.IsZero()) {
+		types.EmitSwapFeesCollectedEvent(
+			ctx,
+			swapFeeValueInUSD.String(),
+			slippageAmountInUSD.String(),
+			weightRecoveryFeeAmountInUSD.String(),
+			bonusTokenAmountInUSD.String(),
+			takerFeesAmountInUSD.String(),
+		)
+	}
 
 	// emit swap event
 	types.EmitSwapEvent(ctx, sender, recipient, pool.GetPoolId(), tokensIn, tokensOut)