@defillama/sdk 5.0.198 → 5.0.204

package/build/types.d.ts

@@ -11,7 +11,8 @@ export type CallsParams = {
 };
 export type CallOptions = {
     target: Address;
-    abi: string | any;
+    abi?: string | any;
+    abis?: string[];
     block?: Block;
     params?: CallParams;
     chain?: Chain | string;
@@ -23,7 +24,8 @@ export type CallOptions = {
 };
 export type Chain = string;
 export type MulticallOptions = {
-    abi: string | any;
+    abi?: string | any;
+    abis?: string[];
     calls: CallsParams[] | (string | number)[];
     block?: Block;
     target?: Address;

package/build/util/common.js

@@ -122,6 +122,9 @@ function sumSingleBalance(balances, token, balance, chain) {
         else
             throw new Error('Invalid balance value:' + balance + ' ' + token);
     }
+    if (!token || token.trim() === '') {
+        throw new Error('Missing token address/symbol');
+    }
     if (typeof balance === 'number' || (balances[token] && typeof balances[token] === 'number')) {
         const prevBalance = +(balances.hasOwnProperty(token) ? balances[token] : 0);
         if (typeof prevBalance !== 'number' || isNaN(prevBalance))

package/build/util/computeTVL.js

@@ -26,6 +26,9 @@ async function computeTVL(balances, timestamp, { debug = false } = {}) {
         // if (+balance <= 0) return;
         if (+balance === 0)
             return;
+        if (!token || token.trim() === '') {
+            return;
+        }
         const key = tokenToKey(token).toLowerCase();
         let { price, confidence, decimals = 0, symbol = token } = (_a = priceCache[key]) !== null && _a !== void 0 ? _a : {};
         if (!price || confidence < confidenceThreshold)
@@ -34,6 +37,8 @@ async function computeTVL(balances, timestamp, { debug = false } = {}) {
         usdTvl += value;
         if (symbol === 'ETH')
             symbol = 'WETH';
+        if (!symbol || symbol.trim() === '')
+            symbol = '-';
         (0, generalUtil_1.sumSingleBalance)(usdTokenBalances, symbol, value);
         if (debug && !isNaN(+value))
             debugData.tokenData.push({ symbol, value, token, price, confidence, balance, decimals, });

package/build/util/indexer.js

@@ -60,6 +60,7 @@ const indexer2ChainIdChainMapping = {
     80094: "berachain",
     999: "hyperliquid",
     143: "monad",
+    4326: "megaeth",
 };
 const indexerConfigs = {
     v1: {

package/build/util/updateProviderList.js

@@ -10,6 +10,7 @@ const promise_pool_1 = __importDefault(require("@supercharge/promise-pool"));
 const generalUtil_1 = require("../generalUtil");
 const concurrentCheckChains = +(process.env.SDK_BUILD_CONCURRENT_CHAINS || 7);
 const chainRemovalThreshold = +(process.env.SDK_BUILD_CHAIN_REMOVAL_THRESHOLD || 20);
+const droppedTestnetChainsSet = new Set([]);
 const providerList = providers_json_1.default;
 async function getChainData() {
     try {
@@ -38,15 +39,19 @@ async function main() {
         // .filter((i: any) => !i.status || (i.status === 'active' || i.status === 'incubating'))
         .filter((i) => i.shortName)
         .filter((i) => {
+        var _a, _b;
         if (currentChainsSet.has(i.shortName))
             return true;
         const bannedKeys = ['sepolia', 'test', 'goerli', 'devnet', 'holesky',];
         const bannedRPCKeys = ['sepolia', 'goerli', 'devnet', 'holesky'];
         const isTestnetKey = bannedKeys.some((j) => i.shortName.includes(j));
         const hasTestnetRPC = i.rpc.some((rpc) => bannedRPCKeys.some((k) => rpc === null || rpc === void 0 ? void 0 : rpc.url.includes(k)));
-        if (isTestnetKey || hasTestnetRPC)
-            console.log(`Excluding testnet chain ${i.name} (${i.shortName})`);
-        return !isTestnetKey && !hasTestnetRPC;
+        const hasTestnetName = ((_a = i.name) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('testnet')) || ((_b = i.name) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('devnet'));
+        if (isTestnetKey || hasTestnetRPC || hasTestnetName) {
+            droppedTestnetChainsSet.add(i.shortName);
+            // console.log(`Excluding testnet chain ${i.name} (${i.shortName})`)
+        }
+        return !isTestnetKey && !hasTestnetRPC && !hasTestnetName;
     });
     // trim/remove mainnet|-mainnet|_mainnet from short names, preliminary rpc filtering
     const rpcFilterRegex = /(wss\:|ws\:|terminet\.io|huobichain\.com|getblock\.io|bitstack\.com|nodereal.io\/v1|pokt\.network|histori\.xyz|chainstacklabs\.com|owlracle\.info|blastapi\.io)/;
@@ -64,7 +69,7 @@ async function main() {
             if (!j.url)
                 return false;
             if (rpcFilterRegex.test(j.url)) {
-                console.log(`Removing blacklisted rpc ${j.url} from ${i.name}`);
+                // console.log(`Removing blacklisted rpc ${j.url} from ${i.name}`)
                 return false; // remove anything with blacklisted words
             }
             return true;
@@ -117,16 +122,21 @@ async function main() {
         providerList[key] = providerList[shorName];
     }
     const droppedChains = Object.keys(oldProviders).filter(oldChain => providerList[oldChain] === undefined);
-    if (droppedChains.length > chainRemovalThreshold) {
-        throw new Error(`Following chains used to be included but is not anymore, can the devs fix please?\n${droppedChains.join(', ')}`);
+    const filteredDroppedChains = droppedChains.filter(i => !droppedTestnetChainsSet.has(i) && !i.includes('test'));
+    console.log('Dropped chains before testnet filtering:', droppedChains.length);
+    console.log('Dropped chains after testnet filtering:', filteredDroppedChains.length);
+    if (filteredDroppedChains.length > chainRemovalThreshold) {
+        throw new Error(`Following chains used to be included but is not anymore, can the devs fix please?\n${filteredDroppedChains.join(', ')}`);
     }
     delete providerList.bitcoin; // what were they smoking?
     const rpcCount = Object.values(providerList).reduce((acc, i) => { var _a; return acc + ((_a = i === null || i === void 0 ? void 0 : i.rpc.length) !== null && _a !== void 0 ? _a : 0); }, 0);
+    const rpcCountOld = Object.values(oldProviders).reduce((acc, i) => { var _a; return acc + ((_a = i === null || i === void 0 ? void 0 : i.rpc.length) !== null && _a !== void 0 ? _a : 0); }, 0);
     console.log('Final provider list:');
     console.log('Chain count:', Object.keys(providerList).length);
-    console.log('Dropped chain count:', droppedChains.length);
+    console.log('Dropped chain count:', filteredDroppedChains.length);
     console.log('RPC count:', rpcCount);
-    console.log('Dropped chains:', droppedChains.join(', '));
+    console.log('RPC count current:', rpcCountOld);
+    console.log('Dropped chains:', filteredDroppedChains.join(', '));
     fs_1.default.writeFileSync(__dirname + '/../providers.json', JSON.stringify(providerList));
 }
 const blacklist = [
@@ -172,29 +182,40 @@ const chainShortNameMapping = {
     hydragon: 'hydra',
     camp: 'campmainnet',
     mantra: 'mantrachain',
+    saga: 'sagaevm',
 };
 async function filterForWorkingRPCs(rpc, chain, chainId) {
-    if (rpc.length < 10)
+    if (rpc.length < 4)
         return rpc;
     rpc = filterRPCs(rpc);
-    const promises = await Promise.all(rpc.map(async (i) => {
-        try {
-            const data = await (0, generalUtil_1.postJson)(i, {
-                jsonrpc: '2.0',
-                method: 'eth_blockNumber',
-                params: [],
-                id: 1
-            }, {
-                timeout: 30000
-            });
-            if (data.result)
-                return true;
-        }
-        catch (e) {
-            console.log('ignoring bad rpc', chain, e === null || e === void 0 ? void 0 : e.message);
+    const filteredRPCs = [];
+    await (0, generalUtil_1.runInPromisePool)({
+        items: rpc,
+        concurrency: concurrentCheckChains,
+        permitFailure: true,
+        processor: async (i) => {
+            try {
+                const data = await (0, generalUtil_1.postJson)(i, {
+                    jsonrpc: '2.0',
+                    method: 'eth_chainId',
+                    params: [],
+                    id: 1
+                }, {
+                    timeout: 60000
+                });
+                if (data.result) {
+                    const returnedChainId = parseInt(data.result, 16);
+                    if (returnedChainId !== chainId) {
+                        console.log(`RPC ${i} for ${chain} returned invalid chainId ${returnedChainId}, expected ${chainId}`);
+                    }
+                    filteredRPCs.push(i);
+                }
+            }
+            catch (e) {
+                console.log('ignoring bad rpc', chain, e === null || e === void 0 ? void 0 : e.message);
+            }
         }
-        return false;
-    }));
-    return rpc.filter((_i, index) => promises[index]);
+    });
+    return filteredRPCs;
 }
 main();

package/package.json

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