@defillama/sdk 5.0.131 → 5.0.134

package/build/util/LlamaProvider.js

@@ -9,6 +9,7 @@ const providers_json_1 = __importDefault(require("../providers.json"));
 const env_1 = require("./env");
 const debugLog_1 = require("./debugLog");
 const axios_1 = __importDefault(require("axios"));
+const rpcRequestCounter = {};
 class LlamaProvider extends ethers_1.FallbackProvider {
     constructor({ providers, chainId, chainName, archivalRPCs, }, fallbackConfig) {
         const networkish = { name: chainName, chainId };
@@ -78,6 +79,9 @@ class LlamaProvider extends ethers_1.FallbackProvider {
         return this._performAction('getTransactionReceipt', [_hash]);
     }
     async _performAction(method, params, attempts = 7) {
+        if (!rpcRequestCounter[this.chainName])
+            rpcRequestCounter[this.chainName] = 0;
+        rpcRequestCounter[this.chainName]++;
         await this._isReady;
         let runners = [...this.rpcs];
         if (method === 'getLogs') {
@@ -305,3 +309,9 @@ 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', () => {
+    if (Object.keys(rpcRequestCounter).length > 7) {
+        (0, debugLog_1.debugLog)('RPC request count per chain');
+        console.table(rpcRequestCounter);
+    }
+});

package/build/util/indexer.d.ts

@@ -33,6 +33,8 @@ export type IndexerGetLogsOptions = {
     limit?: number;
     offset?: number;
     debugMode?: boolean;
+    noTarget?: boolean;
+    parseLog?: boolean;
 };
 export type IndexerGetTokenTransfersOptions = {
     target?: Address;
@@ -48,11 +50,11 @@ export type IndexerGetTokenTransfersOptions = {
     offset?: number;
     debugMode?: boolean;
     fromAddressFilter?: string | string[];
-    transferType?: 'in' | 'out';
+    transferType?: 'in' | 'out' | 'all';
     tokens?: string | string[];
     token?: string;
 };
-export declare function getLogs({ chain, topic, topics, fromBlock, toBlock, all, limit, offset, target, targets, eventAbi, entireLog, flatten, extraTopics, fromTimestamp, toTimestamp, debugMode }: IndexerGetLogsOptions): Promise<any[]>;
+export declare function getLogs({ chain, topic, topics, fromBlock, toBlock, all, limit, offset, target, targets, eventAbi, entireLog, flatten, extraTopics, fromTimestamp, toTimestamp, debugMode, noTarget, parseLog, }: IndexerGetLogsOptions): Promise<any[]>;
 export declare function isIndexerEnabled(chain?: string): boolean;
 export declare function getTokenTransfers({ chain, fromAddressFilter, fromBlock, toBlock, all, limit, offset, target, targets, flatten, fromTimestamp, toTimestamp, debugMode, transferType, token, tokens, }: IndexerGetTokenTransfersOptions): Promise<any[]>;
 export {};

package/build/util/indexer.js

@@ -131,7 +131,7 @@ async function getTokens(address, { onlyWhitelisted = true, skipCacheRead = fals
     return tokens;
 }
 exports.getTokens = getTokens;
-async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock, all = true, limit = 1000, offset = 0, target, targets, eventAbi, entireLog = false, flatten = true, extraTopics, fromTimestamp, toTimestamp, debugMode = false }) {
+async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock, all = true, limit = 1000, offset = 0, target, targets, eventAbi, entireLog = false, flatten = true, extraTopics, fromTimestamp, toTimestamp, debugMode = false, noTarget = false, parseLog = true, }) {
     var _a, _b, _c;
     checkIndexerConfig();
     const chainId = chainToIDMapping[chain];
@@ -150,6 +150,8 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
         throw new Error('fromBlock or fromTimestamp is required');
     if (!toBlock && !toTimestamp)
         throw new Error('toBlock or toTimestamp is required');
+    if (!noTarget && !target && !(targets === null || targets === void 0 ? void 0 : targets.length))
+        throw new Error('target|targets is required or set the flag "noTarget" to true');
     if (!fromBlock)
         fromBlock = await (0, blocks_1.getBlockNumber)(chain, fromTimestamp);
     if (!toBlock)
@@ -185,6 +187,9 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
     }
     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);
+    // 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 = [];
         do {
@@ -232,12 +237,11 @@ async function getLogs({ chain = 'ethereum', topic, topics, fromBlock, toBlock,
         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',];
         deleteKeys.forEach(k => delete log[k]);
-        const parsedLog = iface === null || iface === void 0 ? void 0 : iface.parseLog({
-            data: log.data,
-            topics: log.topics,
-        });
+        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;
         log = !entireLog ? log.args : log;
+        if (entireLog && parseLog)
+            log.parsedLog = parsedLog;
         if (splitByAddress) {
             const index = addressIndexMap[source];
             mappedLogs[index].push(log);
@@ -313,11 +317,23 @@ async function getTokenTransfers({ chain = 'ethereum', fromAddressFilter, fromBl
             limit,
             offset,
             tokens,
+            from_address: false,
+            to_address: false,
         };
-        if (transferType === 'in')
-            params.to_address = true;
-        else
-            params.from_address = true;
+        switch (transferType) {
+            case 'in':
+                params.to_address = true;
+                break;
+            case 'out':
+                params.from_address = true;
+                break;
+            case 'all':
+                params.from_address = true;
+                params.to_address = true;
+                break;
+            default:
+                throw new Error('Invalid transferType');
+        }
         const { data: { transfers: _logs, totalCount } } = await axiosIndexer(`/token-transfers`, { params, });
         logs.push(..._logs);
         offset += limit;

package/build/util/logs.d.ts

@@ -22,6 +22,8 @@ export type GetLogsOptions = {
     skipIndexer?: boolean;
     onlyIndexer?: boolean;
     debugMode?: boolean;
+    noTarget?: boolean;
+    parseLog?: boolean;
 };
 export declare function getLogs(options: GetLogsOptions): Promise<EventLog[] | EventLog[][] | any[]>;
 export declare function toFilterTopic(topic: string): string;

package/build/util/logs.js

@@ -12,7 +12,8 @@ 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, skipIndexer = false, onlyIndexer = false, debugMode = false, } = options;
+    targets, flatten = true, skipIndexer = false, onlyIndexer = false, debugMode = false, noTarget = false, // we sometimes want to query logs without a target, but it will an be expensive bug if target/targets were not passed by mistake, so this is a safety check
+    parseLog = false, } = options;
     if (!skipIndexer && (0, indexer_1.isIndexerEnabled)(chain)) {
         try {
             const response = await (0, indexer_1.getLogs)({
@@ -41,6 +42,9 @@ async function getLogs(options) {
         toBlock = await (0, blocks_1.getBlockNumber)(chain, toTimestamp);
     if (!fromBlock || !toBlock)
         throw new Error('fromBlock and toBlock must be > 0');
+    if (!noTarget && !target && !(targets === null || targets === void 0 ? void 0 : targets.length)) {
+        throw new Error('target|targets is required or set the flag "noTarget" to true');
+    }
     if (targets === null || targets === void 0 ? void 0 : targets.length) {
         const newOptions = { ...options, fromBlock, toBlock };
         delete newOptions.targets;
@@ -103,8 +107,12 @@ async function getLogs(options) {
             continue; // no intersection with cache
         logs.push(...cacheData.logs.filter((i) => i.blockNumber >= fromBlock && i.blockNumber <= toBlock));
     }
-    if (!eventAbi || entireLog)
+    if (!eventAbi || entireLog) {
+        if (iface && parseLog) {
+            logs.forEach((i) => i.parsedLog = iface === null || iface === void 0 ? void 0 : iface.parseLog(i));
+        }
         return logs;
+    }
     return logs.map((i) => iface.parseLog(i)).map((i) => onlyArgs ? i.args : i);
     async function addLogsToCache(fromBlock, toBlock) {
         const debugTimeKey = `getLogs-${chain}-${topic}-${target}_${Math.random()}-${fromBlock}-${toBlock}`;

package/build/util/removeRedundantRPCs.d.ts

@@ -0,0 +1 @@
+export {};

package/build/util/removeRedundantRPCs.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const providers_json_1 = __importDefault(require("../providers.json"));
+const fs_1 = __importDefault(require("fs"));
+const axios_1 = __importDefault(require("axios"));
+const providerList = providers_json_1.default;
+async function getChainData() {
+    try {
+        const { data: chainData } = await (0, axios_1.default)('https://chainlist.org/rpcs.json');
+        return chainData;
+    }
+    catch (e) {
+        console.log('Failed to fetch chainlist.org, falling back to local copy');
+        // https://unpkg.com/@defillama/sdk@latest/build/providers.json
+        return require(__dirname + '/chainlistOrgCache.json');
+    }
+}
+async function main() {
+    let chainData = await getChainData();
+    const providerIDMap = {};
+    Object.values(chainData).forEach((i) => providerIDMap[i.chainId] = {
+        ...i,
+        rpc: new Set(i.rpc.map((j) => j.url))
+    });
+    Object.entries(providerList).forEach(([key, data]) => {
+        const chainListdata = providerIDMap[data.chainId];
+        if (!chainListdata)
+            return;
+        data.rpc = data.rpc.filter((i) => {
+            if (i.endsWith('/'))
+                i = i.slice(0, -1);
+            if (chainListdata.rpc.has(i)) {
+                console.log(`Removing rpc ${i} from ${key} as it is already in chainlist`);
+                return false;
+            }
+            return true;
+        });
+        if (!data.rpc.length && chainListdata.shortName === key) {
+            delete providerList[key];
+            console.log(`Removing ${key} as it has no rpcs left`);
+            return;
+        }
+    });
+    fs_1.default.writeFileSync(__dirname + '/../providers.json', JSON.stringify(providers_json_1.default, null, 2));
+}
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defillama/sdk",
-  "version": "5.0.131",
+  "version": "5.0.134",
   "description": "SDK for calculating TVL",
   "main": "build/index.js",
   "scripts": {
@@ -9,6 +9,7 @@
     "watch": "tsc --watch",
     "test": "LLAMA_DEBUG_MODE='' SDK_DEBUG='' jest",
     "update-providers": "ts-node src/util/updateProviderList.ts",
+    "remove-rpcs": "ts-node src/util/removeRedundantRPCs.ts",
     "format": "prettier --write \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
   },