@stake-dao/reader 0.4.85 → 0.4.87

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

@@ -4,14 +4,15 @@ import { formatUnits } from 'viem'
 import { ONE_YEAR, yearnStrats } from '@stake-dao/constants'
 import multicallYearnStratsAbi from '../../../abis/yearnVaultsMulticall.js'
 import { equalTlc, multicall } from '../../../utils.js'
-import { NEW_FACTORY_EXPLORER_EVENTS } from '../../curve/endpoints.js'
+import { NEW_FACTORY_EVENT_TOPIC } from '../../curve/endpoints.js'
 import { getBoost } from '../../utils/boost.js'
 import { buildYearnStrategies } from '../build.js'
 import { computeYearnApr } from './computeYearnApr.js'
 
 import { contracts } from '@stake-dao/constants'
 import type { Price } from '../../../prices.js'
-import type { RewardsData, SdtApr, StrategyData, ValidChainId, ValidExplorer } from '../../types.js'
+import { getLogsFromEtherscan } from '../../../utils/etherscan.js'
+import type { RewardsData, SdtApr, StrategyData, ValidChainId } from '../../types.js'
 import { getAprBreakdown } from '../../utils/getAprBreakdown.js'
 import { decodeNewFactoryEvent } from '../../utils/index.js'
 import { fetchAllYearnGauges } from './fetchAllYearnGauges.js'
@@ -49,7 +50,6 @@ interface TFetchYearn {
   provider: any
   rpc: string
   explorerApiKey: string
-  explorer: ValidExplorer
   chainId: ValidChainId
 }
 
@@ -58,7 +58,6 @@ export const fetchYearn = async ({
   provider,
   rpc,
   explorerApiKey,
-  explorer,
   chainId,
 }: TFetchYearn): Promise<StrategyData> => {
   const fromBlock = yearnStrats.meta.lastSyncBlock[chainId]! + 1
@@ -70,17 +69,16 @@ export const fetchYearn = async ({
 
   const httpCalls = [
     // Etherscan Events
-    (
-      await fetch(
-        NEW_FACTORY_EXPLORER_EVENTS(
-          explorerApiKey,
-          explorer,
-          contracts.yearnVaultFactory![chainId]!,
-          fromBlock,
-          toBlock,
-        ),
-      )
-    ).json(),
+    getLogsFromEtherscan({
+      chainId,
+      address: contracts.yearnVaultFactory![chainId]!,
+      apikey: explorerApiKey,
+      extraQueryParams: {
+        topic0: NEW_FACTORY_EVENT_TOPIC,
+        fromBlock: `${fromBlock}`,
+        toBlock: `${toBlock}`,
+      },
+    }),
     // Yearn Api
     (
       await fetch(

package/src/utils/etherscan.ts

@@ -17,5 +17,13 @@ export const getLogsFromEtherscan = async ({
     ? rawQueryParams
     : { chainid: `${chainId}`, module: 'logs', action: 'getLogs', address, apikey, ...extraQueryParams }
 
-  return fetch(`https://api.etherscan.io/v2/api?${new URLSearchParams(queryParams)}`).then((res) => res.json())
+  const data = await fetch(`https://api.etherscan.io/v2/api?${new URLSearchParams(queryParams)}`).then((res) =>
+    res.json(),
+  )
+
+  if (data.status !== '1') {
+    console.error(`🟥 - error on etherscan api call - ${data.message} - ${data.result}`)
+  }
+
+  return data
 }

package/src/votemarket/fetchCampaigns/processRawCampaigns.ts

@@ -121,6 +121,7 @@ export const processRawCampaigns = async ({
     ...(fetchedTokens.length > 0 ? await getPrices(fetchedTokens as any, chainId) : []),
     ...(nativeFetchedTokens.length > 0 ? await getPrices(nativeFetchedTokens as any, mainnet.id) : []),
     ...(underlyingTokens.length > 0 ? await getPrices(underlyingTokens as any, chainId) : []),
+    { address: '0x4DF454443D6e9A888e9B1571B2375e8Ab4118d9d', symbol: 'TAC IOU', usdPrice: 0.0375 }, // tmp rEYWA price
     // { address: '0x9E49A0314AE61e9C9E34e4Af62a73FBFfB6DE95A', symbol: 'ARR', usdPrice: 10 }, // For test purpose
     // { address: '0x0Cc20784f790805537D4eE33B41f1aC4eC55446B', symbol: 'USDC', usdPrice: 1 }, // For test purpose
     // { address: '0x59c9a01163e685719FAbE5De34779F563f49D4a3', symbol: 'CRV', usdPrice: 30 }, // For test purpose