@1delta/margin-fetcher 0.0.8 → 0.0.9

package/src/lending/addresses/compoundV3.ts

@@ -1,42 +1,56 @@
-import { Chain, COMETS_PER_CHAIN_MAP, COMPOUND_BASE_TOKENS, Lender, SWAYLEND_BASE_TOKENS } from '@1delta/asset-registry'
+import {
+  Chain,
+  COMETS_PER_CHAIN_MAP,
+  COMPOUND_BASE_TOKENS,
+  Lender,
+  SWAYLEND_BASE_TOKENS,
+} from "@1delta/asset-registry";
 
-export function getCompoundV3CometAddress(chainId: string, lender = Lender.COMPOUND_V3_USDCE): string | undefined {
-  return COMETS_PER_CHAIN_MAP[chainId]?.[lender]
+export function getCompoundV3CometAddress(
+  chainId: string,
+  lender = Lender.COMPOUND_V3_USDCE
+): string | undefined {
+  return COMETS_PER_CHAIN_MAP[chainId]?.[lender];
 }
 
 export function getCompoundV3CometRewardsAddress(chainId: string) {
   // @ts-ignore
-  return addressesCompoundV3.cometRewards[chainId]
+  return addressesCompoundV3.cometRewards[chainId];
 }
 
 export function getCompoundV3CometIRGetterAddress(chainId: string) {
   // @ts-ignore
-  return addressesCompoundV3.lens[chainId]
+  return addressesCompoundV3.lens[chainId];
 }
 
 export function getCompoundV3CometLens(chainId: string) {
   // @ts-ignore
-  return addressesCompoundV3.lens[chainId]
+  return addressesCompoundV3.lens[chainId];
 }
 
 const addressesCompoundV3 = {
   lens: {
-    [Chain.POLYGON_MAINNET]: '0x4eDA401658c5286d16c4d342884F32280B4E8b1b',
-    [Chain.MANTLE]: '0x32B31A066c8dd3F7b77283Ba1d89Ddaf6DA0a8aE',
-    [Chain.ARBITRUM_ONE]: '0x13D9c35f4901491Ac4FFebd3100238BBfFBD7181',
+    [Chain.POLYGON_MAINNET]: "0x4eDA401658c5286d16c4d342884F32280B4E8b1b",
+    [Chain.MANTLE]: "0x32B31A066c8dd3F7b77283Ba1d89Ddaf6DA0a8aE",
+    [Chain.ARBITRUM_ONE]: "0x13D9c35f4901491Ac4FFebd3100238BBfFBD7181",
     [Chain.BASE]: "0x7e2D250E4FD0EeD6BD2cB3DC525A2b9f12508152",
     [Chain.OP_MAINNET]: "0xA453ba397c61B0c292EA3959A858821145B2707F",
   },
   cometRewards: {
     [Chain.POLYGON_MAINNET]: "0x45939657d1CA34A8FA39A924B71D28Fe8431e581",
     [Chain.MANTLE]: "0xCd83CbBFCE149d141A5171C3D6a0F0fCCeE225Ab",
-    [Chain.ARBITRUM_ONE]: '0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae',
+    [Chain.ARBITRUM_ONE]: "0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae",
     [Chain.BASE]: "0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1",
     [Chain.OP_MAINNET]: "0x443EA0340cb75a160F31A440722dec7b5bc3C2E9",
-  }
-}
+  },
+};
 
-export function getCompoundV3BaseAsset(lender: Lender | string, chainId: string) {
-  return COMPOUND_BASE_TOKENS[lender]?.[chainId] ?? SWAYLEND_BASE_TOKENS[lender]?.[chainId]
+export function getCompoundV3BaseAsset(
+  lender: Lender | string,
+  chainId: string
+) {
+  return (
+    COMPOUND_BASE_TOKENS[lender]?.[chainId] ??
+    SWAYLEND_BASE_TOKENS[lender]?.[chainId]
+  );
 }
-

package/src/lending/user-data/aave-v2-type/userCallBuild.ts

@@ -2,39 +2,19 @@ import { Call } from "../../../utils/multicall"
 import { Lender } from "@1delta/asset-registry"
 import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress } from "../../../assets"
 import { getAaveTypeIncentivesControllerAddress, getAaveTypeMultiFeeDistribution } from "../../addresses"
-import { getComposerAddress } from "../../../utils"
-
-const fallbackDebtToken = '0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e'
 
 const getBaseAaveV2Calls = (
   chainId: string,
   account: string,
   lender: Lender,
   assetsToQuery: string[],
-  aaveTokenMap: any
 ) => {
-  const broker = getComposerAddress(chainId)
   return assetsToQuery.flatMap((tk) => [
     {
       address: getAaveTypePoolDataProviderAddress(chainId, lender),
       name: 'getUserReserveData',
       params: [tk, account],
     },
-    {
-      address: aaveTokenMap[tk].aToken,
-      name: 'allowance',
-      params: [account, broker],
-    },
-    {
-      address: aaveTokenMap[tk].vToken ?? fallbackDebtToken,
-      name: 'borrowAllowance',
-      params: [account, broker],
-    },
-    {
-      address: aaveTokenMap[tk].sToken ?? fallbackDebtToken,
-      name: 'borrowAllowance',
-      params: [account, broker],
-    },
   ])
 }
 
@@ -55,7 +35,6 @@ export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: st
           account,
           lender,
           assetsToQuery,
-          aaveTokenMap
         ),
         {
           address: rewarder,
@@ -120,8 +99,7 @@ export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: st
           chainId,
           account,
           lender,
-          assetsToQuery,
-          aaveTokenMap
+          assetsToQuery
         ),
         rewardsBalance,
         unclaimedRewards
@@ -129,13 +107,11 @@ export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: st
     }
     default: {
       const assetsToQuery = getAaveAssets(chainId, lender)
-      const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender)
       return getBaseAaveV2Calls(
         chainId,
         account,
         lender,
         assetsToQuery,
-        aaveTokenMap
       )
     }
   }

package/src/lending/user-data/aave-v2-type/userCallParse.ts

@@ -19,7 +19,7 @@ export const getAaveV2UserDataConverter = (
   switch (lender) {
     case Lender.AURELIUS: {
       const assetsToQuery = getAaveAssets(chainId, lender)
-      const expectedNumberOfCalls = assetsToQuery.length * 4 + 1
+      const expectedNumberOfCalls = assetsToQuery.length + 1
       return [
         (data: any[]) => {
           if (data.length !== expectedNumberOfCalls) {
@@ -46,12 +46,14 @@ export const getAaveV2UserDataConverter = (
               pricesHist,
               0,
             )
+            if(!dataForAsset) continue;
+
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
           }
 
-          const startIndex = assetsToQuery.length * 4
+          const startIndex = assetsToQuery.length
           const rewardMapping = Object.fromEntries(data[startIndex][0].map((key: string, index: number) => [key.toLowerCase(), data[startIndex][1][index]]))
           const rewards: UserRewardEntry = {}
           for (let i = 0; i < AURELIUS_REWARD_ASSETS.length; i++) {
@@ -81,7 +83,7 @@ export const getAaveV2UserDataConverter = (
     }
     case Lender.LENDLE: {
       const assetsToQuery = getAaveAssets(chainId, lender)
-      const expectedNumberOfCalls = assetsToQuery.length * 4 + 2
+      const expectedNumberOfCalls = assetsToQuery.length + 2
 
       return [
         (data: any[]) => {
@@ -123,6 +125,7 @@ export const getAaveV2UserDataConverter = (
               pricesHist,
               mappedClaimableRewardsToTokens[i][asset],
             )
+            if(!dataForAsset) continue;
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -153,7 +156,7 @@ export const getAaveV2UserDataConverter = (
     }
     case Lender.MERIDIAN: {
       const assetsToQuery = getLenderAssets(chainId, lender)
-      const expectedNumberOfCalls = assetsToQuery.length * 4 + 2
+      const expectedNumberOfCalls = assetsToQuery.length + 2
 
       return [
         (data: any[]) => {
@@ -200,6 +203,7 @@ export const getAaveV2UserDataConverter = (
               pricesHist,
               assetClaimableRewards,
             )
+            if(!dataForAsset) continue;
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -229,7 +233,7 @@ export const getAaveV2UserDataConverter = (
     }
     default: {
       const assetsToQuery = getLenderAssets(chainId, lender)
-      const expectedNumberOfCalls = assetsToQuery.length * 4
+      const expectedNumberOfCalls = assetsToQuery.length
       return [
         (data: any[]) => {
           if (data.length !== expectedNumberOfCalls) {
@@ -255,6 +259,7 @@ export const getAaveV2UserDataConverter = (
               pricesHist,
               0,
             )
+            if(!dataForAsset) continue;
             totalDebt24h += addedDebt
             totalDeposits24h += addedDeposits
             lendingPositions[asset] = dataForAsset
@@ -288,10 +293,22 @@ function createAaveV2Entry(
   pricesHist: any,
   claimableRewards: any,
 ) {
-  const reserveData = data[i * 4]
+  const reserveData = data[i]
   const currentATokenBalanceRaw = reserveData[AaveV2TypeGetUserReserveData.currentATokenBalance]?.toString()
   const currentStableDebtRaw = reserveData[AaveV2TypeGetUserReserveData.currentStableDebt]?.toString()
   const currentVariableDebtRaw = reserveData[AaveV2TypeGetUserReserveData.currentVariableDebt]?.toString()
+
+  if (
+    currentATokenBalanceRaw === "0" &&
+    currentStableDebtRaw === "0" &&
+    currentVariableDebtRaw === "0") {
+    return {
+      dataForAsset: undefined,
+      addedDeposits: 0,
+      addedDebt: 0
+    }
+  }
+
   const assetMeta = getAssetMeta(chainId, asset)
   const decimals = assetMeta?.decimals ?? 18
   const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
@@ -316,10 +333,6 @@ function createAaveV2Entry(
     collateralActive: Boolean(reserveData[AaveV2TypeGetUserReserveData.usageAsCollateralEnabled]),
     claimableRewards,
 
-    // allowances
-    allowanceWithdrawal: data[i * 4 + 1]?.toString(),
-    allowanceBorrowingVariable: data[i * 4 + 2]?.toString(),
-    allowanceBorrowingStable: data[i * 4 + 3]?.toString(),
   }
 
   return {

package/src/lending/user-data/aave-v3-type/userCallBuild.ts

@@ -18,22 +18,7 @@ const getBaseAaveV3Calls = (
       address: getAaveTypePoolDataProviderAddress(chainId, lender),
       name: 'getUserReserveData',
       params: [tk, account],
-    },
-    {
-      address: aaveTokenMap[tk].aToken,
-      name: 'allowance',
-      params: [account, broker],
-    },
-    {
-      address: aaveTokenMap[tk].vToken ?? fallbackDebtToken,
-      name: 'borrowAllowance',
-      params: [account, broker],
-    },
-    {
-      address: aaveTokenMap[tk].sToken ?? fallbackDebtToken,
-      name: 'borrowAllowance',
-      params: [account, broker],
-    },
+    }
   ])
 }
 

package/src/lending/user-data/aave-v3-type/userCallParse.ts

@@ -15,7 +15,7 @@ export const getAaveV3UserDataConverter = (
 ): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
 
   const assetsToQuery = getAaveAssets(chainId, lender)
-  const expectedNumberOfCalls = assetsToQuery.length * 4 + 1
+  const expectedNumberOfCalls = assetsToQuery.length + 1
   return [
     (data: any[]) => {
       if (data.length !== expectedNumberOfCalls) {
@@ -41,6 +41,8 @@ export const getAaveV3UserDataConverter = (
           prices,
           pricesHist,
         )
+        if (!dataForAsset) continue;
+
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
         lendingPositions[asset] = dataForAsset
@@ -71,12 +73,23 @@ function createAaveV3Entry(
   prices: any,
   pricesHist: any,
 ) {
-  const reserveData = data[i * 4]
+  const reserveData = data[i]
 
   const currentATokenBalanceRaw = reserveData[AaveTypeGetUserReserveIndexes.currentATokenBalance]?.toString()
   const currentStableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentStableDebt]?.toString()
   const currentVariableDebtRaw = reserveData[AaveTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
 
+  if (
+    currentATokenBalanceRaw === "0" &&
+    currentStableDebtRaw === "0" &&
+    currentVariableDebtRaw === "0") {
+    return {
+      dataForAsset: undefined,
+      addedDeposits: 0,
+      addedDebt: 0
+    }
+  }
+
   const assetMeta = getAssetMeta(chainId, asset)
   const decimals = assetMeta?.decimals ?? 18
 
@@ -103,10 +116,6 @@ function createAaveV3Entry(
     stableBorrowRate: reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ?? "0",
     collateralActive: Boolean(reserveData[AaveTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
     claimableRewards: 0,
-    // allowances
-    allowanceWithdrawal: data[i * 4 + 1]?.toString(),
-    allowanceBorrowingVariable: data[i * 4 + 2]?.toString(),
-    allowanceBorrowingStable: data[i * 4 + 3]?.toString(),
   }
 
   return {

package/src/lending/user-data/aave-v3-type/userCallParseYldr.ts

@@ -16,7 +16,7 @@ export const getYldrUserDataConverter = (
 ): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
 
   const assetsToQuery = getAaveAssets(chainId, lender)
-  const expectedNumberOfCalls = assetsToQuery.length * 4
+  const expectedNumberOfCalls = assetsToQuery.length
   return [
     (data: any[]) => {
       if (data.length !== expectedNumberOfCalls) {
@@ -41,6 +41,7 @@ export const getYldrUserDataConverter = (
           prices,
           pricesHist,
         )
+        if (!dataForAsset) continue;
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
         lendingPositions[asset] = dataForAsset
@@ -72,11 +73,22 @@ function createAaveV3Entry(
   prices: any,
   pricesHist: any,
 ) {
-  const reserveData = data[i * 4]
+  const reserveData = data[i]
 
   const currentATokenBalanceRaw = reserveData[YldrTypeGetUserReserveIndexes.currentYTokenBalance]?.toString()
   const currentVariableDebtRaw = reserveData[YldrTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
 
+
+  if (
+    currentATokenBalanceRaw === "0" &&
+    currentVariableDebtRaw === "0") {
+    return {
+      dataForAsset: undefined,
+      addedDeposits: 0,
+      addedDebt: 0
+    }
+  }
+
   const assetMeta = getAssetMeta(chainId, asset)
   const decimals = assetMeta?.decimals ?? 18
 
@@ -102,10 +114,6 @@ function createAaveV3Entry(
     stableBorrowRate: 0,
     collateralActive: Boolean(reserveData[YldrTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
     claimableRewards: 0,
-    // allowances
-    allowanceWithdrawal: data[i * 4 + 1]?.toString(),
-    allowanceBorrowingVariable: "0",
-    allowanceBorrowingStable: data[i * 4 + 3]?.toString(),
   }
 
   return {

package/src/lending/user-data/compound-v3/addresses.ts

@@ -1,40 +1,59 @@
-import { Chain, COMETS_PER_CHAIN_MAP, COMPOUND_BASE_TOKENS, Lender, SWAYLEND_BASE_TOKENS } from "@1delta/asset-registry"
+import {
+  Chain,
+  COMETS_PER_CHAIN_MAP,
+  COMPOUND_BASE_TOKENS,
+  Lender,
+  SWAYLEND_BASE_TOKENS,
+} from "@1delta/asset-registry";
 
-export function getCompoundV3CometAddress(chainId: string, lender = Lender.COMPOUND_V3_USDCE): string | undefined {
-    return COMETS_PER_CHAIN_MAP[chainId]?.[lender]
-  }
-  
-  export function getCompoundV3CometRewardsAddress(chainId: string) {
-    return addressesCompoundV3.cometRewards[chainId as keyof typeof addressesCompoundV3.cometRewards]
-  }
-  
-  export function getCompoundV3CometIRGetterAddress(chainId: string) {
-    return addressesCompoundV3.lens[chainId as keyof typeof addressesCompoundV3.lens]
-  }
-  
-  export function getCompoundV3CometLens(chainId: string) {
-    return addressesCompoundV3.lens[chainId as keyof typeof addressesCompoundV3.lens]
-  }
-  
-  const addressesCompoundV3 = {
-    lens: {
-      [Chain.POLYGON_MAINNET]: '0x4eDA401658c5286d16c4d342884F32280B4E8b1b',
-      [Chain.MANTLE]: '0x32B31A066c8dd3F7b77283Ba1d89Ddaf6DA0a8aE',
-      [Chain.ARBITRUM_ONE]: '0x13D9c35f4901491Ac4FFebd3100238BBfFBD7181',
-      [Chain.BASE]: "0x7e2D250E4FD0EeD6BD2cB3DC525A2b9f12508152",
-      [Chain.OP_MAINNET]: "0xA453ba397c61B0c292EA3959A858821145B2707F",
-    },
-    cometRewards: {
-      [Chain.POLYGON_MAINNET]: "0x45939657d1CA34A8FA39A924B71D28Fe8431e581",
-      [Chain.MANTLE]: "0xCd83CbBFCE149d141A5171C3D6a0F0fCCeE225Ab",
-      [Chain.ARBITRUM_ONE]: '0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae',
-      [Chain.BASE]: "0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1",
-      [Chain.OP_MAINNET]: "0x443EA0340cb75a160F31A440722dec7b5bc3C2E9",
-    }
-  }
-  
-  export function getCompoundV3BaseAsset(lender: Lender | string, chainId: string) {
-    return COMPOUND_BASE_TOKENS[lender]?.[chainId] ?? SWAYLEND_BASE_TOKENS[lender]?.[chainId]
-  }
-  
-  
+export function getCompoundV3CometAddress(
+  chainId: string,
+  lender = Lender.COMPOUND_V3_USDCE
+): string | undefined {
+  return COMETS_PER_CHAIN_MAP[chainId]?.[lender];
+}
+
+export function getCompoundV3CometRewardsAddress(chainId: string) {
+  return addressesCompoundV3.cometRewards[
+    chainId as keyof typeof addressesCompoundV3.cometRewards
+  ];
+}
+
+export function getCompoundV3CometIRGetterAddress(chainId: string) {
+  return addressesCompoundV3.lens[
+    chainId as keyof typeof addressesCompoundV3.lens
+  ];
+}
+
+export function getCompoundV3CometLens(chainId: string) {
+  return addressesCompoundV3.lens[
+    chainId as keyof typeof addressesCompoundV3.lens
+  ];
+}
+
+const addressesCompoundV3 = {
+  lens: {
+    [Chain.POLYGON_MAINNET]: "0x4eDA401658c5286d16c4d342884F32280B4E8b1b",
+    [Chain.MANTLE]: "0x32B31A066c8dd3F7b77283Ba1d89Ddaf6DA0a8aE",
+    [Chain.ARBITRUM_ONE]: "0x13D9c35f4901491Ac4FFebd3100238BBfFBD7181",
+    [Chain.BASE]: "0x7e2D250E4FD0EeD6BD2cB3DC525A2b9f12508152",
+    [Chain.OP_MAINNET]: "0xA453ba397c61B0c292EA3959A858821145B2707F",
+  },
+  cometRewards: {
+    [Chain.POLYGON_MAINNET]: "0x45939657d1CA34A8FA39A924B71D28Fe8431e581",
+    [Chain.MANTLE]: "0xCd83CbBFCE149d141A5171C3D6a0F0fCCeE225Ab",
+    [Chain.ARBITRUM_ONE]: "0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae",
+    [Chain.BASE]: "0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1",
+    [Chain.OP_MAINNET]: "0x443EA0340cb75a160F31A440722dec7b5bc3C2E9",
+  },
+};
+
+export function getCompoundV3BaseAsset(
+  lender: Lender | string,
+  chainId: string
+) {
+  return (
+    COMPOUND_BASE_TOKENS[lender]?.[chainId] ??
+    SWAYLEND_BASE_TOKENS[lender]?.[chainId]
+  );
+}

package/src/lending/user-data/compound-v3/userCallParse.ts

@@ -1,6 +1,5 @@
 import { Lender } from "@1delta/asset-registry"
-import { formatUnits } from "viem"
-import { CompoundV3UserReserveResponse, UserLendingPosition, UserRewardEntry } from "../types"
+import { CompoundV3UserReserveResponse } from "../types"
 import { getAssetMeta, getCompoundV3Assets, toGenericPriceKey, toOracleKey } from "../../../assets"
 import { getCompoundV3BaseAsset } from "./addresses"
 import { parseRawAmount } from "../../../utils/parsing"
@@ -37,6 +36,7 @@ export const getCompoundV3UserDataConverter = (
         const assetMeta = getAssetMeta(chainId, asset)
         const decimals = assetMeta?.decimals ?? 18
         const depositsRaw = data[i][0]?.toString()
+        if(depositsRaw === "0") continue; 
         const deposits = parseRawAmount(depositsRaw, decimals)
         const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
         const price = prices[key] ?? 1

package/src/lending-pairs/computeLendingPairs.ts

@@ -1,4 +1,5 @@
 import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../assets"
+import { getLiquidityThresholds, meetsLiquidityThresholds } from "../assets/liquidityThresholds"
 import { ConfigEntry, LenderData, PoolData } from "../types"
 import { isAaveV3Type, isInit } from "../utils"
 
@@ -24,6 +25,21 @@ export interface LendingPair {
     apr: number
     tags?: string[]
     eMode?: number
+    
+    // liquidity data
+    longTotalDepositsUSD: number
+    longTotalDebtUSD: number
+    longTotalLiquidityUSD: number
+    shortTotalDepositsUSD: number
+    shortTotalDebtUSD: number
+    shortTotalLiquidityUSD: number
+    
+    // status flags
+    longIsActive: boolean
+    longIsFrozen: boolean
+    shortIsActive: boolean
+    shortIsFrozen: boolean
+    shortBorrowingEnabled: boolean
 }
 
 const isEMode = (longData: PoolData, shortData: PoolData) => Boolean(longData.eMode) ?
@@ -145,7 +161,18 @@ export function generateLendingPairs(lenderData: LenderData, prices: { [k: strin
                         priceChange: price24h === 0 ? 0 : (price - price24h) / price24h,
                         maxLeverage: maxDepositLeverage,
                         apr: (depositApr + collateralRewards) * depositLeverage + (borrowRewards - borrowApr) * borrowLeverage,
-                        eMode: long.eMode?.category ?? 0
+                        eMode: long.eMode?.category ?? 0,                        
+                        longTotalDepositsUSD: long.totalDepositsUSD,
+                        longTotalDebtUSD: long.totalDebtUSD,
+                        longTotalLiquidityUSD: long.totalLiquidityUSD,
+                        shortTotalDepositsUSD: short.totalDepositsUSD,
+                        shortTotalDebtUSD: short.totalDebtUSD,
+                        shortTotalLiquidityUSD: short.totalLiquidityUSD,
+                        longIsActive: long.isActive,
+                        longIsFrozen: long.isFrozen,
+                        shortIsActive: short.isActive,
+                        shortIsFrozen: short.isFrozen,
+                        shortBorrowingEnabled: short.borrowingEnabled
                     });
                 }
             }
@@ -162,10 +189,73 @@ function getPriceKey(asset: string, chainId: string): [string, string] {
 
 const MAX_ENTRIES = 10
 
+function filterPairsByCategory(
+    pairs: LendingPair[], 
+    longFilter: (group: string) => boolean,
+    shortFilter: (group: string) => boolean
+): LendingPair[] {
+    return pairs
+        .filter(p => {
+            if (!longFilter(p.assetGroupLong) || !shortFilter(p.assetGroupShort)) {
+                return false;
+            }
+            
+            if (p.assetGroupShort?.includes("PT-") || p.assetGroupLong?.includes("PT-")) {
+                return false;
+            }
+            
+            if (!p.longIsActive || p.longIsFrozen || !p.shortIsActive || p.shortIsFrozen) {
+                return false;
+            }
+            
+            if (!p.shortBorrowingEnabled) {
+                return false;
+            }
+            
+             // apply liquidity thresholds
+             const longThresholds = getLiquidityThresholds(p.chainId, p.assetLong, p.assetGroupLong);
+             const shortThresholds = getLiquidityThresholds(p.chainId, p.assetShort, p.assetGroupShort);
+            
+            const longMeetsThresholds = meetsLiquidityThresholds({
+                totalDepositsUSD: p.longTotalDepositsUSD,
+                totalDebtUSD: p.longTotalDebtUSD,
+                totalLiquidityUSD: p.longTotalLiquidityUSD
+            }, longThresholds);
+            
+            const shortMeetsThresholds = meetsLiquidityThresholds({
+                totalDepositsUSD: p.shortTotalDepositsUSD,
+                totalDebtUSD: p.shortTotalDebtUSD,
+                totalLiquidityUSD: p.shortTotalLiquidityUSD
+            }, shortThresholds);
+            
+            if (!longMeetsThresholds || !shortMeetsThresholds) {
+                return false;
+            }
+            
+            return true;
+        })
+        .sort((a, b) => b.apr - a.apr)  
+        .slice(0, MAX_ENTRIES);
+}
+
 export function getTopPairs(pairs: LendingPair[]) {
-    const stables = pairs.filter(p => p.assetGroupLong?.includes("USD") && p.assetGroupShort?.includes("USD") && !p.assetGroupShort?.includes("PT-")).sort((a, b) => a.apr > b.apr ? -1 : 1).slice(0, MAX_ENTRIES)
-    const btcLst = pairs.filter(p => p.assetGroupLong?.includes("BTC") && p.assetGroupShort?.includes("BTC") && !p.assetGroupShort?.includes("PT-")).sort((a, b) => a.apr > b.apr ? -1 : 1).slice(0, MAX_ENTRIES)
-    const ethLst = pairs.filter(p => p.assetGroupLong?.includes("ETH") && p.assetGroupShort?.includes("ETH") && !p.assetGroupShort?.includes("PT-")).sort((a, b) => a.apr > b.apr ? -1 : 1).slice(0, MAX_ENTRIES)
+    const stables = filterPairsByCategory(
+        pairs,
+        (group) => group?.includes("USD") ?? false,
+        (group) => group?.includes("USD") ?? false
+    );
+    
+    const btcLst = filterPairsByCategory(
+        pairs,
+        (group) => group?.includes("BTC") ?? false,
+        (group) => group?.includes("BTC") ?? false
+    );
+    
+    const ethLst = filterPairsByCategory(
+        pairs,
+        (group) => group?.includes("ETH") ?? false,
+        (group) => group?.includes("ETH") ?? false
+    );
 
     return {
         stables,
@@ -182,7 +272,47 @@ function isStable(assetGroup: string): boolean {
 export function getDistinctPairsByShortAsset(
     pairs: LendingPair[],
 ): LendingPair[] {
-    const sorted = [...pairs].sort((a, b) =>
+    const qualityPairs = pairs.filter(p => {
+        if (!isFinite(p.apr) || !isFinite(p.priceChange)) {
+            return false;
+        }
+        
+        if (!p.longIsActive || p.longIsFrozen || !p.shortIsActive || p.shortIsFrozen) {
+            return false;
+        }
+        
+        if (!p.shortBorrowingEnabled) {
+            return false;
+        }
+        
+        // Apply liquidity thresholds
+        const longThresholds = getLiquidityThresholds(p.chainId, p.assetLong, p.assetGroupLong);
+        const shortThresholds = getLiquidityThresholds(p.chainId, p.assetShort, p.assetGroupShort);
+        
+        const longMeetsThresholds = meetsLiquidityThresholds({
+            totalDepositsUSD: p.longTotalDepositsUSD,
+            totalDebtUSD: p.longTotalDebtUSD,
+            totalLiquidityUSD: p.longTotalLiquidityUSD
+        }, longThresholds);
+        
+        const shortMeetsThresholds = meetsLiquidityThresholds({
+            totalDepositsUSD: p.shortTotalDepositsUSD,
+            totalDebtUSD: p.shortTotalDebtUSD,
+            totalLiquidityUSD: p.shortTotalLiquidityUSD
+        }, shortThresholds);
+        
+        if (!longMeetsThresholds || !shortMeetsThresholds) {
+            return false;
+        }
+        
+        if (p.assetGroupShort?.includes("PT-") || p.assetGroupLong?.includes("PT-")) {
+            return false;
+        }
+        
+        return true;
+    });
+    
+    const sorted = [...qualityPairs].sort((a, b) =>
         b.priceChange - a.priceChange
     );