@defillama/sdk 5.0.10 → 5.0.11

package/build/util/logs.js

@@ -1,241 +1,168 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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 };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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 p_limit_1 = __importDefault(require("p-limit"));
-var env_1 = require("./env");
-var currentVersion = 'v2';
-function getLogs(options) {
-    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(extraKey);
+const _1 = require(".");
+const ethers_1 = require("ethers");
+const blocks_1 = require("./blocks");
+const cache_1 = require("./cache");
+const debugLog_1 = require("./debugLog");
+const p_limit_1 = __importDefault(require("p-limit"));
+const env_1 = require("./env");
+const currentVersion = 'v3';
+async function getLogs(options) {
+    let { target, chain = 'ethereum', fromBlock, toBlock, fromTimestamp, toTimestamp, eventAbi, topic, topics, extraTopics, // can be passed as input as extra filter arguments
+    skipCache = false, skipCacheRead = false, entireLog = false, cacheInCloud = false, onlyArgs = false, keys = [], //  [Deprecated] This is just used to select only part of the logs
+    targets, flatten = true, } = options;
+    if (!target && !(targets === null || targets === void 0 ? void 0 : targets.length))
+        throw new Error('target|targets is required');
+    if (!fromBlock && !fromTimestamp)
+        throw new Error('fromBlock or fromTimestamp is required');
+    if (!toBlock && !toTimestamp)
+        throw new Error('toBlock or toTimestamp is required');
+    const limiter = getChainLimiter(chain);
+    if (!fromBlock)
+        fromBlock = (await limiter(() => (0, blocks_1.getBlock)(chain, fromTimestamp))).block;
+    if (!toBlock)
+        toBlock = (await limiter(() => (0, blocks_1.getBlock)(chain, toTimestamp))).block;
+    if (!fromBlock || !toBlock)
+        throw new Error('fromBlock and toBlock must be > 0');
+    if (targets === null || targets === void 0 ? void 0 : targets.length) {
+        const newOptions = { ...options, fromBlock, toBlock };
+        delete newOptions.targets;
+        const res = await Promise.all(targets.map(i => getLogs({ ...newOptions, target: i })));
+        if (flatten)
+            return res.flat();
+        return res;
+    }
+    let iface;
+    if (eventAbi)
+        iface = new ethers_1.Interface([eventAbi]);
+    if ((!topics || !topics.length)) {
+        if (topic)
+            topic = toFilterTopic(topic);
+        else if (eventAbi)
+            topic = toFilterTopic(iface);
+        else {
+            throw new Error('eventAbi | topic | topics are required');
         }
-        // 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]);
+        topics = [topic];
+        if (extraTopics)
+            topics.push(...extraTopics);
+    }
+    let caches = await _getCache();
+    const isFirstRun = !caches.length;
+    if (isFirstRun || skipCacheRead) {
+        await limiter(() => addLogsToCache(fromBlock, toBlock));
+    }
+    else {
+        let _fromBlock = fromBlock; // we need to keep a copy of fromBlock as it will be modified
+        let _toBlock = toBlock; // we need to keep a copy of toBlock as it will be modified
+        const firstCache = caches[0];
+        const lastCache = caches[caches.length - 1];
+        for (const cacheData of caches) {
+            const { fromBlock: cFirstBlock, toBlock: cToBlock } = cacheData.metadata;
+            if (_toBlock < firstCache.metadata.fromBlock || _fromBlock > lastCache.metadata.toBlock) { // no intersection with any cache
+                await limiter(() => addLogsToCache(_fromBlock, _toBlock));
+                break;
+            }
+            if (_fromBlock >= cToBlock)
+                continue; // request is after cache end
+            if (_fromBlock <= cFirstBlock) { // request is before cache start
+                await limiter(() => addLogsToCache(_fromBlock, Math.min(_toBlock, cFirstBlock - 1)));
             }
-            var fragment = topic.fragments[0];
-            return (0, ethers_1.id)("".concat(fragment.name, "(").concat(fragment.inputs.map(function (i) { return i.type; }).join(','), ")"));
+            if (_toBlock <= cToBlock)
+                break; // request ends before cache end
+            _fromBlock = cToBlock;
         }
-        var target, _a, chain, fromBlock, toBlock, fromTimestamp, toTimestamp, eventAbi, topic, topics, extraTopics, _b, skipCache, _c, skipCacheRead, _d, entireLog, _e, cacheInCloud, _f, onlyArgs, _g, keys, targets, _h, flatten, limiter, newOptions_1, res, iface, cacheData, isFirstRun, metadata_1, logs;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
-                case 0:
-                    target = options.target, _a = options.chain, chain = _a === void 0 ? 'ethereum' : _a, fromBlock = options.fromBlock, toBlock = options.toBlock, fromTimestamp = options.fromTimestamp, toTimestamp = options.toTimestamp, eventAbi = options.eventAbi, topic = options.topic, topics = options.topics, extraTopics = options.extraTopics, _b = options.skipCache, skipCache = _b === void 0 ? false : _b, _c = options.skipCacheRead, skipCacheRead = _c === void 0 ? false : _c, _d = options.entireLog, entireLog = _d === void 0 ? false : _d, _e = options.cacheInCloud, cacheInCloud = _e === void 0 ? false : _e, _f = options.onlyArgs, onlyArgs = _f === void 0 ? false : _f, _g = options.keys, keys = _g === void 0 ? [] : _g, targets = options.targets, _h = options.flatten, flatten = _h === void 0 ? true : _h;
-                    if (!target && !(targets === null || targets === void 0 ? void 0 : targets.length))
-                        throw new Error('target|targets is required');
-                    if (!fromBlock && !fromTimestamp)
-                        throw new Error('fromBlock or fromTimestamp is required');
-                    if (!toBlock && !toTimestamp)
-                        throw new Error('toBlock or toTimestamp is required');
-                    limiter = getChainLimiter(chain);
-                    if (!!fromBlock) return [3 /*break*/, 2];
-                    return [4 /*yield*/, limiter(function () { return (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*/, limiter(function () { return (0, blocks_1.getBlock)(chain, toTimestamp); })];
-                case 3:
-                    toBlock = (_j.sent()).block;
-                    _j.label = 4;
-                case 4:
-                    if (!(targets === null || targets === void 0 ? void 0 : targets.length)) return [3 /*break*/, 6];
-                    newOptions_1 = __assign(__assign({}, options), { fromBlock: fromBlock, toBlock: toBlock });
-                    delete newOptions_1.targets;
-                    return [4 /*yield*/, Promise.all(targets.map(function (i) { return getLogs(__assign(__assign({}, newOptions_1), { target: i })); }))];
-                case 5:
-                    res = _j.sent();
-                    if (flatten)
-                        return [2 /*return*/, res.flat()];
-                    return [2 /*return*/, res];
-                case 6:
-                    if (eventAbi)
-                        iface = new ethers_1.Interface([eventAbi]);
-                    if ((!topics || !topics.length)) {
-                        if (topic)
-                            topic = toFilterTopic(topic);
-                        else if (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 7:
-                    cacheData = _j.sent();
-                    isFirstRun = !cacheData.metadata;
-                    if (isFirstRun)
-                        cacheData.metadata = { version: currentVersion };
-                    if (!isFirstRun) return [3 /*break*/, 9];
-                    return [4 /*yield*/, limiter(function () { return addLogsToCache(fromBlock, toBlock); })];
-                case 8:
-                    _j.sent();
-                    return [3 /*break*/, 13];
-                case 9:
-                    metadata_1 = cacheData.metadata;
-                    if (!(fromBlock < metadata_1.fromBlock)) return [3 /*break*/, 11];
-                    return [4 /*yield*/, limiter(function () { return addLogsToCache(fromBlock, metadata_1.fromBlock); })];
-                case 10:
-                    _j.sent();
-                    _j.label = 11;
-                case 11:
-                    if (!(toBlock > metadata_1.toBlock)) return [3 /*break*/, 13];
-                    return [4 /*yield*/, limiter(function () { return addLogsToCache(metadata_1.toBlock, toBlock); })];
-                case 12:
-                    _j.sent();
-                    _j.label = 13;
-                case 13:
-                    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; })];
+    }
+    const logs = [];
+    for (const cacheData of caches) {
+        const { fromBlock: cFirstBlock, toBlock: cToBlock } = cacheData.metadata;
+        if (fromBlock > cToBlock || toBlock < cFirstBlock)
+            continue; // no intersection with cache
+        logs.push(...cacheData.logs.filter((i) => i.blockNumber >= fromBlock && i.blockNumber <= toBlock));
+    }
+    if (!eventAbi || entireLog)
+        return logs;
+    return logs.map((i) => iface.parseLog(i)).map((i) => onlyArgs ? i.args : i);
+    async function addLogsToCache(fromBlock, toBlock) {
+        (0, debugLog_1.debugLog)('adding logs to cache: ', fromBlock, toBlock, target, topic);
+        if (fromBlock > toBlock)
+            return; // no data to add
+        fromBlock = fromBlock - 10;
+        toBlock = toBlock + 10;
+        let { output: logs } = await (0, _1.getLogs)({
+            chain, target: target, topic: topic, keys, topics, fromBlock, toBlock,
+        });
+        caches.push({
+            logs,
+            metadata: { fromBlock, toBlock, }
+        });
+        caches.sort((a, b) => a.metadata.fromBlock - b.metadata.fromBlock);
+        const mergedCaches = [caches[0]];
+        caches.slice(1).forEach(i => {
+            const last = mergedCaches[mergedCaches.length - 1];
+            if (last.metadata.toBlock + 1 > i.metadata.fromBlock) {
+                last.metadata.toBlock = i.metadata.toBlock;
+                last.logs = dedupLogs(last.logs, i.logs);
+            }
+            else {
+                mergedCaches.push(i);
+            }
+        });
+        caches = mergedCaches;
+        if (!skipCache)
+            await (0, cache_1.writeCache)(getFile(), { caches, version: currentVersion }, { skipR2CacheWrite: !cacheInCloud });
+    }
+    function dedupLogs(...logs) {
+        const logIndices = new Set();
+        return logs.flat().filter((i) => {
+            var _a;
+            let 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: logIndex/index');
             }
+            if (logIndices.has(key))
+                return false;
+            logIndices.add(key);
+            return true;
         });
-    });
+    }
+    async function _getCache() {
+        const key = getFile();
+        const defaultRes = [];
+        if (skipCache)
+            return defaultRes;
+        let cache = await (0, cache_1.readCache)(key, { skipR2Cache: !cacheInCloud });
+        if (!cache.caches || !cache.caches.length || cache.version !== currentVersion)
+            return defaultRes;
+        return cache.caches;
+    }
+    function getFile() {
+        let 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/${chain}/${target.toLowerCase()}-${extraKey}`;
+    }
+    // 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]);
+        }
+        const fragment = topic.fragments[0];
+        return (0, ethers_1.id)(`${fragment.name}(${fragment.inputs.map((i) => i.type).join(',')})`);
+    }
 }
 exports.getLogs = getLogs;
-var chainLimiters = {};
+const chainLimiters = {};
 function getChainLimiter(chain) {
     if (!chainLimiters[chain])
         chainLimiters[chain] = createLimiter(chain);

package/build/util/promisePool.js

@@ -1,67 +1,16 @@
 "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 });
-var promise_pool_1 = require("@supercharge/promise-pool");
-var generalUtil_1 = require("../generalUtil");
+const promise_pool_1 = require("@supercharge/promise-pool");
+const generalUtil_1 = require("../generalUtil");
 generalUtil_1.formError;
-function runInPromisePool(params) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, results, errors, flatResults;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, promise_pool_1.PromisePool
-                        .withConcurrency(params.concurrency)
-                        .for(params.items)
-                        .process(function (item, i) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, params.processor(item, i)];
-                            case 1: return [2 /*return*/, [_a.sent(), i]];
-                        }
-                    }); }); })];
-                case 1:
-                    _a = _b.sent(), results = _a.results, errors = _a.errors;
-                    if (errors.length)
-                        throw (0, generalUtil_1.formError)(null, { promisePoolErrors: errors });
-                    flatResults = results.sort(function (a, b) { return a[1] - b[1]; }).map((function (i) { return i[0]; }));
-                    return [2 /*return*/, flatResults];
-            }
-        });
-    });
+async function runInPromisePool(params) {
+    const { results, errors } = await promise_pool_1.PromisePool
+        .withConcurrency(params.concurrency)
+        .for(params.items)
+        .process(async (item, i) => [await params.processor(item, i), i]);
+    if (errors.length)
+        throw (0, generalUtil_1.formError)(null, { promisePoolErrors: errors });
+    const flatResults = results.sort((a, b) => a[1] - b[1]).map((i => i[0]));
+    return flatResults;
 }
 exports.default = runInPromisePool;

package/build/util/r2.js

@@ -1,48 +1,16 @@
 "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 };
-    }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getR2JSONString = exports.storeR2JSONString = void 0;
-var env_1 = require("./env");
-var _a = require("@aws-sdk/client-s3"), S3Client = _a.S3Client, PutObjectCommand = _a.PutObjectCommand, GetObjectCommand = _a.GetObjectCommand;
-var R2_ENDPOINT = env_1.ENV_CONSTANTS.R2_ENDPOINT, R2_ACCESS_KEY_ID = env_1.ENV_CONSTANTS.R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY = env_1.ENV_CONSTANTS.R2_SECRET_ACCESS_KEY;
-var datasetBucket = "defillama-datasets";
-var publicBucketUrl = "https://defillama-datasets.llama.fi";
-var R2;
+const axios_1 = __importDefault(require("axios"));
+const env_1 = require("./env");
+const { S3Client, PutObjectCommand, GetObjectCommand, } = require("@aws-sdk/client-s3");
+const { R2_ENDPOINT, R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY } = env_1.ENV_CONSTANTS;
+const datasetBucket = "defillama-datasets";
+const publicBucketUrl = "https://defillama-datasets.llama.fi";
+let R2;
 if (R2_ENDPOINT && R2_ACCESS_KEY_ID && R2_SECRET_ACCESS_KEY) {
     R2 = new S3Client({
         region: "auto",
@@ -53,62 +21,35 @@ if (R2_ENDPOINT && R2_ACCESS_KEY_ID && R2_SECRET_ACCESS_KEY) {
         },
     });
 }
-var getKey = function (filename) { return filename.replace(/(:|'|#)/g, '/'); };
-function storeR2JSONString(filename, body) {
-    return __awaiter(this, void 0, void 0, function () {
-        var command;
-        return __generator(this, function (_a) {
-            if (typeof body !== 'string')
-                body = body.toString('base64');
-            if (!R2)
-                return [2 /*return*/];
-            command = new PutObjectCommand({
-                Bucket: datasetBucket,
-                Key: getKey(filename),
-                Body: body,
-                ContentType: "application/json",
-            });
-            return [2 /*return*/, R2.send(command)];
-        });
+const getKey = (filename) => filename.replace(/(:|'|#)/g, '/');
+async function storeR2JSONString(filename, body) {
+    if (typeof body !== 'string')
+        body = body.toString('base64');
+    if (!R2)
+        return;
+    const command = new PutObjectCommand({
+        Bucket: datasetBucket,
+        Key: getKey(filename),
+        Body: body,
+        ContentType: "application/json",
     });
+    return R2.send(command);
 }
 exports.storeR2JSONString = storeR2JSONString;
-function getR2JSONString(filename) {
-    return __awaiter(this, void 0, void 0, function () {
-        function _fetchData() {
-            return __awaiter(this, void 0, void 0, function () {
-                var response;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, fetch("".concat(publicBucketUrl, "/").concat(filename))];
-                        case 1:
-                            response = _a.sent();
-                            return [2 /*return*/, response.text()];
-                    }
-                });
-            });
-        }
-        var command, Body, e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 5, , 6]);
-                    if (!!R2) return [3 /*break*/, 2];
-                    return [4 /*yield*/, _fetchData()];
-                case 1: return [2 /*return*/, _a.sent()];
-                case 2:
-                    command = new GetObjectCommand({ Bucket: datasetBucket, Key: getKey(filename), });
-                    return [4 /*yield*/, R2.send(command)];
-                case 3:
-                    Body = (_a.sent()).Body;
-                    return [4 /*yield*/, Body.transformToString()];
-                case 4: return [2 /*return*/, _a.sent()];
-                case 5:
-                    e_1 = _a.sent();
-                    return [2 /*return*/, {}];
-                case 6: return [2 /*return*/];
-            }
-        });
-    });
+async function getR2JSONString(filename) {
+    try {
+        if (!R2)
+            return await _fetchData();
+        const command = new GetObjectCommand({ Bucket: datasetBucket, Key: getKey(filename), });
+        const { Body } = await R2.send(command);
+        return await Body.transformToString();
+    }
+    catch (e) {
+        return {};
+    }
+    async function _fetchData() {
+        const response = await (0, axios_1.default)(`${publicBucketUrl}/${filename}`);
+        return response.data;
+    }
 }
 exports.getR2JSONString = getR2JSONString;