@defillama/sdk 2.3.112 → 2.3.114

package/build/abi/multicall.js

@@ -317,6 +317,10 @@ function multicallAddress(chainId) {
             return "0x176CcFFbAB792Aaa0da7C430FE20a7106d969f66";
         case 53935: // dfk
             return "0x5b24224dC16508DAD755756639E420817DD4c99E";
+        case 3000: // echelon
+            return "0xe6d0cEE385992029Cb64C94A2dF6d0331937B2C8";
+        case 55: // zyx
+            return "0xd0dd5446f58D6f4F4A669f289E4268c1b12AEc31";
         default:
             return null;
     }

package/build/computeTVL/index.d.ts

@@ -55,6 +55,5 @@ export default function (rawBalances: Balances, timestamp: number | "now", verbo
     usdTvl: number;
     usdTokenBalances: ReturnedTokenBalances;
     tokenBalances: ReturnedTokenBalances;
-    rawTokenBalances: ReturnedTokenBalances;
 }>;
 export {};

package/build/computeTVL/index.js

@@ -45,6 +45,7 @@ var humanizeNumber_1 = require("./humanizeNumber");
 var prices_1 = require("./prices");
 var node_fetch_1 = __importDefault(require("node-fetch"));
 var generalUtil_1 = require("../generalUtil");
+var index_1 = require("./../util/index");
 function tokenMulticall(addresses, abi, chain) {
     return abi_1.multiCall({
         abi: abi,
@@ -299,11 +300,11 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                                         chains.forEach(function (chain) {
                                             if (address.startsWith(chain)) {
                                                 chainSelector_1 = chain;
-                                                normalizedAddress_1 = address.slice(chain.length + 1);
+                                                normalizedAddress_1 = index_1.normalizeAddress(address.slice(chain.length + 1));
                                             }
                                         });
                                         chainTokenPrices = (_b = allChainTokenPrices[chainSelector_1]) !== null && _b !== void 0 ? _b : {};
-                                        chainAddress_1 = chainSelector_1 + ":" + normalizedAddress_1.toLowerCase();
+                                        chainAddress_1 = chainSelector_1 + ":" + normalizedAddress_1;
                                         coinData = symbolsAndDecimals.find(function (coin) { return coin.coin === chainAddress_1; });
                                         tokenSymbol = (_c = coinData === null || coinData === void 0 ? void 0 : coinData.symbol) === null || _c === void 0 ? void 0 : _c.toUpperCase();
                                         if (tokenSymbol === undefined || tokenSymbol === null) {
@@ -316,14 +317,14 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                                         else {
                                             amount = Number(balance) / Math.pow(10, Number(tokenDecimals));
                                         }
-                                        price = (_d = chainTokenPrices[normalizedAddress_1.toLowerCase()]) === null || _d === void 0 ? void 0 : _d.usd;
-                                        addTokenBalance(rawTokenBalances, normalizedAddress_1.toLowerCase(), amount);
+                                        price = (_d = chainTokenPrices[normalizedAddress_1]) === null || _d === void 0 ? void 0 : _d.usd;
+                                        //addTokenBalance(rawTokenBalances, normalizedAddress, amount)
                                     }
                                     else {
                                         tokenSymbol = address;
                                         price = (_e = allChainTokenPrices["coingecko"][address.toLowerCase()]) === null || _e === void 0 ? void 0 : _e.usd;
                                         amount = Number(balance);
-                                        addTokenBalance(rawTokenBalances, "coingecko:" + address.toLowerCase(), amount);
+                                        //addTokenBalance(rawTokenBalances, `coingecko:${address.toLowerCase()}`, amount)
                                     }
                                     if (price === undefined) {
                                         if (verbose) {
@@ -365,7 +366,7 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                             usdTvl: usdTvl,
                             usdTokenBalances: usdTokenBalances,
                             tokenBalances: tokenBalances,
-                            rawTokenBalances: rawTokenBalances
+                            //rawTokenBalances
                         }];
             }
         });

package/build/general.js

@@ -64,7 +64,7 @@ exports.providers = {
     boba: createProvider("boba", "https://mainnet.boba.network/", 288),
     cronos: createProvider("cronos", "https://cronosrpc-1.xstaking.sg,https://evm.cronos.org,https://rpc.vvs.finance,https://evm-cronos.crypto.org", 25),
     polis: createProvider("polis", "https://rpc.polis.tech", 333999),
-    zyx: createProvider("zyx", "https://rpc-1.zyx.network/,https://rpc-2.zyx.network/,https://rpc-3.zyx.network/,https://rpc-5.zyx.network/", 55),
+    zyx: createProvider("zyx", "https://rpc-6.zyx.network,https://rpc-4.zyx.network,https://rpc-1.zyx.network/,https://rpc-2.zyx.network/,https://rpc-3.zyx.network/,https://rpc-5.zyx.network/", 55),
     telos: createProvider("telos", "https://mainnet.telos.net/evm,https://rpc1.eu.telos.net/evm,https://rpc1.us.telos.net/evm", 40),
     metis: createProvider("metis", "https://andromeda.metis.io/?owner=1088", 1088),
     ubiq: createProvider("ubiq", "https://rpc.octano.dev", 8),
@@ -104,7 +104,7 @@ exports.providers = {
     ontology_evm: createProvider("ontology_evm", "https://dappnode1.ont.io:10339", 58),
     jfin: createProvider("jfin", "https://rpc.jfinchain.com/", 3501),
     bitkub: createProvider("bitkub", "https://rpc.bitkubchain.io/", 96),
-    bitgert: createProvider("bitgert", "https://chainrpc.com", 32520),
+    bitgert: createProvider("bitgert", "https://rpc.icecreamswap.com,https://serverrpc.com,https://chainrpc.com,https://mainnet-rpc.brisescan.com", 32520),
     canto: createProvider("canto", "https://jsonrpc.canto.nodestake.top,https://canto.evm.chandrastation.com/", 7700),
     dogechain: createProvider("dogechain", "https://dogechain.ankr.com,https://rpc.dogechain.dog,https://rpc01-sg.dogechain.dog,https://rpc02-sg.dogechain.dog,https://rpc03-sg.dogechain.dog", 2000),
     posi: createProvider("posi", "https://api.posichain.org,https://api.s0.posichain.org", 900000),

package/build/util/index.js

@@ -63,10 +63,10 @@ var kavaBlockProvider = {
                     .then(function (res) { return res.json(); })
                     .then(function (block) { return ({
                     number: Number(block.block.header.height),
-                    timestamp: Math.round(Date.parse(block.block.header.time) / 1000),
+                    timestamp: Math.round(Date.parse(block.block.header.time) / 1000)
                 }); })];
         });
-    }); },
+    }); }
 };
 var terraBlockProvider = {
     getBlock: function (height) { return __awaiter(void 0, void 0, void 0, function () {
@@ -75,10 +75,10 @@ var terraBlockProvider = {
                     .then(function (res) { return res.json(); })
                     .then(function (block) { return ({
                     number: Number(block.block.header.height),
-                    timestamp: Math.round(Date.parse(block.block.header.time) / 1000),
+                    timestamp: Math.round(Date.parse(block.block.header.time) / 1000)
                 }); })];
         });
-    }); },
+    }); }
 };
 function getBlock(provider, height, chain) {
     return __awaiter(this, void 0, void 0, function () {
@@ -89,7 +89,7 @@ function getBlock(provider, height, chain) {
                 case 1:
                     block = _a.sent();
                     if (block === null) {
-                        throw new Error("Can't get block of chain " + (chain !== null && chain !== void 0 ? chain : 'ethereum'));
+                        throw new Error("Can't get block of chain " + (chain !== null && chain !== void 0 ? chain : "ethereum"));
                     }
                     return [2 /*return*/, block];
             }
@@ -132,14 +132,15 @@ function lookupBlock(timestamp, extraParams) {
                     return [4 /*yield*/, getBlock(provider, "latest", extraParams.chain)];
                 case 1:
                     lastBlock = _f.sent();
-                    if (extraParams.chain !== 'bsc' && (lastBlock.timestamp - timestamp) < -30 * 60) {
+                    if (extraParams.chain !== "bsc" &&
+                        lastBlock.timestamp - timestamp < -30 * 60) {
                         throw new Error("Last block of chain \"" + extraParams.chain + "\" is further than 30 minutes into the past. Provider is \"" + ((_b = (_a = provider) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.url) + "\"");
                     }
                     if (Math.abs(lastBlock.timestamp - timestamp) < 60) {
                         // Short-circuit in case we are trying to get the current block
                         return [2 /*return*/, {
                                 block: lastBlock.number,
-                                timestamp: lastBlock.timestamp,
+                                timestamp: lastBlock.timestamp
                             }];
                     }
                     high = lastBlock.number;
@@ -162,17 +163,18 @@ function lookupBlock(timestamp, extraParams) {
                     if (high - low > 4) return [3 /*break*/, 2];
                     _f.label = 5;
                 case 5:
-                    if (extraParams.chain !== 'bsc' && Math.abs(block.timestamp - timestamp) > 3600) {
+                    if (extraParams.chain !== "bsc" &&
+                        Math.abs(block.timestamp - timestamp) > 3600) {
                         throw new Error("Block selected is more than 1 hour away from the requested timestamp");
                     }
                     return [2 /*return*/, {
                             block: block.number,
-                            timestamp: block.timestamp,
+                            timestamp: block.timestamp
                         }];
                 case 6:
                     e_1 = _f.sent();
                     console.log(e_1);
-                    throw new Error("Couldn't find block height for chain " + ((_e = extraParams.chain) !== null && _e !== void 0 ? _e : 'ethereum') + ", RPC node rugged");
+                    throw new Error("Couldn't find block height for chain " + ((_e = extraParams.chain) !== null && _e !== void 0 ? _e : "ethereum") + ", RPC node rugged");
                 case 7: return [2 /*return*/];
             }
         });
@@ -192,12 +194,12 @@ function kyberTokens() {
                         acc[pair.contractAddress] = {
                             symbol: pair.symbol,
                             decimals: pair.decimals,
-                            ethPrice: pair.currentPrice,
+                            ethPrice: pair.currentPrice
                         };
                         return acc;
                     }, {});
                     return [2 /*return*/, {
-                            output: tokens,
+                            output: tokens
                         }];
             }
         });
@@ -219,7 +221,7 @@ function getLogs(params) {
                         address: params.target,
                         topics: (_a = params.topics) !== null && _a !== void 0 ? _a : [ethers_1.utils.id(params.topic)],
                         fromBlock: params.fromBlock,
-                        toBlock: params.toBlock, // We don't replicate Defipulse's bug because the results end up being the same anyway and hopefully they'll eventually fix it
+                        toBlock: params.toBlock // We don't replicate Defipulse's bug because the results end up being the same anyway and hopefully they'll eventually fix it
                     };
                     logs = [];
                     blockSpread = params.toBlock - params.fromBlock;
@@ -255,11 +257,11 @@ function getLogs(params) {
                             throw new Error("Unsupported");
                         }
                         return [2 /*return*/, {
-                                output: logs.map(function (log) { return log.topics; }),
+                                output: logs.map(function (log) { return log.topics; })
                             }];
                     }
                     return [2 /*return*/, {
-                            output: logs,
+                            output: logs
                         }];
             }
         });
@@ -275,8 +277,8 @@ function normalizeAddress(address) {
 }
 exports.normalizeAddress = normalizeAddress;
 function normalizePrefixes(address) {
-    var normalizedAddress = normalizeAddress(address);
-    if (address != normalizedAddress)
+    var prefix = address.substring(0, address.indexOf(":"));
+    if (["solana", "tezos"].includes(prefix))
         return address;
     return address.startsWith("0x")
         ? "ethereum:" + address.toLowerCase()
@@ -285,26 +287,26 @@ function normalizePrefixes(address) {
             : address.toLowerCase();
 }
 exports.normalizePrefixes = normalizePrefixes;
-var ethereumAddress = "0x0000000000000000000000000000000000000000";
-var weth = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
+var ethereumAddress = "ethereum:0x0000000000000000000000000000000000000000";
+var weth = "ethereum:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
 function normalizeBalances(balances) {
+    var _a;
     Object.keys(balances).map(function (key) {
-        var _a;
         if (+balances[key] === 0) {
             delete balances[key];
             return;
         }
-        var eth = balances[ethereumAddress];
-        if (eth !== undefined) {
-            balances[weth] = new bignumber_js_1.default((_a = balances[weth]) !== null && _a !== void 0 ? _a : 0).plus(eth).toFixed(0);
-            delete balances[ethereumAddress];
-        }
-        var normalisedKey = normalizeAddress(key);
+        var normalisedKey = normalizePrefixes(key);
         if (normalisedKey == key)
             return;
         generalUtil_1.sumSingleBalance(balances, normalisedKey, balances[key]);
         delete balances[key];
     });
+    var eth = balances[ethereumAddress];
+    if (eth !== undefined) {
+        balances[weth] = new bignumber_js_1.default((_a = balances[weth]) !== null && _a !== void 0 ? _a : 0).plus(eth).toFixed(0);
+        delete balances[ethereumAddress];
+    }
     return balances;
 }
 exports.normalizeBalances = normalizeBalances;

package/package.json

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