@defillama/sdk 5.0.136 → 5.0.137

package/build/util/LlamaProvider.js

@@ -110,6 +110,12 @@ class LlamaProvider extends ethers_1.FallbackProvider {
             runners.splice(1, 0, primaryRunner);
         }
         runners = runners.slice(0, attempts);
+        // print stats every 5 minutes
+        let currentTimeMS = Date.now();
+        if (currentTimeMS - lastPrintTimeMS > 1000 * 60 * 5) {
+            lastPrintTimeMS = currentTimeMS;
+            printRPCCallStats();
+        }
         // if (this.chainName === 'rsk' && method === 'getLogs') {
         //   const hostString = getEnvValue('RSK_ARCHIVAL_RPC')
         //   if (!hostString) 
@@ -309,9 +315,11 @@ function getMedianBlockValue(blocks) {
     const mid = Math.floor(blocks.length / 3);
     return blocks.length % 2 !== 0 ? blocks[mid] : (blocks[mid - 1] + blocks[mid]) / 2;
 }
-process.on('exit', () => {
+let lastPrintTimeMS = Date.now();
+function printRPCCallStats() {
     if (Object.keys(rpcRequestCounter).length > 7) {
         (0, debugLog_1.debugLog)('RPC request count per chain');
         (0, debugLog_1.debugTable)(rpcRequestCounter);
     }
-});
+}
+process.on('exit', printRPCCallStats);

package/build/util/env.js

@@ -12,6 +12,7 @@ const whitelistedEnvConstants = [
 const defaultEnvValues = {
     INTERNAL_SDK_CACHE_FILE: './cache.json',
     TRON_RPC_CONCURRENCY_LIMIT: '5',
+    LLAMA_INDEXER_ADDRESS_CHUNK_SIZE: '20',
     TRON_RPC: 'https://api.trongrid.io',
     TRON_EVM_RPC: 'https://rpc.ankr.com/tron_jsonrpc',
     NAKA_RPC: 'https://node.nakachain.xyz',

package/build/util/indexer.js

@@ -16,6 +16,7 @@ const logs_1 = require("./logs");
 const _1 = require(".");
 const indexerURL = (0, env_1.getEnvValue)('LLAMA_INDEXER_ENDPOINT');
 const LLAMA_INDEXER_API_KEY = (0, env_1.getEnvValue)('LLAMA_INDEXER_API_KEY');
+const addressChunkSize = +(0, env_1.getEnvValue)('LLAMA_INDEXER_ADDRESS_CHUNK_SIZE');
 const axiosIndexer = axios_1.default.create({
     headers: {
         "x-api-key": LLAMA_INDEXER_API_KEY,
@@ -186,12 +187,12 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
         console.time(debugTimeKey);
     }
     const addressSet = new Set(address === null || address === void 0 ? void 0 : address.split(','));
-    const addressChunks = (0, _1.sliceIntoChunks)((_c = address === null || address === void 0 ? void 0 : address.split(',')) !== null && _c !== void 0 ? _c : [], 10);
+    const addressChunks = (0, _1.sliceIntoChunks)((_c = address === null || address === void 0 ? void 0 : address.split(',')) !== null && _c !== void 0 ? _c : [], addressChunkSize);
     // to ensure that we have at least one chunk to process if no target is provided
     if (noTarget && addressChunks.length === 0)
         addressChunks.push(undefined);
     for (const chunk of addressChunks) {
-        let _logAgg = [];
+        let logCount = 0;
         do {
             const params = {
                 addresses: hasAddressFilter ? chunk.join(',') : undefined,
@@ -206,18 +207,17 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
             // getLogs uses 'address' field to return log source, so we add the field here to make it compatible
             _logs.forEach((l) => {
                 l.address = l.source;
+                const iswhitelisted = !addressSet.size || addressSet.has(l.source.toLowerCase());
+                if (iswhitelisted) {
+                    logs.push(l);
+                }
             });
-            _logAgg.push(..._logs.filter((l) => {
-                if (!addressSet.size)
-                    return true;
-                return addressSet.has(l === null || l === void 0 ? void 0 : l.source.toLowerCase());
-            }));
+            logCount += _logs.length;
             offset += limit;
             // If we have all the logs, or we have reached the limit, or there are no logs, we stop
-            if (_logs.length < limit || totalCount <= _logAgg.length || _logs.length === 0)
+            if (_logs.length < limit || totalCount <= logCount || _logs.length === 0)
                 hasMore = false;
         } while (all && hasMore);
-        logs.push(..._logAgg);
     }
     if (debugMode) {
         console.timeEnd(debugTimeKey);
@@ -239,7 +239,7 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
         log.transactionHash = log.transaction_hash;
         log.blockNumber = log.block_number;
         log.topics = [log.topic0, log.topic1, log.topic2, log.topic3,].filter(t => t !== '').map(i => ethers_1.ethers.zeroPadValue(i, 32));
-        const deleteKeys = ['chain', 'address', 'block_number', 'log_index', 'topic0', 'topic1', 'topic2', 'topic3', 'decodedArgs', 'transaction_hash',];
+        const deleteKeys = ['chain', 'block_number', 'log_index', 'topic0', 'topic1', 'topic2', 'topic3', 'decodedArgs', 'transaction_hash',];
         deleteKeys.forEach(k => delete log[k]);
         const parsedLog = iface === null || iface === void 0 ? void 0 : iface.parseLog({ data: log.data, topics: log.topics, });
         log.args = parsedLog === null || parsedLog === void 0 ? void 0 : parsedLog.args;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defillama/sdk",
-  "version": "5.0.136",
+  "version": "5.0.137",
   "description": "SDK for calculating TVL",
   "main": "build/index.js",
   "scripts": {