@ichidao/ichi-vaults-sdk 0.0.61 → 0.0.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { JsonRpcProvider } from '@ethersproject/providers';
2
2
  import { Fees, FeesInfo, SupportedDex, TotalAmounts, TotalAmountsBN, VaultState } from '../types';
3
3
  export declare function getTotalAmountsAtFeeCollectionEvent(objFees: VaultState, isVaultInverted: boolean, token0Decimals: number, token1Decimals: number): [number, number];
4
+ export declare function getFeesAmountInBaseTokens(objFees: Fees, isVaultInverted: boolean, token0Decimals: number, token1Decimals: number): number;
4
5
  export declare function getTotalFeesAmountInBaseTokens(feesDataset: Fees[], t0decimals: number, t1decimals: number, isInverted: boolean): number;
5
6
  export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<TotalAmounts>;
6
7
  export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, raw: true, days?: number): Promise<TotalAmountsBN>;
@@ -42,7 +42,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
42
42
  return (mod && mod.__esModule) ? mod : { "default": mod };
43
43
  };
44
44
  Object.defineProperty(exports, "__esModule", { value: true });
45
- exports.getFeesCollectedInfo = exports.getFeesCollected = exports.getTotalFeesAmountInBaseTokens = exports.getTotalAmountsAtFeeCollectionEvent = void 0;
45
+ exports.getFeesCollectedInfo = exports.getFeesCollected = exports.getTotalFeesAmountInBaseTokens = exports.getFeesAmountInBaseTokens = exports.getTotalAmountsAtFeeCollectionEvent = void 0;
46
46
  var bignumber_1 = require("@ethersproject/bignumber");
47
47
  var vault_1 = require("./vault");
48
48
  var _totalBalances_1 = require("./_totalBalances");
@@ -83,6 +83,7 @@ function getFeesAmountInBaseTokens(objFees, isVaultInverted, token0Decimals, tok
83
83
  var amount1 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.feeAmount1), token1Decimals)) * price1;
84
84
  return amount0 + amount1;
85
85
  }
86
+ exports.getFeesAmountInBaseTokens = getFeesAmountInBaseTokens;
86
87
  function getTotalFeesAmountInBaseTokens(feesDataset, t0decimals, t1decimals, isInverted) {
87
88
  var amount = feesDataset.reduce(function (total, curr) { return total + getFeesAmountInBaseTokens(curr, isInverted, t0decimals, t1decimals); }, 0);
88
89
  return amount;
@@ -1 +1 @@
1
- {"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import { JsonRpcProvider } from '@ethersproject/providers';
2
+ import { IchiVault, SupportedDex, VaultState, VaultTransactionEvent } from '../types';
3
+ export type VaultEvent = {
4
+ atTimestamp: string;
5
+ dtr: number;
6
+ tvl: number;
7
+ feeAmount: number;
8
+ };
9
+ export declare function getTvlAtTransactionEvent(objTransactionEvent: VaultTransactionEvent, vault: IchiVault, token0decimals: number, token1decimals: number): number;
10
+ export declare function getTvlAtFeeCollectionEvent(objFeeCollectionEvent: VaultState, vault: IchiVault, token0decimals: number, token1decimals: number): number;
11
+ export declare function getVaultEventsForTimeInterval(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, timeInterval: number): Promise<VaultEvent[]>;
@@ -0,0 +1,177 @@
1
+ "use strict";
2
+ /* eslint-disable no-redeclare */
3
+ /* eslint-disable import/prefer-default-export */
4
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
5
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
6
+ return new (P || (P = Promise))(function (resolve, reject) {
7
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
8
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
9
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
10
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
11
+ });
12
+ };
13
+ var __generator = (this && this.__generator) || function (thisArg, body) {
14
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
15
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
16
+ function verb(n) { return function (v) { return step([n, v]); }; }
17
+ function step(op) {
18
+ if (f) throw new TypeError("Generator is already executing.");
19
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
20
+ 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;
21
+ if (y = 0, t) op = [op[0] & 2, t.value];
22
+ switch (op[0]) {
23
+ case 0: case 1: t = op; break;
24
+ case 4: _.label++; return { value: op[1], done: false };
25
+ case 5: _.label++; y = op[1]; op = [0]; continue;
26
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
27
+ default:
28
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
29
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
30
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
31
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
32
+ if (t[2]) _.ops.pop();
33
+ _.trys.pop(); continue;
34
+ }
35
+ op = body.call(thisArg, _);
36
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
37
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
38
+ }
39
+ };
40
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
41
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
42
+ if (ar || !(i in from)) {
43
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
44
+ ar[i] = from[i];
45
+ }
46
+ }
47
+ return to.concat(ar || Array.prototype.slice.call(from));
48
+ };
49
+ var __importDefault = (this && this.__importDefault) || function (mod) {
50
+ return (mod && mod.__esModule) ? mod : { "default": mod };
51
+ };
52
+ Object.defineProperty(exports, "__esModule", { value: true });
53
+ exports.getVaultEventsForTimeInterval = exports.getTvlAtFeeCollectionEvent = exports.getTvlAtTransactionEvent = void 0;
54
+ var bignumber_1 = require("@ethersproject/bignumber");
55
+ // eslint-disable-next-line import/no-cycle
56
+ var vault_1 = require("./vault");
57
+ var _totalBalances_1 = require("./_totalBalances");
58
+ var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
59
+ var timestamps_1 = require("../utils/timestamps");
60
+ var getPrice_1 = __importDefault(require("../utils/getPrice"));
61
+ var calculateFees_1 = require("./calculateFees");
62
+ var priceFromPool_1 = require("./priceFromPool");
63
+ var _vaultEvents_1 = require("./_vaultEvents");
64
+ var calculateDtr_1 = require("./calculateDtr");
65
+ function formatVaultEvent(dtr, tvl, fee) {
66
+ var ve = { atTimestamp: dtr.atTimestamp, dtr: dtr.percent, tvl: tvl, feeAmount: fee };
67
+ return ve;
68
+ }
69
+ // total amounts at deposit or withdrawal in deposit tokens
70
+ function getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals, beforeEvent) {
71
+ var price0 = !isVaultInverted
72
+ ? 1
73
+ : (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), token0Decimals, token1Decimals);
74
+ var price1 = isVaultInverted
75
+ ? 1
76
+ : (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), token0Decimals, token1Decimals);
77
+ var amount0 = beforeEvent
78
+ ? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0BeforeEvent), token0Decimals)) * price0
79
+ : Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0), token0Decimals)) * price0;
80
+ var amount1 = beforeEvent
81
+ ? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount1BeforeEvent), token1Decimals)) * price1
82
+ : Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount1), token1Decimals)) * price1;
83
+ return [amount0, amount1];
84
+ }
85
+ function getTvlAtTransactionEvent(objTransactionEvent, vault, token0decimals, token1decimals) {
86
+ var isVaultInverted = vault.allowTokenB;
87
+ var totalAmounts = getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0decimals, token1decimals, false);
88
+ var tvl = totalAmounts[0] + totalAmounts[1];
89
+ return tvl;
90
+ }
91
+ exports.getTvlAtTransactionEvent = getTvlAtTransactionEvent;
92
+ function getTvlAtFeeCollectionEvent(objFeeCollectionEvent, vault, token0decimals, token1decimals) {
93
+ var isVaultInverted = vault.allowTokenB;
94
+ var totalAmounts = (0, calculateFees_1.getTotalAmountsAtFeeCollectionEvent)(objFeeCollectionEvent, isVaultInverted, token0decimals, token1decimals);
95
+ var tvl = totalAmounts[0] + totalAmounts[1];
96
+ return tvl;
97
+ }
98
+ exports.getTvlAtFeeCollectionEvent = getTvlAtFeeCollectionEvent;
99
+ // time Interval in days
100
+ function getVaultEventsForTimeInterval(vaultAddress, jsonProvider, dex, timeInterval) {
101
+ return __awaiter(this, void 0, void 0, function () {
102
+ var _a, chainId, vault, token0Decimals, token1Decimals, isVaultInverted, rebalances, collectedFees, deposits, withdraws, arrRebalances, arrOtherFees, arrDeposits, arrWithdraws, currentVaultEvent, result;
103
+ var _b;
104
+ return __generator(this, function (_c) {
105
+ switch (_c.label) {
106
+ case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
107
+ case 1:
108
+ _a = _c.sent(), chainId = _a.chainId, vault = _a.vault;
109
+ return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenA, jsonProvider, chainId)];
110
+ case 2:
111
+ token0Decimals = _c.sent();
112
+ return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(vault.tokenB, jsonProvider, chainId)];
113
+ case 3:
114
+ token1Decimals = _c.sent();
115
+ isVaultInverted = vault.allowTokenB;
116
+ return [4 /*yield*/, (0, _vaultEvents_1._getRebalances)(vaultAddress, chainId, dex, timeInterval)];
117
+ case 4:
118
+ rebalances = _c.sent();
119
+ if (!rebalances)
120
+ throw new Error("Error getting vault rebalances on ".concat(chainId, " for ").concat(vaultAddress));
121
+ return [4 /*yield*/, (0, _vaultEvents_1._getFeesCollectedEvents)(vaultAddress, chainId, dex, timeInterval)];
122
+ case 5:
123
+ collectedFees = _c.sent();
124
+ if (!collectedFees)
125
+ throw new Error("Error getting vault collected fees on ".concat(chainId, " for ").concat(vaultAddress));
126
+ return [4 /*yield*/, (0, _vaultEvents_1._getDeposits)(vaultAddress, chainId, dex, timeInterval)];
127
+ case 6:
128
+ deposits = _c.sent();
129
+ if (!deposits)
130
+ throw new Error("Error getting vault deposits on ".concat(chainId, " for ").concat(vaultAddress));
131
+ return [4 /*yield*/, (0, _vaultEvents_1._getWithdraws)(vaultAddress, chainId, dex, timeInterval)];
132
+ case 7:
133
+ withdraws = _c.sent();
134
+ if (!withdraws)
135
+ throw new Error("Error getting vault withdraws on ".concat(chainId, " for ").concat(vaultAddress));
136
+ arrRebalances = rebalances
137
+ .slice()
138
+ .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
139
+ .map(function (e) {
140
+ 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));
141
+ });
142
+ arrOtherFees = collectedFees
143
+ .slice()
144
+ .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
145
+ .map(function (e) {
146
+ 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));
147
+ });
148
+ arrDeposits = deposits
149
+ .slice()
150
+ .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
151
+ .map(function (e) {
152
+ return formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0);
153
+ });
154
+ arrWithdraws = withdraws
155
+ .slice()
156
+ .filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.daysToMilliseconds)(timeInterval); })
157
+ .map(function (e) {
158
+ return formatVaultEvent((0, calculateDtr_1.getDtrAtTransactionEvent)(e, vault.allowTokenB, token0Decimals, token1Decimals), getTvlAtTransactionEvent(e, vault, token0Decimals, token1Decimals), 0);
159
+ });
160
+ _b = {
161
+ atTimestamp: Math.floor(Date.now() / 1000).toString()
162
+ };
163
+ return [4 /*yield*/, (0, priceFromPool_1.getCurrentDtr)(vaultAddress, jsonProvider, dex, isVaultInverted, token0Decimals, token1Decimals)];
164
+ case 8:
165
+ _b.dtr = _c.sent();
166
+ return [4 /*yield*/, (0, priceFromPool_1.getVaultTvl)(vault, jsonProvider, chainId, dex, isVaultInverted, token0Decimals, token1Decimals)];
167
+ case 9:
168
+ currentVaultEvent = (_b.tvl = _c.sent(),
169
+ _b);
170
+ 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); });
171
+ return [2 /*return*/, result];
172
+ }
173
+ });
174
+ });
175
+ }
176
+ exports.getVaultEventsForTimeInterval = getVaultEventsForTimeInterval;
177
+ //# sourceMappingURL=vaultTvl.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vaultTvl.js","sourceRoot":"","sources":["../../../src/functions/vaultTvl.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@
2
2
  /**
3
3
  * @license
4
4
  * author: ICHI DAO <core@ichi.org>
5
- * ichi-vaults-sdk.js v0.0.61
5
+ * ichi-vaults-sdk.js v0.0.63
6
6
  * Released under the MIT license.
7
7
  */
8
8
 
@@ -20,4 +20,5 @@ tslib_1.__exportStar(require("./functions/calculateFees"), exports);
20
20
  tslib_1.__exportStar(require("./functions/calculateDtr"), exports);
21
21
  tslib_1.__exportStar(require("./functions/calculateApr"), exports);
22
22
  tslib_1.__exportStar(require("./functions/vaultMetrics"), exports);
23
+ tslib_1.__exportStar(require("./functions/vaultTvl"), exports);
23
24
  tslib_1.__exportStar(require("./types/index"), exports);
@@ -7,4 +7,5 @@ export * from './functions/calculateFees';
7
7
  export * from './functions/calculateDtr';
8
8
  export * from './functions/calculateApr';
9
9
  export * from './functions/vaultMetrics';
10
+ export * from './functions/vaultTvl';
10
11
  export * from './types/index';
@@ -2,7 +2,7 @@
2
2
  /**
3
3
  * @license
4
4
  * author: ICHI DAO <core@ichi.org>
5
- * ichi-vaults-sdk.js v0.0.61
5
+ * ichi-vaults-sdk.js v0.0.63
6
6
  * Released under the MIT license.
7
7
  */
8
8
 
@@ -18,4 +18,5 @@ tslib_1.__exportStar(require("./functions/calculateFees"), exports);
18
18
  tslib_1.__exportStar(require("./functions/calculateDtr"), exports);
19
19
  tslib_1.__exportStar(require("./functions/calculateApr"), exports);
20
20
  tslib_1.__exportStar(require("./functions/vaultMetrics"), exports);
21
+ tslib_1.__exportStar(require("./functions/vaultTvl"), exports);
21
22
  tslib_1.__exportStar(require("./types/index"), exports);
package/dist/src/index.js CHANGED
@@ -24,5 +24,6 @@ __exportStar(require("./functions/calculateFees"), exports);
24
24
  __exportStar(require("./functions/calculateDtr"), exports);
25
25
  __exportStar(require("./functions/calculateApr"), exports);
26
26
  __exportStar(require("./functions/vaultMetrics"), exports);
27
+ __exportStar(require("./functions/vaultTvl"), exports);
27
28
  __exportStar(require("./types/index"), exports);
28
29
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,4DAA0C;AAC1C,2DAAyC;AACzC,sDAAoC;AACpC,uDAAqC;AACrC,oDAAkC;AAClC,4DAA0C;AAC1C,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,gDAA8B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,4DAA0C;AAC1C,2DAAyC;AACzC,sDAAoC;AACpC,uDAAqC;AACrC,oDAAkC;AAClC,4DAA0C;AAC1C,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,uDAAqC;AACrC,gDAA8B"}
@@ -1,6 +1,7 @@
1
1
  import { JsonRpcProvider } from '@ethersproject/providers';
2
2
  import { Fees, FeesInfo, SupportedDex, TotalAmounts, TotalAmountsBN, VaultState } from '../types';
3
3
  export declare function getTotalAmountsAtFeeCollectionEvent(objFees: VaultState, isVaultInverted: boolean, token0Decimals: number, token1Decimals: number): [number, number];
4
+ export declare function getFeesAmountInBaseTokens(objFees: Fees, isVaultInverted: boolean, token0Decimals: number, token1Decimals: number): number;
4
5
  export declare function getTotalFeesAmountInBaseTokens(feesDataset: Fees[], t0decimals: number, t1decimals: number, isInverted: boolean): number;
5
6
  export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<TotalAmounts>;
6
7
  export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, raw: true, days?: number): Promise<TotalAmountsBN>;
@@ -0,0 +1,11 @@
1
+ import { JsonRpcProvider } from '@ethersproject/providers';
2
+ import { IchiVault, SupportedDex, VaultState, VaultTransactionEvent } from '../types';
3
+ export type VaultEvent = {
4
+ atTimestamp: string;
5
+ dtr: number;
6
+ tvl: number;
7
+ feeAmount: number;
8
+ };
9
+ export declare function getTvlAtTransactionEvent(objTransactionEvent: VaultTransactionEvent, vault: IchiVault, token0decimals: number, token1decimals: number): number;
10
+ export declare function getTvlAtFeeCollectionEvent(objFeeCollectionEvent: VaultState, vault: IchiVault, token0decimals: number, token1decimals: number): number;
11
+ export declare function getVaultEventsForTimeInterval(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, timeInterval: number): Promise<VaultEvent[]>;
@@ -7,4 +7,5 @@ export * from './functions/calculateFees';
7
7
  export * from './functions/calculateDtr';
8
8
  export * from './functions/calculateApr';
9
9
  export * from './functions/vaultMetrics';
10
+ export * from './functions/vaultTvl';
10
11
  export * from './types/index';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ichidao/ichi-vaults-sdk",
3
- "version": "0.0.61",
3
+ "version": "0.0.63",
4
4
  "description": "The ICHI Vaults SDK",
5
5
  "main": "dist/src/index.cjs.js",
6
6
  "module": "dist/src/index.esm.js",