Merge branch 'main' into incentive_staking_reward_fix

elys-network · Feb 12, 2024 · e71d4b7 · e71d4b7
2 parents 7856640 + 7a05e8c
commit e71d4b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/x/amm/keeper/calc_swap_estimation_by_denom.go b/x/amm/keeper/calc_swap_estimation_by_denom.go
@@ -36,7 +36,7 @@ func (k Keeper) CalcSwapEstimationByDenom(
 	// Initialize return variables
 	inRoute, outRoute = nil, nil
 	outAmount, availableLiquidity = sdk.Coin{}, sdk.Coin{}
-	spotPrice, swapFeeOut, discountOut, weightBonus, priceImpact = sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()
+	spotPrice, swapFeeOut, discountOut, weightBonus, priceImpact = sdk.ZeroDec(), sdk.ZeroDec(), discount, sdk.ZeroDec(), sdk.ZeroDec()
 
 	// Determine the correct route based on the amount's denom
 	if amount.Denom == denomIn {

diff --git a/x/incentive/keeper/keeper.go b/x/incentive/keeper/keeper.go
@@ -292,6 +292,15 @@ func (k Keeper) UpdateStakersRewardsUnclaimed(ctx sdk.Context, stakeIncentive ty
 	edenRemained := stakersEdenAmountPerDistribution.Sub(totalEdenGiven)
 	dexRewardsRemained := dexRevenueStakersAmtPerDistribution.Sub(sdk.NewDecFromInt(totalRewardsGiven))
 
+	// if edenRemained is negative, override it with zero
+	if edenRemained.IsNegative() {
+		edenRemained = sdk.ZeroInt()
+	}
+	// if dexRewardsRemained is negative, override it with zero
+	if dexRewardsRemained.IsNegative() {
+		dexRewardsRemained = sdk.ZeroDec()
+	}
+
 	// Fund community the remain coins
 	// ----------------------------------
 	edenRemainedCoin := sdk.NewDecCoin(ptypes.Eden, edenRemained)