@defillama/sdk 2.3.110 → 2.3.112

package/build/abi/multicall.js

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

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

@@ -189,7 +189,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 +285,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 () {
@@ -316,11 +317,13 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                                             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);
                                     }
                                     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 +365,7 @@ function default_1(rawBalances, timestamp, verbose, knownTokenPrices, getCoingec
                             usdTvl: usdTvl,
                             usdTokenBalances: usdTokenBalances,
                             tokenBalances: tokenBalances,
+                            rawTokenBalances: rawTokenBalances
                         }];
             }
         });

package/build/general.js

@@ -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://rpc.icecreamswap.com,https://serverrpc.com,https://chainrpc.com,https://mainnet-rpc.brisescan.com", 32520),
+    bitgert: createProvider("bitgert", "https://chainrpc.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.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) {
@@ -264,3 +266,45 @@ function getLogs(params) {
     });
 }
 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 = "0x0000000000000000000000000000000000000000";
+var weth = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
+function normalizeBalances(balances) {
+    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);
+        if (normalisedKey == key)
+            return;
+        generalUtil_1.sumSingleBalance(balances, normalisedKey, balances[key]);
+        delete balances[key];
+    });
+    return balances;
+}
+exports.normalizeBalances = normalizeBalances;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defillama/sdk",
-  "version": "2.3.110",
+  "version": "2.3.112",
   "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",