@defillama/sdk 5.0.2 → 5.0.4

package/build/ChainApi.d.ts

@@ -2,6 +2,7 @@ import { Block, CallOptions, MulticallOptions, FetchListOptions, ByteCodeCallOpt
 import Balances from "./Balances";
 import { Chain } from "./general";
 import { Provider } from "ethers";
+import { GetLogsOptions } from "./util/logs";
 export declare class ChainApi {
     block?: Block;
     chain: Chain | string;
@@ -55,5 +56,6 @@ export declare class ChainApi {
         usdTokenBalances: BalancesV1;
         rawTokenBalances: BalancesV1;
     }>;
+    getLogs(params: GetLogsOptions): Promise<any[] | import("ethers").EventLog[]>;
 }
 export default ChainApi;

package/build/ChainApi.js

@@ -60,6 +60,7 @@ var debugLog_1 = require("./util/debugLog");
 var generalUtil_1 = require("./generalUtil");
 var multicall3_1 = require("./abi/multicall3");
 var eth_1 = require("./eth");
+var logs_1 = __importDefault(require("./util/logs"));
 var nullAddress = '0x0000000000000000000000000000000000000000';
 var ChainApi = /** @class */ (function () {
     function ChainApi(params) {
@@ -257,6 +258,14 @@ var ChainApi = /** @class */ (function () {
             });
         });
     };
+    ChainApi.prototype.getLogs = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                params.chain = this.chain;
+                return [2 /*return*/, (0, logs_1.default)(params)];
+            });
+        });
+    };
     return ChainApi;
 }());
 exports.ChainApi = ChainApi;

package/build/general.js

@@ -20,7 +20,7 @@ function createProvider(name, rpcString, chainId) {
     }
     else {
         try {
-            return new ethers_1.ethers.FallbackProvider(rpcList.map(function (url, i) { return ({ provider: getProviderObject(url), priority: i, chainId: chainId, }); }), networkish, { cacheTimeout: 5 * 1000 });
+            return new ethers_1.ethers.FallbackProvider(rpcList.map(function (url, i) { return ({ provider: getProviderObject(url), priority: i, chainId: chainId, }); }), networkish, { cacheTimeout: 5 * 1000, quorum: 1, eventWorkers: 1, eventQuorum: 1, });
         }
         catch (e) {
             // debugLog(`Error creating provider for ${name} with RPCs: ${rpcList.join(', ')}`)
@@ -69,7 +69,8 @@ function createProvider(name, rpcString, chainId) {
           *  any other value is in ms. (default: ``250``)
          */
         var batchMaxSize = 10 * (1024 * 1024); // 10Mb
-        var jsonRpcApiProviderOptions = { staticNetwork: true, batchStallTime: 42, batchMaxSize: batchMaxSize, batchMaxCount: 1000, cacheTimeout: 5 * 1000 };
+        // some rpcs throw error if batchMaxCount is set higher than 100
+        var jsonRpcApiProviderOptions = { staticNetwork: true, batchStallTime: 42, batchMaxSize: batchMaxSize, batchMaxCount: 99, cacheTimeout: 5 * 1000 };
         if (url.startsWith('wss://')) {
             delete jsonRpcApiProviderOptions.batchMaxCount;
             return new ethers_1.ethers.WebSocketProvider(url, networkish, jsonRpcApiProviderOptions);

package/build/generalUtil.js

@@ -218,7 +218,7 @@ function getProviderUrl(provider) {
 }
 exports.getProviderUrl = getProviderUrl;
 function formErrorString(e, errorParams) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     if (errorParams === void 0) { errorParams = {}; }
     if (!e) {
         if (errorParams.promisePoolErrors) {
@@ -242,14 +242,14 @@ function formErrorString(e, errorParams) {
     var errorString = e.toString();
     if (typeof e !== 'object')
         return errorString;
-    if (((e.reason || e.method) && e.code) || errorParams.result === '0x') { // ethers.js error
-        var method = (_d = e.method) !== null && _d !== void 0 ? _d : errorParams.abi;
+    if (((e.reason || e.method || e.shortMessage) && e.code) || errorParams.result === '0x') { // ethers.js error
+        var method = (_g = (_d = e.method) !== null && _d !== void 0 ? _d : (_f = (_e = e.info) === null || _e === void 0 ? void 0 : _e.request) === null || _f === void 0 ? void 0 : _f.method) !== null && _g !== void 0 ? _g : errorParams.abi;
         if (e.body) {
             try {
                 e.body = JSON.parse(e.body);
             }
             catch (e) { }
-            if ((_f = (_e = e.body) === null || _e === void 0 ? void 0 : _e.error) === null || _f === void 0 ? void 0 : _f.message)
+            if ((_j = (_h = e.body) === null || _h === void 0 ? void 0 : _h.error) === null || _j === void 0 ? void 0 : _j.message)
                 return e.body.error.message;
         }
         if (!method && e.requestBody) {
@@ -257,11 +257,11 @@ function formErrorString(e, errorParams) {
                 e.requestBody = JSON.parse(e.requestBody);
             }
             catch (e) { }
-            method = (_g = e.requestBody) === null || _g === void 0 ? void 0 : _g.method;
+            method = (_k = e.requestBody) === null || _k === void 0 ? void 0 : _k.method;
         }
-        if (!e.provider && errorParams.provider)
+        else if (!e.provider && errorParams.provider)
             e.provider = errorParams.provider;
-        var providerUrl = getProviderUrl((_h = e.provider) !== null && _h !== void 0 ? _h : errorParams.provider);
+        var providerUrl = getProviderUrl((_l = e.provider) !== null && _l !== void 0 ? _l : errorParams.provider);
         if (e.serverError)
             return "host: ".concat(providerUrl, " ").concat(e.serverError.toString());
         if (e.results) {
@@ -275,7 +275,7 @@ function formErrorString(e, errorParams) {
             var extraInfo = 'target: ' + errorParams.target;
             if (errorParams.params && errorParams.params.length)
                 extraInfo += shortenString(' params: ' + errorParams.params.join(', '));
-            return "Failed to call ".concat(method, " ").concat(extraInfo, " on chain: [").concat(errorParams.chain, "] rpc: ").concat(providerUrl, "  call reverted ").concat((_j = e.errorName) !== null && _j !== void 0 ? _j : '', "   ").concat((_k = e.errorArgs) !== null && _k !== void 0 ? _k : '');
+            return "Failed to call: ".concat(method, " ").concat(extraInfo, " on chain: [").concat(errorParams.chain, "] rpc: ").concat(providerUrl, "  call reverted, reason: ").concat((_o = (_m = e.errorName) !== null && _m !== void 0 ? _m : e.shortMessage) !== null && _o !== void 0 ? _o : '', "   ").concat((_p = e.errorArgs) !== null && _p !== void 0 ? _p : '');
         }
         if (method === 'eth_blockNumber')
             return "host: ".concat(providerUrl, " reason: ").concat(e.reason, " code: ").concat(e.code);
@@ -293,7 +293,8 @@ function shortenString(str, length) {
 function formError(e, errorParams) {
     var _a;
     if (errorParams === void 0) { errorParams = {}; }
-    if ((e === null || e === void 0 ? void 0 : e._isCustomError) || (!Object.keys(errorParams).length && typeof e === 'object' && !Object.keys(e).length))
+    var errorParamsSet = Object.keys(errorParams).length;
+    if ((e === null || e === void 0 ? void 0 : e._isCustomError) || (!errorParamsSet && typeof e === 'object' && !Object.keys(e).length))
         return e; // already formatted or vannila error
     var error = new Error(formErrorString(e, errorParams));
     try {
@@ -304,6 +305,7 @@ function formError(e, errorParams) {
     }
     catch (e) { }
     error._isCustomError = true;
+    error.message = shortenString(error.message, 420);
     error.stack = '';
     return error;
 }

package/build/index.d.ts

@@ -4,6 +4,7 @@ export { Balances } from './Balances';
 export { getProvider, setProvider } from './general';
 export * as util from "./generalUtil";
 export * as cache from "./util/cache";
+export { getLogs as getEventLogs } from "./util/logs";
 export * as sdkCache from "./util/internal-cache";
 export * as api from "./api";
 export * as api2 from "./api2";

package/build/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.humanizeNumber = exports.logTable = exports.log = exports.blocks = exports.api2 = exports.api = exports.sdkCache = exports.cache = exports.util = exports.setProvider = exports.getProvider = exports.Balances = exports.ChainApi = void 0;
+exports.humanizeNumber = exports.logTable = exports.log = exports.blocks = exports.api2 = exports.api = exports.sdkCache = exports.getEventLogs = exports.cache = exports.util = exports.setProvider = exports.getProvider = exports.Balances = exports.ChainApi = void 0;
 var debugLog_1 = require("./util/debugLog");
 var ChainApi_1 = require("./ChainApi");
 Object.defineProperty(exports, "ChainApi", { enumerable: true, get: function () { return ChainApi_1.ChainApi; } });
@@ -34,6 +34,8 @@ Object.defineProperty(exports, "getProvider", { enumerable: true, get: function
 Object.defineProperty(exports, "setProvider", { enumerable: true, get: function () { return general_1.setProvider; } });
 exports.util = __importStar(require("./generalUtil"));
 exports.cache = __importStar(require("./util/cache"));
+var logs_1 = require("./util/logs");
+Object.defineProperty(exports, "getEventLogs", { enumerable: true, get: function () { return logs_1.getLogs; } });
 exports.sdkCache = __importStar(require("./util/internal-cache"));
 exports.api = __importStar(require("./api"));
 exports.api2 = __importStar(require("./api2"));

package/build/util/cache.d.ts

@@ -17,4 +17,11 @@ export declare function getTempLocalCache({ file, defaultData, clearAfter }: {
     defaultData?: any;
     clearAfter?: number;
 }): any;
+export declare function deleteCache(file: string): Promise<void>;
+export declare function readExpiringJsonCache(file: string): Promise<any>;
+export declare function writeExpiringJsonCache(file: string, data: any, { expireAfter, // cache for 1 day by default
+expiryTimestamp, }: {
+    expireAfter?: number;
+    expiryTimestamp?: number;
+}): Promise<void>;
 export {};

package/build/util/cache.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTempLocalCache = exports.compressCache = exports.parseCache = exports.writeCache = exports.readCache = exports.currentVersion = void 0;
+exports.writeExpiringJsonCache = exports.readExpiringJsonCache = exports.deleteCache = exports.getTempLocalCache = exports.compressCache = exports.parseCache = exports.writeCache = exports.readCache = exports.currentVersion = void 0;
 var debugLog_1 = require("./debugLog");
 var r2_1 = require("./r2");
 var zlib_1 = require("zlib");
@@ -273,3 +273,65 @@ function getTempLocalCache(_a) {
     }
 }
 exports.getTempLocalCache = getTempLocalCache;
+// this removes data only from the file cache, not from the R2 cache
+function deleteCache(file) {
+    return __awaiter(this, void 0, void 0, function () {
+        var filePath;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    filePath = getFilePath(file);
+                    return [4 /*yield*/, fs.unlink(filePath)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.deleteCache = deleteCache;
+function readExpiringJsonCache(file) {
+    return __awaiter(this, void 0, void 0, function () {
+        var options, data;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = { readFromR2Cache: false, skipR2Cache: true };
+                    file = 'expiring/' + file;
+                    return [4 /*yield*/, readCache(file, options)];
+                case 1:
+                    data = _a.sent();
+                    if (!data || Object.keys(data).length === 0)
+                        return [2 /*return*/, null];
+                    if (!(data.expiryTimestamp < (Date.now() / 1e3))) return [3 /*break*/, 3];
+                    return [4 /*yield*/, deleteCache(file)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/, null];
+                case 3: return [2 /*return*/, data.data];
+            }
+        });
+    });
+}
+exports.readExpiringJsonCache = readExpiringJsonCache;
+function writeExpiringJsonCache(file, data, _a) {
+    var _b = _a.expireAfter, expireAfter = _b === void 0 ? 60 * 60 * 24 : _b, // cache for 1 day by default
+    expiryTimestamp = _a.expiryTimestamp;
+    return __awaiter(this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    file = 'expiring/' + file;
+                    if (!expiryTimestamp)
+                        expiryTimestamp = Math.floor(Date.now() / 1e3) + expireAfter;
+                    options = { skipR2CacheWrite: true };
+                    return [4 /*yield*/, writeCache(file, { data: data, expiryTimestamp: expiryTimestamp }, options)];
+                case 1:
+                    _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.writeExpiringJsonCache = writeExpiringJsonCache;

package/build/util/index.d.ts

@@ -1,6 +1,6 @@
 import { Chain } from "../general";
 import type { Address } from "../types";
-import { ethers } from "ethers";
+import { EventLog } from "ethers";
 import runInPromisePoolOrig from "./promisePool";
 export { getLatestBlock, getTimestamp, lookupBlock, } from "./blocks";
 export declare const runInPromisePool: typeof runInPromisePoolOrig;
@@ -14,9 +14,7 @@ export declare function getLogs(params: {
     topics?: string[];
     chain?: Chain;
 }): Promise<{
-    output: (readonly string[])[];
-} | {
-    output: ethers.Log[];
+    output: EventLog[];
 }>;
 export declare function normalizeAddress(address: string): string;
 export declare function normalizePrefixes(address: string): string;

package/build/util/index.js

@@ -129,6 +129,8 @@ function getLogs(params) {
                                 output: logs.map(function (log) { return log.topics; })
                             }];
                     }
+                    // ethers v5 logs had this but not ethers v6, so adding field to keep it compatible
+                    logs.forEach(function (log) { var _a; return log.logIndex = (_a = log.logIndex) !== null && _a !== void 0 ? _a : log.index; });
                     return [2 /*return*/, {
                             output: logs
                         }];

package/build/util/logs.d.ts

@@ -0,0 +1,31 @@
+import { EventLog } from "ethers";
+import { Address } from "../types";
+export type GetLogsOptions = {
+    target: Address;
+    topic?: string;
+    keys?: string[];
+    fromBlock?: number;
+    toBlock?: number;
+    topics?: string[];
+    extraTopics?: string[];
+    chain?: string;
+    eventAbi?: string | any;
+    fromTimestamp?: number;
+    toTimestamp?: number;
+    skipCache?: boolean;
+    skipCacheRead?: boolean;
+    entireLog?: boolean;
+    cacheInCloud?: boolean;
+    onlyArgs?: boolean;
+};
+export declare function getLogs({ target, chain, fromBlock, toBlock, fromTimestamp, toTimestamp, eventAbi, topic, topics, extraTopics, // can be passed as input as extra filter arguments
+skipCache, skipCacheRead, entireLog, cacheInCloud, onlyArgs, keys, }: GetLogsOptions): Promise<EventLog[] | any[]>;
+export type logCache = {
+    logs: EventLog[];
+    metadata?: {
+        version: string;
+        fromBlock: number;
+        toBlock: number;
+    };
+};
+export default getLogs;

package/build/util/logs.js

@@ -0,0 +1,215 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogs = void 0;
+var _1 = require(".");
+var ethers_1 = require("ethers");
+var blocks_1 = require("./blocks");
+var cache_1 = require("./cache");
+var debugLog_1 = require("./debugLog");
+var currentVersion = 'v2';
+function getLogs(_a) {
+    var target = _a.target, _b = _a.chain, chain = _b === void 0 ? 'ethereum' : _b, fromBlock = _a.fromBlock, toBlock = _a.toBlock, fromTimestamp = _a.fromTimestamp, toTimestamp = _a.toTimestamp, eventAbi = _a.eventAbi, topic = _a.topic, topics = _a.topics, extraTopics = _a.extraTopics, // can be passed as input as extra filter arguments
+    _c = _a.skipCache, // can be passed as input as extra filter arguments
+    skipCache = _c === void 0 ? false : _c, _d = _a.skipCacheRead, skipCacheRead = _d === void 0 ? false : _d, _e = _a.entireLog, entireLog = _e === void 0 ? false : _e, _f = _a.cacheInCloud, cacheInCloud = _f === void 0 ? false : _f, _g = _a.onlyArgs, onlyArgs = _g === void 0 ? false : _g, _h = _a.keys, keys = _h === void 0 ? [] : _h;
+    return __awaiter(this, void 0, void 0, function () {
+        function addLogsToCache(fromBlock, toBlock) {
+            return __awaiter(this, void 0, void 0, function () {
+                var metadata, logs, logIndices;
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            metadata = cacheData.metadata;
+                            return [4 /*yield*/, (0, _1.getLogs)({
+                                    chain: chain,
+                                    target: target,
+                                    topic: topic,
+                                    keys: keys,
+                                    topics: topics,
+                                    fromBlock: fromBlock,
+                                    toBlock: toBlock,
+                                })];
+                        case 1:
+                            logs = (_b.sent()).output;
+                            (_a = cacheData.logs).push.apply(_a, logs);
+                            logIndices = new Set();
+                            cacheData.logs = cacheData.logs.filter(function (i) {
+                                var _a;
+                                var key = i.transactionHash + ((_a = i.logIndex) !== null && _a !== void 0 ? _a : i.index); // ethers v5 had logIndex, ethers v6 has index
+                                if (!(i.hasOwnProperty('logIndex') || i.hasOwnProperty('index')) || !i.hasOwnProperty('transactionHash')) {
+                                    (0, debugLog_1.debugLog)(i, i.logIndex, i.index, i.transactionHash);
+                                    throw new Error('Missing crucial field');
+                                }
+                                if (logIndices.has(key))
+                                    return false;
+                                logIndices.add(key);
+                                return true;
+                            });
+                            if (!metadata.fromBlock || fromBlock < metadata.fromBlock)
+                                metadata.fromBlock = fromBlock;
+                            if (!metadata.toBlock || toBlock > metadata.toBlock)
+                                metadata.toBlock = toBlock;
+                            if (!!skipCache) return [3 /*break*/, 3];
+                            return [4 /*yield*/, (0, cache_1.writeCache)(getFile(), cacheData, { skipR2CacheWrite: !cacheInCloud })];
+                        case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        }
+        function _getCache() {
+            return __awaiter(this, void 0, void 0, function () {
+                var key, defaultRes, cache;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            key = getFile();
+                            defaultRes = {
+                                logs: [],
+                            };
+                            if (skipCache || skipCacheRead)
+                                return [2 /*return*/, defaultRes];
+                            return [4 /*yield*/, (0, cache_1.readCache)(key, { skipR2Cache: !cacheInCloud })];
+                        case 1:
+                            cache = _a.sent();
+                            if (!cache.metadata || cache.metadata.version !== currentVersion)
+                                return [2 /*return*/, defaultRes];
+                            return [2 /*return*/, cache];
+                    }
+                });
+            });
+        }
+        function getFile() {
+            var extraKey = topics === null || topics === void 0 ? void 0 : topics.join('-').toLowerCase();
+            if (!extraKey)
+                throw new Error('extraKey is required');
+            if (keys.length)
+                extraKey += '-' + keys.join('-').toLowerCase();
+            return "event-logs/".concat(chain, "/").concat(target.toLowerCase(), "/").concat(target.toLowerCase());
+        }
+        // we need to form filter topic with indexed keyword, else it messes up generated topic string
+        function toFilterTopic(topic) {
+            if (typeof topic === 'string') {
+                if (topic.startsWith('0x'))
+                    return topic;
+                topic = new ethers_1.Interface([topic]);
+            }
+            var fragment = topic.fragments[0];
+            return (0, ethers_1.id)("".concat(fragment.name, "(").concat(fragment.inputs.map(function (i) { return i.type; }).join(','), ")"));
+        }
+        var iface, cacheData, isFirstRun, metadata, logs;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
+                case 0:
+                    if (!target)
+                        throw new Error('target is required');
+                    if (!fromBlock && !fromTimestamp)
+                        throw new Error('fromBlock or fromTimestamp is required');
+                    if (!toBlock && !toTimestamp)
+                        throw new Error('toBlock or toTimestamp is required');
+                    if (!!fromBlock) return [3 /*break*/, 2];
+                    return [4 /*yield*/, (0, blocks_1.getBlock)(chain, fromTimestamp)];
+                case 1:
+                    fromBlock = (_j.sent()).block;
+                    _j.label = 2;
+                case 2:
+                    if (!!toBlock) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, blocks_1.getBlock)(chain, toTimestamp)];
+                case 3:
+                    toBlock = (_j.sent()).block;
+                    _j.label = 4;
+                case 4:
+                    if ((!topics || !topics.length) && !topic) {
+                        if (topic) {
+                            topic = toFilterTopic(topic);
+                        }
+                        else if (eventAbi) {
+                            iface = new ethers_1.Interface([eventAbi]);
+                            topic = toFilterTopic(iface);
+                        }
+                        else {
+                            throw new Error('eventAbi | topic | topics are required');
+                        }
+                        topics = [topic];
+                        if (extraTopics)
+                            topics.push.apply(topics, extraTopics);
+                    }
+                    return [4 /*yield*/, _getCache()];
+                case 5:
+                    cacheData = _j.sent();
+                    isFirstRun = !cacheData.metadata;
+                    if (isFirstRun)
+                        cacheData.metadata = { version: currentVersion };
+                    if (!isFirstRun) return [3 /*break*/, 7];
+                    return [4 /*yield*/, addLogsToCache(fromBlock, toBlock)];
+                case 6:
+                    _j.sent();
+                    return [3 /*break*/, 11];
+                case 7:
+                    metadata = cacheData.metadata;
+                    if (!(fromBlock < metadata.fromBlock)) return [3 /*break*/, 9];
+                    return [4 /*yield*/, addLogsToCache(fromBlock, metadata.fromBlock - 1)];
+                case 8:
+                    _j.sent();
+                    _j.label = 9;
+                case 9:
+                    if (!(toBlock > metadata.toBlock)) return [3 /*break*/, 11];
+                    return [4 /*yield*/, addLogsToCache(metadata.toBlock + 1, toBlock)];
+                case 10:
+                    _j.sent();
+                    _j.label = 11;
+                case 11:
+                    logs = cacheData.logs.filter(function (i) {
+                        if (i.blockNumber < fromBlock)
+                            return false;
+                        if (i.blockNumber > toBlock)
+                            return false;
+                        return true;
+                    });
+                    if (!eventAbi || entireLog)
+                        return [2 /*return*/, logs];
+                    return [2 /*return*/, logs.map(function (i) { return iface.parseLog(i); }).map(function (i) { return onlyArgs ? i.args : i; })];
+            }
+        });
+    });
+}
+exports.getLogs = getLogs;
+exports.default = getLogs;

package/package.json

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