@ichidao/ichi-vaults-sdk 0.1.42 → 2.0.0

package/dist/src/functions/vaultPositions.js

@@ -1,153 +1,88 @@
 "use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        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]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        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.getVaultPositions = void 0;
 // eslint-disable-next-line import/no-cycle
-var vault_1 = require("./vault");
-var contracts_1 = require("../contracts");
-var _totalBalances_1 = require("./_totalBalances");
-var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
-var univ3prices = require('@thanpolas/univ3prices');
+const vault_1 = require("./vault");
+const contracts_1 = require("../contracts");
+const _totalBalances_1 = require("./_totalBalances");
+const formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
+const univ3prices = require('@thanpolas/univ3prices');
 function getPriceAtTick(decimals, tick) {
-    var price = univ3prices.tickPrice(decimals, tick);
+    const price = univ3prices.tickPrice(decimals, tick);
     return price;
 }
 // get price at tick in deposit tokens
 function getPriceInDepositToken(isVaultInverted, decimals, tick) {
-    var priceFromPool = getPriceAtTick(decimals, tick);
-    var result = (isVaultInverted && tick > 0) || (!isVaultInverted && tick < 0)
+    const priceFromPool = getPriceAtTick(decimals, tick);
+    const result = (isVaultInverted && tick > 0) || (!isVaultInverted && tick < 0)
         ? Number(priceFromPool.toFixed())
         : 1 / Number(priceFromPool.toFixed());
     return result;
 }
-function getVaultPositions(vaultAddress, jsonProvider, dex) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, chainId, vault, decimals0, decimals1, tokenDecimals, isInv, vaultContract, baseLower, baseUpper, limitLower, limitUpper, currentTick, basePosition, limitPosition, priceAtBaseLower, priceAtBaseUpper, priceAtLimitLower, priceAtLimitUpper, currentPrice, basePositionTvl, limitPositionTvl, e_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
-                case 1:
-                    _a = _b.sent(), chainId = _a.chainId, vault = _a.vault;
-                    return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenA, jsonProvider, chainId)];
-                case 2:
-                    decimals0 = _b.sent();
-                    return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenB, jsonProvider, chainId)];
-                case 3:
-                    decimals1 = _b.sent();
-                    tokenDecimals = [decimals0, decimals1];
-                    isInv = vault.allowTokenB;
-                    vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
-                    _b.label = 4;
-                case 4:
-                    _b.trys.push([4, 12, , 13]);
-                    return [4 /*yield*/, vaultContract.baseLower()];
-                case 5:
-                    baseLower = _b.sent();
-                    return [4 /*yield*/, vaultContract.baseUpper()];
-                case 6:
-                    baseUpper = _b.sent();
-                    return [4 /*yield*/, vaultContract.limitLower()];
-                case 7:
-                    limitLower = _b.sent();
-                    return [4 /*yield*/, vaultContract.limitUpper()];
-                case 8:
-                    limitUpper = _b.sent();
-                    return [4 /*yield*/, vaultContract.currentTick()];
-                case 9:
-                    currentTick = _b.sent();
-                    return [4 /*yield*/, vaultContract.getBasePosition()];
-                case 10:
-                    basePosition = _b.sent();
-                    return [4 /*yield*/, vaultContract.getLimitPosition()];
-                case 11:
-                    limitPosition = _b.sent();
-                    priceAtBaseLower = getPriceInDepositToken(isInv, tokenDecimals, baseLower);
-                    priceAtBaseUpper = getPriceInDepositToken(isInv, tokenDecimals, baseUpper);
-                    priceAtLimitLower = getPriceInDepositToken(isInv, tokenDecimals, limitLower);
-                    priceAtLimitUpper = getPriceInDepositToken(isInv, tokenDecimals, limitUpper);
-                    currentPrice = getPriceInDepositToken(isInv, tokenDecimals, currentTick);
-                    basePositionTvl = !isInv
-                        ? Number((0, formatBigInt_1.default)(basePosition.amount0, decimals0)) +
-                            Number((0, formatBigInt_1.default)(basePosition.amount1, decimals1)) * currentPrice
-                        : Number((0, formatBigInt_1.default)(basePosition.amount1, decimals1)) +
-                            Number((0, formatBigInt_1.default)(basePosition.amount0, decimals0)) * currentPrice;
-                    limitPositionTvl = !isInv
-                        ? Number((0, formatBigInt_1.default)(limitPosition.amount0, decimals0)) +
-                            Number((0, formatBigInt_1.default)(limitPosition.amount1, decimals1)) * currentPrice
-                        : Number((0, formatBigInt_1.default)(limitPosition.amount1, decimals1)) +
-                            Number((0, formatBigInt_1.default)(limitPosition.amount0, decimals0)) * currentPrice;
-                    return [2 /*return*/, {
-                            currentTick: currentTick,
-                            currentPrice: currentPrice,
-                            positions: [
-                                {
-                                    tickLower: baseLower,
-                                    tickUpper: baseUpper,
-                                    priceLower: priceAtBaseLower,
-                                    priceUpper: priceAtBaseUpper,
-                                    liquidity: basePosition.liquidity.toString(),
-                                    amountToken0: basePosition.amount0.toString(),
-                                    amountToken1: basePosition.amount1.toString(),
-                                    positionTvl: basePositionTvl,
-                                },
-                                {
-                                    tickLower: limitLower,
-                                    tickUpper: limitUpper,
-                                    priceLower: priceAtLimitLower,
-                                    priceUpper: priceAtLimitUpper,
-                                    liquidity: limitPosition.liquidity.toString(),
-                                    amountToken0: limitPosition.amount0.toString(),
-                                    amountToken1: limitPosition.amount1.toString(),
-                                    positionTvl: limitPositionTvl,
-                                },
-                            ],
-                        }];
-                case 12:
-                    e_1 = _b.sent();
-                    console.error("Could not get vault positions for vault ".concat(vaultAddress, " "));
-                    throw e_1;
-                case 13: return [2 /*return*/];
-            }
-        });
-    });
+async function getVaultPositions(vaultAddress, jsonProvider, dex) {
+    const { chainId, vault } = await (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex);
+    const decimals0 = await (0, _totalBalances_1.getTokenDecimals)(vault.tokenA, jsonProvider, chainId);
+    const decimals1 = await (0, _totalBalances_1.getTokenDecimals)(vault.tokenB, jsonProvider, chainId);
+    const tokenDecimals = [decimals0, decimals1];
+    const isInv = vault.allowTokenB;
+    const vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
+    try {
+        const baseLower = Number(await vaultContract.baseLower());
+        const baseUpper = Number(await vaultContract.baseUpper());
+        const limitLower = Number(await vaultContract.limitLower());
+        const limitUpper = Number(await vaultContract.limitUpper());
+        const currentTick = Number(await vaultContract.currentTick());
+        const basePosition = await vaultContract.getBasePosition();
+        const limitPosition = await vaultContract.getLimitPosition();
+        const priceAtBaseLower = getPriceInDepositToken(isInv, tokenDecimals, baseLower);
+        const priceAtBaseUpper = getPriceInDepositToken(isInv, tokenDecimals, baseUpper);
+        const priceAtLimitLower = getPriceInDepositToken(isInv, tokenDecimals, limitLower);
+        const priceAtLimitUpper = getPriceInDepositToken(isInv, tokenDecimals, limitUpper);
+        const currentPrice = getPriceInDepositToken(isInv, tokenDecimals, currentTick);
+        const basePositionTvl = !isInv
+            ? Number((0, formatBigInt_1.default)(basePosition.amount0, decimals0)) +
+                Number((0, formatBigInt_1.default)(basePosition.amount1, decimals1)) * currentPrice
+            : Number((0, formatBigInt_1.default)(basePosition.amount1, decimals1)) +
+                Number((0, formatBigInt_1.default)(basePosition.amount0, decimals0)) * currentPrice;
+        const limitPositionTvl = !isInv
+            ? Number((0, formatBigInt_1.default)(limitPosition.amount0, decimals0)) +
+                Number((0, formatBigInt_1.default)(limitPosition.amount1, decimals1)) * currentPrice
+            : Number((0, formatBigInt_1.default)(limitPosition.amount1, decimals1)) +
+                Number((0, formatBigInt_1.default)(limitPosition.amount0, decimals0)) * currentPrice;
+        return {
+            currentTick,
+            currentPrice,
+            positions: [
+                {
+                    tickLower: baseLower,
+                    tickUpper: baseUpper,
+                    priceLower: priceAtBaseLower,
+                    priceUpper: priceAtBaseUpper,
+                    liquidity: basePosition.liquidity.toString(),
+                    amountToken0: basePosition.amount0.toString(),
+                    amountToken1: basePosition.amount1.toString(),
+                    positionTvl: basePositionTvl,
+                },
+                {
+                    tickLower: limitLower,
+                    tickUpper: limitUpper,
+                    priceLower: priceAtLimitLower,
+                    priceUpper: priceAtLimitUpper,
+                    liquidity: limitPosition.liquidity.toString(),
+                    amountToken0: limitPosition.amount0.toString(),
+                    amountToken1: limitPosition.amount1.toString(),
+                    positionTvl: limitPositionTvl,
+                },
+            ],
+        };
+    }
+    catch (e) {
+        console.error(`Could not get vault positions for vault ${vaultAddress} `);
+        throw e;
+    }
 }
 exports.getVaultPositions = getVaultPositions;
 //# sourceMappingURL=vaultPositions.js.map

package/dist/src/functions/vaultPositions.js.map

@@ -1 +1 @@
-{"version":3,"file":"vaultPositions.js","sourceRoot":"","sources":["../../../src/functions/vaultPositions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vaultPositions.js","sourceRoot":"","sources":["../../../src/functions/vaultPositions.ts"],"names":[],"mappings":"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"}

package/dist/src/functions/vaultTvl.d.ts

@@ -1,4 +1,4 @@
-import { JsonRpcProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from 'ethers';
 import { IchiVault, SupportedDex, VaultState, VaultTransactionEvent } from '../types';
 export type VaultEvent = {
     atTimestamp: string;

package/dist/src/functions/vaultTvl.js

@@ -1,209 +1,124 @@
 "use strict";
 /* eslint-disable no-redeclare */
 /* eslint-disable import/prefer-default-export */
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        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]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-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));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVaultEventsForTimeInterval = exports.getTvlAtFeeCollectionEvent = exports.getTvlAtTransactionEvent = void 0;
-var bignumber_1 = require("@ethersproject/bignumber");
 // eslint-disable-next-line import/no-cycle
-var vault_1 = require("./vault");
-var _totalBalances_1 = require("./_totalBalances");
-var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
-var timestamps_1 = require("../utils/timestamps");
-var getPrice_1 = __importDefault(require("../utils/getPrice"));
-var calculateFees_1 = require("./calculateFees");
-var priceFromPool_1 = require("./priceFromPool");
-var _vaultEvents_1 = require("./_vaultEvents");
-var calculateDtr_1 = require("./calculateDtr");
+const vault_1 = require("./vault");
+const _totalBalances_1 = require("./_totalBalances");
+const formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
+const timestamps_1 = require("../utils/timestamps");
+const getPrice_1 = __importDefault(require("../utils/getPrice"));
+const calculateFees_1 = require("./calculateFees");
+const priceFromPool_1 = require("./priceFromPool");
+const _vaultEvents_1 = require("./_vaultEvents");
+const calculateDtr_1 = require("./calculateDtr");
 function formatVaultEvent(dtr, tvl, fee, lpPrice, poolPrice) {
     return {
         atTimestamp: dtr.atTimestamp,
         dtr: dtr.percent,
-        tvl: tvl,
+        tvl,
         feeAmount: fee,
-        lpPrice: lpPrice,
-        poolPrice: poolPrice,
+        lpPrice,
+        poolPrice,
     };
 }
 // get price from the pool/vault
 function getPoolPriceAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals) {
-    var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
-    var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
-    var price = (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
+    const depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
+    const scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
+    const price = (0, getPrice_1.default)(isVaultInverted, BigInt(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
     return price;
 }
 // total amounts at deposit or withdrawal in deposit tokens
 function getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals, beforeEvent) {
-    var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
-    var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
-    var price0 = !isVaultInverted
+    const depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
+    const scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
+    const price0 = !isVaultInverted
         ? 1
-        : (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
-    var price1 = isVaultInverted
+        : (0, getPrice_1.default)(isVaultInverted, BigInt(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
+    const price1 = isVaultInverted
         ? 1
-        : (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
-    var amount0 = beforeEvent
-        ? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0BeforeEvent), token0Decimals)) * price0
-        : Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0), token0Decimals)) * price0;
-    var amount1 = beforeEvent
-        ? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount1BeforeEvent), token1Decimals)) * price1
-        : Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount1), token1Decimals)) * price1;
+        : (0, getPrice_1.default)(isVaultInverted, BigInt(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
+    const amount0 = beforeEvent
+        ? Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalAmount0BeforeEvent), token0Decimals)) * price0
+        : Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalAmount0), token0Decimals)) * price0;
+    const amount1 = beforeEvent
+        ? Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalAmount1BeforeEvent), token1Decimals)) * price1
+        : Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalAmount1), token1Decimals)) * price1;
     return [amount0, amount1];
 }
 function getTvlAtTransactionEvent(objTransactionEvent, vault, token0decimals, token1decimals) {
-    var isVaultInverted = vault.allowTokenB;
-    var totalAmounts = getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0decimals, token1decimals, false);
-    var tvl = totalAmounts[0] + totalAmounts[1];
+    const isVaultInverted = vault.allowTokenB;
+    const totalAmounts = getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0decimals, token1decimals, false);
+    const tvl = totalAmounts[0] + totalAmounts[1];
     return tvl;
 }
 exports.getTvlAtTransactionEvent = getTvlAtTransactionEvent;
 function getTvlAtFeeCollectionEvent(objFeeCollectionEvent, vault, token0decimals, token1decimals) {
-    var isVaultInverted = vault.allowTokenB;
-    var totalAmounts = (0, calculateFees_1.getTotalAmountsAtFeeCollectionEvent)(objFeeCollectionEvent, isVaultInverted, token0decimals, token1decimals);
-    var tvl = totalAmounts[0] + totalAmounts[1];
+    const isVaultInverted = vault.allowTokenB;
+    const totalAmounts = (0, calculateFees_1.getTotalAmountsAtFeeCollectionEvent)(objFeeCollectionEvent, isVaultInverted, token0decimals, token1decimals);
+    const tvl = totalAmounts[0] + totalAmounts[1];
     return tvl;
 }
 exports.getTvlAtFeeCollectionEvent = getTvlAtFeeCollectionEvent;
 function getLpPriceAtFeeCollectionEvent(objTransactionEvent, vault, token0decimals, token1decimals) {
-    var tvl = getTvlAtFeeCollectionEvent(objTransactionEvent, vault, token0decimals, token1decimals);
-    var totalSupply = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalSupply), 18));
+    const tvl = getTvlAtFeeCollectionEvent(objTransactionEvent, vault, token0decimals, token1decimals);
+    const totalSupply = Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalSupply), 18));
     return tvl / totalSupply;
 }
 function getLpPriceAtTransactionEvent(objTransactionEvent, vault, token0decimals, token1decimals) {
-    var tvl = getTvlAtTransactionEvent(objTransactionEvent, vault, token0decimals, token1decimals);
-    var totalSupply = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalSupply), 18));
+    const tvl = getTvlAtTransactionEvent(objTransactionEvent, vault, token0decimals, token1decimals);
+    const totalSupply = Number((0, formatBigInt_1.default)(BigInt(objTransactionEvent.totalSupply), 18));
     return tvl / totalSupply;
 }
 // time Interval in days
-function getVaultEventsForTimeInterval(vaultAddress, jsonProvider, dex, timeInterval) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, chainId, vault, token0Decimals, token1Decimals, isVaultInverted, rebalances, collectedFees, deposits, withdraws, arrRebalances, arrOtherFees, arrDeposits, arrWithdraws, currentVaultEvent, result;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
-                case 1:
-                    _a = _c.sent(), chainId = _a.chainId, vault = _a.vault;
-                    return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenA, jsonProvider, chainId)];
-                case 2:
-                    token0Decimals = _c.sent();
-                    return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenB, jsonProvider, chainId)];
-                case 3:
-                    token1Decimals = _c.sent();
-                    isVaultInverted = vault.allowTokenB;
-                    return [4 /*yield*/, (0, _vaultEvents_1._getRebalances)(vaultAddress, chainId, dex, timeInterval)];
-                case 4:
-                    rebalances = _c.sent();
-                    if (!rebalances)
-                        throw new Error("Error getting vault rebalances on ".concat(chainId, " for ").concat(vaultAddress));
-                    return [4 /*yield*/, (0, _vaultEvents_1._getFeesCollectedEvents)(vaultAddress, chainId, dex, timeInterval)];
-                case 5:
-                    collectedFees = _c.sent();
-                    if (!collectedFees)
-                        throw new Error("Error getting vault collected fees on ".concat(chainId, " for ").concat(vaultAddress));
-                    return [4 /*yield*/, (0, _vaultEvents_1._getDeposits)(vaultAddress, chainId, dex, timeInterval)];
-                case 6:
-                    deposits = _c.sent();
-                    if (!deposits)
-                        throw new Error("Error getting vault deposits on ".concat(chainId, " for ").concat(vaultAddress));
-                    return [4 /*yield*/, (0, _vaultEvents_1._getWithdraws)(vaultAddress, chainId, dex, timeInterval)];
-                case 7:
-                    withdraws = _c.sent();
-                    if (!withdraws)
-                        throw new Error("Error getting vault withdraws on ".concat(chainId, " for ").concat(vaultAddress));
-                    arrRebalances = rebalances
-                        .slice()
-                        .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
-                        .map(function (e) {
-                        return formatVaultEvent((0, calculateDtr_1.getDtrAtFeeCollectionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), (0, calculateFees_1.getFeesAmountInBaseTokens)(e, vault.allowTokenB, token0Decimals, token1Decimals), getLpPriceAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals));
-                    });
-                    arrOtherFees = collectedFees
-                        .slice()
-                        .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
-                        .map(function (e) {
-                        return formatVaultEvent((0, calculateDtr_1.getDtrAtFeeCollectionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), (0, calculateFees_1.getFeesAmountInBaseTokens)(e, vault.allowTokenB, token0Decimals, token1Decimals), getLpPriceAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals));
-                    });
-                    arrDeposits = deposits
-                        .slice()
-                        .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
-                        .map(function (e) {
-                        return formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0, getLpPriceAtTransactionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals));
-                    });
-                    arrWithdraws = withdraws
-                        .slice()
-                        .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
-                        .map(function (e) {
-                        return formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0, getLpPriceAtTransactionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals));
-                    });
-                    _b = {
-                        atTimestamp: Math.floor(Date.now() / 1000).toString()
-                    };
-                    return [4 /*yield*/, (0, priceFromPool_1.getCurrentDtr)(vaultAddress, jsonProvider, dex, isVaultInverted, token0Decimals, token1Decimals)];
-                case 8:
-                    _b.dtr = _c.sent();
-                    return [4 /*yield*/, (0, priceFromPool_1.getVaultTvl)(vault, jsonProvider, chainId, dex, isVaultInverted, token0Decimals, token1Decimals)];
-                case 9:
-                    _b.tvl = _c.sent(),
-                        _b.feeAmount = 0;
-                    return [4 /*yield*/, (0, priceFromPool_1.getCurrLpPrice)(vault, jsonProvider, dex, chainId, isVaultInverted, token0Decimals, token1Decimals)];
-                case 10:
-                    _b.lpPrice = _c.sent();
-                    return [4 /*yield*/, (0, priceFromPool_1.getCurrPrice)(vault, jsonProvider, chainId, dex, isVaultInverted, token0Decimals, token1Decimals)];
-                case 11:
-                    currentVaultEvent = (_b.poolPrice = _c.sent(),
-                        _b);
-                    result = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], arrDeposits, true), arrWithdraws, true), arrRebalances, true), arrOtherFees, true), [currentVaultEvent], false).sort(function (a, b) { return Number(b.atTimestamp) - Number(a.atTimestamp); });
-                    return [2 /*return*/, result];
-            }
-        });
-    });
+async function getVaultEventsForTimeInterval(vaultAddress, jsonProvider, dex, timeInterval) {
+    const { chainId, vault } = await (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex);
+    const token0Decimals = await (0, _totalBalances_1.getTokenDecimals)(vault.tokenA, jsonProvider, chainId);
+    const token1Decimals = await (0, _totalBalances_1.getTokenDecimals)(vault.tokenB, jsonProvider, chainId);
+    const isVaultInverted = vault.allowTokenB;
+    const rebalances = await (0, _vaultEvents_1._getRebalances)(vaultAddress, chainId, dex, timeInterval);
+    if (!rebalances)
+        throw new Error(`Error getting vault rebalances on ${chainId} for ${vaultAddress}`);
+    const collectedFees = await (0, _vaultEvents_1._getFeesCollectedEvents)(vaultAddress, chainId, dex, timeInterval);
+    if (!collectedFees)
+        throw new Error(`Error getting vault collected fees on ${chainId} for ${vaultAddress}`);
+    const deposits = await (0, _vaultEvents_1._getDeposits)(vaultAddress, chainId, dex, timeInterval);
+    if (!deposits)
+        throw new Error(`Error getting vault deposits on ${chainId} for ${vaultAddress}`);
+    const withdraws = await (0, _vaultEvents_1._getWithdraws)(vaultAddress, chainId, dex, timeInterval);
+    if (!withdraws)
+        throw new Error(`Error getting vault withdraws on ${chainId} for ${vaultAddress}`);
+    const arrRebalances = rebalances
+        .slice()
+        .filter((r) => Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval))
+        .map((e) => formatVaultEvent((0, calculateDtr_1.getDtrAtFeeCollectionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), (0, calculateFees_1.getFeesAmountInBaseTokens)(e, vault.allowTokenB, token0Decimals, token1Decimals), getLpPriceAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals)));
+    const arrOtherFees = collectedFees
+        .slice()
+        .filter((r) => Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval))
+        .map((e) => formatVaultEvent((0, calculateDtr_1.getDtrAtFeeCollectionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), (0, calculateFees_1.getFeesAmountInBaseTokens)(e, vault.allowTokenB, token0Decimals, token1Decimals), getLpPriceAtFeeCollectionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals)));
+    const arrDeposits = deposits
+        .slice()
+        .filter((r) => Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval))
+        .map((e) => formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0, getLpPriceAtTransactionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals)));
+    const arrWithdraws = withdraws
+        .slice()
+        .filter((r) => Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval))
+        .map((e) => formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0, getLpPriceAtTransactionEvent(e, vault, token0Decimals, token1Decimals), getPoolPriceAtTransactionEvent(e, isVaultInverted, token0Decimals, token1Decimals)));
+    const currentVaultEvent = {
+        atTimestamp: Math.floor(Date.now() / 1000).toString(),
+        dtr: await (0, priceFromPool_1.getCurrentDtr)(vaultAddress, jsonProvider, dex, isVaultInverted, token0Decimals, token1Decimals),
+        tvl: await (0, priceFromPool_1.getVaultTvl)(vault, jsonProvider, chainId, dex, isVaultInverted, token0Decimals, token1Decimals),
+        feeAmount: 0,
+        lpPrice: await (0, priceFromPool_1.getCurrLpPrice)(vault, jsonProvider, dex, chainId, isVaultInverted, token0Decimals, token1Decimals),
+        poolPrice: await (0, priceFromPool_1.getCurrPrice)(vault, jsonProvider, chainId, dex, isVaultInverted, token0Decimals, token1Decimals),
+    };
+    const result = [...arrDeposits, ...arrWithdraws, ...arrRebalances, ...arrOtherFees, currentVaultEvent].sort((a, b) => Number(b.atTimestamp) - Number(a.atTimestamp));
+    return result;
 }
 exports.getVaultEventsForTimeInterval = getVaultEventsForTimeInterval;
 //# sourceMappingURL=vaultTvl.js.map

package/dist/src/functions/vaultTvl.js.map

@@ -1 +1 @@
-{"version":3,"file":"vaultTvl.js","sourceRoot":"","sources":["../../../src/functions/vaultTvl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vaultTvl.js","sourceRoot":"","sources":["../../../src/functions/vaultTvl.ts"],"names":[],"mappings":"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"}