apr fixes (#1242)

Author: avkr003

x/masterchef/keeper/apr_denom.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
+	"fmt"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	assetprofiletypes "github.com/elys-network/elys/x/assetprofile/types"
 	commitmenttypes "github.com/elys-network/elys/x/commitment/types"
@@ -70,9 +71,9 @@ func (k Keeper) CalculateApr(ctx sdk.Context, query *types.QueryAprRequest) (mat
 		}
 	} else if query.Denom == ptypes.BaseCurrency {
 		if query.WithdrawType == commitmenttypes.EarnType_USDC_PROGRAM {
-			borrowPool, found := k.stableKeeper.GetPoolByDenom(ctx, query.Denom)
+			borrowPool, found := k.stableKeeper.GetPoolByDenom(ctx, baseCurrency)
 			if !found {
-				return math.LegacyZeroDec(), errorsmod.Wrap(types.ErrPoolNotFound, "pool not found")
+				return math.LegacyZeroDec(), fmt.Errorf("pool not found for denom %s", baseCurrency)
 			}
 			res, err := k.stableKeeper.BorrowRatio(ctx, &stabletypes.QueryBorrowRatioRequest{
 				PoolId: stabletypes.UsdcPoolId,

x/masterchef/keeper/apr_stable_stake.go

@@ -18,6 +18,11 @@ func (k Keeper) CalculateStableStakeApr(ctx sdk.Context, query *types.QueryStabl
 	// Update params
 	defer k.SetParams(ctx, params)
 
+	baseCurrency, found := k.assetProfileKeeper.GetUsdcDenom(ctx)
+	if !found {
+		return sdkmath.LegacyZeroDec(), errorsmod.Wrapf(assetprofiletypes.ErrAssetProfileNotFound, "asset %s not found", ptypes.BaseCurrency)
+	}
+
 	// If we don't have enough params
 	if query.Denom == ptypes.Eden {
 		lpIncentive := params.LpIncentives
@@ -30,11 +35,6 @@ func (k Keeper) CalculateStableStakeApr(ctx sdk.Context, query *types.QueryStabl
 			return sdkmath.LegacyZeroDec(), nil
 		}
 
-		baseCurrency, found := k.assetProfileKeeper.GetUsdcDenom(ctx)
-		if !found {
-			return sdkmath.LegacyZeroDec(), errorsmod.Wrapf(assetprofiletypes.ErrAssetProfileNotFound, "asset %s not found", ptypes.BaseCurrency)
-		}
-
 		stableTvl := k.stableKeeper.TVL(ctx, stabletypes.UsdcPoolId)
 		if stableTvl.IsZero() {
 			return sdkmath.LegacyZeroDec(), nil
@@ -76,7 +76,7 @@ func (k Keeper) CalculateStableStakeApr(ctx sdk.Context, query *types.QueryStabl
 			Quo(stableTvl)
 		return apr, nil
 	} else if query.Denom == ptypes.BaseCurrency {
-		borrowPool, found := k.stableKeeper.GetPoolByDenom(ctx, query.Denom)
+		borrowPool, found := k.stableKeeper.GetPoolByDenom(ctx, baseCurrency)
 		if !found {
 			return math.LegacyZeroDec(), errorsmod.Wrap(types.ErrPoolNotFound, "pool not found")
 		}