npm - @ichidao/ichi-vaults-sdk - Versions diffs - 0.0.18 → 0.0.19 - Mend

@ichidao/ichi-vaults-sdk 0.0.18 → 0.0.19

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.

Files changed (32) hide show

package/README.md +61 -4
package/dist/src/functions/{feesCollected.js → calculateFees.js} +17 -8
package/dist/src/functions/calculateFees.js.map +1 -0
package/dist/src/{src/functions/rebalances.d.ts → functions/fees.d.ts} +2 -1
package/dist/src/functions/{rebalances.js → fees.js} +62 -11
package/dist/src/functions/fees.js.map +1 -0
package/dist/src/functions/vault.js +11 -9
package/dist/src/functions/vault.js.map +1 -1
package/dist/src/graphql/constants.d.ts +5 -1
package/dist/src/graphql/constants.js +67 -19
package/dist/src/graphql/constants.js.map +1 -1
package/dist/src/graphql/queries.d.ts +1 -0
package/dist/src/graphql/queries.js +3 -2
package/dist/src/graphql/queries.js.map +1 -1
package/dist/src/index.cjs.js +2 -1
package/dist/src/index.d.ts +1 -0
package/dist/src/index.esm.js +2 -1
package/dist/src/index.js +1 -0
package/dist/src/index.js.map +1 -1
package/dist/src/{functions/rebalances.d.ts → src/functions/fees.d.ts} +2 -1
package/dist/src/src/graphql/constants.d.ts +5 -1
package/dist/src/src/graphql/queries.d.ts +1 -0
package/dist/src/src/index.d.ts +1 -0
package/dist/src/src/types/index.d.ts +1 -1
package/dist/src/src/types/vaultQueryData.d.ts +5 -2
package/dist/src/types/index.d.ts +1 -1
package/dist/src/types/vaultQueryData.d.ts +5 -2
package/package.json +1 -1
package/dist/src/functions/feesCollected.js.map +0 -1
package/dist/src/functions/rebalances.js.map +0 -1
/package/dist/src/functions/{feesCollected.d.ts → calculateFees.d.ts} +0 -0
/package/dist/src/src/functions/{feesCollected.d.ts → calculateFees.d.ts} +0 -0

package/README.md CHANGED Viewed

@@ -19,8 +19,9 @@ This sdk contains collection of functions to interact with IchiVault's smart con
         * [`getUserAmounts()`](#8-getUserAmounts)
         * [`getTotalSupply()`](#9-getTotalSupply)
         * [`getTotalAmounts()`](#10-getTotalAmounts)
-        * [`getIchiVaultInfo()`](#11-getIchiVaultInfo)
-        * [`getVaultsByTokens()`](#12-getVaultsByTokens)
+        * [`getFeesCollected()`](#11-getFeesCollected)
+        * [`getIchiVaultInfo()`](#12-getIchiVaultInfo)
+        * [`getVaultsByTokens()`](#13-getVaultsByTokens)
 ## Installation
 Install with
@@ -394,7 +395,63 @@ const amountsBN: [BigNumber, BigNumber] & {total0: BigNumber, total1: BigNumber}
 )
 ```
-#### 11. `getIchiVaultInfo()`
+#### 11. `getFeesCollected()`
+| param | type |  default | required
+| -------- | -------- | -------- | --------
+| vaultAddress   | string | - | true |
+| jsonProvider      | [JsonRpcProvider](https://github.com/ethers-io/ethers.js/blob/f97b92bbb1bde22fcc44100af78d7f31602863ab/packages/providers/src.ts/json-rpc-provider.ts#L393) | - | true
+| dex   | SupportedDex | - | true
+| rawOrDays   | true or number | undefined | false |
+| days   | number | undefined | false |
+<br/>
+```typescript
+import { Web3Provider } from '@ethersproject/providers';
+import { getFeesCollected, SupportedDex } from '@ichidao/ichi-vaults-sdk';
+const web3Provider = new Web3Provider(YOUR_WEB3_PROVIDER);
+const vaultAddress = "0x3ac9...a5f132";
+const dex = SupportedDex.UniswapV3;
+const days = 7;
+const amounts: [string, string] & {total0: string, total1: string} = await getFeesCollected(
+    vaultAddress,
+    web3Provider
+    dex,
+)
+// - or -
+const amountsBN: [BigNumber, BigNumber] & {total0: BigNumber, total1: BigNumber} = await getFeesCollected(
+    vaultAddress,
+    web3Provider
+    dex,
+    true
+)
+// - or -
+const amounts: [string, string] & {total0: string, total1: string} = await getFeesCollected(
+    vaultAddress,
+    web3Provider
+    dex,
+    days
+)
+// - or -
+const amountsBN: [BigNumber, BigNumber] & {total0: BigNumber, total1: BigNumber} = await getFeesCollected(
+    vaultAddress,
+    web3Provider
+    dex,
+    true,
+    days
+)
+```
+#### 12. `getIchiVaultInfo()`
 | param | type |  default | required
 | -------- | -------- | -------- | --------
@@ -419,7 +476,7 @@ if (vaultInfo) {
 }
 ```
-#### 12. `getVaultsByTokens()`
+#### 13. `getVaultsByTokens()`
 | param | type |  default | required
 | -------- | -------- | -------- | --------

package/dist/src/functions/{feesCollected.js → calculateFees.js} RENAMED Viewed

@@ -46,12 +46,12 @@ var bignumber_1 = require("@ethersproject/bignumber");
 var types_1 = require("../types");
 // eslint-disable-next-line import/no-cycle
 var vault_1 = require("./vault");
-var rebalances_1 = require("./rebalances");
+var fees_1 = require("./fees");
 var balances_1 = require("./balances");
 var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
 function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
     return __awaiter(this, void 0, void 0, function () {
-        var chainId, vault, token0Decimals, token1Decimals, numOfDays, rebalances, amount0BN, amount1BN, feeAmountsBN, feeAmounts;
+        var chainId, vault, token0Decimals, token1Decimals, numOfDays, rebalances, collectedFees, amount0BN, amount1BN, feeAmountsBN, feeAmounts;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
@@ -72,18 +72,28 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
                 case 4:
                     token1Decimals = _a.sent();
                     numOfDays = typeof rawOrDays === 'boolean' ? days : rawOrDays;
-                    return [4 /*yield*/, (0, rebalances_1.getRebalances)(vaultAddress, jsonProvider, dex, numOfDays)];
+                    return [4 /*yield*/, (0, fees_1.getRebalances)(vaultAddress, jsonProvider, dex, numOfDays)];
                 case 5:
                     rebalances = _a.sent();
                     if (!rebalances)
                         throw new Error("Error getting vault rebalances on ".concat(chainId, " for ").concat(vaultAddress));
-                    console.log({ rebalances: rebalances });
+                    return [4 /*yield*/, (0, fees_1.getCollectedFees)(vaultAddress, jsonProvider, dex, numOfDays)];
+                case 6:
+                    collectedFees = _a.sent();
+                    if (!collectedFees)
+                        throw new Error("Error getting vault collected fees on ".concat(chainId, " for ").concat(vaultAddress));
                     amount0BN = rebalances
                         .map(function (r) { return bignumber_1.BigNumber.from(r.feeAmount0); })
-                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0));
+                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0))
+                        .add(collectedFees
+                        .map(function (f) { return bignumber_1.BigNumber.from(f.feeAmount0); })
+                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0)));
                     amount1BN = rebalances
                         .map(function (r) { return bignumber_1.BigNumber.from(r.feeAmount1); })
-                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0));
+                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0))
+                        .add(collectedFees
+                        .map(function (f) { return bignumber_1.BigNumber.from(f.feeAmount1); })
+                        .reduce(function (total, curr) { return total.add(curr); }, bignumber_1.BigNumber.from(0)));
                     feeAmountsBN = {
                         total0: amount0BN,
                         total1: amount1BN,
@@ -97,7 +107,6 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
                             0: (0, formatBigInt_1.default)(feeAmountsBN.total0, token0Decimals),
                             1: (0, formatBigInt_1.default)(feeAmountsBN.total1, token1Decimals),
                         };
-                        console.log({ feeAmounts: feeAmounts });
                         return [2 /*return*/, feeAmounts];
                     }
                     return [2 /*return*/, feeAmountsBN];
@@ -106,4 +115,4 @@ function getFeesCollected(vaultAddress, jsonProvider, dex, rawOrDays, days) {
     });
 }
 exports.getFeesCollected = getFeesCollected;
-//# sourceMappingURL=feesCollected.js.map
+//# sourceMappingURL=calculateFees.js.map

package/dist/src/functions/calculateFees.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/src/{src/functions/rebalances.d.ts → functions/fees.d.ts} RENAMED Viewed

@@ -1,4 +1,5 @@
 import { JsonRpcProvider } from '@ethersproject/providers';
 import { SupportedDex } from '../types';
-import { RebalancesQueryData } from '../types/vaultQueryData';
+import { CollectFeesQueryData, RebalancesQueryData } from '../types/vaultQueryData';
 export declare function getRebalances(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<RebalancesQueryData['vaultRebalances']>;
+export declare function getCollectedFees(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<CollectFeesQueryData['vaultCollectFees']>;

package/dist/src/functions/{rebalances.js → fees.js} RENAMED Viewed

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRebalances = void 0;
+exports.getCollectedFees = exports.getRebalances = void 0;
 /* eslint-disable camelcase */
 /* eslint-disable radix */
 // eslint-disable-next-line import/no-unresolved
@@ -50,20 +50,21 @@ function daysToMilliseconds(days) {
 }
 // eslint-disable-next-line import/prefer-default-export
 function getRebalances(vaultAddress, jsonProvider, dex, days) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var chainId, key, url, currTimestamp, startTimestamp;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
                 case 1:
-                    chainId = (_a.sent()).chainId;
+                    chainId = (_b.sent()).chainId;
                     if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
                         throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
                     }
                     key = "".concat(chainId + vaultAddress, "-rebalances");
                     if (Object.prototype.hasOwnProperty.call(promises, key))
                         return [2 /*return*/, promises[key]];
-                    url = constants_1.graphUrls[chainId][dex];
+                    url = (_a = constants_1.graphUrls[chainId][dex]) === null || _a === void 0 ? void 0 : _a.url;
                     if (!url)
                         throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
                     currTimestamp = Date.now();
@@ -71,7 +72,7 @@ function getRebalances(vaultAddress, jsonProvider, dex, days) {
                         ? parseInt(((currTimestamp - daysToMilliseconds(days)) / 1000).toString()).toString()
                         : '0';
                     if (url === 'none' && jsonProvider) {
-                        // promises[key] = [];
+                        throw new Error("Unsupported function for DEX ".concat(dex, " on chain ").concat(chainId));
                     }
                     else {
                         promises[key] = (0, graphql_request_1.request)(url, queries_1.rebalancesQuery, {
@@ -84,19 +85,69 @@ function getRebalances(vaultAddress, jsonProvider, dex, days) {
                         })
                             .catch(function (err) {
                             console.error(err);
-                            if (jsonProvider) {
-                                // promises[key] = getVaultInfoFromContract(vaultAddress, jsonProvider);
-                            }
                         })
                             .finally(function () { return setTimeout(function () { return delete promises[key]; }, 2 * 60 * 100 /* 2 mins */); });
                     }
                     return [4 /*yield*/, promises[key]];
                 case 2:
                 // eslint-disable-next-line no-return-await
-                return [2 /*return*/, _a.sent()];
+                return [2 /*return*/, _b.sent()];
             }
         });
     });
 }
 exports.getRebalances = getRebalances;
-//# sourceMappingURL=rebalances.js.map
+// eslint-disable-next-line import/prefer-default-export
+function getCollectedFees(vaultAddress, jsonProvider, dex, days) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function () {
+        var chainId, key, url, supportsCollectFees, currTimestamp, startTimestamp;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, jsonProvider.getNetwork()];
+                case 1:
+                    chainId = (_c.sent()).chainId;
+                    if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
+                        throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
+                    }
+                    key = "".concat(chainId + vaultAddress, "-collect-fees");
+                    if (Object.prototype.hasOwnProperty.call(promises, key))
+                        return [2 /*return*/, promises[key]];
+                    url = (_a = constants_1.graphUrls[chainId][dex]) === null || _a === void 0 ? void 0 : _a.url;
+                    if (!url)
+                        throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
+                    supportsCollectFees = (_b = constants_1.graphUrls[chainId][dex]) === null || _b === void 0 ? void 0 : _b.supportsCollectFees;
+                    if (!supportsCollectFees) {
+                        return [2 /*return*/, []];
+                    }
+                    currTimestamp = Date.now();
+                    startTimestamp = days
+                        ? parseInt(((currTimestamp - daysToMilliseconds(days)) / 1000).toString()).toString()
+                        : '0';
+                    if (url === 'none' && jsonProvider) {
+                        throw new Error("Unsupported function for DEX ".concat(dex, " on chain ").concat(chainId));
+                    }
+                    else {
+                        promises[key] = (0, graphql_request_1.request)(url, queries_1.vaultCollectFeesQuery, {
+                            vaultAddress: vaultAddress,
+                            createdAtTimestamp_gt: startTimestamp,
+                        })
+                            .then(function (_a) {
+                            var vaultCollectFees = _a.vaultCollectFees;
+                            return vaultCollectFees;
+                        })
+                            .catch(function (err) {
+                            console.error(err);
+                        })
+                            .finally(function () { return setTimeout(function () { return delete promises[key]; }, 2 * 60 * 100 /* 2 mins */); });
+                    }
+                    return [4 /*yield*/, promises[key]];
+                case 2:
+                // eslint-disable-next-line no-return-await
+                return [2 /*return*/, _c.sent()];
+            }
+        });
+    });
+}
+exports.getCollectedFees = getCollectedFees;
+//# sourceMappingURL=fees.js.map

package/dist/src/functions/fees.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/src/functions/vault.js CHANGED Viewed

@@ -89,15 +89,16 @@ function getVaultInfoFromContract(vaultAddress, jsonProvider) {
 }
 // eslint-disable-next-line import/prefer-default-export
 function getIchiVaultInfo(chainId, dex, vaultAddress, jsonProvider) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var key, url;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     key = "".concat(chainId + vaultAddress, "-info");
                     if (Object.prototype.hasOwnProperty.call(promises, key))
                         return [2 /*return*/, promises[key]];
-                    url = constants_1.graphUrls[chainId][dex];
+                    url = (_a = constants_1.graphUrls[chainId][dex]) === null || _a === void 0 ? void 0 : _a.url;
                     if (!url)
                         throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
                     if (url === 'none' && jsonProvider) {
@@ -122,19 +123,20 @@ function getIchiVaultInfo(chainId, dex, vaultAddress, jsonProvider) {
                     return [4 /*yield*/, promises[key]];
                 case 1:
                 // eslint-disable-next-line no-return-await
-                return [2 /*return*/, _a.sent()];
+                return [2 /*return*/, _b.sent()];
             }
         });
     });
 }
 exports.getIchiVaultInfo = getIchiVaultInfo;
 function getVaultsByTokens(chainId, dex, depositTokenAddress, pairedTokenAddress) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var url, addressTokenA, addressTokenB, key1, arrVaults1, key2, arrVaults2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    url = constants_1.graphUrls[chainId][dex];
+                    url = (_a = constants_1.graphUrls[chainId][dex]) === null || _a === void 0 ? void 0 : _a.url;
                     if (!url)
                         throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
                     if (url === 'none')
@@ -155,7 +157,7 @@ function getVaultsByTokens(chainId, dex, depositTokenAddress, pairedTokenAddress
                         .finally(function () { return setTimeout(function () { return delete promises[key1]; }, 2 * 60 * 100 /* 2 mins */); });
                     return [4 /*yield*/, promises[key1]];
                 case 1:
-                    arrVaults1 = (_a.sent()).filter(function (v) { return v.allowTokenA; });
+                    arrVaults1 = (_b.sent()).filter(function (v) { return v.allowTokenA; });
                     addressTokenA = pairedTokenAddress;
                     addressTokenB = depositTokenAddress;
                     key2 = "".concat(addressTokenA, "-").concat(addressTokenB);
@@ -172,7 +174,7 @@ function getVaultsByTokens(chainId, dex, depositTokenAddress, pairedTokenAddress
                         .finally(function () { return setTimeout(function () { return delete promises[key2]; }, 2 * 60 * 100 /* 2 mins */); });
                     return [4 /*yield*/, promises[key2]];
                 case 2:
-                    arrVaults2 = (_a.sent()).filter(function (v) { return v.allowTokenB; });
+                    arrVaults2 = (_b.sent()).filter(function (v) { return v.allowTokenB; });
                     // eslint-disable-next-line no-return-await
                     return [2 /*return*/, __spreadArray(__spreadArray([], arrVaults1, true), arrVaults2, true)];
             }

package/dist/src/functions/vault.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/functions/vault.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,mDAA0C;AAK1C,0CAAoD;AACpD,kDAAiD;AACjD,8CAAoE;AAEpE,IAAM,QAAQ,GAAiC,EAAE,CAAC;AAElD,SAAe,wBAAwB,CAAC,YAAoB,EAAE,YAA6B;;;;;;oBACnF,KAAK,GAAc;wBACvB,EAAE,EAAE,YAAY;wBAChB,MAAM,EAAE,EAAE;wBACV,MAAM,EAAE,EAAE;wBACV,WAAW,EAAE,KAAK;wBAClB,WAAW,EAAE,KAAK;qBACnB,CAAC;oBACI,aAAa,GAAG,IAAA,gCAAoB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBACvE,KAAA,KAAK,CAAA;oBAAU,qBAAM,aAAa,CAAC,MAAM,EAAE,EAAA;;oBAA3C,GAAM,MAAM,GAAG,SAA4B,CAAC;oBAC5C,KAAA,KAAK,CAAA;oBAAU,qBAAM,aAAa,CAAC,MAAM,EAAE,EAAA;;oBAA3C,GAAM,MAAM,GAAG,SAA4B,CAAC;oBAC5C,KAAA,KAAK,CAAA;oBAAe,qBAAM,aAAa,CAAC,WAAW,EAAE,EAAA;;oBAArD,GAAM,WAAW,GAAG,SAAiC,CAAC;oBACtD,KAAA,KAAK,CAAA;oBAAe,qBAAM,aAAa,CAAC,WAAW,EAAE,EAAA;;oBAArD,GAAM,WAAW,GAAG,SAAiC,CAAC;oBAEtD,sBAAO,KAAK,EAAC;;;;CACd;AAED,wDAAwD;AACxD,SAAsB,gBAAgB,CACpC,OAAyB,EACzB,GAAiB,EACjB,YAAoB,EACpB,YAA8B~~;;;;;;~~oBAExB,GAAG,GAAG,UAAG,OAAO,GAAG,YAAY,UAAO,CAAC;oBAE7C,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;wBAAE,sBAAO,QAAQ,CAAC,GAAG,CAAC,EAAC;oBAExE,GAAG,GAAG,qBAAS,CAAC,OAAO,CAAE,CAAC,GAAG,CAAC,CAAC;~~oBACrC~~,IAAI,CAAC,GAAG;wBAAE,MAAM,IAAI,KAAK,CAAC,0BAAmB,GAAG,uBAAa,OAAO,CAAE,CAAC,CAAC;oBACxE,IAAI,GAAG,KAAK,MAAM,IAAI,YAAY,EAAE;wBAClC,QAAQ,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;qBACtE;yBAAM;wBACL,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,yBAAO,EAA2C,GAAG,EAAE,oBAAU,EAAE;4BACjF,YAAY,EAAE,YAAY,CAAC,WAAW,EAAE;yBACzC,CAAC;6BACC,IAAI,CAAC,UAAC,EAAa;gCAAX,SAAS,eAAA;4BAAO,OAAA,SAAS;wBAAT,CAAS,CAAC;6BAClC,KAAK,CAAC,UAAC,GAAG;4BACT,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;4BACnB,IAAI,YAAY,EAAE;gCAChB,QAAQ,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;6BACtE;wBACH,CAAC,CAAC;6BACD,OAAO,CAAC,cAAM,OAAA,UAAU,CAAC,cAAM,OAAA,OAAO,QAAQ,CAAC,GAAG,CAAC,EAApB,CAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,EAAjE,CAAiE,CAAC,CAAC;qBACrF;oBAGM,qBAAM,QAAQ,CAAC,GAAG,CAAC,EAAA;;gBAD1B,2CAA2C;gBAC3C,sBAAO,SAAmB,EAAC;;;;CAC5B;AA9BD,4CA8BC;AAED,SAAsB,iBAAiB,CACrC,OAAyB,EACzB,GAAiB,EACjB,mBAA2B,EAC3B,kBAA0B~~;;;;;;~~oBAEpB,GAAG,GAAG,qBAAS,CAAC,OAAO,CAAE,CAAC,GAAG,CAAC,CAAC;~~oBACrC~~,IAAI,CAAC,GAAG;wBAAE,MAAM,IAAI,KAAK,CAAC,0BAAmB,GAAG,uBAAa,OAAO,CAAE,CAAC,CAAC;oBACxE,IAAI,GAAG,KAAK,MAAM;wBAAE,MAAM,IAAI,KAAK,CAAC,yCAAkC,GAAG,uBAAa,OAAO,CAAE,CAAC,CAAC;oBAE7F,aAAa,GAAG,mBAAmB,CAAC;oBACpC,aAAa,GAAG,kBAAkB,CAAC;oBAEjC,IAAI,GAAG,UAAG,aAAa,cAAI,aAAa,CAAE,CAAC;oBACjD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;wBAAE,sBAAO,QAAQ,CAAC,IAAI,CAAC,EAAC;oBAEhF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,yBAAO,EACtB,GAAG,EACH,4BAAkB,EAClB;wBACE,aAAa,eAAA;wBACb,aAAa,eAAA;qBACd,CACF;yBACE,IAAI,CAAC,UAAC,EAAc;4BAAZ,UAAU,gBAAA;wBAAO,OAAA,UAAU;oBAAV,CAAU,CAAC;yBACpC,OAAO,CAAC,cAAM,OAAA,UAAU,CAAC,cAAM,OAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,EAArB,CAAqB,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,EAAlE,CAAkE,CAAC,CAAC;oBAEhE,qBAAM,QAAQ,CAAC,IAAI,CAAC,EAAA;;oBAAnC,UAAU,GAAI,CAAC,SAAoB,CAAW,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAC,CAAe,CAAC,WAAW,EAA5B,CAA4B,CAAC;oBAEhG,aAAa,GAAG,kBAAkB,CAAC;oBACnC,aAAa,GAAG,mBAAmB,CAAC;oBAE9B,IAAI,GAAG,UAAG,aAAa,cAAI,aAAa,CAAE,CAAC;oBACjD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;wBAAE,sBAAO,QAAQ,CAAC,IAAI,CAAC,EAAC;oBAEhF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,yBAAO,EACtB,GAAG,EACH,4BAAkB,EAClB;wBACE,aAAa,eAAA;wBACb,aAAa,eAAA;qBACd,CACF;yBACE,IAAI,CAAC,UAAC,EAAc;4BAAZ,UAAU,gBAAA;wBAAO,OAAA,UAAU;oBAAV,CAAU,CAAC;yBACpC,OAAO,CAAC,cAAM,OAAA,UAAU,CAAC,cAAM,OAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,EAArB,CAAqB,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,EAAlE,CAAkE,CAAC,CAAC;oBAEhE,qBAAM,QAAQ,CAAC,IAAI,CAAC,EAAA;;oBAAnC,UAAU,GAAI,CAAC,SAAoB,CAAW,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAC,CAAe,CAAC,WAAW,EAA5B,CAA4B,CAAC;oBAEhG,2CAA2C;oBAC3C,sDAAW,UAAU,SAAK,UAAU,SAAE;;;;CACvC;AAlDD,8CAkDC"}
1	+ {"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/functions/vault.ts"],"names":[],"mappings":"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"}

package/dist/src/graphql/constants.d.ts CHANGED Viewed

@@ -2,6 +2,10 @@ import { SupportedDex, SupportedChainId } from '../types';
 type PartialRecord<K extends keyof any, T> = {
     [P in K]?: T;
 };
-type dexGraph = PartialRecord<SupportedDex, string>;
+type GraphQL = {
+    url: string;
+    supportsCollectFees: boolean;
+};
+type dexGraph = PartialRecord<SupportedDex, GraphQL>;
 export declare const graphUrls: Record<SupportedChainId, dexGraph>;
 export {};

package/dist/src/graphql/constants.js CHANGED Viewed

@@ -7,41 +7,89 @@ var types_1 = require("../types");
 // 'none' indicates that graph is not enabled on that chain
 exports.graphUrls = (_a = {},
     _a[types_1.SupportedChainId.arbitrum] = (_b = {},
-        _b[types_1.SupportedDex.UniswapV3] = 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1',
-        _b[types_1.SupportedDex.Ramses] = 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-ramses',
-        _b[types_1.SupportedDex.Horiza] = 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-horiza',
-        _b[types_1.SupportedDex.Sushiswap] = 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-sushiswap',
+        _b[types_1.SupportedDex.UniswapV3] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1',
+            supportsCollectFees: false,
+        },
+        _b[types_1.SupportedDex.Ramses] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-ramses',
+            supportsCollectFees: false,
+        },
+        _b[types_1.SupportedDex.Horiza] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-horiza',
+            supportsCollectFees: false,
+        },
+        _b[types_1.SupportedDex.Sushiswap] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1-sushiswap',
+            supportsCollectFees: false,
+        },
         _b),
     _a[types_1.SupportedChainId.mainnet] = (_c = {},
-        _c[types_1.SupportedDex.UniswapV3] = 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1',
-        _c[types_1.SupportedDex.Blueprint] = 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1-blueprint',
-        _c[types_1.SupportedDex.Pancakeswap] = 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1-pancakeswap',
+        _c[types_1.SupportedDex.UniswapV3] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1',
+            supportsCollectFees: false,
+        },
+        _c[types_1.SupportedDex.Blueprint] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1-blueprint',
+            supportsCollectFees: false,
+        },
+        _c[types_1.SupportedDex.Pancakeswap] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/mainnet-v1-pancakeswap',
+            supportsCollectFees: true,
+        },
         _c),
     _a[types_1.SupportedChainId.polygon] = (_d = {},
-        _d[types_1.SupportedDex.UniswapV3] = 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1',
-        _d[types_1.SupportedDex.Retro] = 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1-retro',
-        _d[types_1.SupportedDex.Quickswap] = 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1-quickswap',
+        _d[types_1.SupportedDex.UniswapV3] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1',
+            supportsCollectFees: false,
+        },
+        _d[types_1.SupportedDex.Retro] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1-retro',
+            supportsCollectFees: false,
+        },
+        _d[types_1.SupportedDex.Quickswap] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/polygon-v1-quickswap',
+            supportsCollectFees: true,
+        },
         _d),
     _a[types_1.SupportedChainId.bsc] = (_e = {},
-        _e[types_1.SupportedDex.UniswapV3] = 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1',
-        _e[types_1.SupportedDex.Pancakeswap] = 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-pancakeswap',
-        _e[types_1.SupportedDex.Thena] = 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-thena',
+        _e[types_1.SupportedDex.UniswapV3] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1',
+            supportsCollectFees: false,
+        },
+        _e[types_1.SupportedDex.Pancakeswap] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-pancakeswap',
+            supportsCollectFees: false,
+        },
+        _e[types_1.SupportedDex.Thena] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-thena',
+            supportsCollectFees: true,
+        },
         _e),
     _a[types_1.SupportedChainId.eon] = (_f = {},
-        _f[types_1.SupportedDex.Ascent] = 'none',
+        _f[types_1.SupportedDex.Ascent] = { url: 'none', supportsCollectFees: false },
         _f),
     _a[types_1.SupportedChainId.hedera_testnet] = (_g = {},
-        _g[types_1.SupportedDex.SaucerSwap] = 'none',
+        _g[types_1.SupportedDex.SaucerSwap] = { url: 'none', supportsCollectFees: false },
         _g),
     _a[types_1.SupportedChainId.linea] = (_h = {},
-        _h[types_1.SupportedDex.Lynex] = 'none',
+        _h[types_1.SupportedDex.Lynex] = { url: 'none', supportsCollectFees: false },
         _h),
     _a[types_1.SupportedChainId.zksync_era] = (_j = {},
-        _j[types_1.SupportedDex.Pancakeswap] = 'https://api.studio.thegraph.com/query/61136/zksync-v1-pancakeswap/version/latest',
-        _j[types_1.SupportedDex.Velocore] = 'https://api.studio.thegraph.com/query/61136/zksync-v1-velocore/version/latest',
+        _j[types_1.SupportedDex.Pancakeswap] = {
+            url: 'https://api.studio.thegraph.com/query/61136/zksync-v1-pancakeswap/version/latest',
+            supportsCollectFees: true,
+        },
+        _j[types_1.SupportedDex.Velocore] = {
+            url: 'https://api.studio.thegraph.com/query/61136/zksync-v1-velocore/version/latest',
+            supportsCollectFees: false,
+        },
         _j),
     _a[types_1.SupportedChainId.zksync_era_testnet] = (_k = {},
-        _k[types_1.SupportedDex.Velocore] = 'https://api.thegraph.com/subgraphs/name/ichi-org/era-testnet-v1-velocore',
+        _k[types_1.SupportedDex.Velocore] = {
+            url: 'https://api.thegraph.com/subgraphs/name/ichi-org/era-testnet-v1-velocore',
+            supportsCollectFees: true,
+        },
         _k),
     _a);
 //# sourceMappingURL=constants.js.map

package/dist/src/graphql/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/graphql/constants.ts"],"names":[],"mappings":";;;;AAAA,iDAAiD;AACjD,kCAA0D;~~AAO1D~~,2DAA2D;AAC9C,QAAA,SAAS;IACpB,GAAC,wBAAgB,CAAC,QAAQ;QACxB,GAAC,oBAAY,CAAC,SAAS,IAAG,8DAA8D;~~QACxF~~,GAAC,oBAAY,CAAC,MAAM,IAAG,qEAAqE;~~QAC5F~~,GAAC,oBAAY,CAAC,MAAM,IAAG,qEAAqE;~~QAC5F~~,GAAC,oBAAY,CAAC,SAAS,IAAG,wEAAwE;~~WACnG~~;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG,6DAA6D;~~QACvF~~,GAAC,oBAAY,CAAC,SAAS,IAAG,uEAAuE;~~QACjG~~,GAAC,oBAAY,CAAC,WAAW,IAAG,yEAAyE;~~WACtG~~;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG,6DAA6D;~~QACvF~~,GAAC,oBAAY,CAAC,KAAK,IAAG,mEAAmE;~~QACzF~~,GAAC,oBAAY,CAAC,SAAS,IAAG,uEAAuE;~~WAClG~~;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,SAAS,IAAG,yDAAyD;~~QACnF~~,GAAC,oBAAY,CAAC,WAAW,IAAG,qEAAqE;~~QACjG~~,GAAC,oBAAY,CAAC,KAAK,IAAG,+DAA+D;~~WACtF~~;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,MAAM,IAAG,MAAM;~~WAC9B~~;IACD,GAAC,wBAAgB,CAAC,cAAc;QAC9B,GAAC,oBAAY,CAAC,UAAU,IAAG,MAAM;~~WAClC~~;IACD,GAAC,wBAAgB,CAAC,KAAK;QACrB,GAAC,oBAAY,CAAC,KAAK,IAAG,MAAM;~~WAC7B~~;IACD,GAAC,wBAAgB,CAAC,UAAU;QAC1B,GAAC,oBAAY,CAAC,WAAW,IAAG,kFAAkF;~~QAC9G~~,GAAC,oBAAY,CAAC,QAAQ,IAAG,+EAA+E;~~WACzG~~;IACD,GAAC,wBAAgB,CAAC,kBAAkB;QAClC,GAAC,oBAAY,CAAC,QAAQ,IAAG,0EAA0E;~~WACpG~~;QACD"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/graphql/constants.ts"],"names":[],"mappings":";;;;AAAA,iDAAiD;AACjD,kCAA0D;AAQ1D,2DAA2D;AAC9C,QAAA,SAAS;IACpB,GAAC,wBAAgB,CAAC,QAAQ;QACxB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,8DAA8D;YACnE,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,GAAG,EAAE,qEAAqE;YAC1E,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,GAAG,EAAE,qEAAqE;YAC1E,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,wEAAwE;YAC7E,mBAAmB,EAAE,KAAK;SAC3B;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,6DAA6D;YAClE,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,uEAAuE;YAC5E,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,WAAW,IAAG;YAC1B,GAAG,EAAE,yEAAyE;YAC9E,mBAAmB,EAAE,IAAI;SAC1B;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,6DAA6D;YAClE,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,GAAG,EAAE,mEAAmE;YACxE,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,uEAAuE;YAC5E,mBAAmB,EAAE,IAAI;SAC1B;WACF;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,GAAG,EAAE,yDAAyD;YAC9D,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,WAAW,IAAG;YAC1B,GAAG,EAAE,qEAAqE;YAC1E,mBAAmB,EAAE,KAAK;SAC3B;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,GAAG,EAAE,+DAA+D;YACpE,mBAAmB,EAAE,IAAI;SAC1B;WACF;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,MAAM,IAAG,EAAE,GAAG,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE;WACnE;IACD,GAAC,wBAAgB,CAAC,cAAc;QAC9B,GAAC,oBAAY,CAAC,UAAU,IAAG,EAAE,GAAG,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE;WACvE;IACD,GAAC,wBAAgB,CAAC,KAAK;QACrB,GAAC,oBAAY,CAAC,KAAK,IAAG,EAAE,GAAG,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE;WAClE;IACD,GAAC,wBAAgB,CAAC,UAAU;QAC1B,GAAC,oBAAY,CAAC,WAAW,IAAG;YAC1B,GAAG,EAAE,kFAAkF;YACvF,mBAAmB,EAAE,IAAI;SAC1B;QACD,GAAC,oBAAY,CAAC,QAAQ,IAAG;YACvB,GAAG,EAAE,+EAA+E;YACpF,mBAAmB,EAAE,KAAK;SAC3B;WACF;IACD,GAAC,wBAAgB,CAAC,kBAAkB;QAClC,GAAC,oBAAY,CAAC,QAAQ,IAAG;YACvB,GAAG,EAAE,0EAA0E;YAC/E,mBAAmB,EAAE,IAAI;SAC1B;WACF;QACD"}

package/dist/src/graphql/queries.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 export declare const vaultQuery: string;
 export declare const vaultByTokensQuery: string;
 export declare const rebalancesQuery: string;
+export declare const vaultCollectFeesQuery: string;

package/dist/src/graphql/queries.js CHANGED Viewed

@@ -4,11 +4,12 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     return cooked;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rebalancesQuery = exports.vaultByTokensQuery = exports.vaultQuery = void 0;
+exports.vaultCollectFeesQuery = exports.rebalancesQuery = exports.vaultByTokensQuery = exports.vaultQuery = void 0;
 // eslint-disable-next-line import/no-unresolved
 var graphql_request_1 = require("graphql-request");
 exports.vaultQuery = (0, graphql_request_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  query ($vaultAddress: String!) {\n    ichiVault(id: $vaultAddress) {\n      id\n      tokenA\n      tokenB\n      allowTokenA\n      allowTokenB\n    }\n  }\n"], ["\n  query ($vaultAddress: String!) {\n    ichiVault(id: $vaultAddress) {\n      id\n      tokenA\n      tokenB\n      allowTokenA\n      allowTokenB\n    }\n  }\n"])));
 exports.vaultByTokensQuery = (0, graphql_request_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  query ($addressTokenA: String!, $addressTokenB: String!) {\n    ichiVaults(where: { tokenA: $addressTokenA, tokenB: $addressTokenB }) {\n      id\n      tokenA\n      tokenB\n      allowTokenA\n      allowTokenB\n    }\n  }\n"], ["\n  query ($addressTokenA: String!, $addressTokenB: String!) {\n    ichiVaults(where: { tokenA: $addressTokenA, tokenB: $addressTokenB }) {\n      id\n      tokenA\n      tokenB\n      allowTokenA\n      allowTokenB\n    }\n  }\n"])));
 exports.rebalancesQuery = (0, graphql_request_1.gql)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  query ($vaultAddress: String!, $createdAtTimestamp_gt: String!) {\n    vaultRebalances(where: { vault: $vaultAddress, createdAtTimestamp_gt: $createdAtTimestamp_gt }) {\n      feeAmount0\n      feeAmount1\n      createdAtTimestamp\n      vault\n    }\n  }\n"], ["\n  query ($vaultAddress: String!, $createdAtTimestamp_gt: String!) {\n    vaultRebalances(where: { vault: $vaultAddress, createdAtTimestamp_gt: $createdAtTimestamp_gt }) {\n      feeAmount0\n      feeAmount1\n      createdAtTimestamp\n      vault\n    }\n  }\n"])));
-var templateObject_1, templateObject_2, templateObject_3;
+exports.vaultCollectFeesQuery = (0, graphql_request_1.gql)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n  query ($vaultAddress: String!, $createdAtTimestamp_gt: String!) {\n    vaultCollectFees(where: { vault: $vaultAddress, createdAtTimestamp_gt: $createdAtTimestamp_gt }) {\n      feeAmount0\n      feeAmount1\n      createdAtTimestamp\n      vault\n    }\n  }\n"], ["\n  query ($vaultAddress: String!, $createdAtTimestamp_gt: String!) {\n    vaultCollectFees(where: { vault: $vaultAddress, createdAtTimestamp_gt: $createdAtTimestamp_gt }) {\n      feeAmount0\n      feeAmount1\n      createdAtTimestamp\n      vault\n    }\n  }\n"])));
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4;
 //# sourceMappingURL=queries.js.map

package/dist/src/graphql/queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/graphql/queries.ts"],"names":[],"mappings":";;;;;;;AAAA,gDAAgD;AAChD,mDAAsC;AAEzB,QAAA,UAAU,OAAG,qBAAG,wOAAA,oKAU5B,KAAC;AAEW,QAAA,kBAAkB,OAAG,qBAAG,2SAAA,uOAUpC,KAAC;AAEW,QAAA,eAAe,OAAG,qBAAG,2UAAA,uQASjC,KAAC"}
1	+ {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/graphql/queries.ts"],"names":[],"mappings":";;;;;;;AAAA,gDAAgD;AAChD,mDAAsC;AAEzB,QAAA,UAAU,OAAG,qBAAG,wOAAA,oKAU5B,KAAC;AAEW,QAAA,kBAAkB,OAAG,qBAAG,2SAAA,uOAUpC,KAAC;AAEW,QAAA,eAAe,OAAG,qBAAG,2UAAA,uQASjC,KAAC;AAEW,QAAA,qBAAqB,OAAG,qBAAG,4UAAA,wQASvC,KAAC"}

package/dist/src/index.cjs.js CHANGED Viewed

@@ -2,7 +2,7 @@
   /**
    * @license
    * author: ICHI DAO <core@ichi.org>
-   * ichi-vaults-sdk.js v0.0.18
+   * ichi-vaults-sdk.js v0.0.19
    * Released under the MIT license.
    */
@@ -16,4 +16,5 @@ tslib_1.__exportStar(require("./functions/balances"), exports);
 tslib_1.__exportStar(require("./functions/deposit"), exports);
 tslib_1.__exportStar(require("./functions/withdraw"), exports);
 tslib_1.__exportStar(require("./functions/vault"), exports);
+tslib_1.__exportStar(require("./functions/calculateFees"), exports);
 tslib_1.__exportStar(require("./types/index"), exports);

package/dist/src/index.d.ts CHANGED Viewed

@@ -2,4 +2,5 @@ export * from './functions/balances';
 export * from './functions/deposit';
 export * from './functions/withdraw';
 export * from './functions/vault';
+export * from './functions/calculateFees';
 export * from './types/index';

package/dist/src/index.esm.js CHANGED Viewed

@@ -2,7 +2,7 @@
   /**
    * @license
    * author: ICHI DAO <core@ichi.org>
-   * ichi-vaults-sdk.js v0.0.18
+   * ichi-vaults-sdk.js v0.0.19
    * Released under the MIT license.
    */
@@ -14,4 +14,5 @@ tslib_1.__exportStar(require("./functions/balances"), exports);
 tslib_1.__exportStar(require("./functions/deposit"), exports);
 tslib_1.__exportStar(require("./functions/withdraw"), exports);
 tslib_1.__exportStar(require("./functions/vault"), exports);
+tslib_1.__exportStar(require("./functions/calculateFees"), exports);
 tslib_1.__exportStar(require("./types/index"), exports);

package/dist/src/index.js CHANGED Viewed

@@ -20,5 +20,6 @@ __exportStar(require("./functions/balances"), exports);
 __exportStar(require("./functions/deposit"), exports);
 __exportStar(require("./functions/withdraw"), exports);
 __exportStar(require("./functions/vault"), exports);
+__exportStar(require("./functions/calculateFees"), exports);
 __exportStar(require("./types/index"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAAiD;AACjD,2CAA2C;AAC3C,uDAAqC;AACrC,sDAAoC;AACpC,uDAAqC;AACrC,oDAAkC;AAClC,gDAA8B"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAAiD;AACjD,2CAA2C;AAC3C,uDAAqC;AACrC,sDAAoC;AACpC,uDAAqC;AACrC,oDAAkC;AAClC,4DAA0C;AAC1C,gDAA8B"}

package/dist/src/{functions/rebalances.d.ts → src/functions/fees.d.ts} RENAMED Viewed

@@ -1,4 +1,5 @@
 import { JsonRpcProvider } from '@ethersproject/providers';
 import { SupportedDex } from '../types';
-import { RebalancesQueryData } from '../types/vaultQueryData';
+import { CollectFeesQueryData, RebalancesQueryData } from '../types/vaultQueryData';
 export declare function getRebalances(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<RebalancesQueryData['vaultRebalances']>;
+export declare function getCollectedFees(vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, days?: number): Promise<CollectFeesQueryData['vaultCollectFees']>;

package/dist/src/src/graphql/constants.d.ts CHANGED Viewed

@@ -2,6 +2,10 @@ import { SupportedDex, SupportedChainId } from '../types';
 type PartialRecord<K extends keyof any, T> = {
     [P in K]?: T;
 };
-type dexGraph = PartialRecord<SupportedDex, string>;
+type GraphQL = {
+    url: string;
+    supportsCollectFees: boolean;
+};
+type dexGraph = PartialRecord<SupportedDex, GraphQL>;
 export declare const graphUrls: Record<SupportedChainId, dexGraph>;
 export {};

package/dist/src/src/graphql/queries.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 export declare const vaultQuery: string;
 export declare const vaultByTokensQuery: string;
 export declare const rebalancesQuery: string;
+export declare const vaultCollectFeesQuery: string;

package/dist/src/src/index.d.ts CHANGED Viewed

@@ -2,4 +2,5 @@ export * from './functions/balances';
 export * from './functions/deposit';
 export * from './functions/withdraw';
 export * from './functions/vault';
+export * from './functions/calculateFees';
 export * from './types/index';

package/dist/src/src/types/index.d.ts CHANGED Viewed

@@ -52,7 +52,7 @@ export interface IchiVault {
     allowTokenA: boolean;
     allowTokenB: boolean;
 }
-export interface Rebalance {
+export interface Fees {
     feeAmount0: string;
     feeAmount1: string;
     createdAtTimestamp: string;

package/dist/src/src/types/vaultQueryData.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { IchiVault, Rebalance } from '..';
+import { IchiVault, Fees } from '..';
 export interface VaultQueryData {
     ichiVault: IchiVault;
 }
@@ -6,5 +6,8 @@ export interface VaultsByTokensQueryData {
     ichiVaults: IchiVault[];
 }
 export interface RebalancesQueryData {
-    vaultRebalances: Rebalance[];
+    vaultRebalances: Fees[];
+}
+export interface CollectFeesQueryData {
+    vaultCollectFees: Fees[];
 }

package/dist/src/types/index.d.ts CHANGED Viewed

@@ -52,7 +52,7 @@ export interface IchiVault {
     allowTokenA: boolean;
     allowTokenB: boolean;
 }
-export interface Rebalance {
+export interface Fees {
     feeAmount0: string;
     feeAmount1: string;
     createdAtTimestamp: string;

package/dist/src/types/vaultQueryData.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { IchiVault, Rebalance } from '..';
+import { IchiVault, Fees } from '..';
 export interface VaultQueryData {
     ichiVault: IchiVault;
 }
@@ -6,5 +6,8 @@ export interface VaultsByTokensQueryData {
     ichiVaults: IchiVault[];
 }
 export interface RebalancesQueryData {
-    vaultRebalances: Rebalance[];
+    vaultRebalances: Fees[];
+}
+export interface CollectFeesQueryData {
+    vaultCollectFees: Fees[];
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ichidao/ichi-vaults-sdk",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "The ICHI Vaults SDK",
   "main": "dist/src/index.cjs.js",
   "module": "dist/src/index.esm.js",

package/dist/src/functions/feesCollected.js.map DELETED Viewed

@@ -1 +0,0 @@

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

package/dist/src/functions/rebalances.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"rebalances.js","sourceRoot":"","sources":["../../../src/functions/rebalances.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAA8B;AAC9B,0BAA0B;AAC1B,gDAAgD;AAChD,mDAA0C;AAE1C,kCAA0D;AAG1D,kDAAiD;AACjD,8CAAqD;AAErD,IAAM,QAAQ,GAAiC,EAAE,CAAC;AAElD,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACpC,CAAC;AAED,wDAAwD;AACxD,SAAsB,aAAa,CACjC,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,IAAa;;;;;wBAEO,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;oBAEK,GAAG,GAAG,UAAG,OAAO,GAAG,YAAY,gBAAa,CAAC;oBACnD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;wBAAE,sBAAO,QAAQ,CAAC,GAAG,CAAC,EAAC;oBAExE,GAAG,GAAG,qBAAS,CAAC,OAA2B,CAAE,CAAC,GAAG,CAAC,CAAC;oBACzD,IAAI,CAAC,GAAG;wBAAE,MAAM,IAAI,KAAK,CAAC,0BAAmB,GAAG,uBAAa,OAAO,CAAE,CAAC,CAAC;oBAElE,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC3B,cAAc,GAAG,IAAI;wBACzB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE;wBACrF,CAAC,CAAC,GAAG,CAAC;oBAER,IAAI,GAAG,KAAK,MAAM,IAAI,YAAY,EAAE;wBAClC,sBAAsB;qBACvB;yBAAM;wBACL,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,yBAAO,EACrB,GAAG,EACH,yBAAe,EACf;4BACE,YAAY,cAAA;4BACZ,qBAAqB,EAAE,cAAc;yBACtC,CACF;6BACE,IAAI,CAAC,UAAC,EAAmB;gCAAjB,eAAe,qBAAA;4BAAO,OAAA,eAAe;wBAAf,CAAe,CAAC;6BAC9C,KAAK,CAAC,UAAC,GAAG;4BACT,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;4BACnB,IAAI,YAAY,EAAE;gCAChB,wEAAwE;6BACzE;wBACH,CAAC,CAAC;6BACD,OAAO,CAAC,cAAM,OAAA,UAAU,CAAC,cAAM,OAAA,OAAO,QAAQ,CAAC,GAAG,CAAC,EAApB,CAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,EAAjE,CAAiE,CAAC,CAAC;qBACrF;oBAGM,qBAAM,QAAQ,CAAC,GAAG,CAAC,EAAA;;gBAD1B,2CAA2C;gBAC3C,sBAAO,SAAmB,EAAC;;;;CAC5B;AA7CD,sCA6CC"}

/package/dist/src/functions/{feesCollected.d.ts → calculateFees.d.ts} RENAMED Viewed

File without changes

/package/dist/src/src/functions/{feesCollected.d.ts → calculateFees.d.ts} RENAMED Viewed

File without changes