[Amm]: Query fixes (#1273)

fixes

Co-authored-by: Abhinav Kumar <57705190+avkr003@users.noreply.github.com>

Author: amityadav0

x/amm/keeper/calc_in_route_spot_price.go

@@ -81,7 +81,7 @@ func (k Keeper) CalcInRouteSpotPrice(ctx sdk.Context,
 			rebalanceTreasuryAddr := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
 			treasuryTokenAmount := k.bankKeeper.GetBalance(ctx, rebalanceTreasuryAddr, tokenOut.Denom).Amount
 
-			bonusTokenAmount := oracleOutAmount.Mul(weightBalanceBonus).Dec().TruncateInt()
+			bonusTokenAmount = oracleOutAmount.Mul(weightBalanceBonus).Dec().TruncateInt()
 
 			if treasuryTokenAmount.LT(bonusTokenAmount) {
 				weightBalanceBonus = osmomath.BigDecFromSDKInt(treasuryTokenAmount).Quo(oracleOutAmount)
@@ -114,7 +114,7 @@ func (k Keeper) CalcInRouteSpotPrice(ctx sdk.Context,
 			poolAsset.Token.Amount = accAmount
 		}
 		availableLiquidity = poolAsset.Token
-		weightBalance = weightBalanceBonus
+		weightBalance = weightBalance.Add(weightBalanceBonus)
 		slippage = slippage.Add(swapSlippage)
 	}
 

x/amm/keeper/calc_out_route_spot_price.go

@@ -62,7 +62,7 @@ func (k Keeper) CalcOutRouteSpotPrice(ctx sdk.Context, tokenOut sdk.Coin, routes
 			rebalanceTreasuryAddr := sdk.MustAccAddressFromBech32(pool.GetRebalanceTreasury())
 			treasuryTokenAmount := k.bankKeeper.GetBalance(ctx, rebalanceTreasuryAddr, tokenOut.Denom).Amount
 
-			bonusTokenAmount := osmomath.BigDecFromSDKInt(tokenOut.Amount).Mul(weightBalanceBonus).Dec().TruncateInt()
+			bonusTokenAmount = osmomath.BigDecFromSDKInt(tokenOut.Amount).Mul(weightBalanceBonus).Dec().TruncateInt()
 
 			if treasuryTokenAmount.LT(bonusTokenAmount) {
 				weightBalanceBonus = osmomath.BigDecFromSDKInt(treasuryTokenAmount).Quo(osmomath.BigDecFromSDKInt(tokenOut.Amount))
@@ -90,7 +90,7 @@ func (k Keeper) CalcOutRouteSpotPrice(ctx sdk.Context, tokenOut sdk.Coin, routes
 			return osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), sdk.Coin{}, osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), sdk.Coin{}, osmomath.ZeroBigDec(), osmomath.ZeroBigDec(), err
 		}
 		availableLiquidity = poolAsset.Token
-		weightBonus = weightBalanceBonus
+		weightBonus = weightBonus.Add(weightBalanceBonus)
 		slippage = slippage.Add(swapSlippage)
 	}
 

x/amm/keeper/query_swap_estimation_by_denom.go

@@ -3,8 +3,6 @@ package keeper
 import (
 	"context"
 
-	sdkmath "cosmossdk.io/math"
-
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/x/amm/types"
@@ -38,12 +36,6 @@ func (k Keeper) SwapEstimationByDenom(goCtx context.Context, req *types.QuerySwa
 	if err != nil {
 		return nil, err
 	}
-	recoveryReward := sdkmath.ZeroInt()
-	if weightBonus.IsPositive() {
-		recoveryReward = osmomath.BigDecFromSDKInt(amount.Amount).Mul(weightBonus).Dec().TruncateInt()
-	}
-	// Add weight balance amount here, not added in execution as out amount will be changed and that will impact the transfers
-	amount.Amount = amount.Amount.Add(recoveryReward)
 
 	// Even when multiple routes, taker Fee per route is params.TakerFee/TotalRoutes, so net taker fee will be params.TakerFee
 	takerFees := k.parameterKeeper.GetParams(ctx).TakerFees
@@ -60,7 +52,5 @@ func (k Keeper) SwapEstimationByDenom(goCtx context.Context, req *types.QuerySwa
 		WeightBalanceRatio: weightBonus.Dec(),
 		PriceImpact:        priceImpact.Dec(),
 		TakerFee:           takerFees,
-		// sdk.NewCoin() will panic in case of negative weightBonus
-		WeightBalanceRewardAmount: sdk.Coin{Denom: amount.Denom, Amount: recoveryReward},
 	}, nil
 }