@sonarwatch/portfolio-plugins 0.8.81 → 0.8.83

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 (75) hide show
  1. package/CHANGELOG.md +17 -9
  2. package/package.json +2 -2
  3. package/src/index.js +4 -0
  4. package/src/index.js.map +1 -1
  5. package/src/plugins/aave/helpers.js +2 -1
  6. package/src/plugins/aave/helpers.js.map +1 -1
  7. package/src/plugins/balancer/helpers/pools.js +21 -21
  8. package/src/plugins/compound/getMarketsV2Job.d.ts +1 -1
  9. package/src/plugins/compound/getMarketsV2Job.js +1 -1
  10. package/src/plugins/compound/getMarketsV2Job.js.map +1 -1
  11. package/src/plugins/compound/getPositionsV2Fetcher.d.ts +1 -1
  12. package/src/plugins/compound/getPositionsV2Fetcher.js +1 -1
  13. package/src/plugins/compound/getPositionsV2Fetcher.js.map +1 -1
  14. package/src/plugins/compound/index.js +2 -2
  15. package/src/plugins/compound/index.js.map +1 -1
  16. package/src/plugins/marginfi/fetcherExecutor.js +10 -1
  17. package/src/plugins/marginfi/fetcherExecutor.js.map +1 -1
  18. package/src/plugins/pancakeswap/getFarmsV2Fetcher.d.ts +2 -2
  19. package/src/plugins/pancakeswap/getFarmsV2Fetcher.js +10 -5
  20. package/src/plugins/pancakeswap/getFarmsV2Fetcher.js.map +1 -1
  21. package/src/plugins/pancakeswap/getStakersBalancesFetcher.d.ts +2 -2
  22. package/src/plugins/pancakeswap/getStakersBalancesFetcher.js +7 -2
  23. package/src/plugins/pancakeswap/getStakersBalancesFetcher.js.map +1 -1
  24. package/src/plugins/pancakeswap/index.js +10 -40
  25. package/src/plugins/pancakeswap/index.js.map +1 -1
  26. package/src/plugins/solend/obligationsFetcher.js +9 -1
  27. package/src/plugins/solend/obligationsFetcher.js.map +1 -1
  28. package/src/plugins/solend/reservesJob.js +13 -18
  29. package/src/plugins/solend/reservesJob.js.map +1 -1
  30. package/src/plugins/solend/types.d.ts +2 -0
  31. package/src/plugins/sushiswap/constants.d.ts +8 -0
  32. package/src/plugins/sushiswap/constants.js +18 -0
  33. package/src/plugins/sushiswap/constants.js.map +1 -0
  34. package/src/plugins/sushiswap/helpers.d.ts +2 -0
  35. package/src/plugins/sushiswap/helpers.js +90 -0
  36. package/src/plugins/sushiswap/helpers.js.map +1 -0
  37. package/src/plugins/sushiswap/index.d.ts +6 -0
  38. package/src/plugins/sushiswap/index.js +24 -0
  39. package/src/plugins/sushiswap/index.js.map +1 -0
  40. package/src/plugins/sushiswap/poolsJob.d.ts +3 -0
  41. package/src/plugins/sushiswap/poolsJob.js +38 -0
  42. package/src/plugins/sushiswap/poolsJob.js.map +1 -0
  43. package/src/plugins/sushiswap/types.d.ts +16 -0
  44. package/src/plugins/sushiswap/types.js +3 -0
  45. package/src/plugins/sushiswap/types.js.map +1 -0
  46. package/src/plugins/uniswap/getPositionsV3Fetcher.d.ts +1 -1
  47. package/src/plugins/uniswap/getPositionsV3Fetcher.js +2 -3
  48. package/src/plugins/uniswap/getPositionsV3Fetcher.js.map +1 -1
  49. package/src/plugins/uniswap/index.js +1 -1
  50. package/src/plugins/uniswap/index.js.map +1 -1
  51. package/src/plugins/uniswap-v2/constants.d.ts +0 -1
  52. package/src/plugins/uniswap-v2/constants.js +1 -2
  53. package/src/plugins/uniswap-v2/constants.js.map +1 -1
  54. package/src/plugins/uniswap-v2/getPoolsJob.d.ts +2 -2
  55. package/src/plugins/uniswap-v2/getPoolsJob.js +8 -8
  56. package/src/plugins/uniswap-v2/getPoolsJob.js.map +1 -1
  57. package/src/plugins/uniswap-v2/getPositionsV2Fetcher.d.ts +2 -2
  58. package/src/plugins/uniswap-v2/getPositionsV2Fetcher.js +10 -5
  59. package/src/plugins/uniswap-v2/getPositionsV2Fetcher.js.map +1 -1
  60. package/src/plugins/uniswap-v2/helpers.d.ts +2 -1
  61. package/src/plugins/uniswap-v2/helpers.js +28 -24
  62. package/src/plugins/uniswap-v2/helpers.js.map +1 -1
  63. package/src/plugins/uniswap-v2/index.js +2 -9
  64. package/src/plugins/uniswap-v2/index.js.map +1 -1
  65. package/src/plugins/venus/constants.js +1 -1
  66. package/src/plugins/venus/constants.js.map +1 -1
  67. package/src/plugins/venus/index.js +2 -2
  68. package/src/plugins/venus/index.js.map +1 -1
  69. package/src/utils/clients/getEvmClient.d.ts +2 -2
  70. package/src/utils/clients/getEvmClient.js.map +1 -1
  71. package/src/utils/clients/getEvmClients.d.ts +2 -2
  72. package/src/utils/clients/getEvmClients.js.map +1 -1
  73. package/src/utils/clients/types.d.ts +2 -0
  74. package/src/utils/clients/types.js +3 -0
  75. package/src/utils/clients/types.js.map +1 -0
package/CHANGELOG.md CHANGED
@@ -2,18 +2,26 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.8.81](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.80...plugins-0.8.81) (2023-11-17)
6
-
7
-
8
-
9
- ## [0.8.80](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.79...plugins-0.8.80) (2023-11-15)
10
-
11
-
12
-
13
- ## [0.8.79](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.78...plugins-0.8.79) (2023-11-15)
5
+ ## [0.8.83](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.82...plugins-0.8.83) (2023-11-19)
14
6
 
15
7
 
16
8
 
9
+ ## [0.8.82](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.81...plugins-0.8.82) (2023-11-17)
10
+
11
+
12
+
13
+ ## [0.8.81](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.80...plugins-0.8.81) (2023-11-17)
14
+
15
+
16
+
17
+ ## [0.8.80](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.79...plugins-0.8.80) (2023-11-15)
18
+
19
+
20
+
21
+ ## [0.8.79](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.78...plugins-0.8.79) (2023-11-15)
22
+
23
+
24
+
17
25
  ## [0.8.78](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.77...plugins-0.8.78) (2023-11-14)
18
26
 
19
27
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.8.81",
3
+ "version": "0.8.83",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -40,7 +40,7 @@
40
40
  "web3-v1": "npm:web3@^1.5.0"
41
41
  },
42
42
  "peerDependencies": {
43
- "@sonarwatch/portfolio-core": "0.8.81"
43
+ "@sonarwatch/portfolio-core": "0.8.83"
44
44
  },
45
45
  "main": "./src/index.js",
46
46
  "types": "./src/index.d.ts"
package/src/index.js CHANGED
@@ -68,6 +68,7 @@ const fluxbeam_1 = require("./plugins/fluxbeam");
68
68
  const jupiter_1 = require("./plugins/jupiter");
69
69
  const zeta_1 = require("./plugins/zeta");
70
70
  const venus_1 = require("./plugins/venus");
71
+ const sushiswap_1 = require("./plugins/sushiswap");
71
72
  var constants_1 = require("./plugins/tokens/constants");
72
73
  Object.defineProperty(exports, "walletTokensPlatform", { enumerable: true, get: function () { return constants_1.walletTokensPlatform; } });
73
74
  Object.defineProperty(exports, "walletNftsPlatform", { enumerable: true, get: function () { return constants_1.walletNftsPlatform; } });
@@ -125,6 +126,7 @@ exports.platforms = [
125
126
  ...fluxbeam_1.platforms,
126
127
  ...zeta_1.platforms,
127
128
  ...venus_1.platforms,
129
+ ...sushiswap_1.platforms,
128
130
  ];
129
131
  // JOBS //
130
132
  exports.jobs = [
@@ -169,6 +171,7 @@ exports.jobs = [
169
171
  ...jupiter_1.jobs,
170
172
  ...zeta_1.jobs,
171
173
  ...venus_1.jobs,
174
+ ...sushiswap_1.jobs,
172
175
  ];
173
176
  // FETCHERS //
174
177
  exports.fetchers = [
@@ -213,6 +216,7 @@ exports.fetchers = [
213
216
  ...jupiter_1.fetchers,
214
217
  ...zeta_1.fetchers,
215
218
  ...venus_1.fetchers,
219
+ ...sushiswap_1.fetchers,
216
220
  ];
217
221
  exports.fetchersByAddressSystem = (0, getFetchersByAddressSystem_1.getFetchersByAddressSystem)(exports.fetchers);
218
222
  //# sourceMappingURL=index.js.map
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/plugins/src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/plugins/src/index.ts"],"names":[],"mappings":"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"}
@@ -226,13 +226,14 @@ function getElementLendingData(networkId, userSummary) {
226
226
  }
227
227
  }
228
228
  const rewardAssets = getRewardAssets(networkId, calculatedUserIncentives);
229
- const { borrowedValue, suppliedValue, collateralRatio, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
229
+ const { borrowedValue, suppliedValue, healthRatio, collateralRatio, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
230
230
  const elementData = {
231
231
  rewardAssets,
232
232
  borrowedAssets,
233
233
  borrowedValue,
234
234
  borrowedYields,
235
235
  collateralRatio,
236
+ healthRatio,
236
237
  suppliedAssets,
237
238
  suppliedValue,
238
239
  suppliedYields,
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"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"}
@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
36
36
  const graphql_request_1 = __importStar(require("graphql-request"));
37
37
  function getBalancerPoolsV2(url) {
38
38
  return __awaiter(this, void 0, void 0, function* () {
39
- const query = (0, graphql_request_1.gql) `
40
- query pools {
41
- pools(
42
- first: 1000
43
- orderBy: totalLiquidity
44
- orderDirection: desc
45
- where: { totalLiquidity_gt: "500" }
46
- ) {
47
- id
48
- address
49
- symbol
50
- totalLiquidity
51
- totalShares
52
- tokens {
53
- balance
54
- decimals
55
- symbol
56
- address
57
- }
58
- }
59
- }
39
+ const query = (0, graphql_request_1.gql) `
40
+ query pools {
41
+ pools(
42
+ first: 1000
43
+ orderBy: totalLiquidity
44
+ orderDirection: desc
45
+ where: { totalLiquidity_gt: "500" }
46
+ ) {
47
+ id
48
+ address
49
+ symbol
50
+ totalLiquidity
51
+ totalShares
52
+ tokens {
53
+ balance
54
+ decimals
55
+ symbol
56
+ address
57
+ }
58
+ }
59
+ }
60
60
  `;
61
61
  const res = yield (0, graphql_request_1.default)(url, query);
62
62
  const pools = res.pools;
@@ -1,3 +1,3 @@
1
1
  import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
2
2
  import { Job } from '../../Job';
3
- export default function getMarketsV2Job(platformId: string, networkId: EvmNetworkIdType, comptroller: string): Job;
3
+ export default function getMarketsV2Job(networkId: EvmNetworkIdType, platformId: string, comptroller: string): Job;
@@ -14,7 +14,7 @@ const viem_1 = require("viem");
14
14
  const clients_1 = require("../../utils/clients");
15
15
  const abis_1 = require("./abis");
16
16
  const constants_1 = require("./constants");
17
- function getMarketsV2Job(platformId, networkId, comptroller) {
17
+ function getMarketsV2Job(networkId, platformId, comptroller) {
18
18
  const client = (0, clients_1.getEvmClient)(networkId);
19
19
  const executor = (cache) => __awaiter(this, void 0, void 0, function* () {
20
20
  const markets = [];
@@ -1 +1 @@
1
- {"version":3,"file":"getMarketsV2Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getMarketsV2Job.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getMarketsV2Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getMarketsV2Job.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
2
2
  import { Fetcher } from '../../Fetcher';
3
- export default function getPositionsV2Fetcher(platformId: string, networkId: EvmNetworkIdType): Fetcher;
3
+ export default function getPositionsV2Fetcher(networkId: EvmNetworkIdType, platformId: string): Fetcher;
@@ -20,7 +20,7 @@ const clients_1 = require("../../utils/clients");
20
20
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
21
21
  const constants_1 = require("./constants");
22
22
  const helpers_1 = require("./helpers");
23
- function getPositionsV2Fetcher(platformId, networkId) {
23
+ function getPositionsV2Fetcher(networkId, platformId) {
24
24
  const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
25
25
  const client = (0, clients_1.getEvmClient)(networkId);
26
26
  const address = owner;
@@ -1 +1 @@
1
- {"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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"}
@@ -13,11 +13,11 @@ const getPositionsV2Fetcher_1 = __importDefault(require("./getPositionsV2Fetcher
13
13
  exports.platforms = [constants_1.compoundPlatform];
14
14
  exports.jobs = [
15
15
  marketsJob_1.default,
16
- (0, getMarketsV2Job_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.ethereum, constants_1.comptrollerV2Ethereum),
16
+ (0, getMarketsV2Job_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, constants_1.comptrollerV2Ethereum),
17
17
  ];
18
18
  exports.fetchers = [
19
19
  (0, getPositionsV3Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum),
20
20
  (0, getPositionsV3Fetcher_1.default)(portfolio_core_1.NetworkId.polygon),
21
- (0, getPositionsV2Fetcher_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.ethereum),
21
+ (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId),
22
22
  ];
23
23
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,2CAIqB;AACrB,8DAAsC;AACtC,oFAA4D;AAC5D,wEAAgD;AAChD,oFAA4D;AAE/C,QAAA,SAAS,GAAe,CAAC,4BAAgB,CAAC,CAAC;AAC3C,QAAA,IAAI,GAAU;IACzB,oBAAU;IACV,IAAA,yBAAe,EAAC,sBAAU,EAAE,0BAAS,CAAC,QAAQ,EAAE,iCAAqB,CAAC;CACvE,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,CAAC;IACzC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,OAAO,CAAC;IACxC,IAAA,+BAAqB,EAAC,sBAAU,EAAE,0BAAS,CAAC,QAAQ,CAAC;CACtD,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,2CAIqB;AACrB,8DAAsC;AACtC,oFAA4D;AAC5D,wEAAgD;AAChD,oFAA4D;AAE/C,QAAA,SAAS,GAAe,CAAC,4BAAgB,CAAC,CAAC;AAC3C,QAAA,IAAI,GAAU;IACzB,oBAAU;IACV,IAAA,yBAAe,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,iCAAqB,CAAC;CACvE,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,CAAC;IACzC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,OAAO,CAAC;IACxC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,CAAC;CACtD,CAAC"}
@@ -35,6 +35,8 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
35
35
  const suppliedAssets = [];
36
36
  const suppliedYields = [];
37
37
  const rewardAssets = [];
38
+ const suppliedLtvs = [];
39
+ const borrowedWeights = [];
38
40
  const balancesAddresses = lendingAccountBalances.map((lendingAccountBalance) => lendingAccountBalance.bankPk.toString());
39
41
  const banksInfo = yield cache.getItems(balancesAddresses, {
40
42
  prefix: constants_1.prefix,
@@ -69,6 +71,9 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
69
71
  if (!tokenPrice)
70
72
  continue;
71
73
  if (!accountBalanceInfo.assetShares.value.isZero()) {
74
+ suppliedLtvs.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.assetWeightMaint)
75
+ .decimalPlaces(2)
76
+ .toNumber());
72
77
  const suppliedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.assetShares)
73
78
  .times(bankInfo.dividedAssetShareValue)
74
79
  .toNumber();
@@ -82,6 +87,9 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
82
87
  suppliedYields.push(bankLendingYields);
83
88
  }
84
89
  if (!accountBalanceInfo.liabilityShares.value.isZero()) {
90
+ borrowedWeights.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.liabilityWeightMaint)
91
+ .decimalPlaces(2)
92
+ .toNumber());
85
93
  const borrowedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.liabilityShares)
86
94
  .times(bankInfo.dividedLiabilityShareValue)
87
95
  .toNumber();
@@ -97,7 +105,7 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
97
105
  }
98
106
  if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
99
107
  return [];
100
- const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
108
+ const { borrowedValue, collateralRatio, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
101
109
  const element = {
102
110
  type: portfolio_core_1.PortfolioElementType.borrowlend,
103
111
  networkId: portfolio_core_1.NetworkId.solana,
@@ -112,6 +120,7 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
112
120
  suppliedValue,
113
121
  suppliedYields,
114
122
  collateralRatio,
123
+ healthRatio,
115
124
  rewardAssets,
116
125
  value,
117
126
  },
@@ -1 +1 @@
1
- {"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
2
- import { FetcherExecutor } from '../../Fetcher';
3
- export default function getFarmsV2Fetcher(masterChef: string, networkId: EvmNetworkIdType): FetcherExecutor;
2
+ import { Fetcher } from '../../Fetcher';
3
+ export default function getFarmsV2Fetcher(networkId: EvmNetworkIdType, version: string, masterChef: string): Fetcher;
@@ -15,14 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
16
16
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
17
17
  const constants_1 = require("./constants");
18
- const constants_2 = require("../uniswap-v2/constants");
19
18
  const abis_1 = require("./abis");
20
19
  const clients_1 = require("../../utils/clients");
21
20
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
22
- function getFarmsV2Fetcher(masterChef, networkId) {
23
- return (owner, cache) => __awaiter(this, void 0, void 0, function* () {
21
+ const helpers_1 = require("../uniswap-v2/helpers");
22
+ function getFarmsV2Fetcher(networkId, version, masterChef) {
23
+ const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
24
24
  const client = (0, clients_1.getEvmClient)(networkId);
25
- const pairsV2 = yield cache.getItem(constants_2.pairsV2Key, {
25
+ const pairsV2 = yield cache.getItem((0, helpers_1.getPairKey)('v2'), {
26
26
  networkId,
27
27
  prefix: constants_1.platformId,
28
28
  });
@@ -105,7 +105,7 @@ function getFarmsV2Fetcher(masterChef, networkId) {
105
105
  networkId,
106
106
  platformId: constants_1.platformId,
107
107
  label: 'Farming',
108
- name: 'V2',
108
+ name: version,
109
109
  type: portfolio_core_1.PortfolioElementType.liquidity,
110
110
  data: {
111
111
  liquidities,
@@ -114,6 +114,11 @@ function getFarmsV2Fetcher(masterChef, networkId) {
114
114
  },
115
115
  ];
116
116
  });
117
+ return {
118
+ executor,
119
+ id: `${constants_1.platformId}-${networkId}-farms-${version}`,
120
+ networkId,
121
+ };
117
122
  }
118
123
  exports.default = getFarmsV2Fetcher;
119
124
  //# sourceMappingURL=getFarmsV2Fetcher.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getFarmsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getFarmsV2Fetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getFarmsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getFarmsV2Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AAErC,2CAAyC;AACzC,iCAAkC;AAClC,iDAAmD;AACnD,qGAA6E;AAE7E,mDAAmD;AAEnD,SAAwB,iBAAiB,CACvC,SAA2B,EAC3B,OAAe,EACf,UAAkB;IAElB,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE;YAC9D,SAAS;YACT,MAAM,EAAE,sBAAU;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAExB,MAAM,mBAAmB,GAAG;YAC1B,GAAG,EAAE,CAAC,eAAQ,CAAC,UAAU,CAAC;YAC1B,YAAY,EAAE,eAAQ,CAAC,UAAU,CAAC,IAAI;YACtC,OAAO,EAAE,UAA2B;SAC5B,CAAC;QAEX,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAEtE,MAAM,oBAAoB,GAAG;YAC3B,GAAG,EAAE,CAAC,eAAQ,CAAC,QAAQ,CAAC;YACxB,YAAY,EAAE,eAAQ,CAAC,QAAQ,CAAC,IAAI;YACpC,OAAO,EAAE,UAA2B;SAC5B,CAAC;QACX,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,gCAAK,oBAAoB,KAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAW,CAAC,CAAC;SACzE;QAED,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;YAC1C,SAAS,EAAE,iBAAiB;SAC7B,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,YAAY;aAC7B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACrE,IAAI,EAAE,CAAC;QAEV,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACzE,MAAM,gBAAgB,GAA4B,IAAI,GAAG,EAAE,CAAC;QAE5D,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7B,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CACrD,CAAC;QAEF,MAAM,YAAY,GAAG;YACnB,GAAG,EAAE,CAAC,eAAQ,CAAC,QAAQ,CAAC;YACxB,YAAY,EAAE,eAAQ,CAAC,QAAQ,CAAC,IAAI;YACpC,OAAO,EAAE,UAA2B;SAC5B,CAAC;QACX,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS;gBAAE,SAAS;YAE/C,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACnC,iBAAiB,CAAC,IAAI,CAAC,gCAClB,YAAY,KACf,IAAI,EAAE,CAAC,CAAC,EAAE,KAAsB,CAAC,GACzB,CAAC,CAAC;SACb;QAED,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;YAC1C,SAAS,EAAE,iBAAiB;SAC7B,CAAC,CAAC;QAEH,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS;gBAAE,SAAS;YAE/C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY;gBAAE,SAAS;YAC5B,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;gBAAE,SAAS;YAClD,IAAI,CAAC,YAAY,CAAC,WAAW;gBAAE,SAAS;YAExC,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC3D,SAAS,CAAC,SAAA,EAAE,EAAI,YAAY,CAAC,QAAQ,CAAA,CAAC;iBACtC,QAAQ,EAAE,CAAC;YAEd,MAAM,MAAM,GAAqB,EAAE,CAAC;YACpC,KAAK,MAAM,UAAU,IAAI,YAAY,CAAC,WAAW,EAAE;gBACjD,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,WAAW,GAAG,MAAM,EAC/B,SAAS,EACT,UAAU,CACX,CACF,CAAC;aACH;YAED,WAAW,CAAC,IAAI,CAAC;gBACf,MAAM;gBACN,WAAW,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACvD,YAAY,EAAE,EAAE;gBAChB,iBAAiB,EAAE,CAAC;gBACpB,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,EAAE;aACX,CAAC,CAAC;SACJ;QAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAExC,OAAO;YACL;gBACE,SAAS;gBACT,UAAU,EAAV,sBAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,qCAAoB,CAAC,SAAS;gBACpC,IAAI,EAAE;oBACJ,WAAW;iBACZ;gBACD,KAAK,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;aACvD;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,QAAQ;QACR,EAAE,EAAE,GAAG,sBAAU,IAAI,SAAS,UAAU,OAAO,EAAE;QACjD,SAAS;KACV,CAAC;AACJ,CAAC;AA/HD,oCA+HC"}
@@ -1,4 +1,4 @@
1
1
  import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
2
- import { FetcherExecutor } from '../../Fetcher';
2
+ import { Fetcher } from '../../Fetcher';
3
3
  import { StakerInfo } from './types';
4
- export default function getStakersBalancesFetcher(stakersInfos: StakerInfo[], networkId: EvmNetworkIdType, platformId: string): FetcherExecutor;
4
+ export default function getStakersBalancesFetcher(networkId: EvmNetworkIdType, platformId: string, stakersInfos: StakerInfo[]): Fetcher;
@@ -17,9 +17,9 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
17
17
  const clients_1 = require("../../utils/clients");
18
18
  const abis_1 = require("./abis");
19
19
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
20
- function getStakersBalancesFetcher(stakersInfos, networkId, platformId) {
20
+ function getStakersBalancesFetcher(networkId, platformId, stakersInfos) {
21
21
  const client = (0, clients_1.getEvmClient)(networkId);
22
- return (owner, cache) => __awaiter(this, void 0, void 0, function* () {
22
+ const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
23
23
  const address = owner;
24
24
  const stakerBalanceContracts = [];
25
25
  for (const stakerInfo of stakersInfos) {
@@ -69,6 +69,11 @@ function getStakersBalancesFetcher(stakersInfos, networkId, platformId) {
69
69
  },
70
70
  ];
71
71
  });
72
+ return {
73
+ executor,
74
+ id: `${platformId}-${networkId}-stakers`,
75
+ networkId,
76
+ };
72
77
  }
73
78
  exports.default = getStakersBalancesFetcher;
74
79
  //# sourceMappingURL=getStakersBalancesFetcher.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getStakersBalancesFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getStakersBalancesFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AAErC,iDAAmD;AACnD,iCAAoC;AAGpC,qGAA6E;AAE7E,SAAwB,yBAAyB,CAC/C,YAA0B,EAC1B,SAA2B,EAC3B,UAAkB;IAElB,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC;IACvC,OAAO,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,KAAsB,CAAC;QACvC,MAAM,sBAAsB,GAAG,EAAE,CAAC;QAClC,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;YACrC,MAAM,qBAAqB,GAAG;gBAC5B,GAAG,EAAE,CAAC,iBAAU,CAAC,QAAQ,CAAC;gBAC1B,OAAO,EAAE,UAAU,CAAC,QAAyB;gBAC7C,YAAY,EAAE,iBAAU,CAAC,QAAQ,CAAC,IAAI;gBACtC,IAAI,EAAE,CAAC,OAAO,CAAC;aACP,CAAC;YACX,sBAAsB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACpD;QAED,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;YAChD,SAAS,EAAE,sBAAsB;SAClC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC9C,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3D,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAC7C,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAC1B,SAAS,CACV,CAAC;QACF,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;QAC1D,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1B,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAC7C,CAAC;QACF,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5C,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAEzC,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS;gBAAE,SAAS;YAC9C,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;gBAAE,SAAS;YAEjD,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC7D,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC1D,SAAS,CAAC,SAAA,EAAE,EAAI,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA,CAAC;iBACzC,QAAQ,EAAE,CAAC;YAEd,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,SAAS,EACT,UAAU,CACX,CACF,CAAC;SACH;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEnC,OAAO;YACL;gBACE,SAAS;gBACT,KAAK,EAAE,QAAQ;gBACf,UAAU;gBACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;gBACnC,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjD,IAAI,EAAE;oBACJ,MAAM;iBACP;aACF;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;AACJ,CAAC;AAxED,4CAwEC"}
1
+ {"version":3,"file":"getStakersBalancesFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getStakersBalancesFetcher.ts"],"names":[],"mappings":"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"}
@@ -11,63 +11,33 @@ const getPoolsJob_1 = __importDefault(require("../uniswap-v2/getPoolsJob"));
11
11
  const getPositionsV2Fetcher_1 = __importDefault(require("../uniswap-v2/getPositionsV2Fetcher"));
12
12
  const getStakersBalancesFetcher_1 = __importDefault(require("./getStakersBalancesFetcher"));
13
13
  const stakerCakeFetcher_1 = __importDefault(require("./stakerCakeFetcher"));
14
- const getFarmsV2Fetcher_1 = __importDefault(require("./getFarmsV2Fetcher"));
15
14
  const getPositionsV3Fetcher_1 = require("../uniswap/getPositionsV3Fetcher");
15
+ const getFarmsV2Fetcher_1 = __importDefault(require("./getFarmsV2Fetcher"));
16
16
  exports.platforms = [constants_1.pancakeswapPlatform];
17
17
  exports.jobs = [
18
18
  // Aptos
19
19
  aptosLpJob_1.default,
20
20
  // Ethereum
21
- {
22
- id: `${constants_1.platformId}-v2-${portfolio_core_1.NetworkId.ethereum}`,
23
- executor: (0, getPoolsJob_1.default)(constants_1.theGraphUrlEthV2, constants_1.platformId, portfolio_core_1.NetworkId.ethereum),
24
- },
21
+ (0, getPoolsJob_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, 'V1', constants_1.theGraphUrlEthV2),
25
22
  // BNB
26
- {
27
- id: `${constants_1.platformId}-v2-${portfolio_core_1.NetworkId.bnb}`,
28
- executor: (0, getPoolsJob_1.default)(constants_1.factoryV2Bnb, constants_1.platformId, portfolio_core_1.NetworkId.bnb),
29
- },
23
+ (0, getPoolsJob_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, 'V1', constants_1.factoryV2Bnb),
30
24
  ];
31
25
  exports.fetchers = [
32
26
  // V3 (all EVMs)
33
- ...constants_1.networksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId)),
27
+ ...constants_1.networksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId, 'V3')),
34
28
  // V2 Ethereum
35
- {
36
- id: `${constants_1.platformId}-poolsV2-${portfolio_core_1.NetworkId.ethereum}`,
37
- executor: (0, getPositionsV2Fetcher_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.ethereum),
38
- networkId: portfolio_core_1.NetworkId.ethereum,
39
- },
40
- {
41
- id: `${constants_1.platformId}-farmsV2-${portfolio_core_1.NetworkId.ethereum}`,
42
- executor: (0, getFarmsV2Fetcher_1.default)(constants_1.masterChefV2Ethereum, portfolio_core_1.NetworkId.ethereum),
43
- networkId: portfolio_core_1.NetworkId.ethereum,
44
- },
45
- {
46
- id: `${constants_1.platformId}-stakers-${portfolio_core_1.NetworkId.ethereum}`,
47
- executor: (0, getStakersBalancesFetcher_1.default)(constants_1.stakersEthereum, portfolio_core_1.NetworkId.ethereum, constants_1.platformId),
48
- networkId: portfolio_core_1.NetworkId.ethereum,
49
- },
29
+ (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, 'V2'),
30
+ (0, getFarmsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, 'V2', constants_1.masterChefV2Ethereum),
31
+ (0, getStakersBalancesFetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, constants_1.stakersEthereum),
50
32
  // V2 BNB
51
- {
52
- id: `${constants_1.platformId}-poolsV2-${portfolio_core_1.NetworkId.bnb}`,
53
- executor: (0, getPositionsV2Fetcher_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.bnb),
54
- networkId: portfolio_core_1.NetworkId.bnb,
55
- },
33
+ (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, 'V2'),
56
34
  // {
57
35
  // id: `${platformId}-farmsV1-${NetworkId.bnb}`,
58
36
  // executor: getFarmsV2FetcherGenerator(masterChefBnb, NetworkId.bnb),
59
37
  // networkId: NetworkId.bnb,
60
38
  // },
61
- {
62
- id: `${constants_1.platformId}-farmsV2-${portfolio_core_1.NetworkId.bnb}`,
63
- executor: (0, getFarmsV2Fetcher_1.default)(constants_1.masterChefV2Bnb, portfolio_core_1.NetworkId.bnb),
64
- networkId: portfolio_core_1.NetworkId.bnb,
65
- },
66
- {
67
- id: `${constants_1.platformId}-stakers-${portfolio_core_1.NetworkId.bnb}`,
68
- executor: (0, getStakersBalancesFetcher_1.default)(constants_1.stakersBnb, portfolio_core_1.NetworkId.bnb, constants_1.platformId),
69
- networkId: portfolio_core_1.NetworkId.bnb,
70
- },
39
+ (0, getFarmsV2Fetcher_1.default)(portfolio_core_1.NetworkId.bnb, 'V2', constants_1.masterChefV2Bnb),
40
+ (0, getStakersBalancesFetcher_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, constants_1.stakersBnb),
71
41
  stakerCakeFetcher_1.default,
72
42
  ];
73
43
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,8DAAoC;AACpC,2CAUqB;AACrB,4EAAoD;AACpD,gGAAwE;AACxE,4FAAoE;AACpE,4EAAoD;AACpD,4EAAoD;AACpD,4EAAyE;AAE5D,QAAA,SAAS,GAAe,CAAC,+BAAmB,CAAC,CAAC;AAC9C,QAAA,IAAI,GAAU;IACzB,QAAQ;IACR,oBAAQ;IACR,WAAW;IACX;QACE,EAAE,EAAE,GAAG,sBAAU,OAAO,0BAAS,CAAC,QAAQ,EAAE;QAC5C,QAAQ,EAAE,IAAA,qBAAW,EAAC,4BAAgB,EAAE,sBAAU,EAAE,0BAAS,CAAC,QAAQ,CAAC;KACxE;IACD,MAAM;IACN;QACE,EAAE,EAAE,GAAG,sBAAU,OAAO,0BAAS,CAAC,GAAG,EAAE;QACvC,QAAQ,EAAE,IAAA,qBAAW,EAAC,wBAAY,EAAE,sBAAU,EAAE,0BAAS,CAAC,GAAG,CAAC;KAC/D;CACF,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,gBAAgB;IAChB,GAAG,2BAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,6CAAqB,EAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC7E,cAAc;IACd;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,+BAAqB,EAAC,sBAAU,EAAE,0BAAS,CAAC,QAAQ,CAAC;QAC/D,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,2BAAiB,EAAC,gCAAoB,EAAE,0BAAS,CAAC,QAAQ,CAAC;QACrE,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,mCAAyB,EACjC,2BAAe,EACf,0BAAS,CAAC,QAAQ,EAClB,sBAAU,CACX;QACD,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IAED,SAAS;IACT;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,+BAAqB,EAAC,sBAAU,EAAE,0BAAS,CAAC,GAAG,CAAC;QAC1D,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD,IAAI;IACJ,kDAAkD;IAClD,wEAAwE;IACxE,8BAA8B;IAC9B,KAAK;IACL;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,2BAAiB,EAAC,2BAAe,EAAE,0BAAS,CAAC,GAAG,CAAC;QAC3D,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,mCAAyB,EAAC,sBAAU,EAAE,0BAAS,CAAC,GAAG,EAAE,sBAAU,CAAC;QAC1E,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD,2BAAiB;CAClB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,8DAAoC;AACpC,2CAUqB;AACrB,4EAAoD;AACpD,gGAAwE;AACxE,4FAAoE;AACpE,4EAAoD;AACpD,4EAAyE;AACzE,4EAAoD;AAEvC,QAAA,SAAS,GAAe,CAAC,+BAAmB,CAAC,CAAC;AAC9C,QAAA,IAAI,GAAU;IACzB,QAAQ;IACR,oBAAQ;IACR,WAAW;IACX,IAAA,qBAAW,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,IAAI,EAAE,4BAAgB,CAAC;IACnE,MAAM;IACN,IAAA,qBAAW,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,IAAI,EAAE,wBAAY,CAAC;CAC3D,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,gBAAgB;IAChB,GAAG,2BAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,IAAA,6CAAqB,EAAC,MAAM,EAAE,sBAAU,EAAE,IAAI,CAAC,CAChD;IACD,cAAc;IACd,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,IAAI,CAAC;IAC3D,IAAA,2BAAiB,EAAC,0BAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,gCAAoB,CAAC;IACjE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,2BAAe,CAAC;IAE1E,SAAS;IACT,IAAA,+BAAqB,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,IAAI,CAAC;IACtD,IAAI;IACJ,kDAAkD;IAClD,wEAAwE;IACxE,8BAA8B;IAC9B,KAAK;IACL,IAAA,2BAAiB,EAAC,0BAAS,CAAC,GAAG,EAAE,IAAI,EAAE,2BAAe,CAAC;IACvD,IAAA,mCAAyB,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,sBAAU,CAAC;IAChE,2BAAiB;CAClB,CAAC"}
@@ -106,6 +106,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
106
106
  const suppliedAssets = [];
107
107
  const suppliedYields = [];
108
108
  const rewardAssets = [];
109
+ const suppliedLtvs = [];
110
+ const borrowedWeights = [];
109
111
  for (let j = 0; j < market.reserves.length; j += 1) {
110
112
  const { address: reserveAddress } = market.reserves[j];
111
113
  const reserveInfo = reserveByAddress.get(reserveAddress);
@@ -136,6 +138,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
136
138
  .div(Math.pow(10, decimals))
137
139
  .times(reserveDepositAmount / collateralSupply)
138
140
  .toNumber();
141
+ suppliedLtvs.push(reserve.config.liquidationThreshold / 100);
139
142
  const apy = +reserveInfo.rates.supplyInterest / 100;
140
143
  const cSuppliedYields = [
141
144
  {
@@ -156,6 +159,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
156
159
  .div(borrow.cumulativeBorrowRateWads)
157
160
  .dividedBy(new bignumber_js_1.default(Math.pow(10, (constants_1.wadsDecimal + decimals))))
158
161
  .toNumber();
162
+ borrowedWeights.push(new bignumber_js_1.default(reserve.config.addedBorrowWeightBPS)
163
+ .dividedBy(Math.pow(10, 20))
164
+ .plus(1)
165
+ .toNumber());
159
166
  const apy = +reserveInfo.rates.borrowInterest / 100;
160
167
  const cBorrowedYields = [
161
168
  {
@@ -170,7 +177,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
170
177
  }
171
178
  if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
172
179
  continue;
173
- const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
180
+ const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
174
181
  elements.push({
175
182
  type: portfolio_core_1.PortfolioElementType.borrowlend,
176
183
  networkId: portfolio_core_1.NetworkId.solana,
@@ -186,6 +193,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
186
193
  suppliedValue,
187
194
  suppliedYields,
188
195
  collateralRatio,
196
+ healthRatio,
189
197
  rewardAssets,
190
198
  value,
191
199
  },