Update event name and emit internal swapInfo event without deducting fees (#1411)

* update event name and emit event without deducting fees

* add comment

Author: 99adarsh

x/amm/keeper/apply_exit_pool_state_change.go

@@ -106,6 +106,7 @@ func (k Keeper) ApplyExitPoolStateChange(
 	}
 
 	if exitCoins.Len() == 1 {
+		// swapInfos contains the internal swaps without fees
 		types.EmitSwapsInfoEvent(ctx, pool.PoolId, exiter.String(), swapInfos)
 	}
 

x/amm/keeper/apply_join_pool_state_change.go

@@ -176,6 +176,7 @@ func (k Keeper) ApplyJoinPoolStateChange(
 	types.EmitAddLiquidityEvent(ctx, joiner, pool.GetPoolId(), joinCoins)
 
 	if joinCoins.Len() == 1 {
+		// swapInfos contains the internal swaps without fees
 		types.EmitSwapsInfoEvent(ctx, pool.PoolId, joiner.String(), swapInfos)
 	}
 

x/amm/keeper/keeper_join_pool_no_swap.go

@@ -70,7 +70,7 @@ func (k Keeper) JoinPoolNoSwap(
 		params := k.GetParams(ctx)
 		takerFees := k.parameterKeeper.GetParams(ctx).GetBigDecTakerFees()
 		snapshot := k.GetPoolWithAccountedBalance(ctx, pool.PoolId)
-		tokensJoined, sharesOut, _, weightBalanceBonus, swapFee, takerFeesFinal, virtualSwaps, err := pool.JoinPool(ctx, snapshot, k.oracleKeeper, k.accountedPoolKeeper, tokensIn, params, takerFees)
+		tokensJoined, sharesOut, _, weightBalanceBonus, swapFee, takerFeesFinal, swapInfos, err := pool.JoinPool(ctx, snapshot, k.oracleKeeper, k.accountedPoolKeeper, tokensIn, params, takerFees)
 		if err != nil {
 			return nil, sdkmath.ZeroInt(), err
 		}
@@ -83,7 +83,7 @@ func (k Keeper) JoinPoolNoSwap(
 		// slippage will be 0 as tokensIn.Len() != 1
 		slippageCoins := sdk.Coins{}
 
-		err = k.ApplyJoinPoolStateChange(ctx, pool, sender, sharesOut, tokensJoined, weightBalanceBonus, takerFeesFinal, swapFee, slippageCoins, virtualSwaps)
+		err = k.ApplyJoinPoolStateChange(ctx, pool, sender, sharesOut, tokensJoined, weightBalanceBonus, takerFeesFinal, swapFee, slippageCoins, swapInfos)
 		if err != nil {
 			return nil, sdkmath.Int{}, err
 		}
@@ -100,7 +100,7 @@ func (k Keeper) JoinPoolNoSwap(
 	takerFees := k.parameterKeeper.GetParams(ctx).GetBigDecTakerFees()
 	// on oracle pool, full tokenInMaxs are used regardless shareOutAmount
 	snapshot := k.GetPoolWithAccountedBalance(ctx, pool.PoolId)
-	tokensJoined, sharesOut, slippage, weightBalanceBonus, swapFee, takerFeesFinal, virtualSwaps, err := pool.JoinPool(ctx, snapshot, k.oracleKeeper, k.accountedPoolKeeper, tokenInMaxs, params, takerFees)
+	tokensJoined, sharesOut, slippage, weightBalanceBonus, swapFee, takerFeesFinal, swapInfos, err := pool.JoinPool(ctx, snapshot, k.oracleKeeper, k.accountedPoolKeeper, tokenInMaxs, params, takerFees)
 	if err != nil {
 		return nil, sdkmath.ZeroInt(), err
 	}
@@ -148,7 +148,7 @@ func (k Keeper) JoinPoolNoSwap(
 			shareOutAmount, sharesOut))
 	}
 
-	err = k.ApplyJoinPoolStateChange(ctx, pool, sender, sharesOut, tokensJoined, weightBalanceBonus, takerFeesFinal, swapFee, slippageCoins, virtualSwaps)
+	err = k.ApplyJoinPoolStateChange(ctx, pool, sender, sharesOut, tokensJoined, weightBalanceBonus, takerFeesFinal, swapFee, slippageCoins, swapInfos)
 	if err != nil {
 		return nil, sdkmath.Int{}, err
 	}

x/amm/types/calc_exit_pool.go

@@ -151,6 +151,7 @@ func (p Pool) CalcExitPool(
 		}
 
 		swapInfo := NewSwapInfo(swappedWeightedTokenIn, tokenOut)
+		swapInfos = append(swapInfos, swapInfo)
 
 		// Ensure tokenPrice is not zero to avoid division by zero
 		if tokenPrice.IsZero() {
@@ -198,17 +199,11 @@ func (p Pool) CalcExitPool(
 
 			takerFeesFinal = takerFees.Mul(initialWeightIn)
 
-			swapInfo.TokenOut.Amount = osmomath.BigDecFromSDKInt(swapInfo.TokenOut.Amount).
-				Mul(osmomath.OneBigDec().Sub(weightBreakingFee)).
-				Mul(osmomath.OneBigDec().Sub(swapFee.Add(takerFeesFinal))).Dec().RoundInt()
-
 			tokenOutAmount = (oracleOutAmount.
 				Mul(osmomath.OneBigDec().Sub(weightBreakingFee)).
 				Mul(osmomath.OneBigDec().Sub(swapFee.Add(takerFeesFinal)))).Dec().RoundInt()
 		}
 
-		swapInfos = append(swapInfos, swapInfo)
-
 		return sdk.Coins{sdk.NewCoin(tokenOutDenom, tokenOutAmount)}, weightBalanceBonus, slippage, swapFee, takerFeesFinal, slippageCoins, swapInfos, nil
 	}
 

x/amm/types/events.go

@@ -14,7 +14,7 @@ const (
 	TypeEvtUpFrontTokenSwapped  = "upfront_token_swapped"
 	TypeEvtTokenSwappedFee      = "token_swapped_fee"
 	TypeEvtSwapTokenPriceChange = "swap_token_price_change"
-	TypeEvtVirtualSwaps         = "virtual_swaps"
+	TypeEvtInternalSwaps        = "internal_swaps"
 
 	AttributeValueCategory = ModuleName
 	AttributeKeyPoolId     = "pool_id"
@@ -146,7 +146,7 @@ func NewRemoveLiquidityEvent(sender sdk.AccAddress, poolId uint64, liquidity sdk
 
 func NewSwapInfoEvent(poolId uint64, sender string, tokensIn, tokensOut sdk.Coins) sdk.Event {
 	return sdk.NewEvent(
-		TypeEvtVirtualSwaps,
+		TypeEvtInternalSwaps,
 		sdk.NewAttribute(sdk.AttributeKeySender, sender),
 		sdk.NewAttribute(AttributeKeyPoolId, strconv.FormatUint(poolId, 10)),
 		sdk.NewAttribute(AttributeKeyTokensIn, tokensIn.String()),

x/amm/types/pool_join_pool.go

@@ -166,6 +166,7 @@ func (p *Pool) JoinPool(
 	if err != nil {
 		return sdk.NewCoins(), sdkmath.ZeroInt(), osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), nil, err
 	}
+	swapsInfos = append(swapsInfos, NewSwapInfo(swappedTokenIn, secondTokenOut))
 
 	tvl, err := p.TVL(ctx, oracleKeeper, accountedPoolKeeper)
 	if err != nil {
@@ -195,13 +196,6 @@ func (p *Pool) JoinPool(
 
 	takerFeesFinal = takerFees.Mul(initialWeightOut)
 
-	secondTokenOut.Amount = sdkmath.Int(osmomath.BigDecFromSDKInt(secondTokenOut.Amount).
-		Mul(joinValueWithSlippage).Quo(tvl).
-		Mul(osmomath.OneBigDec().Sub(weightBreakingFee)).
-		Mul(osmomath.OneBigDec().Sub(swapFee.Add(takerFeesFinal))).Dec().RoundInt())
-
-	swapsInfos = append(swapsInfos, NewSwapInfo(swappedTokenIn, secondTokenOut))
-
 	totalShares := p.GetTotalShares()
 	numSharesDec := osmomath.BigDecFromSDKInt(totalShares.Amount).
 		Mul(joinValueWithSlippage).Quo(tvl).