@defillama/sdk 2.3.126 → 3.0.1

package/build/abi/convertResults.js

@@ -1,56 +1,53 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var bignumber_1 = require("@ethersproject/bignumber");
-var lodash_1 = __importDefault(require("lodash"));
-function stringifyBigNumbers(result, final) {
+function isNumberOrBigNumber(value) {
+    return bignumber_1.BigNumber.isBigNumber(value) || typeof value === "number";
+}
+function stringifyBigNumbers(result) {
+    var final = __assign({}, result);
+    if (Array.isArray(result))
+        final = __spreadArray([], result, true);
     Object.keys(result).forEach(function (key) {
-        try {
-            final[key] = lodash_1.default.cloneDeep(result[key]);
-            if (bignumber_1.BigNumber.isBigNumber(result[key]) ||
-                typeof result[key] === "number") {
-                final[key] = result[key].toString();
-            }
-            if (typeof final[key] === "object") {
-                stringifyBigNumbers(result[key], final[key]);
-            }
-        }
-        catch (e) {
-            console.log(e);
-        }
+        if (isNumberOrBigNumber(result[key]))
+            final[key] = result[key].toString();
+        else if (typeof result[key] === "object")
+            final[key] = stringifyBigNumbers(result[key]);
+        else
+            final[key] = result[key];
     });
-}
-function containsNamedResults(obj) {
-    return Object.keys(obj).some(function (key) { return isNaN(Number(key)); }); // Are there any non-numeric keys?
+    return final;
 }
 function default_1(results) {
-    if (typeof results === "string" || typeof results === "boolean") {
+    var response;
+    if (typeof results === "string" || typeof results === "boolean")
         return results;
-    }
-    var convertedResults = {};
-    if (results instanceof Array && !containsNamedResults(results)) {
-        // Match every idiosynchrasy of the SDK
-        convertedResults = [];
-    }
-    if (bignumber_1.BigNumber.isBigNumber(results) || typeof results === "number") {
-        convertedResults = results.toString();
-    }
-    else {
-        stringifyBigNumbers(results, convertedResults);
-    }
-    if (results instanceof Array) {
-        if (results.length === 1) {
-            return convertedResults[0];
-        }
-        else {
-            // Some calls return the extra __length__ parameter (I think when some results are named)
-            if (containsNamedResults(convertedResults)) {
-                convertedResults["__length__"] = results.length;
-            }
-        }
-    }
-    return convertedResults;
+    if (isNumberOrBigNumber(results))
+        return results.toString();
+    response = stringifyBigNumbers(results);
+    if (response instanceof Array)
+        if (response.length === 1)
+            return response[0];
+    return response;
 }
 exports.default = default_1;

package/build/abi/index.d.ts

@@ -1,6 +1,6 @@
 import { Address } from "../types";
 import { Chain } from "../general";
-declare type CallParams = string | number | (string | number)[] | undefined;
+type CallParams = string | number | (string | number)[] | undefined;
 export declare function call(params: {
     target: Address;
     abi: string | any;

package/build/abi/index.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -57,6 +57,7 @@ var general_1 = require("../general");
 var multicall_1 = __importDefault(require("./multicall"));
 var convertResults_1 = __importDefault(require("./convertResults"));
 var promise_pool_1 = require("@supercharge/promise-pool");
+var debugLog_1 = require("../util/debugLog");
 function resolveABI(providedAbi) {
     var abi = providedAbi;
     if (typeof abi === "string") {
@@ -91,7 +92,7 @@ function call(params) {
                     contractInterface = new ethers_1.ethers.utils.Interface([abi]);
                     functionABI = ethers_1.ethers.utils.FunctionFragment.from(abi);
                     callData = contractInterface.encodeFunctionData(functionABI, callParams);
-                    return [4 /*yield*/, general_1.getProvider(params.chain).call({
+                    return [4 /*yield*/, (0, general_1.getProvider)(params.chain).call({
                             to: params.target,
                             data: callData,
                         }, (_a = params.block) !== null && _a !== void 0 ? _a : "latest")];
@@ -99,7 +100,7 @@ function call(params) {
                     result = _b.sent();
                     decodedResult = contractInterface.decodeFunctionResult(functionABI, result);
                     return [2 /*return*/, {
-                            output: convertResults_1.default(decodedResult),
+                            output: (0, convertResults_1.default)(decodedResult),
                         }];
             }
         });
@@ -132,7 +133,7 @@ function multiCall(params) {
                             .process(function (calls, i) { return __awaiter(_this, void 0, void 0, function () {
                             var _a;
                             return __generator(this, function (_b) {
-                                return [2 /*return*/, multicall_1.default(abi, calls, (_a = params.chain) !== null && _a !== void 0 ? _a : "ethereum", params.block).then(function (calls) { return [calls, i]; })];
+                                return [2 /*return*/, (0, multicall_1.default)(abi, calls, (_a = params.chain) !== null && _a !== void 0 ? _a : "ethereum", params.block).then(function (calls) { return [calls, i]; })];
                             });
                         }); })];
                 case 1:
@@ -149,9 +150,8 @@ function multiCall(params) {
                         return c;
                     }));
                     failedQueries = flatResults.filter(function (r) { return !r.success; });
-                    if (failedQueries.length && (process.env.SDK_DEBUG === "true" || process.env.LLAMA_DEBUG_MODE)) {
-                        console.log("Failed multicalls:", failedQueries.map(function (r) { return r.input; }));
-                    }
+                    if (failedQueries.length)
+                        (0, debugLog_1.debugLog)("Failed multicalls:", failedQueries.map(function (r) { return r.input; }));
                     if (!(params.requery === true && flatResults.some(function (r) { return !r.success; }))) return [3 /*break*/, 3];
                     failed = flatResults.map(function (r, i) { return [r, i]; }).filter(function (r) { return !r[0].success; });
                     return [4 /*yield*/, multiCall({

package/build/abi/multicall.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -82,7 +82,7 @@ function makeMultiCall(functionABI, calls, chain, block) {
                     return [2 /*return*/, returnValues.map(function (values, index) {
                             var output;
                             try {
-                                output = convertResults_1.default(contractInterface.decodeFunctionResult(fd, values));
+                                output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values));
                             }
                             catch (e) {
                                 output = null;
@@ -131,7 +131,7 @@ function executeCalls(contractCalls, chain, block) {
                         to: address,
                         data: callData,
                     };
-                    return [4 /*yield*/, rpcCall_1.call(general_1.getProvider(chain), tx, block !== null && block !== void 0 ? block : "latest", chain)];
+                    return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), tx, block !== null && block !== void 0 ? block : "latest", chain)];
                 case 4:
                     returnData = _b.sent();
                     _a = ethers_1.ethers.utils.defaultAbiCoder.decode(["uint256", "bytes[]"], returnData), blockNumber = _a[0], returnValues = _a[1];
@@ -150,7 +150,7 @@ function executeCalls(contractCalls, chain, block) {
                                 switch (_b.label) {
                                     case 0:
                                         _b.trys.push([0, 2, , 3]);
-                                        return [4 /*yield*/, rpcCall_1.call(general_1.getProvider(chain), { to: to, data: data }, block !== null && block !== void 0 ? block : "latest", chain)];
+                                        return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), { to: to, data: data }, block !== null && block !== void 0 ? block : "latest", chain)];
                                     case 1: return [2 /*return*/, _b.sent()];
                                     case 2:
                                         e_2 = _b.sent();
@@ -172,12 +172,12 @@ function multicallAddressOrThrow(chain) {
         var network, address, msg;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, general_1.getProvider(chain).getNetwork()];
+                case 0: return [4 /*yield*/, (0, general_1.getProvider)(chain).getNetwork()];
                 case 1:
                     network = _a.sent();
                     address = multicallAddress(network.chainId);
                     if (address === null) {
-                        msg = "multicall is not available on the network " + network.chainId;
+                        msg = "multicall is not available on the network ".concat(network.chainId);
                         console.error(msg);
                         throw new Error(msg);
                     }
@@ -191,7 +191,7 @@ function networkSupportsMulticall(chain) {
         var network, address;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, general_1.getProvider(chain).network];
+                case 0: return [4 /*yield*/, (0, general_1.getProvider)(chain).network];
                 case 1:
                     network = _a.sent();
                     address = multicallAddress(network.chainId);

package/build/abi/rpcCall.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 var events_1 = require("events");
-var DEBUG_MODE_ENABLED = !!process.env.LLAMA_DEBUG_MODE;
+var debugLog_1 = require("../util/debugLog");
 var maxParallelCalls = !!process.env.LLAMA_SDK_MAX_PARALLEL ? +process.env.LLAMA_SDK_MAX_PARALLEL : 100;
 var COUNTERS = {};
 var emitter = new events_1.EventEmitter();
@@ -61,20 +61,20 @@ function call(provider, data, block, chain) {
                         chain = 'noChain';
                     counter = getChainCounter(chain);
                     currentId = counter.requestCount++;
-                    eventId = chain + "-" + currentId;
+                    eventId = "".concat(chain, "-").concat(currentId);
                     if (!(counter.activeWorkers > maxParallelCalls)) return [3 /*break*/, 2];
                     counter.queue.push(eventId);
-                    return [4 /*yield*/, events_1.once(emitter, eventId)];
+                    return [4 /*yield*/, (0, events_1.once)(emitter, eventId)];
                 case 1:
                     _a.sent();
                     _a.label = 2;
                 case 2:
                     counter.activeWorkers++;
-                    if (DEBUG_MODE_ENABLED) {
+                    if (debugLog_1.DEBUG_ENABLED) {
                         showEveryX = counter.queue.length > 100 ? 50 : 10 // show log fewer times if lot more are queued up
                         ;
                         if (currentId % showEveryX === 0)
-                            console.log("chain: " + chain + " request #: " + currentId + " queue: " + counter.queue.length + " active requests: " + counter.activeWorkers);
+                            console.log("chain: ".concat(chain, " request #: ").concat(currentId, " queue: ").concat(counter.queue.length, " active requests: ").concat(counter.activeWorkers));
                     }
                     _a.label = 3;
                 case 3:

package/build/api.d.ts

@@ -1,10 +1,10 @@
 export * as util from "./util";
 export * as eth from "./eth";
 export * as erc20 from "./erc20";
-export * as cdp from "./cdp";
 export * as abi from "./abi";
-import { setProvider } from "./general";
+import { setProvider, getProvider } from "./general";
 declare const config: {
     setProvider: typeof setProvider;
+    getProvider: typeof getProvider;
 };
 export { config };

package/build/api.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,14 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.abi = exports.cdp = exports.erc20 = exports.eth = exports.util = void 0;
+exports.config = exports.abi = exports.erc20 = exports.eth = exports.util = void 0;
 exports.util = __importStar(require("./util"));
 exports.eth = __importStar(require("./eth"));
 exports.erc20 = __importStar(require("./erc20"));
-exports.cdp = __importStar(require("./cdp"));
 exports.abi = __importStar(require("./abi"));
 var general_1 = require("./general");
 var config = {
     setProvider: general_1.setProvider,
+    getProvider: general_1.getProvider,
 };
 exports.config = config;

package/build/computeTVL/blocks.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -127,7 +127,7 @@ function getBlock(chain, timestamp) {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            provider = general_1.getProvider("ethereum");
+                            provider = (0, general_1.getProvider)("ethereum");
                             return [4 /*yield*/, provider.getBlockNumber()];
                         case 1:
                             lastBlockNumber = _a.sent();
@@ -149,7 +149,7 @@ function getBlock(chain, timestamp) {
                             _a.label = 2;
                         case 2:
                             _a.trys.push([2, 4, , 5]);
-                            return [4 /*yield*/, index_1.lookupBlock(timestamp, { chain: chain, })];
+                            return [4 /*yield*/, (0, index_1.lookupBlock)(timestamp, { chain: chain, })];
                         case 3:
                             block = _a.sent();
                             return [2 /*return*/, block];

package/build/computeTVL/humanizeNumber.js

@@ -10,7 +10,7 @@ function humanizeNumber(amount) {
     for (var _i = 0, quantifiers_1 = quantifiers; _i < quantifiers_1.length; _i++) {
         var _a = quantifiers_1[_i], denominator = _a[0], letter = _a[1];
         if (amount > denominator) {
-            return (amount / denominator).toFixed(2) + " " + letter;
+            return "".concat((amount / denominator).toFixed(2), " ").concat(letter);
         }
     }
     return amount.toString();

package/build/computeTVL/prices.d.ts

@@ -3,7 +3,7 @@ export interface TokenPrices {
         usd: number;
     } | undefined;
 }
-export declare type GetCoingeckoLog = () => Promise<any>;
+export type GetCoingeckoLog = () => Promise<any>;
 export declare function makeCoingeckoCall(url: string, coingeckoMaxRetries: number, getCoingeckoLock: GetCoingeckoLog): Promise<any>;
 export declare function getTokenPrices(originalIds: string[], url: string, knownTokenPrices: TokenPrices, getCoingeckoLock: GetCoingeckoLog, coingeckoMaxRetries: number, prefix?: string): Promise<TokenPrices>;
 export declare function getHistoricalTokenPrices(ids: string[], url: string, timestamp: number, getCoingeckoLock: GetCoingeckoLog, coingeckoMaxRetries: number): Promise<TokenPrices>;

package/build/computeTVL/prices.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHistoricalTokenPrices = exports.getTokenPrices = exports.makeCoingeckoCall = void 0;
 var node_fetch_1 = __importDefault(require("node-fetch"));
 function fetchJson(url) {
-    return node_fetch_1.default(url).then(function (res) { return res.json(); });
+    return (0, node_fetch_1.default)(url).then(function (res) { return res.json(); });
 }
 function makeCoingeckoCall(url, coingeckoMaxRetries, getCoingeckoLock) {
     return __awaiter(this, void 0, void 0, function () {
@@ -100,9 +100,9 @@ function getTokenPrices(originalIds, url, knownTokenPrices, getCoingeckoLock, co
                     _a.label = 1;
                 case 1:
                     if (!(i < newIds.length)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, makeCoingeckoCall("https://api.coingecko.com/api/" + url + "=" + newIds
+                    return [4 /*yield*/, makeCoingeckoCall("https://api.coingecko.com/api/".concat(url, "=").concat(newIds
                             .slice(i, i + 100)
-                            .join(",") + "&vs_currencies=usd", coingeckoMaxRetries, getCoingeckoLock)];
+                            .join(","), "&vs_currencies=usd"), coingeckoMaxRetries, getCoingeckoLock)];
                 case 2:
                     tempTokenPrices = _a.sent();
                     Object.assign(tokenPrices, tempTokenPrices);
@@ -133,7 +133,7 @@ function getHistoricalTokenPrices(ids, url, timestamp, getCoingeckoLock, coingec
                 case 1:
                     if (!(_i < ids_1.length)) return [3 /*break*/, 4];
                     id = ids_1[_i];
-                    return [4 /*yield*/, makeCoingeckoCall(url + "/" + id.toLowerCase() + "/market_chart/range?vs_currency=usd&from=" + (timestamp - secondsPerHalfDay) + "&to=" + (timestamp + secondsPerHalfDay), coingeckoMaxRetries, getCoingeckoLock)];
+                    return [4 /*yield*/, makeCoingeckoCall("".concat(url, "/").concat(id.toLowerCase(), "/market_chart/range?vs_currency=usd&from=").concat(timestamp - secondsPerHalfDay, "&to=").concat(timestamp + secondsPerHalfDay), coingeckoMaxRetries, getCoingeckoLock)];
                 case 2:
                     range = _d.sent();
                     if (range.error === undefined && ((_a = range.prices) === null || _a === void 0 ? void 0 : _a.length) > 0) {

package/build/erc20/index.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -46,7 +46,7 @@ var abi = [
     "function symbol() view returns (string)",
 ];
 function getContract(address, chain) {
-    return new ethers_1.ethers.Contract(address, abi, general_1.getProvider(chain));
+    return new ethers_1.ethers.Contract(address, abi, (0, general_1.getProvider)(chain));
 }
 function info(tokenAddress, chain) {
     return __awaiter(this, void 0, void 0, function () {
@@ -116,7 +116,7 @@ function totalSupply(params) {
                 case 1:
                     supply = _b.sent();
                     return [2 /*return*/, {
-                            output: general_1.handleDecimals(supply, params.decimals),
+                            output: (0, general_1.handleDecimals)(supply, params.decimals),
                         }];
             }
         });
@@ -135,7 +135,7 @@ function balanceOf(params) {
                 case 1:
                     balance = _b.sent();
                     return [2 /*return*/, {
-                            output: general_1.handleDecimals(balance, params.decimals),
+                            output: (0, general_1.handleDecimals)(balance, params.decimals),
                         }];
             }
         });

package/build/eth/index.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -43,11 +43,11 @@ function getBalance(params) {
         var balance;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, general_1.getProvider(params.chain).getBalance(params.target, params.block)];
+                case 0: return [4 /*yield*/, (0, general_1.getProvider)(params.chain).getBalance(params.target, params.block)];
                 case 1:
                     balance = _a.sent();
                     return [2 /*return*/, {
-                            output: general_1.handleDecimals(balance, params.decimals),
+                            output: (0, general_1.handleDecimals)(balance, params.decimals),
                         }];
             }
         });
@@ -73,7 +73,7 @@ function getBalances(params) {
                                         target: target
                                     };
                                     _a = general_1.handleDecimals;
-                                    return [4 /*yield*/, general_1.getProvider(params.chain).getBalance(target, params.block)];
+                                    return [4 /*yield*/, (0, general_1.getProvider)(params.chain).getBalance(target, params.block)];
                                 case 1: return [2 /*return*/, (_b.balance = _a.apply(void 0, [_c.sent(), params.decimals]),
                                         _b)];
                             }

package/build/general.d.ts

@@ -2,7 +2,7 @@ import { ethers, BigNumber } from "ethers";
 export declare const providers: {
     [chain: string]: ethers.providers.BaseProvider;
 };
-export declare type Chain = "ethereum" | "bsc" | "polygon" | "heco" | "fantom" | "rsk" | "tomochain" | "xdai" | "avax" | "wan" | "iotex" | "harmony" | "thundercore" | "okexchain" | "optimism" | "arbitrum" | "kcc" | "celo" | "moonriver" | "shiden" | "palm" | "energyweb" | "energi" | "songbird" | "hpb" | "gochain" | "ethereumclassic" | "xdaiarb" | "kardia" | "fuse" | "smartbch" | "elastos" | "hoo" | "fusion" | "aurora" | "ronin" | "boba" | "cronos" | "polis" | "zyx" | "telos" | "metis" | "ubiq" | "velas" | "callisto" | "csc" | "nahmii" | "liquidchain" | "meter" | "theta" | "oasis" | "syscoin" | "moonbeam" | "curio" | "astar" | "godwoken" | "evmos" | "conflux" | "milkomeda" | "milkomeda_a1" | "dfk" | "bittorrent" | "findora" | "candle" | "lachain" | "reichain" | "rei" | "clv" | "echelon" | "multivac" | "sx" | "karura_evm" | "nova" | "ontology_evm" | "jfin" | "bitkub" | "bitgert" | "canto" | "dogechain" | "posi" | "arbitrum_nova" | "ultron" | "tombchain" | "vision" | "ethpow" | "functionx" | "cube" | "xdc" | "step" | "kekchain" | "muuchain";
+export type Chain = "ethereum" | "bsc" | "polygon" | "heco" | "fantom" | "rsk" | "tomochain" | "xdai" | "avax" | "wan" | "iotex" | "harmony" | "thundercore" | "okexchain" | "optimism" | "arbitrum" | "kcc" | "celo" | "moonriver" | "shiden" | "palm" | "energyweb" | "energi" | "songbird" | "hpb" | "gochain" | "ethereumclassic" | "xdaiarb" | "kardia" | "fuse" | "smartbch" | "elastos" | "hoo" | "fusion" | "aurora" | "ronin" | "boba" | "cronos" | "polis" | "zyx" | "telos" | "metis" | "ubiq" | "velas" | "callisto" | "csc" | "nahmii" | "liquidchain" | "meter" | "theta" | "oasis" | "syscoin" | "moonbeam" | "curio" | "astar" | "godwoken" | "evmos" | "conflux" | "milkomeda" | "milkomeda_a1" | "dfk" | "bittorrent" | "findora" | "candle" | "lachain" | "reichain" | "rei" | "clv" | "echelon" | "multivac" | "sx" | "karura_evm" | "nova" | "ontology_evm" | "jfin" | "bitkub" | "bitgert" | "canto" | "dogechain" | "posi" | "arbitrum_nova" | "ultron" | "tombchain" | "vision" | "ethpow" | "functionx" | "cube" | "xdc" | "step" | "kekchain" | "muuchain";
 export declare function getProvider(chain?: Chain): ethers.providers.BaseProvider;
 export declare const TEN: ethers.BigNumber;
 export declare function handleDecimals(num: BigNumber, decimals?: number): string;

package/build/generalUtil.d.ts

@@ -1,4 +1,6 @@
-import computeTVL from "./computeTVL";
+import { BigNumber } from "ethers";
+import * as blocks from "./computeTVL/blocks";
+import * as humanizeNumber from "./computeTVL/humanizeNumber";
 import type { Balances, StringNumber, Address } from "./types";
 export declare function sumMultiBalanceOf(balances: Balances, results: {
     ethCallCount?: number;
@@ -11,9 +13,10 @@ export declare function sumMultiBalanceOf(balances: Balances, results: {
         };
     }[];
 }, allCallsMustBeSuccessful?: boolean, transformAddress?: (addr: string) => string): void;
-export declare function sumSingleBalance(balances: Balances, token: string, balance: string | number): void;
-declare type ChainBlocks = {
+export declare function sumSingleBalance(balances: Balances, token: string, balance: string | number | BigNumber, chain?: string): void;
+export declare function mergeBalances(balances: Balances, balancesToMerge: Balances): void;
+type ChainBlocks = {
     [chain: string]: number;
 };
 export declare function sumChainTvls(chainTvls: Array<(timestamp: number, ethBlock: number, chainBlocks: ChainBlocks) => Promise<Balances>>): (timestamp: number, ethBlock: number, chainBlocks: ChainBlocks) => Promise<{}>;
-export { computeTVL };
+export { blocks, humanizeNumber, };

package/build/generalUtil.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -14,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -35,14 +58,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeTVL = exports.sumChainTvls = exports.sumSingleBalance = exports.sumMultiBalanceOf = void 0;
+exports.humanizeNumber = exports.blocks = exports.sumChainTvls = exports.mergeBalances = exports.sumSingleBalance = exports.sumMultiBalanceOf = void 0;
 var ethers_1 = require("ethers");
-var computeTVL_1 = __importDefault(require("./computeTVL"));
-exports.computeTVL = computeTVL_1.default;
+var blocks = __importStar(require("./computeTVL/blocks"));
+exports.blocks = blocks;
+var humanizeNumber = __importStar(require("./computeTVL/humanizeNumber"));
+exports.humanizeNumber = humanizeNumber;
 // We ignore `sum` as it's never used (only in some SDK wrapper code)
 function sumMultiBalanceOf(balances, results, allCallsMustBeSuccessful, transformAddress) {
     if (allCallsMustBeSuccessful === void 0) { allCallsMustBeSuccessful = true; }
@@ -66,18 +88,32 @@ function sumMultiBalanceOf(balances, results, allCallsMustBeSuccessful, transfor
     });
 }
 exports.sumMultiBalanceOf = sumMultiBalanceOf;
-function sumSingleBalance(balances, token, balance) {
-    var _a, _b;
+function sumSingleBalance(balances, token, balance, chain) {
+    if (chain)
+        token = "".concat(chain, ":").concat(token);
+    if (typeof balance === 'object') {
+        if (typeof balance.toString === 'function')
+            balance = balance.toString();
+        else
+            throw new Error('Invalid balance value:' + balance);
+    }
     if (typeof balance === 'number') {
-        var prevBalance = (_a = balances[token]) !== null && _a !== void 0 ? _a : 0;
-        if (typeof prevBalance !== 'number') {
-            throw new Error("Trying to merge token balance and coingecko amount for " + token);
-        }
-        balances[token] = prevBalance + balance;
+        var prevBalance = +(balances.hasOwnProperty(token) ? balances[token] : 0);
+        if (typeof prevBalance !== 'number' || isNaN(prevBalance))
+            throw new Error("Trying to merge token balance and coingecko amount for ".concat(token, " current balance: ").concat(balance, " previous balance: ").concat(balances[token]));
+        var value = prevBalance + balance;
+        isValidNumber(value);
+        balances[token] = value;
     }
     else {
-        var prevBalance = ethers_1.BigNumber.from((_b = balances[token]) !== null && _b !== void 0 ? _b : "0");
-        balances[token] = prevBalance.add(ethers_1.BigNumber.from(balance)).toString();
+        var prevBalance = ethers_1.BigNumber.from(balances.hasOwnProperty(token) ? balances[token] : '0');
+        var value = prevBalance.add(ethers_1.BigNumber.from(balance)).toString();
+        isValidNumber(+value);
+        balances[token] = value;
+    }
+    function isValidNumber(value) {
+        if (isNaN(value))
+            throw new Error("Invalid balance: ".concat(balance));
     }
 }
 exports.sumSingleBalance = sumSingleBalance;
@@ -86,6 +122,7 @@ function mergeBalances(balances, balancesToMerge) {
         sumSingleBalance(balances, balance[0], balance[1]);
     });
 }
+exports.mergeBalances = mergeBalances;
 function sumChainTvls(chainTvls) {
     var _this = this;
     return function (timestamp, ethBlock, chainBlocks) { return __awaiter(_this, void 0, void 0, function () {

package/build/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];