@stake-dao/reader 0.4.86 → 0.4.87

package/dist/esm/utils/etherscan.js

@@ -2,6 +2,10 @@ export const getLogsFromEtherscan = async ({ chainId, address, apikey, rawQueryP
     const queryParams = rawQueryParams
         ? 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;
 };
 //# sourceMappingURL=etherscan.js.map

package/dist/esm/utils/etherscan.js.map

@@ -1 +1 @@
-{"version":3,"file":"etherscan.js","sourceRoot":"","sources":["../../../src/utils/etherscan.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,OAAO,EACP,OAAO,EACP,MAAM,EACN,cAAc,EACd,gBAAgB,GAAG,EAAE,GACI,EAAE,EAAE;IAC7B,MAAM,WAAW,GAAG,cAAc;QAChC,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAEtG,OAAO,KAAK,CAAC,mCAAmC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;AAC/G,CAAC,CAAA"}
+{"version":3,"file":"etherscan.js","sourceRoot":"","sources":["../../../src/utils/etherscan.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,OAAO,EACP,OAAO,EACP,MAAM,EACN,cAAc,EACd,gBAAgB,GAAG,EAAE,GACI,EAAE,EAAE;IAC7B,MAAM,WAAW,GAAG,cAAc;QAChC,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAEtG,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,mCAAmC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC3G,GAAG,CAAC,IAAI,EAAE,CACX,CAAA;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IACtF,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}

package/dist/types/strategies/balancer/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/balancer/fetch.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAA6C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAMxG,UAAU,cAAc;IACtB,QAAQ,EAAE,GAAG,CAAA;IACb,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED,eAAO,MAAM,aAAa,4DAKvB,cAAc,KAAG,OAAO,CAAC,YAAY,CAwOvC,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/balancer/fetch.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAA6C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAMxG,UAAU,cAAc;IACtB,QAAQ,EAAE,GAAG,CAAA;IACb,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,YAAY,CAAA;IACrB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED,eAAO,MAAM,aAAa,4DAKvB,cAAc,KAAG,OAAO,CAAC,YAAY,CA6OvC,CAAA"}

package/dist/types/strategies/curve/endpoints.d.ts

@@ -1,4 +1,6 @@
+export declare const FACTORY_EVENT_TOPIC = "0x26ad9f07a47e389150a15677a365d64f42af0000b792c182ada6a3b5ab193a0b";
 export declare const FACTORY_EXPLORER_EVENTS: (apiKey: string, chainId: number, contract: string, fromBlock: number, toBlock?: number | "latest") => string;
+export declare const NEW_FACTORY_EVENT_TOPIC = "0x5f7560a5797edc6f72421362defa094d690eb9f7ced3cc5a5c13383502e4fcc5";
 export declare const NEW_FACTORY_EXPLORER_EVENTS: (apiKey: string, chainId: number, contract: string, fromBlock: number, toBlock?: number | "latest") => string;
 export declare const CURVE_API_URL = "https://api.curve.finance/api";
 export declare const CONVEX_POOLS_URL = "https://curve.convexfinance.com/api/curve/pools";

package/dist/types/strategies/curve/endpoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../../../src/strategies/curve/endpoints.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,WAC1B,MAAM,WACL,MAAM,YACL,MAAM,aACL,MAAM,YACR,MAAM,GAAG,QAAQ,WAE8M,CAAA;AAE1O,eAAO,MAAM,2BAA2B,WAC9B,MAAM,WACL,MAAM,YACL,MAAM,aACL,MAAM,YACR,MAAM,GAAG,QAAQ,WAE8M,CAAA;AAE1O,eAAO,MAAM,aAAa,kCAAkC,CAAA;AAC5D,eAAO,MAAM,gBAAgB,oDAAoD,CAAA;AACjF,eAAO,MAAM,yBAAyB,6DAA6D,CAAA"}
+{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../../../src/strategies/curve/endpoints.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uEAAuE,CAAA;AAEvG,eAAO,MAAM,uBAAuB,WAC1B,MAAM,WACL,MAAM,YACL,MAAM,aACL,MAAM,YACR,MAAM,GAAG,QAAQ,WAEkK,CAAA;AAE9L,eAAO,MAAM,uBAAuB,uEAAuE,CAAA;AAE3G,eAAO,MAAM,2BAA2B,WAC9B,MAAM,WACL,MAAM,YACL,MAAM,aACL,MAAM,YACR,MAAM,GAAG,QAAQ,WAEsK,CAAA;AAElM,eAAO,MAAM,aAAa,kCAAkC,CAAA;AAC5D,eAAO,MAAM,gBAAgB,oDAAoD,CAAA;AACjF,eAAO,MAAM,yBAAyB,6DAA6D,CAAA"}

package/dist/types/strategies/curve/httpCalls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpCalls.d.ts","sourceRoot":"","sources":["../../../../src/strategies/curve/httpCalls.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAEjF,eAAO,MAAM,iBAAiB,mBACZ,MAAM,OACjB,MAAM,WACF,MAAM,aACJ,MAAM,WACR,MAAM,iBACA,iBAAiB;;;;;;;;;;;;EAsFjC,CAAA"}
+{"version":3,"file":"httpCalls.d.ts","sourceRoot":"","sources":["../../../../src/strategies/curve/httpCalls.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAEjF,eAAO,MAAM,iBAAiB,mBACZ,MAAM,OACjB,MAAM,WACF,MAAM,aACJ,MAAM,WACR,MAAM,iBACA,iBAAiB;;;;;;;;;;;;EAoFjC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAKlD,UAAU,iBAAiB;IACzB,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,gBAAgB,uDAA8D,iBAAiB;;;;;EAwB3G,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/strategies/pancakeswap/fetch/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAKlD,UAAU,iBAAiB;IACzB,QAAQ,EAAE,GAAG,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,gBAAgB,uDAA8D,iBAAiB;;;;;EA6B3G,CAAA"}

package/dist/types/strategies/pendle/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/pendle/fetch.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAU,YAAY,EAAE,MAAM,aAAa,CAAA;AAsBpE,UAAU,YAAY;IACpB,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,WAAW,uDAA8D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwTjG,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../src/strategies/pendle/fetch.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAI5C,OAAO,KAAK,EAAE,WAAW,EAAU,YAAY,EAAE,MAAM,aAAa,CAAA;AAsBpE,UAAU,YAAY;IACpB,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,WAAW,uDAA8D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6TjG,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;AAC/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,CAmMpC,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;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"}

package/dist/types/utils/etherscan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"etherscan.d.ts","sourceRoot":"","sources":["../../../src/utils/etherscan.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAC1C,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAC7C;AAED,eAAO,MAAM,oBAAoB,oEAM9B,wBAAwB,iBAM1B,CAAA"}
+{"version":3,"file":"etherscan.d.ts","sourceRoot":"","sources":["../../../src/utils/etherscan.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAC1C,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAC7C;AAED,eAAO,MAAM,oBAAoB,oEAM9B,wBAAwB,iBAc1B,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stake-dao/reader",
   "description": "",
-  "version": "0.4.86",
+  "version": "0.4.87",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",

package/src/strategies/balancer/fetch.ts

@@ -14,9 +14,9 @@ import {
   tokenWithId,
 } from '@stake-dao/constants'
 import { batchBalancerStrats } from '../../bytecodes/index.js'
-import { concatBytecode, getBoost, getPricesFromLlama, getSdtApr } from '../../index.js'
+import { concatBytecode, getBoost, getLogsFromEtherscan, getPricesFromLlama, getSdtApr } from '../../index.js'
 import { equalTlc, graphql } from '../../utils.js'
-import { FACTORY_EXPLORER_EVENTS } from '../curve/endpoints.js'
+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'
@@ -42,11 +42,16 @@ export const fetchBalancer = async ({
 
   const httpCalls = [
     // Etherscan Events
-    (
-      await fetch(
-        FACTORY_EXPLORER_EVENTS(explorerApiKey, chainId, contracts.balancerVaultFactory![1]!, fromBlock, toBlock),
-      )
-    ).json(),
+    getLogsFromEtherscan({
+      chainId,
+      address: contracts.balancerVaultFactory![1]!,
+      apikey: explorerApiKey,
+      extraQueryParams: {
+        topic0: FACTORY_EVENT_TOPIC,
+        fromBlock: `${fromBlock}`,
+        toBlock: `${toBlock}`,
+      },
+    }),
   ]
 
   const httpResponses = (await Promise.allSettled(httpCalls)).map((result) =>

package/src/strategies/curve/endpoints.ts

@@ -1,3 +1,5 @@
+export const FACTORY_EVENT_TOPIC = '0x26ad9f07a47e389150a15677a365d64f42af0000b792c182ada6a3b5ab193a0b'
+
 export const FACTORY_EXPLORER_EVENTS = (
   apiKey: string,
   chainId: number,
@@ -5,7 +7,9 @@ export const FACTORY_EXPLORER_EVENTS = (
   fromBlock: number,
   toBlock: number | 'latest' = 'latest',
 ) =>
-  `https://api.etherscan.io/v2/api?chainid=${chainId}&module=logs&action=getLogs&address=${contract}&fromBlock=${fromBlock}&toBlock=${toBlock}&topic0=0x26ad9f07a47e389150a15677a365d64f42af0000b792c182ada6a3b5ab193a0b&apikey=${apiKey}`
+  `https://api.etherscan.io/v2/api?chainid=${chainId}&module=logs&action=getLogs&address=${contract}&fromBlock=${fromBlock}&toBlock=${toBlock}&topic0=${FACTORY_EVENT_TOPIC}&apikey=${apiKey}`
+
+export const NEW_FACTORY_EVENT_TOPIC = '0x5f7560a5797edc6f72421362defa094d690eb9f7ced3cc5a5c13383502e4fcc5'
 
 export const NEW_FACTORY_EXPLORER_EVENTS = (
   apiKey: string,
@@ -14,7 +18,7 @@ export const NEW_FACTORY_EXPLORER_EVENTS = (
   fromBlock: number,
   toBlock: number | 'latest' = 'latest',
 ) =>
-  `https://api.etherscan.io/v2/api?chainid=${chainId}&module=logs&action=getLogs&address=${contract}&fromBlock=${fromBlock}&toBlock=${toBlock}&topic0=0x5f7560a5797edc6f72421362defa094d690eb9f7ced3cc5a5c13383502e4fcc5&apikey=${apiKey}`
+  `https://api.etherscan.io/v2/api?chainid=${chainId}&module=logs&action=getLogs&address=${contract}&fromBlock=${fromBlock}&toBlock=${toBlock}&topic0=${NEW_FACTORY_EVENT_TOPIC}&apikey=${apiKey}`
 
 export const CURVE_API_URL = 'https://api.curve.finance/api'
 export const CONVEX_POOLS_URL = 'https://curve.convexfinance.com/api/curve/pools'

package/src/strategies/curve/httpCalls.ts

@@ -1,11 +1,12 @@
 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_EXPLORER_EVENTS,
-  NEW_FACTORY_EXPLORER_EVENTS,
+  FACTORY_EVENT_TOPIC,
+  NEW_FACTORY_EVENT_TOPIC,
 } from './endpoints.js'
 import { getCurveApiData } from './fetch/curveApiData/getCurveApiData.js'
 import { type GaugesWeightsData } from './fetch/curveApiData/getGaugesWeights.js'
@@ -22,17 +23,16 @@ export const getCurveHttpCalls = async (
     case 1: {
       const ethHttpCalls = [
         // Etherscan Events
-        (
-          await fetch(
-            NEW_FACTORY_EXPLORER_EVENTS(
-              explorerApiKey,
-              chainId,
-              contract('curveVaultFactory', chainId),
-              fromBlock,
-              toBlock,
-            ),
-          )
-        ).json(),
+        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
@@ -61,17 +61,16 @@ export const getCurveHttpCalls = async (
     case 42161: {
       const arbitrumHttpCalls = [
         // Etherscan Events
-        (
-          await fetch(
-            FACTORY_EXPLORER_EVENTS(
-              explorerApiKey,
-              chainId,
-              contract('curveVaultFactory', chainId),
-              fromBlock,
-              toBlock,
-            ),
-          )
-        ).json(),
+        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

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

@@ -1,8 +1,9 @@
-import { NEW_FACTORY_EXPLORER_EVENTS } from '../../curve/endpoints.js'
+import { NEW_FACTORY_EVENT_TOPIC } from '../../curve/endpoints.js'
 
 import { contracts, pancakeswapErc20Strats } from '@stake-dao/constants'
 import { GH_STAKE_DAO_VM_DATA } from '../../../endpoints.js'
 import type { Price } from '../../../prices.js'
+import { getLogsFromEtherscan } from '../../../utils/etherscan.js'
 import type { ValidChainId } from '../../types.js'
 import { getPancakeSwapFeesAPR, getPancakeSwapManagerFeesAPR } from './getPancakeApisData.js'
 import { getPancakeErc20Vaults } from './getPancakeErc20Vaults.js'
@@ -24,11 +25,16 @@ export const fetchPancakeswap = async ({ provider, rpc, chainId, prices, explore
     getPancakeSwapFeesAPR(chainId),
     getPancakeSwapManagerFeesAPR(chainId),
     (await fetch(`${GH_STAKE_DAO_VM_DATA}/main/tvls/cake.json`)).json(),
-    (
-      await fetch(
-        NEW_FACTORY_EXPLORER_EVENTS(explorerApiKey, chainId, contracts.cakeVaultFactory![chainId]!, fromBlock, toBlock),
-      )
-    ).json(),
+    getLogsFromEtherscan({
+      chainId,
+      address: contracts.cakeVaultFactory![chainId]!,
+      apikey: explorerApiKey,
+      extraQueryParams: {
+        topic0: NEW_FACTORY_EVENT_TOPIC,
+        fromBlock: `${fromBlock}`,
+        toBlock: `${toBlock}`,
+      },
+    }),
   ])
 
   const v3Vaults = await getPancakeV3Vaults(rpc, chainId, prices, feesApr, stakedTVLS)

package/src/strategies/pendle/fetch.ts

@@ -17,7 +17,8 @@ import multicallPendleStratsAbi from '../../abis/pendleVaultsMulticall.js'
 import { batchPendleStrats } from '../../bytecodes/index.js'
 import type { Price } from '../../prices.js'
 import { type Call, batchJsonRpc, equalTlc, lc, multicall } from '../../utils.js'
-import { FACTORY_EXPLORER_EVENTS } from '../curve/endpoints.js'
+import { getLogsFromEtherscan } from '../../utils/etherscan.js'
+import { FACTORY_EVENT_TOPIC } from '../curve/endpoints.js'
 import type { RewardsData, SdtApr, ValidChainId } from '../types.js'
 import { getBoost } from '../utils/boost.js'
 import decodeEtherscanFactoryEvent from '../utils/decodeEtherscanFactoryEvent.js'
@@ -62,11 +63,16 @@ export const fetchPendle = async ({ prices, provider, rpc, explorerApiKey, chain
 
   const httpCalls = [
     // Etherscan Events
-    await (
-      await fetch(
-        FACTORY_EXPLORER_EVENTS(explorerApiKey, chainId, contracts.pendleVaultFactory![chainId]!, fromBlock, toBlock),
-      )
-    ).json(),
+    getLogsFromEtherscan({
+      chainId,
+      address: contracts.pendleVaultFactory![chainId]!,
+      apikey: explorerApiKey,
+      extraQueryParams: {
+        topic0: FACTORY_EVENT_TOPIC,
+        fromBlock: `${fromBlock}`,
+        toBlock: `${toBlock}`,
+      },
+    }),
     // Pende Api
     getPendleApiData(),
   ]

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

@@ -4,13 +4,14 @@ 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 { 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'
@@ -68,17 +69,16 @@ export const fetchYearn = async ({
 
   const httpCalls = [
     // Etherscan Events
-    (
-      await fetch(
-        NEW_FACTORY_EXPLORER_EVENTS(
-          explorerApiKey,
-          chainId,
-          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
 }