Refactor APR calculation logic and improve number formatting in Pool …

…components
oraidex · Jan 14, 2025 · bb3daef · bb3daef
1 parent 4d97fa5
commit bb3daef
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 46 deletions.
diff --git a/src/libs/contractSingleton.ts b/src/libs/contractSingleton.ts
@@ -1,6 +1,6 @@
 import { CosmWasmClient, fromBinary, SigningCosmWasmClient, toBinary } from '@cosmjs/cosmwasm-stargate';
 import { MulticallQueryClient } from '@oraichain/common-contracts-sdk';
-import { AXIOS_THROTTLE_THRESHOLD, AXIOS_TIMEOUT, CoinGeckoId, toDisplay } from '@oraichain/oraidex-common';
+import { BigDecimal, CoinGeckoId, toDisplay } from '@oraichain/oraidex-common';
 import {
   AssetInfo,
   OraiswapTokenClient,
@@ -33,15 +33,14 @@ import {
   positionToTick,
   Tickmap
 } from '@oraichain/oraiswap-v3';
-import Axios from 'axios';
-import { retryAdapterEnhancer, throttleAdapterEnhancer } from 'axios-extensions';
 import { network, oraichainTokens } from 'initCommon';
 
 import { CoinGeckoPrices } from 'hooks/useCoingecko';
 import { TokenDataOnChain } from 'pages/Pool-V3/components/PriceRangePlot/utils';
+import { numberExponentToLarge } from 'pages/Pool-V3/hooks/useCreatePositionForm';
 import { getPools } from 'rest/graphClient';
-import { PoolInfoResponse } from 'types/pool';
 import { store } from 'store/configure';
+import { PoolInfoResponse } from 'types/pool';
 
 export const ALL_FEE_TIERS_DATA: FeeTier[] = [
   { fee: 100000000, tick_spacing: 1 },
@@ -845,22 +844,37 @@ export async function fetchPoolAprInfo(
 
   const poolAprs: Record<string, PoolAprInfo> = {};
   for (const item of pools) {
+    // Note: this logic is for pool v2
+
     if ('liquidityAddr' in item) {
-      const { apr, aprBoost, liquidityAddr } = item;
+      const { liquidityAddr } = item;
+
+      // TODO: calculate incentive apr base on reward per sec later
+      const incentiveApr = 0;
+
+      // calculate apr base on volume 24h -> swap fee
+
+      const totalLiquidityUsd = new BigDecimal(numberExponentToLarge(item.totalLiquidity)); // usdt denom
+      const volume24hUsd = new BigDecimal(item.volume24Hour); // usdt denom
+
+      const swapFee = volume24hUsd.mul(0.002); // fee for LP is 0.2%
+      let apr = totalLiquidityUsd.toNumber() !== 0 ? swapFee.div(totalLiquidityUsd).toNumber() : 0;
+
+      if (apr < 0) apr = 0;
 
       poolAprs[liquidityAddr] = {
         apr: {
-          min: aprBoost || 0,
-          max: aprBoost || 0
+          min: apr || 0,
+          max: apr || 0
         },
         incentives: [],
         swapFee: {
           min: apr,
           max: apr
         },
         incentivesApr: {
-          min: 0,
-          max: 0
+          min: incentiveApr,
+          max: incentiveApr
         }
       };
       continue;

diff --git a/src/pages/Pool-V3/components/PoolDetail/index.tsx b/src/pages/Pool-V3/components/PoolDetail/index.tsx
@@ -100,26 +100,26 @@ const PoolV3Detail = () => {
 
   const [aprInfo, setAprInfo] = useConfigReducer('aprPools');
 
-  useEffect(() => {
-    const getAPRInfo = async () => {
-      const res = await fetchPoolAprInfo(
-        [poolDetail],
-        poolPrice,
-        {
-          [poolKeyString]: liquidity.total
-        },
-        feeDailyData
-      );
-      setAprInfo({
-        ...aprInfo,
-        [poolKeyString]: res[poolKeyString]
-      });
-    };
+  // useEffect(() => {
+  //   const getAPRInfo = async () => {
+  //     const res = await fetchPoolAprInfo(
+  //       [poolDetail],
+  //       poolPrice,
+  //       {
+  //         [poolKeyString]: liquidity.total
+  //       },
+  //       feeDailyData
+  //     );
+  //     setAprInfo({
+  //       ...aprInfo,
+  //       [poolKeyString]: res[poolKeyString]
+  //     });
+  //   };
 
-    if (poolDetail && poolPrice && liquidity && poolDetail.poolKey === poolKeyString) {
-      getAPRInfo();
-    }
-  }, [liquidity.total, feeDailyData, poolDetail, poolPrice, poolKeyString]);
+  //   if (poolDetail && poolPrice && liquidity && poolDetail.poolKey === poolKeyString) {
+  //     getAPRInfo();
+  //   }
+  // }, [liquidity.total, feeDailyData, poolDetail, poolPrice, poolKeyString]);
 
   const { spread, pool_key } = poolDetail || {};
   const { allocation, total } = liquidity;

diff --git a/src/pages/Pool-V3/components/PoolList/PoolItemTData.tsx b/src/pages/Pool-V3/components/PoolList/PoolItemTData.tsx
@@ -22,9 +22,6 @@ const PoolItemTData = ({
   setCurrentPool,
   setPairDenomsDeposit
 }) => {
-
-
-
   const navigate = useNavigate();
   const [openTooltip, setOpenTooltip] = useState(false);
 
@@ -99,10 +96,10 @@ const PoolItemTData = ({
         <div className={styles.apr}>
           <span className={styles.amount}>
             {aprInfo.apr.min === aprInfo.apr.max
-              ? `${numberWithCommas(aprInfo.apr.min * 100, undefined, { maximumFractionDigits: 1 })}`
+              ? `${numberWithCommas(aprInfo.apr.min * 100, undefined, { maximumFractionDigits: 2 })}`
               : `${numberWithCommas(aprInfo.apr.min * 100, undefined, {
                   maximumFractionDigits: 1
-                })} - ${numberWithCommas(aprInfo.apr.max * 100, undefined, { maximumFractionDigits: 1 })}`}
+                })} - ${numberWithCommas(aprInfo.apr.max * 100, undefined, { maximumFractionDigits: 2 })}`}
             %
           </span>
           <TooltipIcon
@@ -117,11 +114,11 @@ const PoolItemTData = ({
                   <span>Swap fee</span>
                   <span className={styles.value}>
                     {aprInfo.swapFee.min === aprInfo.swapFee.max
-                      ? `${numberWithCommas(aprInfo.swapFee.min * 100, undefined, { maximumFractionDigits: 1 })}`
+                      ? `${numberWithCommas(aprInfo.swapFee.min * 100, undefined, { maximumFractionDigits: 2 })}`
                       : `${numberWithCommas(aprInfo.swapFee.min * 100, undefined, {
-                          maximumFractionDigits: 1
+                          maximumFractionDigits: 2
                         })} - ${numberWithCommas(aprInfo.swapFee.max * 100, undefined, {
-                          maximumFractionDigits: 1
+                          maximumFractionDigits: 2
                         })}`}
                     %
                   </span>
@@ -133,11 +130,11 @@ const PoolItemTData = ({
                   </span>
                   <span className={styles.value}>
                     {aprInfo.incentivesApr.min === aprInfo.incentivesApr.max
-                      ? `${numberWithCommas(aprInfo.incentivesApr.min * 100, undefined, { maximumFractionDigits: 1 })}`
+                      ? `${numberWithCommas(aprInfo.incentivesApr.min * 100, undefined, { maximumFractionDigits: 2 })}`
                       : `${numberWithCommas(aprInfo.incentivesApr.min * 100, undefined, {
-                          maximumFractionDigits: 1
+                          maximumFractionDigits: 2
                         })} - ${numberWithCommas(aprInfo.incentivesApr.max * 100, undefined, {
-                          maximumFractionDigits: 1
+                          maximumFractionDigits: 2
                         })}`}
                     %
                   </span>
@@ -146,10 +143,10 @@ const PoolItemTData = ({
                   <span>Total APR</span>
                   <span className={styles.totalApr}>
                     {aprInfo.apr.min === aprInfo.apr.max
-                      ? `${numberWithCommas(aprInfo.apr.min * 100, undefined, { maximumFractionDigits: 1 })}`
+                      ? `${numberWithCommas(aprInfo.apr.min * 100, undefined, { maximumFractionDigits: 2 })}`
                       : `${numberWithCommas(aprInfo.apr.min * 100, undefined, {
-                          maximumFractionDigits: 1
-                        })} - ${numberWithCommas(aprInfo.apr.max * 100, undefined, { maximumFractionDigits: 1 })}`}
+                          maximumFractionDigits: 2
+                        })} - ${numberWithCommas(aprInfo.apr.max * 100, undefined, { maximumFractionDigits: 2 })}`}
                     %
                   </span>
                 </div>

diff --git a/src/pages/Pool-V3/components/PoolList/index.tsx b/src/pages/Pool-V3/components/PoolList/index.tsx
@@ -161,10 +161,13 @@ const PoolList = ({ search, filterType }: { search: string; filterType: POOL_TYP
         showApr = {
           ...showApr,
           apr: {
-            min: (showApr['apr']?.['min'] || 0) / 100,
-            max: (showApr['apr']?.['max'] || 0) / 100
+            min: (showApr['apr']?.['min'] || 0),
+            max: (showApr['apr']?.['max'] || 0)
           },
-          swapFee: (showApr['swapFee'] || 0) / 100
+          swapFee: {
+            min: (showApr['swapFee']?.['min'] || 0),
+            max: (showApr['swapFee']?.['max'] || 0)
+          }
         };
       }
 

diff --git a/src/pages/Pool-V3/hooks/useCreatePositionForm.ts b/src/pages/Pool-V3/hooks/useCreatePositionForm.ts
@@ -572,7 +572,7 @@ export function getLiqFrom(target: number, list: ActiveLiquidityPerTickRange[]):
   return 0;
 }
 
-function numberExponentToLarge(numIn) {
+export function numberExponentToLarge(numIn) {
   numIn += ''; // To cater to numric entries
   var sign = ''; // To remember the number sign
   // eslint-disable-next-line @typescript-eslint/no-unused-expressions