@defillama/sdk 2.3.111 → 2.3.113

package/build/computeTVL/index.d.ts

@@ -55,5 +55,6 @@ 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,
@@ -189,7 +190,7 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
     if (getCoingeckoLock === void 0) { getCoingeckoLock = function () { return Promise.resolve(); }; }
     if (coingeckoMaxRetries === void 0) { coingeckoMaxRetries = 3; }
     return __awaiter(this, void 0, void 0, function () {
-        var balances, callTokenDecimals_1, chainIds, _i, chains_1, chain, normalizedBalances, _a, _b, tokenAddressOrName, normalizedAddressOrName, normalizedBalance, chain, symbolsAndDecimals, allChainTokenPrices, usdTokenBalances, tokenBalances, usdAmounts, usdTvl;
+        var balances, callTokenDecimals_1, chainIds, _i, chains_1, chain, normalizedBalances, _a, _b, tokenAddressOrName, normalizedAddressOrName, normalizedBalance, chain, symbolsAndDecimals, allChainTokenPrices, usdTokenBalances, tokenBalances, rawTokenBalances, usdAmounts, usdTvl;
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -285,6 +286,7 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                 case 7:
                     usdTokenBalances = {};
                     tokenBalances = {};
+                    rawTokenBalances = {};
                     usdAmounts = Object.entries(normalizedBalances).map(function (_a) {
                         var address = _a[0], balance = _a[1];
                         return __awaiter(_this, void 0, void 0, function () {
@@ -298,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) {
@@ -315,12 +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;
+                                        price = (_d = chainTokenPrices[normalizedAddress_1]) === null || _d === void 0 ? void 0 : _d.usd;
+                                        addTokenBalance(rawTokenBalances, normalizedAddress_1, 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);
                                     }
                                     if (price === undefined) {
                                         if (verbose) {
@@ -362,6 +366,7 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                             usdTvl: usdTvl,
                             usdTokenBalances: usdTokenBalances,
                             tokenBalances: tokenBalances,
+                            rawTokenBalances: rawTokenBalances
                         }];
             }
         });

package/build/util/index.d.ts

@@ -33,3 +33,10 @@ export declare function getLogs(params: {
 } | {
     output: Log[];
 }>;
+export declare function normalizeAddress(address: string): string;
+export declare function normalizePrefixes(address: string): string;
+export declare function normalizeBalances(balances: {
+    [address: string]: string;
+}): {
+    [address: string]: string;
+};

package/build/util/index.js

@@ -50,10 +50,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogs = exports.kyberTokens = exports.lookupBlock = exports.getLatestBlock = void 0;
+exports.normalizeBalances = exports.normalizePrefixes = exports.normalizeAddress = exports.getLogs = exports.kyberTokens = exports.lookupBlock = exports.getLatestBlock = void 0;
+var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var general_1 = require("../general");
 var node_fetch_1 = __importDefault(require("node-fetch"));
 var ethers_1 = require("ethers");
+var generalUtil_1 = require("../generalUtil");
 var kavaBlockProvider = {
     getBlock: function (height) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -61,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 () {
@@ -73,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 () {
@@ -87,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];
             }
@@ -130,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;
@@ -160,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*/];
             }
         });
@@ -190,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
                         }];
             }
         });
@@ -217,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;
@@ -253,14 +257,56 @@ 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
                         }];
             }
         });
     });
 }
 exports.getLogs = getLogs;
+function normalizeAddress(address) {
+    // sol amd tezos case sensitive so no normalising
+    var prefix = address.substring(0, address.indexOf(":"));
+    if (["solana", "tezos"].includes(prefix))
+        return address;
+    return address.toLowerCase();
+}
+exports.normalizeAddress = normalizeAddress;
+function normalizePrefixes(address) {
+    var normalizedAddress = normalizeAddress(address);
+    if (address == normalizedAddress)
+        return address;
+    return address.startsWith("0x")
+        ? "ethereum:" + address.toLowerCase()
+        : !address.includes(":")
+            ? "coingecko:" + address.toLowerCase()
+            : address.toLowerCase();
+}
+exports.normalizePrefixes = normalizePrefixes;
+var ethereumAddress = "ethereum:0x0000000000000000000000000000000000000000";
+var weth = "ethereum:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
+function normalizeBalances(balances) {
+    var _a;
+    Object.keys(balances).map(function (key) {
+        if (+balances[key] === 0) {
+            delete balances[key];
+            return;
+        }
+        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.111",
+  "version": "2.3.113",
   "description": "SDK for calculating TVL",
   "main": "build/index.js",
   "scripts": {
@@ -18,11 +18,10 @@
   "author": "",
   "license": "ISC",
   "types": "build/index.d.ts",
-  "files": [
-    "build"
-  ],
+  "files": ["build"],
   "dependencies": {
     "@supercharge/promise-pool": "^2.1.0",
+    "bignumber.js": "^9.1.0",
     "ethers": "^5.4.5",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",