Exclude BSE from LP Apy (#1811)

Author: DannyDelott

apps/hyperdrive-trading/src/rewards/getYieldSourceRate.ts

@@ -19,8 +19,10 @@ import { getRewardResolverQuery } from "src/ui/rewards/hooks/getRewardResolverQu
 export async function getYieldSourceRate({
   readHyperdrive,
   appConfig,
+  excludeBigShortEnergy = false,
 }: {
   readHyperdrive: ReadHyperdrive;
+  excludeBigShortEnergy?: boolean;
   appConfig: AppConfig;
 }): Promise<{ rate: bigint; ratePeriodDays: number; netRate: bigint }> {
   const hyperdriveChainId = await readHyperdrive.drift.getChainId();
@@ -57,11 +59,12 @@ export async function getYieldSourceRate({
     });
     return {
       rate: rateSinceInitialization,
-      netRate: await calcNetRate(
-        rateSinceInitialization,
+      netRate: await calcNetRate({
+        rate: rateSinceInitialization,
         appConfig,
         hyperdrive,
-      ),
+        excludeBigShortEnergy,
+      }),
       ratePeriodDays: daysSinceInitialization,
     };
   }
@@ -70,7 +73,12 @@ export async function getYieldSourceRate({
     blockRange: numBlocksForHistoricalRate,
   });
 
-  const netRate = await calcNetRate(rate, appConfig, hyperdrive);
+  const netRate = await calcNetRate({
+    rate,
+    appConfig,
+    hyperdrive,
+    excludeBigShortEnergy,
+  });
 
   const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdrive.address,
@@ -85,11 +93,17 @@ export async function getYieldSourceRate({
   };
 }
 
-async function calcNetRate(
-  rate: bigint,
-  appConfig: AppConfig,
-  hyperdrive: HyperdriveConfig,
-) {
+async function calcNetRate({
+  rate,
+  appConfig,
+  hyperdrive,
+  excludeBigShortEnergy,
+}: {
+  rate: bigint;
+  appConfig: AppConfig;
+  excludeBigShortEnergy: boolean;
+  hyperdrive: HyperdriveConfig;
+}) {
   let netRate = rate;
 
   const rewardConfigs = getOpenShortRewardConfigs({
@@ -100,14 +114,23 @@ async function calcNetRate(
 
   if (rewardConfigs?.length) {
     const rewards = await Promise.all(
-      rewardConfigs.map((rewardConfig) =>
-        queryClient.fetchQuery(
-          getRewardResolverQuery({
-            chainId: hyperdrive.chainId,
-            rewardConfig,
-          }),
+      rewardConfigs
+        .filter((rewardConfig) => {
+          if (!excludeBigShortEnergy) {
+            return true;
+          }
+          return (
+            excludeBigShortEnergy && rewardConfig.id !== "bigShortEnergyRewards"
+          );
+        })
+        .map((rewardConfig) =>
+          queryClient.fetchQuery(
+            getRewardResolverQuery({
+              chainId: hyperdrive.chainId,
+              rewardConfig,
+            }),
+          ),
         ),
-      ),
     );
 
     rewards.flat().forEach((reward) => {

apps/hyperdrive-trading/src/ui/hyperdrive/lp/AddLiquidityForm/AddLiquidityForm.tsx

@@ -129,7 +129,7 @@ export function AddLiquidityForm({
   const lpSharePrice = !isBaseActiveToken
     ? fixed(poolInfo?.lpSharePrice || 0n, baseToken.decimals).div(
         poolInfo?.vaultSharePrice || 0n,
-        baseToken.decimals
+        baseToken.decimals,
       ).bigint
     : poolInfo?.lpSharePrice || 0n;
 
@@ -219,7 +219,7 @@ export function AddLiquidityForm({
                   balance:
                     activeTokenPrice && depositAmountAsBigInt
                       ? fixed(depositAmountAsBigInt, activeToken.decimals).mul(
-                          activeTokenPrice
+                          activeTokenPrice,
                         ).bigint
                       : 0n,
                   decimals: activeToken.decimals,
@@ -318,7 +318,7 @@ export function AddLiquidityForm({
       disclaimer={(() => {
         if (
           previewAddLiquidityError?.message.includes(
-            "Not enough lp shares minted."
+            "Not enough lp shares minted.",
           )
         ) {
           return (
@@ -505,6 +505,7 @@ function LpApyStat({ hyperdrive }: { hyperdrive: HyperdriveConfig }) {
   const { vaultRate, vaultRateStatus } = useYieldSourceRate({
     hyperdriveAddress: hyperdrive.address,
     chainId: hyperdrive.chainId,
+    excludeBigShortEnergy: true,
   });
 
   const yieldSource = getYieldSource({

apps/hyperdrive-trading/src/ui/vaults/queryKeys.ts

@@ -5,6 +5,7 @@ interface VaultQueryKeys {
   vaultRate: {
     chainId: number;
     hyperdriveAddress: Address | undefined;
+    excludeBigShortEnergy: boolean;
   };
 }
 

apps/hyperdrive-trading/src/ui/vaults/useYieldSourceRate.ts

@@ -9,8 +9,10 @@ import { Address } from "viem";
 export function useYieldSourceRate({
   chainId,
   hyperdriveAddress,
+  excludeBigShortEnergy = false,
 }: {
   chainId: number;
+  excludeBigShortEnergy?: boolean;
   hyperdriveAddress: Address | undefined;
 }): {
   vaultRate:
@@ -36,14 +38,15 @@ export function useYieldSourceRate({
     queryKey: makeQueryKey2({
       namespace: "vaults",
       queryId: "vaultRate",
-      params: { chainId, hyperdriveAddress },
+      params: { chainId, hyperdriveAddress, excludeBigShortEnergy },
     }),
     enabled: queryEnabled,
     queryFn: queryEnabled
       ? async () => {
           const { rate, ratePeriodDays, netRate } = await getYieldSourceRate({
             readHyperdrive,
             appConfig,
+            excludeBigShortEnergy,
           });
           return {
             vaultRate: rate,