@stake-dao/reader 0.4.97 → 0.4.99

package/dist/types/strategies/v2/parse.d.ts

@@ -0,0 +1,52 @@
+export declare const parseV2Strats: (global: any, rawStrats: any[], extra: any) => {
+    key: any;
+    tokensFilter: string[];
+    isLending: any;
+    name: any;
+    type: string;
+    version: number;
+    protocol: string;
+    chainId: any;
+    vault: any;
+    lpToken: {
+        id: any;
+        name: any;
+        symbol: any;
+        address: any;
+        decimals: any;
+    };
+    gaugeAddress: any;
+    gauge: {
+        address: any;
+        totalSupply: any;
+        totalSupplyUsd: any;
+        extraRewards: never[];
+    };
+    coins: any;
+    underlyingCoins: never[];
+    lpPriceInUsd: number;
+    streaming: boolean;
+    tvl: number;
+    apr: {
+        boost: number;
+        current: {
+            total: number;
+            details: {
+                label: string;
+                value: number[];
+            }[];
+        };
+    };
+    rewards: any;
+    tradingApy: number;
+    minApr: number;
+    maxApr: any;
+    totalSupply: any;
+    workingBalance: any;
+    onlyboost: import("../types.js").OnlyBoostData;
+    convexPool: {
+        id: number;
+        crvRewards: any;
+    } | undefined;
+}[];
+//# sourceMappingURL=parse.d.ts.map

package/dist/types/strategies/v2/parse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/strategies/v2/parse.ts"],"names":[],"mappings":"AAqCA,eAAO,MAAM,aAAa,WAAY,GAAG,aAAa,GAAG,EAAE,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiKtE,CAAA"}

package/dist/types/strategies/yearn/fetch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/yearn/fetch/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAuB,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAiCrF,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,eAAO,MAAM,UAAU,wDAMpB,WAAW,KAAG,OAAO,CAAC,YAAY,CAkMpC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/yearn/fetch/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAuB,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAkCrF,UAAU,WAAW;IACnB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;CACtB;AAED,eAAO,MAAM,UAAU,wDAMpB,WAAW,KAAG,OAAO,CAAC,YAAY,CAmMpC,CAAA"}

package/dist/types/votemarket/curve/fetchSnapshotUserData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchSnapshotUserData.d.ts","sourceRoot":"","sources":["../../../../src/votemarket/curve/fetchSnapshotUserData.ts"],"names":[],"mappings":"AAMA,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE;QACL,UAAU,EAAE,gBAAgB,EAAE,CAAA;KAC/B,CAAA;CACF;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAC7E;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,GAAG,CAAA;CACZ;AAyDD,eAAO,MAAM,wBAAwB,eAAgB,MAAM,KAAG,MAAM,GAAG,SAWtE,CAAA;AAED,eAAO,MAAM,qBAAqB,gBACnB,MAAM,UACX,MAAM,EAAE,gBACF,GAAG,KAChB,OAAO,CAAC,iBAAiB,EAAE,GAAG,SAAS,CA+DzC,CAAA"}
+{"version":3,"file":"fetchSnapshotUserData.d.ts","sourceRoot":"","sources":["../../../../src/votemarket/curve/fetchSnapshotUserData.ts"],"names":[],"mappings":"AAMA,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE;QACL,UAAU,EAAE,gBAAgB,EAAE,CAAA;KAC/B,CAAA;CACF;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAC7E;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,GAAG,CAAA;CACZ;AAyDD,eAAO,MAAM,wBAAwB,eAAgB,MAAM,KAAG,MAAM,GAAG,SAatE,CAAA;AAED,eAAO,MAAM,qBAAqB,gBACnB,MAAM,UACX,MAAM,EAAE,gBACF,GAAG,KAChB,OAAO,CAAC,iBAAiB,EAAE,GAAG,SAAS,CA+DzC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stake-dao/reader",
   "description": "",
-  "version": "0.4.97",
+  "version": "0.4.99",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "graphql-request": "^6.0.0",
     "lodash-es": "^4.17.21",
     "viem": "2.35.0",
-    "@stake-dao/constants": "0.4.50"
+    "@stake-dao/constants": "0.4.51"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
@@ -49,7 +49,7 @@
   "scripts": {
     "build": "pnpm run clean && pnpm run build:esm+types",
     "build:esm+types": "tsc --project tsconfig.build.json --outDir ./dist/esm --declaration --declarationMap --declarationDir ./dist/types",
-    "clean": "rm -rf dist",
+    "clean": "pnpm exec rimraf dist",
     "test:build": "publint --strict",
     "typecheck": "tsc --noEmit"
   }

package/src/index.ts

@@ -26,6 +26,7 @@ export { parsePeg } from './lockers/fetch/parsePeg.js'
 /// --- STATEGIES
 
 export * from './strategies/utils/index.js'
+export { parseV2Strats } from './strategies/v2/parse.js'
 
 // Curve
 export { buildCurveStrategies } from './strategies/curve/build.js'

package/src/number.ts

@@ -1,51 +1,109 @@
 import { formatUnits } from 'viem'
 
-export const getString = (data: any, nbDecimals = 2) => {
+export const USD_PROPS = {
+  minimumFractionDigits: 2,
+  maximumFractionDigits: 2,
+  notation: 'compact',
+  compactDisplay: 'short',
+} as any
+
+export const getString = (data, nbDecimals = 2) => {
   if (typeof data === 'string') {
     return data
   }
   return data ? Number(data).toFixed(nbDecimals) : 0
 }
 
-export const getFixedNumber = (amount: string, reduce = false) => {
-  const earningsNumber = reduce ? Number(formatUnits(BigInt(amount), 18)) : Number(amount)
-  if (earningsNumber > 0 && earningsNumber < 1) {
-    const indexNotZero = earningsNumber.toString().match('[1-9]')
+export const getApr = (data) => `${getString(data, 2)}%`
+
+export const getFixedNumber = (amount: string | number, reduce = false) => {
+  const earningsNumber = reduce ? formatUnits(BigInt(amount), 18) : `${amount}`
+  const nbEarningsNumber = Number(earningsNumber) > 0 ? Number(earningsNumber) : Number(earningsNumber) * -1
+
+  if (nbEarningsNumber > 0 && nbEarningsNumber < 1) {
+    const indexNotZero = earningsNumber.match('[1-9]')
     return indexNotZero?.index ? indexNotZero.index - 2 + 4 : 4
   }
-  if (earningsNumber >= 1 && earningsNumber < 100) {
-    return 2
-  }
-  if (earningsNumber >= 100 && earningsNumber < 1000) {
+  if (nbEarningsNumber >= 1 && nbEarningsNumber < 1000) {
     return 2
   }
   return 0
 }
 
+export const getSubNumber = (nb: string, decimals?: number) => {
+  const numberNb = Number(nb)
+
+  if (numberNb > 0 && numberNb < 1) {
+    const indexNotZero = nb.match('[1-9]')
+    const indexNotZeroIndex = indexNotZero?.index || 2
+    const nbWithoutZero = nb.replace(`0.${new Array(indexNotZeroIndex - 2).fill(0).join('')}`, '')
+    return indexNotZeroIndex - 2 > 2
+      ? {
+          prefix: '0.0',
+          sub: indexNotZeroIndex - 2,
+          suffix: nbWithoutZero.slice(0, 2),
+          decimals: 1,
+        }
+      : { prefix: nb, decimals: 3 }
+  }
+
+  const fixedTo = decimals ? decimals : getFixedNumber(nb)
+  return { prefix: nb, decimals: fixedTo }
+}
+
 export const fixed = (nb: string, decimals?: number) => {
   const fixedTo = decimals ? decimals : getFixedNumber(nb)
-  return Number(nb).toLocaleString('en-US', {
+  const fixed = Number(nb).toLocaleString('en-US', {
     minimumFractionDigits: fixedTo,
     maximumFractionDigits: fixedTo,
   })
+
+  // Remove trailing zeros after the decimal point
+  // Remove trailing decimal point if there is no fractional part
+  return fixed.replace(/(\.\d*?)0+$/, '$1').replace(/\.$/, '')
 }
 
-export const formatUsd = (number: string | number) => {
-  const nb = typeof number === 'string' ? Number(number) : number
+export const fixedNb = (nb: number, decimals?: number) => {
+  const fixedTo = decimals ? decimals : getFixedNumber(nb)
+  return nb.toLocaleString('en-US', {
+    minimumFractionDigits: fixedTo,
+    maximumFractionDigits: fixedTo,
+  })
+}
+
+export const reducedNb = (number, addNegative?: boolean) => {
+  let isNegative = false
+
+  if (typeof number === 'string') number = Number(number)
+  if (number < 0) {
+    number *= -1
+    isNegative = true
+  }
+
+  let res = fixed(number.toString())
+  if (number > 1000) res = number.toLocaleString('en-US', USD_PROPS)
+
+  return `${isNegative && addNegative ? '-' : ''}${res}`
+}
+
+export const formatUsd = (number) => {
+  if (typeof number === 'string') {
+    number = Number(number)
+  }
 
-  if (nb > 1000000000) {
-    return `${getString(nb / 1000000000, 2)}B`
+  if (number > 1000000000) {
+    return `${getString(number / 1000000000, 2)}B`
   }
-  if (nb > 1000000) {
-    return `${getString(nb / 1000000, 2)}M`
+  if (number > 1000000) {
+    return `${getString(number / 1000000, 2)}M`
   }
-  if (nb > 1000) {
-    return `${getString(nb / 1000, 2)}k`
+  if (number > 1000) {
+    return `${getString(number / 1000, 2)}k`
   }
 
   return fixed(number.toString())
 }
 
 export const withTwoDec = (num: number) => {
-  return (Math.floor(num * 100) / 100).toFixed(2)
+  return fixedNb(num, 2)
 }

package/src/strategies/angle/fetch.ts

@@ -8,6 +8,7 @@ import { type Price, getPricesFromLlama } from '../../prices.js'
 import { batchJsonRpc, equalTlc, multicall } from '../../utils.js'
 import type { RewardsData, SdtApr } from '../types.js'
 import { getAprBreakdown } from '../utils/getAprBreakdown.js'
+import getTokenTypes from '../utils/getTokenTypes.js'
 import { ANGLE_APR_URL, ANGLE_PRICE_URL } from './endpoints.js'
 
 interface TFetchAngle {
@@ -206,6 +207,7 @@ export const fetchAngle = async ({ prices, provider, rpc, chainId }: TFetchAngle
     return {
       key: s.key,
       name: s.name,
+      tokensFilter: getTokenTypes(s),
       protocol: s.protocol,
       chainId: s.chainId,
       vault: s.vault,

package/src/strategies/balancer/fetch.ts

@@ -20,6 +20,7 @@ import { FACTORY_EVENT_TOPIC } from '../curve/endpoints.js'
 import type { BalancerGlobalData, RewardsData, Strategy, StrategyData, ValidChainId } from '../types.js'
 import decodeEtherscanFactoryEvent from '../utils/decodeEtherscanFactoryEvent.js'
 import { getAprBreakdown } from '../utils/getAprBreakdown.js'
+import getTokenTypes from '../utils/getTokenTypes.js'
 import { buildBalancerStrategies } from './build.js'
 import { BALANCER_POOLS_DATA_QUERY, BALANCER_SUBGRAPH_URL } from './endpoints.js'
 
@@ -230,6 +231,7 @@ export const fetchBalancer = async ({
         return {
           key: strat.key,
           name: coins.reduce((res: string, current) => `${res}/${current.symbol}`, '').slice(1),
+          tokensFilter: getTokenTypes(strat),
           protocol: strat.protocol,
           chainId: strat.chainId,
           vault: strat.vault,

package/src/strategies/curve/fetch/getOnlyboostData.ts

@@ -44,6 +44,9 @@ const getOnlyboostData = (
   const stakeDaoOptSupply = formatUnits(data.stakeDaoOptSupply, 0)
   const convexOptSupply = formatUnits(data.convexOptSupply, 0)
 
+  const stakeDaoOptTvl = Number(formatUnits(data.stakeDaoOptSupply, 18)) * lpPriceInUsd
+  const convexOptTvl = Number(formatUnits(data.convexOptSupply, 18)) * lpPriceInUsd
+
   const stakeDaoOptShare = Number(stakeDaoOptSupply) / Number(totalSupply)
   const convexOptShare = Number(convexOptSupply) / Number(totalSupply)
 
@@ -82,9 +85,11 @@ const getOnlyboostData = (
       tvl: stakeDaoTvl,
       supply: stakeDaoSupply,
       boost: stakeDaoBoost,
+      share: stakeDaoShare,
       workingBalance: stakeDaoWorkingBalanceShare,
       workingBalanceShare: stakeDaoWorkingBalanceShare,
       optimal: {
+        tvl: stakeDaoOptTvl,
         supply: stakeDaoOptSupply,
         boost: stakeDaoOptBoost,
         share: stakeDaoOptShare,
@@ -94,9 +99,11 @@ const getOnlyboostData = (
       tvl: convexTvl,
       supply: convexSupply,
       boost: convexBoost,
+      share: convexShare,
       workingBalance: formatUnits(data.convexWorkingBalance, 0),
       workingBalanceShare: formatUnits(convexWorkingBalanceShare, 0),
       optimal: {
+        tvl: convexOptTvl,
         supply: convexOptSupply,
         boost: convexOptBoost,
         share: convexOptShare,

package/src/strategies/curve/fetch/index.ts

@@ -6,8 +6,8 @@ import { type SdtEmissionData, getSdtApr } from '../../../sdt.js'
 import { equalTlc } from '../../../utils.js'
 import type { CurveGlobalData, OnlyBoostData, RewardsData, StrategyData, ValidChainId } from '../../types.js'
 import { getBoost } from '../../utils/boost.js'
-import decodeEtherscanFactoryEvent, { decodeNewFactoryEvent } from '../../utils/decodeEtherscanFactoryEvent.js'
 import { getAprBreakdown } from '../../utils/getAprBreakdown.js'
+import getTokenTypes from '../../utils/getTokenTypes.js'
 import { buildCurveStrategies } from '../build.js'
 import { getCurveHttpCalls } from '../httpCalls.js'
 import { getOnChainSdCurveData } from '../onChainCalls.js'
@@ -21,7 +21,6 @@ interface TFetchCurve {
   prices: Price[]
   provider: any
   rpc: string
-  explorerApiKey: string
   chainId: ValidChainId
   sdtEmissionData: SdtEmissionData
   gaugesWeights: GaugesWeightsData
@@ -31,23 +30,14 @@ export const fetchCurve = async ({
   prices,
   provider,
   rpc,
-  explorerApiKey,
   chainId,
   sdtEmissionData,
   gaugesWeights,
 }: TFetchCurve): Promise<StrategyData> => {
-  const fromBlock = curveStrats.meta.lastSyncBlock[chainId]! + 1
-  const toBlock = Number(await provider.getBlockNumber())
-  const apisData = await getCurveHttpCalls(explorerApiKey, rpc, chainId, fromBlock, toBlock, gaugesWeights)
+  const lastSyncBlock = curveStrats.meta.lastSyncBlock[chainId]!
+  const apisData = await getCurveHttpCalls(rpc, chainId, gaugesWeights)
 
-  const newVaultAndLp =
-    chainId === mainnet.id
-      ? decodeNewFactoryEvent(apisData.explorerData)
-      : decodeEtherscanFactoryEvent(apisData.explorerData)
-
-  const allVaultAndLp = curveStrats.strats[chainId]!.concat(newVaultAndLp).filter(
-    (s) => !BROKEN_VAULTS[chainId].includes(s.vault),
-  )
+  const allVaultAndLp = curveStrats.strats[chainId]!.filter((s) => !BROKEN_VAULTS[chainId].includes(s.vault))
 
   const strats: any[] = await buildCurveStrategies(provider, allVaultAndLp, chainId, apisData.curveApiData)
 
@@ -66,7 +56,7 @@ export const fetchCurve = async ({
     veCrvTotalSupply: '0',
     stakeDaoVeBoost: '0',
     convexVeBoost: '0',
-    lastSyncBlock: toBlock,
+    lastSyncBlock,
     fees: {
       veSdt: 5,
       perf: 2,
@@ -197,6 +187,7 @@ export const fetchCurve = async ({
         name: strat.name,
         subname: strat.subname,
         type: strat.type,
+        tokensFilter: getTokenTypes(strat),
         protocol: strat.protocol,
         chainId: strat.chainId,
         isMetapool: strat.isMetapool,

package/src/strategies/curve/httpCalls.ts

@@ -1,38 +1,23 @@
-import { contract } from '@stake-dao/constants'
-import { getLogsFromEtherscan } from '../../utils/etherscan.js'
 import { handlePromise } from '../utils/promise.js'
-import {
-  CONVEX_LENDING_VAULTS_URL,
-  CONVEX_POOLS_URL,
-  CURVE_API_URL,
-  FACTORY_EVENT_TOPIC,
-  NEW_FACTORY_EVENT_TOPIC,
-} from './endpoints.js'
+import { CONVEX_LENDING_VAULTS_URL, CONVEX_POOLS_URL, CURVE_API_URL } from './endpoints.js'
 import { getCurveApiData } from './fetch/curveApiData/getCurveApiData.js'
 import { type GaugesWeightsData } from './fetch/curveApiData/getGaugesWeights.js'
 
-export const getCurveHttpCalls = async (
-  explorerApiKey: string,
-  rpc: string,
-  chainId: number,
-  fromBlock: number,
-  toBlock: number,
-  gaugesWeights: GaugesWeightsData,
-) => {
+export const getCurveHttpCalls = async (rpc: string, chainId: number, gaugesWeights: GaugesWeightsData) => {
   switch (chainId) {
     case 1: {
       const ethHttpCalls = [
         // Etherscan Events
-        getLogsFromEtherscan({
-          chainId,
-          address: contract('curveVaultFactory', chainId),
-          apikey: explorerApiKey,
-          extraQueryParams: {
-            topic0: NEW_FACTORY_EVENT_TOPIC,
-            fromBlock: `${fromBlock}`,
-            toBlock: `${toBlock}`,
-          },
-        }),
+        // getLogsFromEtherscan({
+        //   chainId,
+        //   address: contract('curveVaultFactory', chainId),
+        //   apikey: explorerApiKey,
+        //   extraQueryParams: {
+        //     topic0: NEW_FACTORY_EVENT_TOPIC,
+        //     fromBlock: `${fromBlock}`,
+        //     toBlock: `${toBlock}`,
+        //   },
+        // }),
         // Curve Data (replace APIs calls)
         getCurveApiData(rpc, chainId, gaugesWeights.gauges),
         // Curve Trading Apy API
@@ -44,14 +29,13 @@ export const getCurveHttpCalls = async (
 
       const ethHttpResponses = await handlePromise(ethHttpCalls, 'curveEthHttpCalls')
 
-      const etherscanData = ethHttpResponses[0]
-      const ethCurveData = ethHttpResponses[1]
-      const ethCurveSubgraph = ethHttpResponses[2].success ? ethHttpResponses[2].data.poolList : undefined
-      const convexPools = ethHttpResponses[3].pools
-      const convexLendingVaults = ethHttpResponses[4].lendingVaults
+      const ethCurveData = ethHttpResponses[0]
+      const ethCurveSubgraph = ethHttpResponses[1].success ? ethHttpResponses[1].data.poolList : undefined
+      const convexPools = ethHttpResponses[2].pools
+      const convexLendingVaults = ethHttpResponses[3].lendingVaults
 
       return {
-        explorerData: etherscanData,
+        explorerData: undefined,
         curveSubgraphData: ethCurveSubgraph,
         convexPools,
         convexLendingVaults,
@@ -61,16 +45,16 @@ export const getCurveHttpCalls = async (
     case 42161: {
       const arbitrumHttpCalls = [
         // Etherscan Events
-        getLogsFromEtherscan({
-          chainId,
-          address: contract('curveVaultFactory', chainId),
-          apikey: explorerApiKey,
-          extraQueryParams: {
-            topic0: FACTORY_EVENT_TOPIC,
-            fromBlock: `${fromBlock}`,
-            toBlock: `${toBlock}`,
-          },
-        }),
+        // getLogsFromEtherscan({
+        //   chainId,
+        //   address: contract('curveVaultFactory', chainId),
+        //   apikey: explorerApiKey,
+        //   extraQueryParams: {
+        //     topic0: FACTORY_EVENT_TOPIC,
+        //     fromBlock: `${fromBlock}`,
+        //     toBlock: `${toBlock}`,
+        //   },
+        // }),
         // Curve Data (replace APIs calls)
         getCurveApiData(rpc, chainId, gaugesWeights.gauges),
         // Curve Trading Apy API
@@ -79,14 +63,13 @@ export const getCurveHttpCalls = async (
 
       const arbitrumHttpResponses = await handlePromise(arbitrumHttpCalls, 'curveArbitrumHttpCalls')
 
-      const arbiscanData = arbitrumHttpResponses[0]
-      const arbitrumCurveData = arbitrumHttpResponses[1]
-      const arbitrumCurveSubgraph = arbitrumHttpResponses[2].success
-        ? arbitrumHttpResponses[2].data.poolList
+      const arbitrumCurveData = arbitrumHttpResponses[0]
+      const arbitrumCurveSubgraph = arbitrumHttpResponses[1].success
+        ? arbitrumHttpResponses[1].data.poolList
         : undefined
 
       return {
-        explorerData: arbiscanData,
+        explorerData: undefined,
         curveSubgraphData: arbitrumCurveSubgraph,
         convexPools: [],
         convexLendingVaults: [],

package/src/strategies/passive/fetch.ts

@@ -5,6 +5,7 @@ import { mainnet } from 'viem/chains'
 import multicallPassiveVaultsAbi from '../../abis/passiveVaultsMulticall.js'
 import { multicall } from '../../utils.js'
 import { getBoost } from '../utils/boost.js'
+import getTokenTypes from '../utils/getTokenTypes.js'
 import { getPassiveHttpCalls } from './httpCalls.js'
 
 interface TFetchPassive {
@@ -64,6 +65,7 @@ export const fetchPassive = async ({ provider, chainId }: TFetchPassive) => {
 
     return {
       ...s,
+      tokensFilter: getTokenTypes(s),
       tradingApy: subgraphData.latestWeeklyApy,
       minApy: curveApiData.gaugeCrvApy ? curveApiData.gaugeCrvApy[0] : 0,
       maxApy: curveApiData.gaugeCrvApy ? curveApiData.gaugeCrvApy[1] : 0,

package/src/strategies/pendle/fetch.ts

@@ -23,6 +23,7 @@ import type { RewardsData, SdtApr, ValidChainId } from '../types.js'
 import { getBoost } from '../utils/boost.js'
 import decodeEtherscanFactoryEvent from '../utils/decodeEtherscanFactoryEvent.js'
 import { getAprBreakdown } from '../utils/getAprBreakdown.js'
+import getTokenTypes from '../utils/getTokenTypes.js'
 import { concatBytecode } from '../utils/index.js'
 import { buildPendleStrategies } from './build.js'
 import getPendleApiData from './getPendleApiData.js'
@@ -283,6 +284,7 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, chain
     return {
       key: s.key,
       name: s.coins.reduce((res: string, current) => `${res}/${current.symbol}`, '').slice(1),
+      tokensFilter: getTokenTypes(s),
       subname,
       protocol: s.protocol,
       chainId: s.chainId,

package/src/strategies/types.ts

@@ -25,9 +25,11 @@ export type OnlyBoostProtocolData = {
   tvl: number
   supply: string
   boost: number
+  share: number
   workingBalance: string
   workingBalanceShare: string
   optimal: {
+    tvl: number
     supply: string
     boost: number
     share: number

package/src/strategies/utils/getTokenTypes.ts

@@ -0,0 +1,35 @@
+import { equalTlc, lc } from '../../utils.js'
+
+const usdSymbols = ['usd', 'frax', 'dai', 'mim', 'dola', 'gho', 'usr', 'fxb20', 'fxb_20']
+const excludeSymbols = ['usd0++']
+
+const getTokenTypes = (s: any) => {
+  const types: string[] = []
+  const coins = s.isLending ? s.coins : s.underlyingCoins?.length > 0 ? s.underlyingCoins : s.coins
+
+  // USD
+  if (s.isLending && usdSymbols.some((usdS) => lc(s.coins[0].symbol).includes(usdS))) types.push('usd')
+  if (
+    coins.every((c) => usdSymbols.some((usdS) => lc(c.symbol).includes(usdS)) && !excludeSymbols.includes(lc(c.symbol)))
+  )
+    types.push('usd')
+
+  // SDT
+  if (coins.some((c) => equalTlc(c.symbol, 'sdt'))) types.push('sdt')
+
+  // CRV
+  if (coins.every((c) => !lc(c.symbol).includes('crvusd') && lc(c.symbol).includes('crv'))) types.push('crv')
+
+  // crvUSD
+  if (coins.some((c) => lc(c.symbol).includes('crvusd'))) types.push('crvusd')
+
+  // BTC
+  if (coins.some((c) => lc(c.symbol).includes('btc'))) types.push('btc')
+
+  // ETH
+  if (coins.some((c) => lc(c.symbol).includes('eth'))) types.push('eth')
+
+  return types
+}
+
+export default getTokenTypes