@ichidao/ichi-vaults-sdk 0.0.19 → 0.0.20
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.
- package/README.md +110 -58
- package/dist/abis/types/AlgebraPool.d.ts +817 -0
- package/dist/abis/types/AlgebraPool.js +3 -0
- package/dist/abis/types/AlgebraPool.js.map +1 -0
- package/dist/abis/types/DepositGuard.d.ts +100 -13
- package/dist/abis/types/UniswapV3Pool.d.ts +771 -0
- package/dist/abis/types/UniswapV3Pool.js +3 -0
- package/dist/abis/types/UniswapV3Pool.js.map +1 -0
- package/dist/abis/types/factories/AlgebraPool__factory.d.ts +821 -0
- package/dist/abis/types/factories/AlgebraPool__factory.js +1062 -0
- package/dist/abis/types/factories/AlgebraPool__factory.js.map +1 -0
- package/dist/abis/types/factories/DepositGuard__factory.d.ts +124 -4
- package/dist/abis/types/factories/DepositGuard__factory.js +160 -5
- package/dist/abis/types/factories/DepositGuard__factory.js.map +1 -1
- package/dist/abis/types/factories/UniswapV3Pool__factory.d.ts +781 -0
- package/dist/abis/types/factories/UniswapV3Pool__factory.js +1009 -0
- package/dist/abis/types/factories/UniswapV3Pool__factory.js.map +1 -0
- package/dist/abis/types/factories/index.d.ts +2 -0
- package/dist/abis/types/factories/index.js +5 -1
- package/dist/abis/types/factories/index.js.map +1 -1
- package/dist/abis/types/index.d.ts +4 -0
- package/dist/abis/types/index.js +5 -1
- package/dist/abis/types/index.js.map +1 -1
- package/dist/src/__tests__/index.test.js +37 -41
- package/dist/src/__tests__/index.test.js.map +1 -1
- package/dist/src/abis/types/AlgebraPool.d.ts +817 -0
- package/dist/src/abis/types/DepositGuard.d.ts +100 -13
- package/dist/src/abis/types/UniswapV3Pool.d.ts +771 -0
- package/dist/src/abis/types/factories/AlgebraPool__factory.d.ts +821 -0
- package/dist/src/abis/types/factories/DepositGuard__factory.d.ts +124 -4
- package/dist/src/abis/types/factories/UniswapV3Pool__factory.d.ts +781 -0
- package/dist/src/abis/types/factories/index.d.ts +2 -0
- package/dist/src/abis/types/index.d.ts +4 -0
- package/dist/src/contracts/index.d.ts +4 -1
- package/dist/src/contracts/index.js +21 -1
- package/dist/src/contracts/index.js.map +1 -1
- package/dist/src/functions/balances.js +4 -4
- package/dist/src/functions/balances.js.map +1 -1
- package/dist/src/functions/calculateFees.d.ts +2 -1
- package/dist/src/functions/calculateFees.js +212 -15
- package/dist/src/functions/calculateFees.js.map +1 -1
- package/dist/src/functions/deposit.js +8 -8
- package/dist/src/functions/deposit.js.map +1 -1
- package/dist/src/functions/fees.d.ts +3 -4
- package/dist/src/functions/fees.js +70 -34
- package/dist/src/functions/fees.js.map +1 -1
- package/dist/src/functions/vault.js +2 -2
- package/dist/src/functions/vault.js.map +1 -1
- package/dist/src/functions/withdraw.js +1 -1
- package/dist/src/functions/withdraw.js.map +1 -1
- package/dist/src/graphql/constants.js +18 -12
- package/dist/src/graphql/constants.js.map +1 -1
- package/dist/src/graphql/queries.d.ts +2 -2
- package/dist/src/graphql/queries.js +4 -2
- package/dist/src/graphql/queries.js.map +1 -1
- package/dist/src/index.cjs.js +1 -1
- package/dist/src/index.esm.js +1 -1
- package/dist/src/src/contracts/index.d.ts +4 -1
- package/dist/src/src/functions/calculateFees.d.ts +2 -1
- package/dist/src/src/functions/fees.d.ts +3 -4
- package/dist/src/src/graphql/queries.d.ts +2 -2
- package/dist/src/src/types/index.d.ts +9 -0
- package/dist/src/src/utils/config/addresses.d.ts +5 -1
- package/dist/src/src/utils/getPrice.d.ts +2 -0
- package/dist/src/src/utils/timestamps.d.ts +1 -0
- package/dist/src/types/index.d.ts +9 -0
- package/dist/src/types/index.js +2 -0
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/utils/config/addresses.d.ts +5 -1
- package/dist/src/utils/config/addresses.js +120 -33
- package/dist/src/utils/config/addresses.js.map +1 -1
- package/dist/src/utils/getPrice.d.ts +2 -0
- package/dist/src/utils/getPrice.js +18 -0
- package/dist/src/utils/getPrice.js.map +1 -0
- package/dist/src/utils/timestamps.d.ts +1 -0
- package/dist/src/utils/timestamps.js +7 -0
- package/dist/src/utils/timestamps.js.map +1 -0
- package/package.json +2 -1
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export { DepositGuard__factory } from "./DepositGuard__factory";
|
|
2
2
|
export { ERC20__factory } from "./ERC20__factory";
|
|
3
3
|
export { IchiVault__factory } from "./IchiVault__factory";
|
|
4
|
+
export { AlgebraPool__factory } from "./AlgebraPool__factory";
|
|
5
|
+
export { UniswapV3Pool__factory } from "./UniswapV3Pool__factory";
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
export type { DepositGuard } from "./DepositGuard";
|
|
2
2
|
export type { ERC20 } from "./ERC20";
|
|
3
3
|
export type { IchiVault } from "./IchiVault";
|
|
4
|
+
export type { AlgebraPool } from "./AlgebraPool";
|
|
5
|
+
export type { UniswapV3Pool } from "./UniswapV3Pool";
|
|
4
6
|
export * as factories from "./factories";
|
|
7
|
+
export { AlgebraPool__factory } from "./factories/AlgebraPool__factory";
|
|
5
8
|
export { DepositGuard__factory } from "./factories/DepositGuard__factory";
|
|
6
9
|
export { ERC20__factory } from "./factories/ERC20__factory";
|
|
7
10
|
export { IchiVault__factory } from "./factories/IchiVault__factory";
|
|
11
|
+
export { UniswapV3Pool__factory } from "./factories/UniswapV3Pool__factory";
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
1
2
|
import { SignerOrProvider } from '../types';
|
|
2
|
-
import { ERC20, IchiVault, DepositGuard } from '../../abis/types';
|
|
3
|
+
import { ERC20, IchiVault, DepositGuard, UniswapV3Pool, AlgebraPool } from '../../abis/types';
|
|
3
4
|
declare function getERC20Contract(address: string, signerOrProvider: SignerOrProvider): ERC20;
|
|
4
5
|
declare function getDepositGuardContract(address: string, signerOrProvider: SignerOrProvider): DepositGuard;
|
|
5
6
|
declare function getIchiVaultContract(address: string, signerOrProvider: SignerOrProvider): IchiVault;
|
|
7
|
+
export declare function getUniswapV3PoolContract(address: string, provider: JsonRpcProvider): UniswapV3Pool;
|
|
8
|
+
export declare function getAlgebraPoolContract(address: string, provider: JsonRpcProvider): AlgebraPool;
|
|
6
9
|
export { getERC20Contract, getDepositGuardContract, getIchiVaultContract };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getIchiVaultContract = exports.getDepositGuardContract = exports.getERC20Contract = void 0;
|
|
3
|
+
exports.getIchiVaultContract = exports.getDepositGuardContract = exports.getERC20Contract = exports.getAlgebraPoolContract = exports.getUniswapV3PoolContract = void 0;
|
|
4
4
|
/* eslint-disable camelcase */
|
|
5
5
|
var address_1 = require("@ethersproject/address");
|
|
6
6
|
var types_1 = require("../../abis/types");
|
|
@@ -19,4 +19,24 @@ function getIchiVaultContract(address, signerOrProvider) {
|
|
|
19
19
|
return types_1.IchiVault__factory.connect(address, signerOrProvider);
|
|
20
20
|
}
|
|
21
21
|
exports.getIchiVaultContract = getIchiVaultContract;
|
|
22
|
+
function getUniswapV3PoolContract(address, provider) {
|
|
23
|
+
try {
|
|
24
|
+
return types_1.UniswapV3Pool__factory.connect(address, provider);
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
console.error("Couldn't create UniswapV3Pool contract with address: ".concat(address));
|
|
28
|
+
throw e;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.getUniswapV3PoolContract = getUniswapV3PoolContract;
|
|
32
|
+
function getAlgebraPoolContract(address, provider) {
|
|
33
|
+
try {
|
|
34
|
+
return types_1.AlgebraPool__factory.connect(address, provider);
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
console.error("Couldn't create AlgebraPool contract with address: ".concat(address));
|
|
38
|
+
throw e;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.getAlgebraPoolContract = getAlgebraPoolContract;
|
|
22
42
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contracts/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kDAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contracts/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kDAAoD;AAGpD,0CAW0B;AAE1B,SAAS,gBAAgB,CAAC,OAAe,EAAE,gBAAkC;IAC3E,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IACpB,OAAO,sBAAY,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AACzD,CAAC;AA4BQ,4CAAgB;AA1BzB,SAAS,uBAAuB,CAAC,OAAe,EAAE,gBAAkC;IAClF,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IACpB,OAAO,6BAAqB,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAClE,CAAC;AAuB0B,0DAAuB;AArBlD,SAAS,oBAAoB,CAAC,OAAe,EAAE,gBAAkC;IAC/E,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IACpB,OAAO,0BAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAC/D,CAAC;AAkBmD,oDAAoB;AAhBxE,SAAgB,wBAAwB,CAAC,OAAe,EAAE,QAAyB;IACjF,IAAI;QACF,OAAO,8BAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,+DAAwD,OAAO,CAAE,CAAC,CAAC;QACjF,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAPD,4DAOC;AACD,SAAgB,sBAAsB,CAAC,OAAe,EAAE,QAAyB;IAC/E,IAAI;QACF,OAAO,4BAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;KACxD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,6DAAsD,OAAO,CAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAPD,wDAOC"}
|
|
@@ -79,7 +79,7 @@ function getUserBalance(accountAddress, vaultAddress, jsonProvider, dex, raw) {
|
|
|
79
79
|
case 2:
|
|
80
80
|
vault = _a.sent();
|
|
81
81
|
if (!vault)
|
|
82
|
-
throw new Error("Vault not found
|
|
82
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
83
83
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
84
84
|
return [4 /*yield*/, vaultContract.balanceOf(accountAddress)];
|
|
85
85
|
case 3:
|
|
@@ -105,7 +105,7 @@ function getTotalAmounts(vaultAddress, jsonProvider, dex, raw) {
|
|
|
105
105
|
case 2:
|
|
106
106
|
vault = _a.sent();
|
|
107
107
|
if (!vault)
|
|
108
|
-
throw new Error("Vault not found
|
|
108
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
109
109
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
110
110
|
return [4 /*yield*/, vaultContract.getTotalAmounts()];
|
|
111
111
|
case 3:
|
|
@@ -145,7 +145,7 @@ function getTotalSupply(vaultAddress, jsonProvider, dex, raw) {
|
|
|
145
145
|
case 2:
|
|
146
146
|
vault = _a.sent();
|
|
147
147
|
if (!vault)
|
|
148
|
-
throw new Error("Vault not found
|
|
148
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
149
149
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
150
150
|
return [4 /*yield*/, vaultContract.totalSupply()];
|
|
151
151
|
case 3:
|
|
@@ -172,7 +172,7 @@ function getUserAmounts(accountAddress, vaultAddress, jsonProvider, dex, raw) {
|
|
|
172
172
|
case 2:
|
|
173
173
|
vault = _a.sent();
|
|
174
174
|
if (!vault)
|
|
175
|
-
throw new Error("Vault not found
|
|
175
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
176
176
|
return [4 /*yield*/, getTotalAmounts(vaultAddress, jsonProvider, dex, true)];
|
|
177
177
|
case 3:
|
|
178
178
|
totalAmountsBN = _a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../../src/functions/balances.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,iCAAmC;AACnC,0CAAsE;AACtE,kCAQkB;AAClB,uEAAiD;AACjD,2CAA2C;AAC3C,iCAA2C;AAE3C,SAAsB,gBAAgB,CAAC,YAAoB,EAAE,YAA6B;;;;;;oBAClF,aAAa,GAAG,IAAA,4BAAgB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBAC7C,qBAAM,aAAa,CAAC,QAAQ,EAAE,EAAA;;oBAA9C,aAAa,GAAG,SAA8B;oBACpD,sBAAO,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,EAAC;;;;CAC5B;AAJD,4CAIC;AAiBD,SAAsB,cAAc,CAClC,cAAsB,EACtB,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,GAAU;;;;;wBAEU,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,CAAE,CAAC,CAAC;qBACnE;oBACa,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,EAAA;;oBAAxE,KAAK,GAAG,SAAgE;oBAC9E,IAAI,CAAC,KAAK;wBAAE,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../../src/functions/balances.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
-
import { SupportedDex, TotalAmounts, TotalAmountsBN } from '../types';
|
|
2
|
+
import { FeesInfo, SupportedDex, TotalAmounts, TotalAmountsBN } from '../types';
|
|
3
3
|
export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<TotalAmounts>;
|
|
4
4
|
export declare function getFeesCollected(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, raw: true, days?: number): Promise<TotalAmountsBN>;
|
|
5
|
+
export declare function getFeesCollectedInfo(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, forDays?: number[]): Promise<FeesInfo[]>;
|
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
42
42
|
};
|
|
43
43
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
|
-
exports.getFeesCollected = void 0;
|
|
44
|
+
exports.getFeesCollectedInfo = exports.getFeesCollected = void 0;
|
|
45
45
|
var bignumber_1 = require("@ethersproject/bignumber");
|
|
46
46
|
var types_1 = require("../types");
|
|
47
47
|
// eslint-disable-next-line import/no-cycle
|
|
@@ -49,6 +49,145 @@ var vault_1 = require("./vault");
|
|
|
49
49
|
var fees_1 = require("./fees");
|
|
50
50
|
var balances_1 = require("./balances");
|
|
51
51
|
var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
|
|
52
|
+
var timestamps_1 = __importDefault(require("../utils/timestamps"));
|
|
53
|
+
var deposit_1 = require("./deposit");
|
|
54
|
+
var getPrice_1 = __importDefault(require("../utils/getPrice"));
|
|
55
|
+
var contracts_1 = require("../contracts");
|
|
56
|
+
var addresses_1 = __importDefault(require("../utils/config/addresses"));
|
|
57
|
+
function getCollectedTokenAmountBN(ind, feesDataset) {
|
|
58
|
+
// const filteredDataset = feesDataset.filter((f) => f.createdAtTimestamp> now-days)
|
|
59
|
+
var amounts = ind === 0
|
|
60
|
+
? feesDataset.map(function (r) { return bignumber_1.BigNumber.from(r.feeAmount0); })
|
|
61
|
+
: feesDataset.map(function (r) { return bignumber_1.BigNumber.from(r.feeAmount1); });
|
|
62
|
+
var amountBN = amounts.reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0));
|
|
63
|
+
return amountBN;
|
|
64
|
+
}
|
|
65
|
+
function getFeesAmountInBaseTokens(objFees, isVaultInverted, token0Decimals, token1Decimals) {
|
|
66
|
+
var price0 = !isVaultInverted
|
|
67
|
+
? 1
|
|
68
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), token0Decimals, token1Decimals);
|
|
69
|
+
var price1 = isVaultInverted
|
|
70
|
+
? 1
|
|
71
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), token0Decimals, token1Decimals);
|
|
72
|
+
var amount0 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.feeAmount0), token0Decimals)) * price0;
|
|
73
|
+
var amount1 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.feeAmount1), token1Decimals)) * price1;
|
|
74
|
+
return amount0 + amount1;
|
|
75
|
+
}
|
|
76
|
+
function getTotalFeesAmountInBaseTokens(feesDataset, t0decimals, t1decimals, isInverted) {
|
|
77
|
+
var amount = feesDataset.reduce(function (total, curr) { return total + getFeesAmountInBaseTokens(curr, isInverted, t0decimals, t1decimals); }, 0);
|
|
78
|
+
return amount;
|
|
79
|
+
}
|
|
80
|
+
function getSqrtPriceFromPool(vaultAddress, jsonProvider, dex) {
|
|
81
|
+
var _a;
|
|
82
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
83
|
+
var chainId, vault, vaultContract, poolAddress, poolContract, globalState, poolContract, slot0, e_1;
|
|
84
|
+
return __generator(this, function (_b) {
|
|
85
|
+
switch (_b.label) {
|
|
86
|
+
case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
|
|
87
|
+
case 1:
|
|
88
|
+
chainId = (_b.sent()).chainId;
|
|
89
|
+
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
90
|
+
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
91
|
+
}
|
|
92
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
93
|
+
case 2:
|
|
94
|
+
vault = _b.sent();
|
|
95
|
+
if (!vault)
|
|
96
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
97
|
+
_b.label = 3;
|
|
98
|
+
case 3:
|
|
99
|
+
_b.trys.push([3, 9, , 10]);
|
|
100
|
+
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
101
|
+
return [4 /*yield*/, vaultContract.pool()];
|
|
102
|
+
case 4:
|
|
103
|
+
poolAddress = _b.sent();
|
|
104
|
+
if (!((_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.isAlgebra)) return [3 /*break*/, 6];
|
|
105
|
+
poolContract = (0, contracts_1.getAlgebraPoolContract)(poolAddress, jsonProvider);
|
|
106
|
+
return [4 /*yield*/, poolContract.globalState()];
|
|
107
|
+
case 5:
|
|
108
|
+
globalState = _b.sent();
|
|
109
|
+
return [2 /*return*/, globalState.price];
|
|
110
|
+
case 6:
|
|
111
|
+
poolContract = (0, contracts_1.getUniswapV3PoolContract)(poolAddress, jsonProvider);
|
|
112
|
+
return [4 /*yield*/, poolContract.slot0()];
|
|
113
|
+
case 7:
|
|
114
|
+
slot0 = _b.sent();
|
|
115
|
+
return [2 /*return*/, slot0[0]];
|
|
116
|
+
case 8: return [3 /*break*/, 10];
|
|
117
|
+
case 9:
|
|
118
|
+
e_1 = _b.sent();
|
|
119
|
+
console.error("Could not get price from vault ".concat(vaultAddress, " "));
|
|
120
|
+
throw e_1;
|
|
121
|
+
case 10: return [2 /*return*/];
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
function getCurrPrice(vaultAddress, jsonProvider, dex, isVaultInverted, token0decimals, token1decimals) {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
128
|
+
var chainId, vault, sqrtPrice, depositTokenDecimals, scarseTokenDecimals, price, e_2;
|
|
129
|
+
return __generator(this, function (_a) {
|
|
130
|
+
switch (_a.label) {
|
|
131
|
+
case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
|
|
132
|
+
case 1:
|
|
133
|
+
chainId = (_a.sent()).chainId;
|
|
134
|
+
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
135
|
+
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
136
|
+
}
|
|
137
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
138
|
+
case 2:
|
|
139
|
+
vault = _a.sent();
|
|
140
|
+
if (!vault)
|
|
141
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
142
|
+
_a.label = 3;
|
|
143
|
+
case 3:
|
|
144
|
+
_a.trys.push([3, 5, , 6]);
|
|
145
|
+
return [4 /*yield*/, getSqrtPriceFromPool(vaultAddress, jsonProvider, dex)];
|
|
146
|
+
case 4:
|
|
147
|
+
sqrtPrice = _a.sent();
|
|
148
|
+
depositTokenDecimals = isVaultInverted ? token1decimals : token0decimals;
|
|
149
|
+
scarseTokenDecimals = isVaultInverted ? token0decimals : token1decimals;
|
|
150
|
+
price = (0, getPrice_1.default)(isVaultInverted, sqrtPrice, depositTokenDecimals, scarseTokenDecimals, 15);
|
|
151
|
+
return [2 /*return*/, price];
|
|
152
|
+
case 5:
|
|
153
|
+
e_2 = _a.sent();
|
|
154
|
+
console.error("Could not get price from vault ".concat(vaultAddress, " "));
|
|
155
|
+
throw e_2;
|
|
156
|
+
case 6: return [2 /*return*/];
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
function getVaultTvl(vaultAddress, jsonProvider, dex, isVaultInverted, token0decimals, token1decimals) {
|
|
162
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
163
|
+
var chainId, vault, totalAmounts, price, tvl;
|
|
164
|
+
return __generator(this, function (_a) {
|
|
165
|
+
switch (_a.label) {
|
|
166
|
+
case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
|
|
167
|
+
case 1:
|
|
168
|
+
chainId = (_a.sent()).chainId;
|
|
169
|
+
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
170
|
+
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
171
|
+
}
|
|
172
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
173
|
+
case 2:
|
|
174
|
+
vault = _a.sent();
|
|
175
|
+
if (!vault)
|
|
176
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
177
|
+
return [4 /*yield*/, (0, balances_1.getTotalAmounts)(vaultAddress, jsonProvider, dex)];
|
|
178
|
+
case 3:
|
|
179
|
+
totalAmounts = _a.sent();
|
|
180
|
+
return [4 /*yield*/, getCurrPrice(vaultAddress, jsonProvider, dex, isVaultInverted, token0decimals, token1decimals)];
|
|
181
|
+
case 4:
|
|
182
|
+
price = _a.sent();
|
|
183
|
+
tvl = !isVaultInverted
|
|
184
|
+
? Number(totalAmounts.total0) + Number(totalAmounts.total1) * price
|
|
185
|
+
: Number(totalAmounts.total1) + Number(totalAmounts.total0) * price;
|
|
186
|
+
return [2 /*return*/, tvl];
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
}
|
|
52
191
|
function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
|
|
53
192
|
return __awaiter(this, void 0, void 0, function () {
|
|
54
193
|
var chainId, vault, token0Decimals, token1Decimals, numOfDays, rebalances, collectedFees, amount0BN, amount1BN, feeAmountsBN, feeAmounts;
|
|
@@ -64,7 +203,7 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
|
|
|
64
203
|
case 2:
|
|
65
204
|
vault = _a.sent();
|
|
66
205
|
if (!vault)
|
|
67
|
-
throw new Error("Vault not found on ".concat(chainId, "
|
|
206
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
68
207
|
return [4 /*yield*/, (0, balances_1.getTokenDecimals)(vault.tokenA, jsonProvider)];
|
|
69
208
|
case 3:
|
|
70
209
|
token0Decimals = _a.sent();
|
|
@@ -77,23 +216,13 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
|
|
|
77
216
|
rebalances = _a.sent();
|
|
78
217
|
if (!rebalances)
|
|
79
218
|
throw new Error("Error getting vault rebalances on ".concat(chainId, " for ").concat(vaultAddress));
|
|
80
|
-
return [4 /*yield*/, (0, fees_1.
|
|
219
|
+
return [4 /*yield*/, (0, fees_1.getFeesCollectedEvents)(vaultAddress, jsonProvider, dex, numOfDays)];
|
|
81
220
|
case 6:
|
|
82
221
|
collectedFees = _a.sent();
|
|
83
222
|
if (!collectedFees)
|
|
84
223
|
throw new Error("Error getting vault collected fees on ".concat(chainId, " for ").concat(vaultAddress));
|
|
85
|
-
amount0BN = rebalances
|
|
86
|
-
|
|
87
|
-
.reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0))
|
|
88
|
-
.add(collectedFees
|
|
89
|
-
.map(function (f) { return bignumber_1.BigNumber.from(f.feeAmount0); })
|
|
90
|
-
.reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0)));
|
|
91
|
-
amount1BN = rebalances
|
|
92
|
-
.map(function (r) { return bignumber_1.BigNumber.from(r.feeAmount1); })
|
|
93
|
-
.reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0))
|
|
94
|
-
.add(collectedFees
|
|
95
|
-
.map(function (f) { return bignumber_1.BigNumber.from(f.feeAmount1); })
|
|
96
|
-
.reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0)));
|
|
224
|
+
amount0BN = getCollectedTokenAmountBN(0, rebalances).add(getCollectedTokenAmountBN(0, collectedFees));
|
|
225
|
+
amount1BN = getCollectedTokenAmountBN(1, rebalances).add(getCollectedTokenAmountBN(1, collectedFees));
|
|
97
226
|
feeAmountsBN = {
|
|
98
227
|
total0: amount0BN,
|
|
99
228
|
total1: amount1BN,
|
|
@@ -115,4 +244,72 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
|
|
|
115
244
|
});
|
|
116
245
|
}
|
|
117
246
|
exports.getFeesCollected = getFeesCollected;
|
|
247
|
+
function getFeesCollectedInfo(vaultAddress, jsonProvider, dex, forDays) {
|
|
248
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
249
|
+
var chainId, vault, token0Decimals, token1Decimals, isVaultInverted, tvl, defaultArrayDays, arrayDays, maxTimePeriod, rebalances, collectedFees, result;
|
|
250
|
+
return __generator(this, function (_a) {
|
|
251
|
+
switch (_a.label) {
|
|
252
|
+
case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
|
|
253
|
+
case 1:
|
|
254
|
+
chainId = (_a.sent()).chainId;
|
|
255
|
+
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
256
|
+
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
257
|
+
}
|
|
258
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
259
|
+
case 2:
|
|
260
|
+
vault = _a.sent();
|
|
261
|
+
if (!vault)
|
|
262
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
263
|
+
return [4 /*yield*/, (0, balances_1.getTokenDecimals)(vault.tokenA, jsonProvider)];
|
|
264
|
+
case 3:
|
|
265
|
+
token0Decimals = _a.sent();
|
|
266
|
+
return [4 /*yield*/, (0, balances_1.getTokenDecimals)(vault.tokenB, jsonProvider)];
|
|
267
|
+
case 4:
|
|
268
|
+
token1Decimals = _a.sent();
|
|
269
|
+
return [4 /*yield*/, (0, deposit_1.isTokenAllowed)(1, vaultAddress, jsonProvider, dex)];
|
|
270
|
+
case 5:
|
|
271
|
+
isVaultInverted = _a.sent();
|
|
272
|
+
return [4 /*yield*/, getVaultTvl(vaultAddress, jsonProvider, dex, isVaultInverted, token0Decimals, token1Decimals)];
|
|
273
|
+
case 6:
|
|
274
|
+
tvl = _a.sent();
|
|
275
|
+
defaultArrayDays = [1, 7, 30];
|
|
276
|
+
arrayDays = forDays && forDays.length > 0 ? forDays : defaultArrayDays;
|
|
277
|
+
maxTimePeriod = Math.max.apply(Math, arrayDays);
|
|
278
|
+
return [4 /*yield*/, (0, fees_1.getRebalances)(vaultAddress, jsonProvider, dex, maxTimePeriod)];
|
|
279
|
+
case 7:
|
|
280
|
+
rebalances = _a.sent();
|
|
281
|
+
if (!rebalances)
|
|
282
|
+
throw new Error("Error getting vault rebalances on ".concat(chainId, " for ").concat(vaultAddress));
|
|
283
|
+
return [4 /*yield*/, (0, fees_1.getFeesCollectedEvents)(vaultAddress, jsonProvider, dex, maxTimePeriod)];
|
|
284
|
+
case 8:
|
|
285
|
+
collectedFees = _a.sent();
|
|
286
|
+
if (!collectedFees)
|
|
287
|
+
throw new Error("Error getting vault collected fees on ".concat(chainId, " for ").concat(vaultAddress));
|
|
288
|
+
result = [];
|
|
289
|
+
arrayDays.forEach(function (dayPeriod) {
|
|
290
|
+
var arrRebalances = rebalances
|
|
291
|
+
.slice()
|
|
292
|
+
.filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.default)(dayPeriod); });
|
|
293
|
+
var arrOtherFees = collectedFees
|
|
294
|
+
.slice()
|
|
295
|
+
.filter(function (r) { return Number(r.createdAtTimestamp) * 1000 > Date.now() - (0, timestamps_1.default)(dayPeriod); });
|
|
296
|
+
var amount0BN = getCollectedTokenAmountBN(0, arrRebalances).add(getCollectedTokenAmountBN(0, arrOtherFees));
|
|
297
|
+
var amount1BN = getCollectedTokenAmountBN(1, arrRebalances).add(getCollectedTokenAmountBN(1, arrOtherFees));
|
|
298
|
+
var totalFeesAmount = getTotalFeesAmountInBaseTokens(arrRebalances, token0Decimals, token1Decimals, isVaultInverted) +
|
|
299
|
+
getTotalFeesAmountInBaseTokens(arrOtherFees, token0Decimals, token1Decimals, isVaultInverted);
|
|
300
|
+
var pct = (((totalFeesAmount / dayPeriod) * 365) / tvl) * 100;
|
|
301
|
+
var feesCollectedInfo = {
|
|
302
|
+
timePeriod: dayPeriod,
|
|
303
|
+
feeAmount0: (0, formatBigInt_1.default)(amount0BN, token0Decimals),
|
|
304
|
+
feeAmount1: (0, formatBigInt_1.default)(amount1BN, token1Decimals),
|
|
305
|
+
pctAPR: pct,
|
|
306
|
+
};
|
|
307
|
+
result.push(feesCollectedInfo);
|
|
308
|
+
});
|
|
309
|
+
return [2 /*return*/, result];
|
|
310
|
+
}
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
exports.getFeesCollectedInfo = getFeesCollectedInfo;
|
|
118
315
|
//# sourceMappingURL=calculateFees.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,sDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ function isTokenAllowed(tokenIdx, vaultAddress, jsonProvider, dex) {
|
|
|
76
76
|
case 2:
|
|
77
77
|
vault = _a.sent();
|
|
78
78
|
if (!vault)
|
|
79
|
-
throw new Error("Vault not found
|
|
79
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
80
80
|
tokenAllowed = vault[tokenIdx === 0 ? 'allowTokenA' : 'allowTokenB'];
|
|
81
81
|
return [2 /*return*/, tokenAllowed];
|
|
82
82
|
}
|
|
@@ -101,10 +101,10 @@ function isDepositTokenApproved(accountAddress, tokenIdx, amount, vaultAddress,
|
|
|
101
101
|
case 2:
|
|
102
102
|
vault = _c.sent();
|
|
103
103
|
if (!vault)
|
|
104
|
-
throw new Error("Vault not found
|
|
104
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
105
105
|
token = vault[tokenIdx === 0 ? 'tokenA' : 'tokenB'];
|
|
106
106
|
tokenContract = (0, contracts_1.getERC20Contract)(token, signer);
|
|
107
|
-
depositGuardAddress = (_b = (_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.
|
|
107
|
+
depositGuardAddress = (_b = (_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address) !== null && _b !== void 0 ? _b : '';
|
|
108
108
|
return [4 /*yield*/, tokenContract.allowance(accountAddress, depositGuardAddress)];
|
|
109
109
|
case 3:
|
|
110
110
|
currentAllowanceBN = _c.sent();
|
|
@@ -135,7 +135,7 @@ function approveDepositToken(accountAddress, tokenIdx, vaultAddress, jsonProvide
|
|
|
135
135
|
case 2:
|
|
136
136
|
vault = _f.sent();
|
|
137
137
|
if (!vault)
|
|
138
|
-
throw new Error("Vault not found
|
|
138
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
139
139
|
token = vault[tokenIdx === 0 ? 'tokenA' : 'tokenB'];
|
|
140
140
|
tokenContract = (0, contracts_1.getERC20Contract)(token, signer);
|
|
141
141
|
return [4 /*yield*/, tokenContract.decimals()];
|
|
@@ -146,7 +146,7 @@ function approveDepositToken(accountAddress, tokenIdx, vaultAddress, jsonProvide
|
|
|
146
146
|
? amount
|
|
147
147
|
: (0, parseBigInt_1.default)(amount, +tokenDecimals || 18)
|
|
148
148
|
: constants_1.MaxUint256;
|
|
149
|
-
depositGuardAddress = (_b = (_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.
|
|
149
|
+
depositGuardAddress = (_b = (_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address) !== null && _b !== void 0 ? _b : '';
|
|
150
150
|
if (!((_c = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _c !== void 0)) return [3 /*break*/, 4];
|
|
151
151
|
_d = _c;
|
|
152
152
|
return [3 /*break*/, 6];
|
|
@@ -179,7 +179,7 @@ function getMaxDepositAmount(tokenIdx, vaultAddress, jsonProvider, dex) {
|
|
|
179
179
|
case 2:
|
|
180
180
|
vault = _a.sent();
|
|
181
181
|
if (!vault)
|
|
182
|
-
throw new Error("Vault not found
|
|
182
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
183
183
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
184
184
|
maxDepositAmount = tokenIdx === 0 ? vaultContract.deposit0Max() : vaultContract.deposit1Max();
|
|
185
185
|
return [2 /*return*/, maxDepositAmount];
|
|
@@ -206,7 +206,7 @@ function deposit(accountAddress, amount0, amount1, vaultAddress, jsonProvider, d
|
|
|
206
206
|
case 2:
|
|
207
207
|
vault = _h.sent();
|
|
208
208
|
if (!vault)
|
|
209
|
-
throw new Error("Vault not found
|
|
209
|
+
throw new Error("Vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
210
210
|
vaultDeployerAddress = (_b = (_a = addresses_1.default[chainId][dex]) === null || _a === void 0 ? void 0 : _a.vaultDeployerAddress) !== null && _b !== void 0 ? _b : '';
|
|
211
211
|
token0 = vault.tokenA;
|
|
212
212
|
token1 = vault.tokenB;
|
|
@@ -234,7 +234,7 @@ function deposit(accountAddress, amount0, amount1, vaultAddress, jsonProvider, d
|
|
|
234
234
|
depositAmount = amount1BN;
|
|
235
235
|
depositToken = token1;
|
|
236
236
|
}
|
|
237
|
-
depositGuardAddress = (_d = (_c = addresses_1.default[chainId][dex]) === null || _c === void 0 ? void 0 : _c.
|
|
237
|
+
depositGuardAddress = (_d = (_c = addresses_1.default[chainId][dex]) === null || _c === void 0 ? void 0 : _c.depositGuard.address) !== null && _d !== void 0 ? _d : '';
|
|
238
238
|
depositGuardContract = (0, contracts_1.getDepositGuardContract)(depositGuardAddress, signer);
|
|
239
239
|
return [4 /*yield*/, depositGuardContract.callStatic.forwardDepositToICHIVault(vaultAddress, vaultDeployerAddress, depositToken, depositAmount, ethers_1.BigNumber.from(0), accountAddress, {
|
|
240
240
|
gasLimit: 5e6, // the deposit via guard tx should never exceed 5e6
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/functions/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sDAAsD;AACtD,iCAAmC;AACnC,0CAA+F;AAC/F,qEAA+C;AAC/C,kCAA0D;AAC1D,mFAA6D;AAC7D,uEAAiD;AACjD,2CAA2C;AAC3C,iCAA2C;AAC3C,wEAAsD;AAEtD,SAAsB,cAAc,CAClC,QAAe,EACf,YAAoB,EACpB,YAA6B,EAC7B,GAAiB;;;;;wBAEG,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,CAAE,CAAC,CAAC;qBACpD;oBAEa,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,EAAA;;oBAAxE,KAAK,GAAG,SAAgE;
|
|
1
|
+
{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/functions/deposit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
2
|
-
import { SupportedDex } from '../types';
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function getCollectedFees(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<CollectFeesQueryData['vaultCollectFees']>;
|
|
2
|
+
import { SupportedDex, Fees } from '../types';
|
|
3
|
+
export declare function getRebalances(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<Fees[]>;
|
|
4
|
+
export declare function getFeesCollectedEvents(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<Fees[]>;
|