@sonarwatch/portfolio-plugins 0.11.9 → 0.11.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/package.json +2 -2
- package/src/plugins/orca/lpTokensJob.js +59 -40
- package/src/plugins/orca/lpTokensJob.js.map +1 -1
- package/src/plugins/pancakeswap/aptosLpJob.js +58 -13
- package/src/plugins/pancakeswap/aptosLpJob.js.map +1 -1
- package/src/utils/misc/getTokensPricesMap.js +1 -3
- package/src/utils/misc/getTokensPricesMap.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.11.10](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.9...plugins-0.11.10) (2023-12-14)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.11.9](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.8...plugins-0.11.9) (2023-12-14)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.10",
|
|
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.
|
|
44
|
+
"@sonarwatch/portfolio-core": "0.11.10"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -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 =
|
|
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,64 @@ 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
|
|
98
|
-
const
|
|
99
|
-
if (
|
|
77
|
+
const mintA = poolAccount.mintA.toString();
|
|
78
|
+
const mintB = poolAccount.mintB.toString();
|
|
79
|
+
if (mintA === 'Basis9oJw9j8cw53oMV7iqsgo6ihi9ALw4QR31rcjUJa' ||
|
|
80
|
+
mintB === 'Basis9oJw9j8cw53oMV7iqsgo6ihi9ALw4QR31rcjUJa')
|
|
81
|
+
console.log(lpMint.toString());
|
|
82
|
+
const tokenPriceA = tokenPrices.get(poolAccount.mintA.toString());
|
|
83
|
+
const tokenPriceB = tokenPrices.get(poolAccount.mintB.toString());
|
|
84
|
+
const [decimalsA, decimalsB] = yield Promise.all([
|
|
85
|
+
(0, getDecimalsForToken_1.getDecimalsForToken)(cache, mintA, portfolio_core_1.NetworkId.solana),
|
|
86
|
+
(0, getDecimalsForToken_1.getDecimalsForToken)(cache, mintB, portfolio_core_1.NetworkId.solana),
|
|
87
|
+
]);
|
|
88
|
+
const lpDecimals = lpSupplyAndDecimals.decimals;
|
|
89
|
+
if (!decimalsA || !decimalsB)
|
|
100
90
|
continue;
|
|
101
91
|
const coinAmountWei = new bignumber_js_1.default(poolCoinTokenAccount.amount.toString());
|
|
102
92
|
const pcAmountWei = new bignumber_js_1.default(poolPcTokenAccount.amount.toString());
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
93
|
+
const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpMint.toString(), constants_1.platformId, portfolio_core_1.NetworkId.solana, {
|
|
94
|
+
address: mintA,
|
|
95
|
+
decimals: decimalsA,
|
|
96
|
+
reserveAmountRaw: coinAmountWei,
|
|
97
|
+
tokenPrice: tokenPriceA,
|
|
98
|
+
}, {
|
|
99
|
+
address: mintB,
|
|
100
|
+
decimals: decimalsB,
|
|
101
|
+
reserveAmountRaw: pcAmountWei,
|
|
102
|
+
tokenPrice: tokenPriceB,
|
|
103
|
+
});
|
|
104
|
+
if (underlyingSource)
|
|
105
|
+
yield cache.setTokenPriceSource(underlyingSource);
|
|
106
|
+
if (!tokenPriceA || !tokenPriceB)
|
|
107
|
+
continue;
|
|
108
|
+
const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.solana, lpMint.toString(), constants_1.platformId, 'V???', { address: lpMint.toString(), decimals: lpDecimals, supplyRaw: lpSupply }, [
|
|
109
|
+
{
|
|
110
|
+
address: tokenPriceA.address,
|
|
111
|
+
decimals: tokenPriceA.decimals,
|
|
112
|
+
price: tokenPriceA.price,
|
|
113
|
+
reserveAmountRaw: coinAmountWei,
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
address: tokenPriceB.address,
|
|
117
|
+
decimals: tokenPriceB.decimals,
|
|
118
|
+
price: tokenPriceB.price,
|
|
119
|
+
reserveAmountRaw: pcAmountWei,
|
|
120
|
+
},
|
|
121
|
+
]);
|
|
122
|
+
yield cache.setTokenPriceSource(lpSource);
|
|
123
|
+
// const poolData: PoolData = {
|
|
124
|
+
// id: lpMint.toString(),
|
|
125
|
+
// lpDecimals,
|
|
126
|
+
// mintTokenX: poolAccount.mintA.toString(),
|
|
127
|
+
// mintTokenY: poolAccount.mintB.toString(),
|
|
128
|
+
// reserveTokenX: coinAmountWei,
|
|
129
|
+
// reserveTokenY: pcAmountWei,
|
|
130
|
+
// supply: lpSupply,
|
|
131
|
+
// decimalX: tokenPriceA.decimals,
|
|
132
|
+
// decimalY: tokenPriceB.decimals,
|
|
133
|
+
// };
|
|
134
|
+
// await computeAndStoreLpPrice(cache, poolData, NetworkId.solana, platformId);
|
|
116
135
|
}
|
|
117
136
|
const tokensSupDecResult = yield (0, runInBatch_1.default)(farmsAccounts.map((farm) => () => (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(farm.farmTokenMint, client, 0)));
|
|
118
137
|
const tokensSuppliesAndDecimalsByMint = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AAErC,2CAAyE;AACzE,uCAA0D;AAC1D,iDAAsD;AACtD,6DAA0E;AAC1E,+CAK4B;AAC5B,gGAA6F;AAG7F,6EAAqD;AACrD,oFAGiD;AACjD,6FAAoE;AACpE,6GAAqF;AACrF,8EAA2E;AAE3E,+FAAuE;AAEvE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,+BAAc,EACd,4BAAgB,EAChB,yBAAe,CAChB,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,+BAAc,EACd,wBAAY,EACZ,sBAAY,CACb,CAAC;IAEF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,sBAAsB,GAAgB,EAAE,CAAC;IAC/C,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9D,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,IAAA,4BAAiB,EAAC,KAAK,EAAE,0BAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,IAAA,sCAA6B,EACxD,MAAM,EACN,2BAAkB,EAClB,sBAAsB,CACvB,CAAC;IAEF,MAAM,qBAAqB,GAA8B,IAAI,GAAG,EAAE,CAAC;IACnE,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAU,EAClC,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,IAAA,yDAA2B,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CACvE,CACF,CAAC;IAEF,MAAM,sBAAsB,GAGxB,IAAI,GAAG,EAAE,CAAC;IACd,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAC/B,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO;QACpC,IAAI,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO;QACrB,sBAAsB,CAAC,GAAG,CACxB,aAAa,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,EACzC,CAAC,CAAC,KAAK,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE;QACvC,IACE;YACE,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE;YACpC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE;SACrC,CAAC,QAAQ,CAAC,kCAAkC,CAAC;YAE9C,SAAS;QAEX,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC;QACrC,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,mBAAmB;YAAE,SAAS;QAEnC,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,KAAK,CAC9D,SAAA,EAAE,EAAI,mBAAmB,CAAC,QAAQ,CAAA,CACnC,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,EAAE;YAAE,SAAS;QAEhC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,GAAG,CACpD,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,CACrC,CAAC;QACF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAClD,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,CACrC,CAAC;QACF,IAAI,CAAC,kBAAkB,IAAI,CAAC,oBAAoB;YAAE,SAAS;QAE3D,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,IACE,KAAK,KAAK,8CAA8C;YACxD,KAAK,KAAK,8CAA8C;YAExD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjC,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,IAAA,yCAAmB,EAAC,KAAK,EAAE,KAAK,EAAE,0BAAS,CAAC,MAAM,CAAC;YACnD,IAAA,yCAAmB,EAAC,KAAK,EAAE,KAAK,EAAE,0BAAS,CAAC,MAAM,CAAC;SACpD,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,mBAAmB,CAAC,QAAQ,CAAC;QAEhD,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;YAAE,SAAS;QAEvC,MAAM,aAAa,GAAG,IAAI,sBAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAExE,MAAM,gBAAgB,GAAG,IAAA,oCAA0B,EACjD,MAAM,CAAC,QAAQ,EAAE,EACjB,sBAAU,EACV,0BAAS,CAAC,MAAM,EAChB;YACE,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,SAAS;YACnB,gBAAgB,EAAE,aAAa;YAC/B,UAAU,EAAE,WAAW;SACxB,EACD;YACE,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,SAAS;YACnB,gBAAgB,EAAE,WAAW;YAC7B,UAAU,EAAE,WAAW;SACxB,CACF,CAAC;QACF,IAAI,gBAAgB;YAAE,MAAM,KAAK,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QAExE,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3C,MAAM,QAAQ,GAAG,IAAA,6BAAmB,EAClC,0BAAS,CAAC,MAAM,EAChB,MAAM,CAAC,QAAQ,EAAE,EACjB,sBAAU,EACV,MAAM,EACN,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EACzE;YACE;gBACE,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,aAAa;aAChC;YACD;gBACE,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,WAAW;aAC9B;SACF,CACF,CAAC;QAEF,MAAM,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAE1C,+BAA+B;QAC/B,2BAA2B;QAC3B,gBAAgB;QAChB,8CAA8C;QAC9C,8CAA8C;QAC9C,kCAAkC;QAClC,gCAAgC;QAChC,sBAAsB;QACtB,oCAAoC;QACpC,oCAAoC;QACpC,KAAK;QAEL,+EAA+E;KAChF;IAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,oBAAU,EACzC,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,IAAA,yDAA2B,EAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAC3E,CACF,CAAC;IACF,MAAM,+BAA+B,GAGjC,IAAI,GAAG,EAAE,CAAC;IACd,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACtC,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO;QACpC,IAAI,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO;QACrB,+BAA+B,CAAC,GAAG,CACjC,aAAa,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,EAC7C,CAAC,CAAC,KAAK,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QAChD,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAElC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,SAAS;YAAE,SAAS;QAEzB,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CACzC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,CACnC,CAAC;QACF,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAExC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;QACnD,MAAM,cAAc,GAAG,+BAA+B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,cAAc;YAAE,SAAS;QAE9B,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACtE,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM;aACrC,GAAG,CAAC,SAAA,EAAE,EAAI,SAAS,CAAC,QAAQ,CAAA,CAAC;aAC7B,QAAQ,EAAE,CAAC;QACd,MAAM,cAAc,GAAG,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC;QAEzD,IAAI,cAAc,GAAG,yCAAgB,CAAC,QAAQ,EAAE;YAAE,SAAS;QAC3D,MAAM,KAAK,GAAG,cAAc,GAAG,UAAU,CAAC;QAE1C,MAAM,KAAK,CAAC,mBAAmB,CAAC;YAC9B,EAAE,EAAE,sBAAU;YACd,WAAW,EAAE,wBAAwB;YACrC,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE;YAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,QAAQ,EAAE,YAAY;YACtB,KAAK;YACL,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -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
|
|
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
|
|
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
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
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`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAAuD;AAGvD,2CAA+E;AAE/E,iDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
function getTokenPricesMap(tokensAddresses, networkId, cache) {
|
|
13
13
|
return __awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const
|
|
15
|
-
tokensAddresses.forEach((mint) => mints.add(mint));
|
|
16
|
-
const tokensPrices = yield cache.getTokenPrices(Array.from(mints), networkId);
|
|
14
|
+
const tokensPrices = yield cache.getTokenPrices(tokensAddresses, networkId);
|
|
17
15
|
const tokenPriceById = new Map();
|
|
18
16
|
tokensPrices.forEach((tP, index) => tP ? tokenPriceById.set(tokensAddresses[index], tP) : undefined);
|
|
19
17
|
return tokenPriceById;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTokensPricesMap.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getTokensPricesMap.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,SAA8B,iBAAiB,CAC7C,eAAyB,EACzB,SAAwB,EACxB,KAAY;;QAEZ,MAAM,
|
|
1
|
+
{"version":3,"file":"getTokensPricesMap.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getTokensPricesMap.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,SAA8B,iBAAiB,CAC7C,eAAyB,EACzB,SAAwB,EACxB,KAAY;;QAEZ,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAC5E,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;QAC1D,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CACjC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAChE,CAAC;QACF,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AAXD,oCAWC"}
|