@sonarwatch/portfolio-plugins 0.11.15 → 0.11.17

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 (16) hide show
  1. package/CHANGELOG.md +25 -17
  2. package/package.json +2 -2
  3. package/src/plugins/aftermath/poolsJob.js +48 -40
  4. package/src/plugins/aftermath/poolsJob.js.map +1 -1
  5. package/src/plugins/auxexchange/aptosLpJob.js +58 -13
  6. package/src/plugins/auxexchange/aptosLpJob.js.map +1 -1
  7. package/src/plugins/kamino/farmsFetcher.js +33 -20
  8. package/src/plugins/kamino/farmsFetcher.js.map +1 -1
  9. package/src/plugins/liquiditypools-sei/job.js +55 -20
  10. package/src/plugins/liquiditypools-sei/job.js.map +1 -1
  11. package/src/plugins/liquidswap/aptosLpJob.js +61 -13
  12. package/src/plugins/liquidswap/aptosLpJob.js.map +1 -1
  13. package/src/plugins/orca/lpTokensJob.js +56 -40
  14. package/src/plugins/orca/lpTokensJob.js.map +1 -1
  15. package/src/plugins/pancakeswap/aptosLpJob.js +58 -13
  16. package/src/plugins/pancakeswap/aptosLpJob.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -2,26 +2,34 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.11.15](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.14...plugins-0.11.15) (2023-12-18)
6
-
7
-
8
-
9
- ## [0.11.14](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.13...plugins-0.11.14) (2023-12-18)
10
-
11
-
12
-
13
- ## [0.11.13](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.12...plugins-0.11.13) (2023-12-17)
14
-
15
-
16
-
17
- ## [0.11.12](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.11...plugins-0.11.12) (2023-12-15)
18
-
19
-
20
-
21
- ## [0.11.11](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.10...plugins-0.11.11) (2023-12-15)
5
+ ## [0.11.17](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.16...plugins-0.11.17) (2023-12-18)
22
6
 
23
7
 
24
8
 
9
+ ## [0.11.16](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.15...plugins-0.11.16) (2023-12-18)
10
+
11
+
12
+
13
+ ## [0.11.15](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.14...plugins-0.11.15) (2023-12-18)
14
+
15
+
16
+
17
+ ## [0.11.14](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.13...plugins-0.11.14) (2023-12-18)
18
+
19
+
20
+
21
+ ## [0.11.13](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.12...plugins-0.11.13) (2023-12-17)
22
+
23
+
24
+
25
+ ## [0.11.12](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.11...plugins-0.11.12) (2023-12-15)
26
+
27
+
28
+
29
+ ## [0.11.11](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.10...plugins-0.11.11) (2023-12-15)
30
+
31
+
32
+
25
33
  ## [0.11.10](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.9...plugins-0.11.10) (2023-12-14)
26
34
 
27
35
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.11.15",
3
+ "version": "0.11.17",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -41,7 +41,7 @@
41
41
  "web3-v1": "npm:web3@^1.5.0"
42
42
  },
43
43
  "peerDependencies": {
44
- "@sonarwatch/portfolio-core": "0.11.15"
44
+ "@sonarwatch/portfolio-core": "0.11.17"
45
45
  },
46
46
  "main": "./src/index.js",
47
47
  "types": "./src/index.d.ts"
package/src/plugins/aftermath/poolsJob.js CHANGED
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,10 +17,13 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
40
17
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
41
18
  const clients_1 = require("../../utils/clients");
42
19
  const constants_1 = require("./constants");
43
- const computeAndStoreLpPrice_1 = __importStar(require("../../utils/misc/computeAndStoreLpPrice"));
20
+ const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
44
21
  const getMultipleObjectsSafe_1 = __importDefault(require("../../utils/sui/getMultipleObjectsSafe"));
45
22
  const getDynamicFieldsSafe_1 = __importDefault(require("../../utils/sui/getDynamicFieldsSafe"));
46
23
  const aptos_1 = require("../../utils/aptos");
24
+ const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
25
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
26
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
47
27
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
48
28
  var _a;
49
29
  const client = (0, clients_1.getClientSui)();
@@ -70,7 +50,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
70
50
  const poolsInfo = yield (0, getMultipleObjectsSafe_1.default)(client, poolsIds, {
71
51
  showContent: true,
72
52
  });
73
- const promises = [];
53
+ const tokenPriceById = yield (0, getTokensPricesMap_1.default)(poolsInfo
54
+ .map((pool) => pool.data ? (0, sui_js_1.getObjectFields)(pool).type_names : [])
55
+ .flat()
56
+ .map((type) => `0x${type}`), networkId, cache);
74
57
  for (const pool of poolsInfo) {
75
58
  if (!pool.data || !pool.data.content)
76
59
  continue;
@@ -116,7 +99,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
116
99
  if (totalLiquidity.isLessThan(computeAndStoreLpPrice_1.minimumLiquidity))
117
100
  continue;
118
101
  const price = totalLiquidity.dividedBy(poolSupply).toNumber();
119
- promises.push(cache.setTokenPriceSource({
102
+ yield cache.setTokenPriceSource({
120
103
  id: constants_1.platformId,
121
104
  weight: 1,
122
105
  address,
@@ -126,24 +109,49 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
126
109
  price,
127
110
  underlyings,
128
111
  timestamp: Date.now(),
129
- }));
112
+ });
130
113
  }
131
114
  else {
132
- const poolData = {
133
- id: address,
134
- lpDecimals: poolInfo.lp_decimals,
135
- mintTokenX: `0x${poolInfo.type_names[0]}`,
136
- decimalX: poolInfo.coin_decimals[0],
137
- mintTokenY: `0x${poolInfo.type_names[1]}`,
138
- decimalY: poolInfo.coin_decimals[1],
139
- reserveTokenX: new bignumber_js_1.default(poolInfo.normalized_balances[0]).dividedBy(poolInfo.decimal_scalars[0]),
140
- reserveTokenY: new bignumber_js_1.default(poolInfo.normalized_balances[1]).dividedBy(poolInfo.decimal_scalars[1]),
141
- supply: new bignumber_js_1.default(poolInfo.lp_supply.fields.value),
142
- };
143
- promises.push((0, computeAndStoreLpPrice_1.default)(cache, poolData, networkId, constants_1.platformId));
115
+ const tokenPriceA = tokenPriceById.get(`0x${poolInfo.type_names[0]}`);
116
+ const tokenPriceB = tokenPriceById.get(`0x${poolInfo.type_names[1]}`);
117
+ const reserveAmountRawA = new bignumber_js_1.default(poolInfo.normalized_balances[0]).dividedBy(poolInfo.decimal_scalars[0]);
118
+ const reserveAmountRawB = new bignumber_js_1.default(poolInfo.normalized_balances[1]).dividedBy(poolInfo.decimal_scalars[1]);
119
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(address, constants_1.platformId, networkId, {
120
+ address: `0x${poolInfo.type_names[0]}`,
121
+ decimals: poolInfo.coin_decimals[0],
122
+ reserveAmountRaw: reserveAmountRawA,
123
+ tokenPrice: tokenPriceA,
124
+ }, {
125
+ address: `0x${poolInfo.type_names[1]}`,
126
+ decimals: poolInfo.coin_decimals[1],
127
+ reserveAmountRaw: reserveAmountRawB,
128
+ tokenPrice: tokenPriceB,
129
+ });
130
+ if (underlyingSource)
131
+ yield cache.setTokenPriceSource(underlyingSource);
132
+ if (!tokenPriceA || !tokenPriceB)
133
+ continue;
134
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(networkId, address, constants_1.platformId, '', {
135
+ address,
136
+ decimals: poolInfo.lp_decimals,
137
+ supplyRaw: new bignumber_js_1.default(poolInfo.lp_supply.fields.value),
138
+ }, [
139
+ {
140
+ address: tokenPriceA.address,
141
+ decimals: tokenPriceA.decimals,
142
+ price: tokenPriceA.price,
143
+ reserveAmountRaw: reserveAmountRawA,
144
+ },
145
+ {
146
+ address: tokenPriceB.address,
147
+ decimals: tokenPriceB.decimals,
148
+ price: tokenPriceB.price,
149
+ reserveAmountRaw: reserveAmountRawB,
150
+ },
151
+ ]);
152
+ yield cache.setTokenPriceSource(lpSource);
144
153
  }
145
154
  }
146
- yield Promise.allSettled(promises);
147
155
  });
148
156
  const job = {
149
157
  id: `${constants_1.platformId}-pools`,
package/src/plugins/aftermath/poolsJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/poolsJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/poolsJob.ts"],"names":[],"mappings":"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"}
package/src/plugins/auxexchange/aptosLpJob.js CHANGED
@@ -17,7 +17,10 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
17
  const aptos_1 = require("../../utils/aptos");
18
18
  const clients_1 = require("../../utils/clients");
19
19
  const constants_1 = require("./constants");
20
- const computeAndStoreLpPrice_1 = __importDefault(require("../../utils/misc/computeAndStoreLpPrice"));
20
+ const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
21
+ const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
22
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
23
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
21
24
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
22
25
  var _a, _b, _c;
23
26
  const client = (0, clients_1.getClientAptos)();
@@ -28,7 +31,12 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
28
31
  resources.forEach((resource) => {
29
32
  resourcesByType.set(resource.type, resource);
30
33
  });
31
- const promises = [];
34
+ const tokenPriceById = yield (0, getTokensPricesMap_1.default)(resources
35
+ .map((resource) => {
36
+ const { keys } = (0, aptos_1.parseTypeString)(resource.type);
37
+ return keys ? keys.map((key) => key.type) : [];
38
+ })
39
+ .flat(), portfolio_core_1.NetworkId.aptos, cache);
32
40
  for (let i = 0; i < resources.length; i++) {
33
41
  const resource = resources[i];
34
42
  if (!resource.type.startsWith(constants_1.lpCoinInfoTypePrefix))
@@ -54,18 +62,55 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
54
62
  if (!typeY)
55
63
  throw new Error(`Failed to get typeY: ${lpType}`);
56
64
  const tokenPairData = poolResource.data;
57
- const poolData = {
58
- id: `${constants_1.platformId}-${lpType}`,
59
- supply: lpSupply,
60
- lpDecimals,
61
- reserveTokenX: new bignumber_js_1.default(tokenPairData.x_reserve.value),
62
- reserveTokenY: new bignumber_js_1.default(tokenPairData.y_reserve.value),
63
- mintTokenX: typeX,
64
- mintTokenY: typeY,
65
- };
66
- promises.push((0, computeAndStoreLpPrice_1.default)(cache, poolData, portfolio_core_1.NetworkId.aptos, constants_1.platformId));
65
+ const [tokenPriceX, tokenPriceY] = [
66
+ tokenPriceById.get(typeX),
67
+ tokenPriceById.get(typeY),
68
+ ];
69
+ const [decimalsX, decimalsY] = yield Promise.all([
70
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeX, portfolio_core_1.NetworkId.aptos),
71
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeY, portfolio_core_1.NetworkId.aptos),
72
+ ]);
73
+ const [reserveAmountRawX, reserveAmountRawY] = [
74
+ new bignumber_js_1.default(tokenPairData.x_reserve.value),
75
+ new bignumber_js_1.default(tokenPairData.y_reserve.value),
76
+ ];
77
+ if (!decimalsX || !decimalsY)
78
+ continue;
79
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpType, constants_1.platformId, portfolio_core_1.NetworkId.aptos, {
80
+ address: typeX,
81
+ decimals: decimalsX,
82
+ reserveAmountRaw: reserveAmountRawX,
83
+ tokenPrice: tokenPriceX,
84
+ }, {
85
+ address: typeY,
86
+ decimals: decimalsY,
87
+ reserveAmountRaw: reserveAmountRawY,
88
+ tokenPrice: tokenPriceY,
89
+ });
90
+ if (underlyingSource)
91
+ yield cache.setTokenPriceSource(underlyingSource);
92
+ if (!tokenPriceX || !tokenPriceY)
93
+ continue;
94
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, '', {
95
+ address: lpType,
96
+ decimals: lpDecimals,
97
+ supplyRaw: lpSupply,
98
+ }, [
99
+ {
100
+ address: tokenPriceX.address,
101
+ decimals: tokenPriceX.decimals,
102
+ price: tokenPriceX.price,
103
+ reserveAmountRaw: reserveAmountRawX,
104
+ },
105
+ {
106
+ address: tokenPriceY.address,
107
+ decimals: tokenPriceY.decimals,
108
+ price: tokenPriceY.price,
109
+ reserveAmountRaw: reserveAmountRawY,
110
+ },
111
+ ]);
112
+ yield cache.setTokenPriceSource(lpSource);
67
113
  }
68
- yield Promise.allSettled(promises);
69
114
  });
70
115
  const job = {
71
116
  id: `${constants_1.platformId}-aptos-lp`,
package/src/plugins/auxexchange/aptosLpJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":"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"}
package/src/plugins/kamino/farmsFetcher.js CHANGED
@@ -19,7 +19,6 @@ const solana_1 = require("../../utils/solana");
19
19
  const vaults_1 = require("./structs/vaults");
20
20
  const filters_1 = require("./filters");
21
21
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
22
- const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
23
22
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
24
23
  const client = (0, clients_1.getClientSolana)();
25
24
  const userStates = yield (0, solana_1.getParsedProgramAccounts)(client, vaults_1.userStateStruct, constants_1.farmProgramId, (0, filters_1.userStateFilter)(owner));
@@ -33,7 +32,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
33
32
  return [];
34
33
  const farmById = new Map();
35
34
  farmsInfo.forEach((farmInfo) => farmById.set(farmInfo.pubkey, farmInfo));
36
- const tokenPriceById = yield (0, getTokensPricesMap_1.default)(farmsInfo.map((farm) => farm.rewardsMints).flat(), portfolio_core_1.NetworkId.solana, cache);
37
35
  const liquidities = [];
38
36
  for (const userState of userStates) {
39
37
  const rewardAssets = [];
@@ -47,25 +45,40 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
47
45
  .dividedBy(Math.pow(10, decimals))
48
46
  .toNumber();
49
47
  assets.push((0, tokenPriceToAssetToken_1.default)(farm.mint, amount, portfolio_core_1.NetworkId.solana, undefined, price));
50
- for (let i = 0; i < farm.rewardsMints.length; i++) {
51
- const rewardMint = farm.rewardsMints[i];
52
- if (rewardMint === '11111111111111111111111111111111')
53
- continue;
54
- const rewardAmountRaw = userState.rewardsIssuedUnclaimed[i].plus(userState.rewardsTallyScaled[i]);
55
- if (rewardAmountRaw.isZero())
56
- continue;
57
- const rewardPrice = tokenPriceById.get(rewardMint);
58
- if (!rewardPrice)
59
- continue;
60
- const rewardAmount = rewardAmountRaw
61
- .dividedBy(Math.pow(10, 18))
62
- .dividedBy(Math.pow(10, rewardPrice.decimals))
63
- .toNumber();
64
- rewardAssets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(rewardMint, rewardAmount, portfolio_core_1.NetworkId.solana, rewardPrice)), { attributes: { isClaimable: false } }));
65
- }
48
+ // for (let i = 0; i < farm.rewardsMints.length; i++) {
49
+ // const rewardMint = farm.rewardsMints[i];
50
+ // if (rewardMint === '11111111111111111111111111111111') continue;
51
+ // const rewardAmountRaw = userState.rewardsIssuedUnclaimed[i].plus(
52
+ // userState.rewardsTallyScaled[i]
53
+ // );
54
+ // console.log(
55
+ // 'constexecutor:FetcherExecutor= ~ userState.rewardsIssuedUnclaimed[i]:',
56
+ // userState.rewardsIssuedUnclaimed[i].toNumber()
57
+ // );
58
+ // console.log(
59
+ // 'constexecutor:FetcherExecutor= ~ userState.rewardsTallyScaled[i]:',
60
+ // userState.rewardsTallyScaled[i].toNumber()
61
+ // );
62
+ // if (rewardAmountRaw.isZero()) continue;
63
+ // const rewardPrice = tokenPriceById.get(rewardMint);
64
+ // if (!rewardPrice) continue;
65
+ // const rewardAmount = rewardAmountRaw
66
+ // .dividedBy(10 ** 18)
67
+ // .dividedBy(10 ** rewardPrice.decimals)
68
+ // .toNumber();
69
+ // rewardAssets.push({
70
+ // ...tokenPriceToAssetToken(
71
+ // rewardMint,
72
+ // rewardAmount,
73
+ // NetworkId.solana,
74
+ // rewardPrice
75
+ // ),
76
+ // attributes: { isClaimable: false },
77
+ // });
78
+ // }
66
79
  const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
67
- const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((r) => r.value));
68
- const value = (0, portfolio_core_1.getUsdValueSum)([assetsValue, rewardAssetsValue]);
80
+ const rewardAssetsValue = null;
81
+ const value = assetsValue;
69
82
  const liquidity = {
70
83
  value,
71
84
  assets,
package/src/plugins/kamino/farmsFetcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/farmsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/farmsFetcher.ts"],"names":[],"mappings":"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"}
package/src/plugins/liquiditypools-sei/job.js CHANGED
@@ -18,16 +18,17 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
18
18
  const constants_1 = require("../../utils/clients/constants");
19
19
  const constants_2 = require("./constants");
20
20
  const sei_1 = require("../../utils/sei");
21
- const computeAndStoreLpPrice_1 = __importDefault(require("../../utils/misc/computeAndStoreLpPrice"));
22
21
  const isAContract_1 = __importDefault(require("../../utils/sei/isAContract"));
22
+ const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
23
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
24
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
23
25
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
24
26
  const cosmWasmClient = yield (0, core_1.getCosmWasmClient)((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.sei));
25
27
  const pushedContractsByPlatform = new Map();
26
- const promises = [];
27
28
  for (const liquidityPoolInfo of constants_2.liquidityPoolsInfos) {
28
29
  const { codes } = liquidityPoolInfo;
29
30
  const contracts = [];
30
- const platform = liquidityPoolInfo.platformId;
31
+ const { platformId } = liquidityPoolInfo;
31
32
  for (let i = 0; i < codes.length; i++) {
32
33
  const codesContracts = yield cosmWasmClient.getContracts(codes[i]);
33
34
  contracts.push(...codesContracts);
@@ -52,27 +53,62 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
52
53
  const poolInfo = yield liquidityPoolInfo.getter(minter.minter);
53
54
  if (!poolInfo)
54
55
  continue;
55
- const poolData = {
56
- id: lpContract,
57
- lpDecimals: lpTokenInfo.decimals,
58
- mintTokenX: poolInfo.mintX,
59
- mintTokenY: poolInfo.mintY,
60
- reserveTokenX: poolInfo.amountX,
61
- reserveTokenY: poolInfo.amountY,
62
- supply,
63
- };
64
- promises.push((0, computeAndStoreLpPrice_1.default)(cache, poolData, portfolio_core_1.NetworkId.sei, platform));
65
- if (pushedContractsByPlatform.get(platform)) {
66
- const pushedContracts = pushedContractsByPlatform.get(platform);
56
+ const [tokenPriceX, tokenPriceY] = yield cache.getTokenPrices([poolInfo.mintX, poolInfo.mintY], portfolio_core_1.NetworkId.sei);
57
+ const [decimalsX, decimalsY] = yield Promise.all([
58
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, poolInfo.mintX, portfolio_core_1.NetworkId.sei),
59
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, poolInfo.mintY, portfolio_core_1.NetworkId.sei),
60
+ ]);
61
+ const [reserveAmountRawX, reserveAmountRawY] = [
62
+ new bignumber_js_1.default(poolInfo.amountX),
63
+ new bignumber_js_1.default(poolInfo.amountY),
64
+ ];
65
+ if (!decimalsX || !decimalsY)
66
+ continue;
67
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpContract, platformId, portfolio_core_1.NetworkId.sei, {
68
+ address: poolInfo.mintX,
69
+ decimals: decimalsX,
70
+ reserveAmountRaw: reserveAmountRawX,
71
+ tokenPrice: tokenPriceX,
72
+ }, {
73
+ address: poolInfo.mintY,
74
+ decimals: decimalsY,
75
+ reserveAmountRaw: reserveAmountRawY,
76
+ tokenPrice: tokenPriceY,
77
+ });
78
+ if (underlyingSource)
79
+ yield cache.setTokenPriceSource(underlyingSource);
80
+ if (!tokenPriceX || !tokenPriceY)
81
+ continue;
82
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.sei, lpContract, platformId, '', {
83
+ address: lpContract,
84
+ decimals: lpTokenInfo.decimals,
85
+ supplyRaw: supply,
86
+ }, [
87
+ {
88
+ address: tokenPriceX.address,
89
+ decimals: tokenPriceX.decimals,
90
+ price: tokenPriceX.price,
91
+ reserveAmountRaw: reserveAmountRawX,
92
+ },
93
+ {
94
+ address: tokenPriceY.address,
95
+ decimals: tokenPriceY.decimals,
96
+ price: tokenPriceY.price,
97
+ reserveAmountRaw: reserveAmountRawY,
98
+ },
99
+ ]);
100
+ yield cache.setTokenPriceSource(lpSource);
101
+ if (pushedContractsByPlatform.get(platformId)) {
102
+ const pushedContracts = pushedContractsByPlatform.get(platformId);
67
103
  if (!pushedContracts)
68
104
  continue;
69
- pushedContractsByPlatform.set(platform, [
105
+ pushedContractsByPlatform.set(platformId, [
70
106
  ...pushedContracts,
71
107
  lpContract,
72
108
  ]);
73
109
  }
74
110
  else {
75
- pushedContractsByPlatform.set(platform, [lpContract]);
111
+ pushedContractsByPlatform.set(platformId, [lpContract]);
76
112
  }
77
113
  }
78
114
  }
@@ -80,12 +116,11 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
80
116
  const contracts = pushedContractsByPlatform.get(platform);
81
117
  if (!contracts || contracts.length === 0)
82
118
  continue;
83
- promises.push(cache.setItem(platform, { id: platform, contracts }, {
119
+ yield cache.setItem(platform, { id: platform, contracts }, {
84
120
  prefix: constants_2.pluginId,
85
121
  networkId: portfolio_core_1.NetworkId.sei,
86
- }));
122
+ });
87
123
  }
88
- yield Promise.allSettled(promises);
89
124
  });
90
125
  const job = {
91
126
  id: constants_2.pluginId,
package/src/plugins/liquiditypools-sei/job.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquiditypools-sei/job.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquiditypools-sei/job.ts"],"names":[],"mappings":"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"}
package/src/plugins/liquidswap/aptosLpJob.js CHANGED
@@ -17,7 +17,10 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
17
  const aptos_1 = require("../../utils/aptos");
18
18
  const clients_1 = require("../../utils/clients");
19
19
  const constants_1 = require("./constants");
20
- const computeAndStoreLpPrice_1 = __importDefault(require("../../utils/misc/computeAndStoreLpPrice"));
20
+ const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
21
+ const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
22
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
23
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
21
24
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
22
25
  var _a, _b, _c;
23
26
  const client = (0, clients_1.getClientAptos)();
@@ -26,18 +29,26 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
26
29
  return;
27
30
  const resourcesByType = new Map();
28
31
  const lpsCoinInfo = [];
32
+ const types = new Set();
29
33
  resources.forEach((resource) => {
30
34
  var _a, _b, _c;
31
35
  if (resource.type.startsWith(constants_1.lpCoinInfoTypePrefix)) {
32
36
  const lpCoinInfo = resource;
33
37
  const supply = (_c = (_b = (_a = lpCoinInfo.data.supply) === null || _a === void 0 ? void 0 : _a.vec[0]) === null || _b === void 0 ? void 0 : _b.integer.vec[0]) === null || _c === void 0 ? void 0 : _c.value;
38
+ const tempTypes = (0, aptos_1.parseTypeString)(resource.type);
39
+ let { keys } = tempTypes;
40
+ while (keys && keys[0].keys) {
41
+ keys = keys[0].keys;
42
+ }
43
+ if (keys)
44
+ keys.forEach((key) => types.add(key.type));
34
45
  if (supply && supply !== '0')
35
46
  lpsCoinInfo.push(lpCoinInfo);
36
47
  return;
37
48
  }
38
49
  resourcesByType.set(resource.type, resource);
39
50
  });
40
- const promises = [];
51
+ const tokenPriceById = yield (0, getTokensPricesMap_1.default)(Array.from(types), portfolio_core_1.NetworkId.aptos, cache);
41
52
  for (let i = 0; i < lpsCoinInfo.length; i++) {
42
53
  const lpInfoResource = lpsCoinInfo[i];
43
54
  const lpType = (0, aptos_1.getNestedType)(lpInfoResource.type);
@@ -70,18 +81,55 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
70
81
  if (liquidityPoolData.coin_x_reserve.value === '0' &&
71
82
  liquidityPoolData.coin_y_reserve.value === '0')
72
83
  continue;
73
- const poolData = {
74
- id: lpType,
75
- lpDecimals,
76
- supply: lpSupply,
77
- mintTokenX: typeX,
78
- mintTokenY: typeY,
79
- reserveTokenX: new bignumber_js_1.default(liquidityPoolData.coin_x_reserve.value),
80
- reserveTokenY: new bignumber_js_1.default(liquidityPoolData.coin_y_reserve.value),
81
- };
82
- promises.push((0, computeAndStoreLpPrice_1.default)(cache, poolData, portfolio_core_1.NetworkId.aptos, constants_1.platformId));
84
+ const [tokenPriceX, tokenPriceY] = [
85
+ tokenPriceById.get(typeX),
86
+ tokenPriceById.get(typeY),
87
+ ];
88
+ const [decimalsX, decimalsY] = yield Promise.all([
89
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeX, portfolio_core_1.NetworkId.aptos),
90
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeY, portfolio_core_1.NetworkId.aptos),
91
+ ]);
92
+ const [reserveAmountRawX, reserveAmountRawY] = [
93
+ new bignumber_js_1.default(liquidityPoolData.coin_x_reserve.value),
94
+ new bignumber_js_1.default(liquidityPoolData.coin_y_reserve.value),
95
+ ];
96
+ if (!decimalsX || !decimalsY)
97
+ continue;
98
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpType, constants_1.platformId, portfolio_core_1.NetworkId.aptos, {
99
+ address: typeX,
100
+ decimals: decimalsX,
101
+ reserveAmountRaw: reserveAmountRawX,
102
+ tokenPrice: tokenPriceX,
103
+ }, {
104
+ address: typeY,
105
+ decimals: decimalsY,
106
+ reserveAmountRaw: reserveAmountRawY,
107
+ tokenPrice: tokenPriceY,
108
+ });
109
+ if (underlyingSource)
110
+ yield cache.setTokenPriceSource(underlyingSource);
111
+ if (!tokenPriceX || !tokenPriceY)
112
+ continue;
113
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, '', {
114
+ address: lpType,
115
+ decimals: lpDecimals,
116
+ supplyRaw: lpSupply,
117
+ }, [
118
+ {
119
+ address: tokenPriceX.address,
120
+ decimals: tokenPriceX.decimals,
121
+ price: tokenPriceX.price,
122
+ reserveAmountRaw: reserveAmountRawX,
123
+ },
124
+ {
125
+ address: tokenPriceY.address,
126
+ decimals: tokenPriceY.decimals,
127
+ price: tokenPriceY.price,
128
+ reserveAmountRaw: reserveAmountRawY,
129
+ },
130
+ ]);
131
+ yield cache.setTokenPriceSource(lpSource);
83
132
  }
84
- yield Promise.allSettled(promises);
85
133
  });
86
134
  const job = {
87
135
  id: `${constants_1.platformId}-aptos-lp`,
package/src/plugins/liquidswap/aptosLpJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
package/src/plugins/orca/lpTokensJob.js CHANGED
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -44,8 +21,11 @@ const oldLiquidities_1 = require("./structs/oldLiquidities");
44
21
  const solana_1 = require("../../utils/solana");
45
22
  const fetchTokenSupplyAndDecimals_1 = require("../../utils/solana/fetchTokenSupplyAndDecimals");
46
23
  const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
47
- const computeAndStoreLpPrice_1 = __importStar(require("../../utils/misc/computeAndStoreLpPrice"));
24
+ const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
48
25
  const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
26
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
27
+ const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
28
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
49
29
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
50
30
  const client = (0, clients_1.getClientSolana)();
51
31
  const farmsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, oldLiquidities_1.aquafarmStruct, constants_1.aquafarmsProgram, filters_1.aquafarmFilters);
@@ -94,25 +74,61 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
94
74
  const poolPcTokenAccount = tokenAccountByAddress.get(poolAccount.tokenAccountB.toString());
95
75
  if (!poolPcTokenAccount || !poolCoinTokenAccount)
96
76
  continue;
97
- const coinToken = tokenPrices.get(poolAccount.mintA.toString());
98
- const pcToken = tokenPrices.get(poolAccount.mintB.toString());
99
- if (!coinToken || !pcToken)
77
+ const mintA = poolAccount.mintA.toString();
78
+ const mintB = poolAccount.mintB.toString();
79
+ const tokenPriceA = tokenPrices.get(poolAccount.mintA.toString());
80
+ const tokenPriceB = tokenPrices.get(poolAccount.mintB.toString());
81
+ const [decimalsA, decimalsB] = yield Promise.all([
82
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, mintA, portfolio_core_1.NetworkId.solana),
83
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, mintB, portfolio_core_1.NetworkId.solana),
84
+ ]);
85
+ const lpDecimals = lpSupplyAndDecimals.decimals;
86
+ if (!decimalsA || !decimalsB)
100
87
  continue;
101
88
  const coinAmountWei = new bignumber_js_1.default(poolCoinTokenAccount.amount.toString());
102
89
  const pcAmountWei = new bignumber_js_1.default(poolPcTokenAccount.amount.toString());
103
- const lpDecimals = lpSupplyAndDecimals.decimals;
104
- const poolData = {
105
- id: lpMint.toString(),
106
- lpDecimals,
107
- mintTokenX: poolAccount.mintA.toString(),
108
- mintTokenY: poolAccount.mintB.toString(),
109
- reserveTokenX: coinAmountWei,
110
- reserveTokenY: pcAmountWei,
111
- supply: lpSupply,
112
- decimalX: coinToken.decimals,
113
- decimalY: pcToken.decimals,
114
- };
115
- yield (0, computeAndStoreLpPrice_1.default)(cache, poolData, portfolio_core_1.NetworkId.solana, constants_1.platformId);
90
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpMint.toString(), constants_1.platformId, portfolio_core_1.NetworkId.solana, {
91
+ address: mintA,
92
+ decimals: decimalsA,
93
+ reserveAmountRaw: coinAmountWei,
94
+ tokenPrice: tokenPriceA,
95
+ }, {
96
+ address: mintB,
97
+ decimals: decimalsB,
98
+ reserveAmountRaw: pcAmountWei,
99
+ tokenPrice: tokenPriceB,
100
+ });
101
+ if (underlyingSource)
102
+ yield cache.setTokenPriceSource(underlyingSource);
103
+ if (!tokenPriceA || !tokenPriceB)
104
+ continue;
105
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.solana, lpMint.toString(), constants_1.platformId, 'Aquafarms (deprecated)', { address: lpMint.toString(), decimals: lpDecimals, supplyRaw: lpSupply }, [
106
+ {
107
+ address: tokenPriceA.address,
108
+ decimals: tokenPriceA.decimals,
109
+ price: tokenPriceA.price,
110
+ reserveAmountRaw: coinAmountWei,
111
+ },
112
+ {
113
+ address: tokenPriceB.address,
114
+ decimals: tokenPriceB.decimals,
115
+ price: tokenPriceB.price,
116
+ reserveAmountRaw: pcAmountWei,
117
+ },
118
+ ]);
119
+ yield cache.setTokenPriceSource(lpSource);
120
+ // const poolData: PoolData = {
121
+ // id: lpMint.toString(),
122
+ // lpDecimals,
123
+ // mintTokenX: poolAccount.mintA.toString(),
124
+ // mintTokenY: poolAccount.mintB.toString(),
125
+ // reserveTokenX: coinAmountWei,
126
+ // reserveTokenY: pcAmountWei,
127
+ // supply: lpSupply,
128
+ // decimalX: tokenPriceA.decimals,
129
+ // decimalY: tokenPriceB.decimals,
130
+ // };
131
+ // await computeAndStoreLpPrice(cache, poolData, NetworkId.solana, platformId);
116
132
  }
117
133
  const tokensSupDecResult = yield (0, runInBatch_1.default)(farmsAccounts.map((farm) => () => (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(farm.farmTokenMint, client, 0)));
118
134
  const tokensSuppliesAndDecimalsByMint = new Map();
package/src/plugins/orca/lpTokensJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":"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"}
package/src/plugins/pancakeswap/aptosLpJob.js CHANGED
@@ -17,7 +17,10 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
17
  const constants_1 = require("./constants");
18
18
  const clients_1 = require("../../utils/clients");
19
19
  const aptos_1 = require("../../utils/aptos");
20
- const computeAndStoreLpPrice_1 = __importDefault(require("../../utils/misc/computeAndStoreLpPrice"));
20
+ const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
21
+ const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
22
+ const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
23
+ const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
21
24
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
22
25
  var _a, _b, _c;
23
26
  const client = (0, clients_1.getClientAptos)();
@@ -28,7 +31,12 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
28
31
  resources.forEach((resource) => {
29
32
  resourcesByType.set(resource.type, resource);
30
33
  });
31
- const promises = [];
34
+ const tokenPriceById = yield (0, getTokensPricesMap_1.default)(resources
35
+ .map((ressource) => {
36
+ const { keys } = (0, aptos_1.parseTypeString)(ressource.type);
37
+ return keys ? keys.map((key) => key.type) : [];
38
+ })
39
+ .flat(), portfolio_core_1.NetworkId.aptos, cache);
32
40
  for (let i = 0; i < resources.length; i++) {
33
41
  const resource = resources[i];
34
42
  if (!resource.type.startsWith(constants_1.lpCoinInfoTypePrefix))
@@ -64,18 +72,55 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
64
72
  if (tokenPairData.balance_x.value === '0' &&
65
73
  tokenPairData.balance_y.value === '0')
66
74
  continue;
67
- const poolData = {
68
- id: lpType,
69
- lpDecimals,
70
- supply: lpSupply,
71
- mintTokenX: typeX,
72
- mintTokenY: typeY,
73
- reserveTokenX: new bignumber_js_1.default(tokenPairData.balance_x.value),
74
- reserveTokenY: new bignumber_js_1.default(tokenPairData.balance_y.value),
75
- };
76
- promises.push((0, computeAndStoreLpPrice_1.default)(cache, poolData, portfolio_core_1.NetworkId.aptos, constants_1.platformId));
75
+ const [tokenPriceX, tokenPriceY] = [
76
+ tokenPriceById.get(typeX),
77
+ tokenPriceById.get(typeY),
78
+ ];
79
+ const [decimalsX, decimalsY] = yield Promise.all([
80
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeX, portfolio_core_1.NetworkId.aptos),
81
+ (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeY, portfolio_core_1.NetworkId.aptos),
82
+ ]);
83
+ const [reserveAmountRawX, reserveAmountRawY] = [
84
+ new bignumber_js_1.default(tokenPairData.balance_x.value),
85
+ new bignumber_js_1.default(tokenPairData.balance_y.value),
86
+ ];
87
+ if (!decimalsX || !decimalsY)
88
+ continue;
89
+ const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpType, constants_1.platformId, portfolio_core_1.NetworkId.aptos, {
90
+ address: typeX,
91
+ decimals: decimalsX,
92
+ reserveAmountRaw: reserveAmountRawX,
93
+ tokenPrice: tokenPriceX,
94
+ }, {
95
+ address: typeY,
96
+ decimals: decimalsY,
97
+ reserveAmountRaw: reserveAmountRawY,
98
+ tokenPrice: tokenPriceY,
99
+ });
100
+ if (underlyingSource)
101
+ yield cache.setTokenPriceSource(underlyingSource);
102
+ if (!tokenPriceX || !tokenPriceY)
103
+ continue;
104
+ const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, '', {
105
+ address: lpType,
106
+ decimals: lpDecimals,
107
+ supplyRaw: lpSupply,
108
+ }, [
109
+ {
110
+ address: tokenPriceX.address,
111
+ decimals: tokenPriceX.decimals,
112
+ price: tokenPriceX.price,
113
+ reserveAmountRaw: reserveAmountRawX,
114
+ },
115
+ {
116
+ address: tokenPriceY.address,
117
+ decimals: tokenPriceY.decimals,
118
+ price: tokenPriceY.price,
119
+ reserveAmountRaw: reserveAmountRawY,
120
+ },
121
+ ]);
122
+ yield cache.setTokenPriceSource(lpSource);
77
123
  }
78
- yield Promise.allSettled(promises);
79
124
  });
80
125
  const job = {
81
126
  id: `${constants_1.platformId}-aptos-lp`,
package/src/plugins/pancakeswap/aptosLpJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":"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"}