Fee collection in amm

x/amm/keeper/apply_exit_pool_state_change.go

@@ -27,6 +27,38 @@
 	k.SetPool(ctx, pool)
 
 	rebalanceTreasuryAddr := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
+	weightRecoveryFeeAmount := sdkmath.ZeroInt()
+	poolAddr := sdk.MustAccAddressFromBech32(pool.GetAddress())
+	// send half (weight breaking fee portion) of weight breaking fee to rebalance treasury
+	if pool.PoolParams.UseOracle && weightBalanceBonus.IsNegative() {
+		params := k.GetParams(ctx)
+		rebalanceTreasury := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
+		// we are multiplying here by params.WeightBreakingFeePortion as we didn't multiply in pool.Join/Exit for weight breaking fee
+		weightRecoveryFee := weightBalanceBonus.Abs().Mul(params.WeightBreakingFeePortion)
+
+		for _, coin := range exitCoins {
+			weightRecoveryFeeAmount = coin.Amount.ToLegacyDec().Mul(weightRecoveryFee).RoundInt()
+
+			if weightRecoveryFeeAmount.IsPositive() {
+				// send weight recovery fee to rebalance treasury if weight recovery fee amount is positive¬
+				netWeightBreakingFeeCoins := sdk.Coins{sdk.NewCoin(coin.Denom, weightRecoveryFeeAmount)}
+
+				err = k.bankKeeper.SendCoins(ctx, poolAddr, rebalanceTreasury, netWeightBreakingFeeCoins)
+				if err != nil {
+					return err
+				}
+
+				err = k.RemoveFromPoolBalanceAndUpdateLiquidity(ctx, &pool, sdkmath.ZeroInt(), netWeightBreakingFeeCoins)
+				if err != nil {
+					return err
+				}
+
+				// Track amount in pool
+				weightRecoveryFeeForPool := weightBalanceBonus.Abs().Mul(sdkmath.LegacyOneDec().Sub(params.WeightBreakingFeePortion))
+				k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, sdkmath.Int(weightRecoveryFeeForPool.Mul(sdkmath.LegacyDec(weightRecoveryFeeAmount)))))
+			}
+		}
+	}
 
 	if weightBalanceBonus.IsPositive() {
 		// calculate treasury amounts to send as bonus

x/amm/keeper/apply_join_pool_state_change.go

@@ -2,6 +2,7 @@
 
 import (
 	"cosmossdk.io/math"
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/x/amm/types"
 )
@@ -26,6 +27,38 @@
 
 	rebalanceTreasuryAddr := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
 
+	weightRecoveryFeeAmount := sdkmath.ZeroInt()
+	poolAddr := sdk.MustAccAddressFromBech32(pool.GetAddress())
+	// send half (weight breaking fee portion) of weight breaking fee to rebalance treasury
+	if pool.PoolParams.UseOracle && weightBalanceBonus.IsNegative() {
+		params := k.GetParams(ctx)
+		rebalanceTreasury := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
+		// we are multiplying here by params.WeightBreakingFeePortion as we didn't multiply in pool.Join/Exit for weight breaking fee
+		weightRecoveryFee := weightBalanceBonus.Abs().Mul(params.WeightBreakingFeePortion)
+		for _, coin := range joinCoins {
+			weightRecoveryFeeAmount = coin.Amount.ToLegacyDec().Mul(weightRecoveryFee).RoundInt()
+
+			if weightRecoveryFeeAmount.IsPositive() {
+				// send weight recovery fee to rebalance treasury if weight recovery fee amount is positive¬
+				netWeightBreakingFeeCoins := sdk.Coins{sdk.NewCoin(coin.Denom, weightRecoveryFeeAmount)}
+
+				err := k.bankKeeper.SendCoins(ctx, poolAddr, rebalanceTreasury, netWeightBreakingFeeCoins)
+				if err != nil {
+					return err
+				}
+
+				err = k.RemoveFromPoolBalanceAndUpdateLiquidity(ctx, &pool, sdkmath.ZeroInt(), netWeightBreakingFeeCoins)
+				if err != nil {
+					return err
+				}
+
+				// Track amount in pool
+				weightRecoveryFeeForPool := weightBalanceBonus.Abs().Mul(sdkmath.LegacyOneDec().Sub(params.WeightBreakingFeePortion))
+				k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, sdkmath.Int(weightRecoveryFeeForPool.Mul(sdkmath.LegacyDec(weightRecoveryFeeAmount)))))
+			}
+		}
+	}
+
 	if weightBalanceBonus.IsPositive() {
 		// calculate treasury amounts to send as bonus
 		weightBalanceBonusCoins := PortionCoins(joinCoins, weightBalanceBonus)