@merkl/api 0.10.344 → 0.10.345

package/dist/src/libs/campaigns/utils/fetchLogs.js

@@ -1,9 +1,8 @@
 import { log } from "../../../utils/logger";
-import { providers } from "../../../utils/providers";
-import { getContractCreationBlock } from "@sdk";
+import { ChainId, ChainInteractionService, getContractCreationBlock } from "@sdk";
 import axios from "axios";
 async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
-    const url = providers[chainId].connection.url;
+    const url = ChainInteractionService(chainId).provider().connection.url;
     if (fromBlock === undefined || fromBlock === null || !toBlock || fromBlock > toBlock) {
         throw new Error(`fromBlock and toBlock are required and fromBlock must be less than toBlock - fromBlock: ${fromBlock} - toBlock:${toBlock}`);
     }
@@ -12,7 +11,7 @@ async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
         let contractCreationBlock = toBlock;
         for (const address of addresses) {
             try {
-                const aux = await getContractCreationBlock(address, providers[chainId]);
+                const aux = await getContractCreationBlock(address, ChainInteractionService(chainId).provider());
                 if (aux < contractCreationBlock) {
                     contractCreationBlock = aux;
                 }
@@ -34,8 +33,10 @@ async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
     let step = tempToBlock - tempFromBlock;
     // Binary search to fetch logs and avoid errors
     let logs = [];
+    // Binary search to fetch logs and avoid errors
     let isRateLimitingError = false;
-    // let stepLimited = false;
+    let stepLimited = false;
+    const maxLogsPerRequest = 10_000;
     while (true) {
         try {
             const data = {
@@ -62,6 +63,15 @@ async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
                 if (res.data.error?.code === 413) {
                     throw new Error("Request entity too large");
                 }
+                if (res.data.error?.code === -32000 && chainId === ChainId.AVALANCHE) {
+                    stepLimited = true;
+                    step = 2047 * 2;
+                    throw new Error("Block width exceeded");
+                }
+                if (res.data.error?.code === -32000 && chainId === ChainId.BSC) {
+                    // Reall error is: " block not found x"
+                    throw new Error("Log size exceeded");
+                }
                 // Check if we hit the maximum log limit for a single call
                 if (res.data.result?.length === 10000)
                     throw new Error("Log size exceeded");
@@ -69,10 +79,35 @@ async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
                 logs = logs.concat(...logsBatch);
                 const batchSize = logsBatch.length;
                 const blockRange = tempToBlock - tempFromBlock + 1;
+                if (!stepLimited) {
+                    if (batchSize === 0) {
+                        // Add safeguard for 0 logs case
+                        // If no logs found, increase step size
+                        step = Math.floor(step * 2);
+                    }
+                    else {
+                        // Aggressive adjustment based on how far we are from optimal logs per request
+                        const optimalLogsPerRequest = maxLogsPerRequest * 0.7; // Target 70% of max logs per request
+                        const logsPerRequestRatio = batchSize / optimalLogsPerRequest;
+                        if (batchSize < maxLogsPerRequest * 0.8) {
+                            // More aggressive adjustment when far from target
+                            const adjustmentFactor = (1 / logsPerRequestRatio) ** 0.7; // Non-linear scaling
+                            step = Math.floor(step * adjustmentFactor);
+                            // Allow for larger jumps when log density is very low
+                            if (logsPerRequestRatio < 0.2) {
+                                step = Math.floor(step * 2);
+                            }
+                        }
+                        else {
+                            // Quick reduction when close to limit
+                            step = Math.floor(step * 0.4);
+                        }
+                    }
+                }
                 log.local(`fetched ${batchSize} logs between blocks ${tempFromBlock} and ${tempToBlock} (block range: ${blockRange})`);
             }
             catch (e) {
-                if (e instanceof Error && e.toString() === "Error: Request failed with status code 429") {
+                if (e.toString() === "Error: Request failed with status code 429") {
                     isRateLimitingError = true;
                 }
                 if (isRateLimitingError) {
@@ -97,7 +132,7 @@ async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
                 isRateLimitingError = false;
             }
             if (step === 0) {
-                log.error("❌ fetchLogs", `error fetching logs for ${addresses}`);
+                log.error("❌ fetchLogs", `error fetching logs for ${addresses} on ${ChainId[chainId]}`);
                 return { logs, block: tempFromBlock };
             }
             tempToBlock = tempFromBlock + step;

package/dist/src/libs/campaigns/utils/getCompV2ForksVaults.js

@@ -16,7 +16,7 @@ async function getCompoundV2ForksVaults() {
             if ([ChainId.LINEA].includes(chainId)) {
                 continue;
             }
-            log.local(`Fetching Compound V2 vaults for chainId ${ChainId[chainId]} and compFork ${CompFork[compFork]}`);
+            log.local(`Fetching Compound V2 vaults on ${ChainId[chainId]}, for ${CompFork[compFork]}`);
             const toBlock = await providers[chainId].getBlockNumber();
             const comptrollerAddress = Comptrollers[compFork][chainId];
             if (!comptrollerAddress) {
@@ -24,7 +24,9 @@ async function getCompoundV2ForksVaults() {
             }
             const creationBlock = (await getContractCreationBlock(comptrollerAddress, providers[chainId])) ?? 0;
             let logs = [];
-            const topic = compFork === CompFork.Venus ? MARKET_SUPPORTED_EVENT_HASH : MARKET_LISTED_EVENT_HASH;
+            const topic = compFork === CompFork.Venus && chainId === ChainId.ZKSYNC
+                ? MARKET_SUPPORTED_EVENT_HASH
+                : MARKET_LISTED_EVENT_HASH;
             logs = await safeFetchLogs(chainId, [topic], [comptrollerAddress], creationBlock, toBlock);
             if (compFork === CompFork.Ionic && chainId === ChainId.MODE) {
                 const isolatedIonicMarketUnitroller = "0x8Fb3D4a94D0aA5D6EDaAC3Ed82B59a27f56d923a";
@@ -33,9 +35,11 @@ async function getCompoundV2ForksVaults() {
                 logs = logs.concat(isolatedMarketLogs);
             }
             const vaults = Object.keys(logs.reduce((acc, transfer) => {
-                const [cToken] = defaultAbiCoder.decode(["address"], transfer.data);
-                if (!!cToken) {
-                    acc[cToken] = true;
+                if (transfer.data !== "0x") {
+                    const [cToken] = defaultAbiCoder.decode(["address"], transfer.data);
+                    if (!!cToken) {
+                        acc[cToken] = true;
+                    }
                 }
                 return acc;
             }, {}));