@sonarwatch/portfolio-plugins 0.11.16 → 0.11.18
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 +9 -1
- package/package.json +2 -2
- package/src/plugins/auxexchange/aptosLpJob.js +58 -13
- package/src/plugins/auxexchange/aptosLpJob.js.map +1 -1
- package/src/plugins/liquiditypools-sei/job.js +55 -20
- package/src/plugins/liquiditypools-sei/job.js.map +1 -1
- package/src/plugins/liquidswap/aptosLpJob.js +32 -45
- package/src/plugins/liquidswap/aptosLpJob.js.map +1 -1
- package/src/plugins/marginfi/fetcherExecutor.js +80 -86
- package/src/plugins/marginfi/fetcherExecutor.js.map +1 -1
- package/src/plugins/sushiswap/aptos/poolsJob.js +1 -1
- package/src/plugins/sushiswap/aptos/poolsJob.js.map +1 -1
- package/src/utils/aptos/resources/coinInfo.d.ts +6 -0
- package/src/utils/misc/getLpTokenSource.d.ts +1 -1
- package/src/utils/misc/getLpTokenSource.js.map +1 -1
- package/src/utils/misc/getLpTokenSourceRaw.d.ts +1 -1
- package/src/utils/misc/getLpTokenSourceRaw.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,10 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
-
## [0.11.
|
|
5
|
+
## [0.11.18](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.17...plugins-0.11.18) (2023-12-19)
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
+
## [0.11.17](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.16...plugins-0.11.17) (2023-12-18)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
## [0.11.16](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.15...plugins-0.11.16) (2023-12-18)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
9
17
|
## [0.11.15](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.14...plugins-0.11.15) (2023-12-18)
|
|
10
18
|
|
|
11
19
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.18",
|
|
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.18"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -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
|
|
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
|
|
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
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
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`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAAuD;AAGvD,
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
|
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
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
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(
|
|
105
|
+
pushedContractsByPlatform.set(platformId, [
|
|
70
106
|
...pushedContracts,
|
|
71
107
|
lpContract,
|
|
72
108
|
]);
|
|
73
109
|
}
|
|
74
110
|
else {
|
|
75
|
-
pushedContractsByPlatform.set(
|
|
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
|
-
|
|
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,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquiditypools-sei/job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAAiD;AACjD,+DAAuD;AACvD,gEAAqC;AAGrC,6DAA+D;AAC/D,2CAA4D;AAC5D,yCAKyB;AACzB,
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquiditypools-sei/job.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokens
|
|
|
21
21
|
const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
|
|
22
22
|
const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
|
|
23
23
|
const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
|
|
24
|
+
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
24
25
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
26
|
var _a, _b, _c;
|
|
26
27
|
const client = (0, clients_1.getClientAptos)();
|
|
@@ -29,53 +30,52 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
29
30
|
return;
|
|
30
31
|
const resourcesByType = new Map();
|
|
31
32
|
const lpsCoinInfo = [];
|
|
32
|
-
const
|
|
33
|
+
const tokens = [];
|
|
34
|
+
const lpInfos = [];
|
|
33
35
|
resources.forEach((resource) => {
|
|
34
|
-
var _a, _b, _c;
|
|
36
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
35
37
|
if (resource.type.startsWith(constants_1.lpCoinInfoTypePrefix)) {
|
|
36
38
|
const lpCoinInfo = resource;
|
|
37
39
|
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
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
if (supply && supply !== '0') {
|
|
41
|
+
const parsedType = (0, aptos_1.parseTypeString)(lpCoinInfo.type);
|
|
42
|
+
const lpType = (_e = (_d = parsedType.keys) === null || _d === void 0 ? void 0 : _d.at(0)) === null || _e === void 0 ? void 0 : _e.type;
|
|
43
|
+
if (!lpType)
|
|
44
|
+
return;
|
|
45
|
+
const parsedLpType = (0, aptos_1.parseTypeString)(lpType);
|
|
46
|
+
const typeX = (_g = (_f = parsedLpType.keys) === null || _f === void 0 ? void 0 : _f.at(0)) === null || _g === void 0 ? void 0 : _g.type;
|
|
47
|
+
const typeY = (_j = (_h = parsedLpType.keys) === null || _h === void 0 ? void 0 : _h.at(1)) === null || _j === void 0 ? void 0 : _j.type;
|
|
48
|
+
const poolType = (_l = (_k = parsedLpType.keys) === null || _k === void 0 ? void 0 : _k.at(2)) === null || _l === void 0 ? void 0 : _l.type;
|
|
49
|
+
if (!typeX || !typeY || !poolType)
|
|
50
|
+
return;
|
|
51
|
+
tokens.push(...[typeX, typeY]);
|
|
52
|
+
lpInfos.push({
|
|
53
|
+
lpType,
|
|
54
|
+
poolType,
|
|
55
|
+
typeX,
|
|
56
|
+
typeY,
|
|
57
|
+
});
|
|
46
58
|
lpsCoinInfo.push(lpCoinInfo);
|
|
59
|
+
}
|
|
47
60
|
return;
|
|
48
61
|
}
|
|
49
62
|
resourcesByType.set(resource.type, resource);
|
|
50
63
|
});
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
// const promises = [];
|
|
64
|
+
const tokenPriceById = yield (0, getTokensPricesMap_1.default)(tokens, portfolio_core_1.NetworkId.aptos, cache);
|
|
65
|
+
const promises = [];
|
|
54
66
|
for (let i = 0; i < lpsCoinInfo.length; i++) {
|
|
55
67
|
const lpInfoResource = lpsCoinInfo[i];
|
|
56
|
-
const lpType
|
|
57
|
-
const lpSupplyString = (_c = (_b = (_a = lpInfoResource.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;
|
|
68
|
+
const { lpType, poolType, typeX, typeY } = lpInfos[i];
|
|
58
69
|
if (!lpInfoResource)
|
|
59
70
|
continue;
|
|
71
|
+
const lpSupplyString = (_c = (_b = (_a = lpInfoResource.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;
|
|
60
72
|
if (!lpSupplyString)
|
|
61
73
|
continue;
|
|
62
74
|
const lpDecimals = lpInfoResource.data.decimals;
|
|
63
75
|
const lpSupply = new bignumber_js_1.default(lpSupplyString);
|
|
64
76
|
if (lpSupply.isZero())
|
|
65
77
|
continue;
|
|
66
|
-
const
|
|
67
|
-
const splits = liquidityPoolId.split(', ');
|
|
68
|
-
const typeX = splits.at(0);
|
|
69
|
-
const typeY = splits.at(1);
|
|
70
|
-
const poolType = splits.at(2);
|
|
71
|
-
if (!typeX)
|
|
72
|
-
throw new Error(`Failed to get typeX: ${lpType}`);
|
|
73
|
-
if (!typeY)
|
|
74
|
-
throw new Error(`Failed to get typeY: ${lpType}`);
|
|
75
|
-
if (!poolType)
|
|
76
|
-
throw new Error(`Failed to get pool type: ${lpType}`);
|
|
77
|
-
const creatorAddress = (0, aptos_1.getCoinAddressFromCoinType)(poolType);
|
|
78
|
-
const liquidityPoolType = `${creatorAddress}::liquidity_pool::LiquidityPool<${liquidityPoolId}>`;
|
|
78
|
+
const liquidityPoolType = `${constants_1.resourceAddress}::liquidity_pool::LiquidityPool<${typeX}, ${typeY}, ${poolType}>`;
|
|
79
79
|
const liquidityPoolResource = resourcesByType.get(liquidityPoolType);
|
|
80
80
|
if (!liquidityPoolResource)
|
|
81
81
|
continue;
|
|
@@ -109,11 +109,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
109
109
|
tokenPrice: tokenPriceY,
|
|
110
110
|
});
|
|
111
111
|
if (underlyingSource)
|
|
112
|
-
|
|
113
|
-
console.log('constexecutor:JobExecutor= ~ underlyingSource:', underlyingSource);
|
|
112
|
+
promises.push(underlyingSource);
|
|
114
113
|
if (!tokenPriceX || !tokenPriceY)
|
|
115
114
|
continue;
|
|
116
|
-
const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId,
|
|
115
|
+
const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, undefined, {
|
|
117
116
|
address: lpType,
|
|
118
117
|
decimals: lpDecimals,
|
|
119
118
|
supplyRaw: lpSupply,
|
|
@@ -131,21 +130,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
131
130
|
reserveAmountRaw: reserveAmountRawY,
|
|
132
131
|
},
|
|
133
132
|
]);
|
|
134
|
-
|
|
135
|
-
// const poolData: PoolData = {
|
|
136
|
-
// id: lpType,
|
|
137
|
-
// lpDecimals,
|
|
138
|
-
// supply: lpSupply,
|
|
139
|
-
// mintTokenX: typeX,
|
|
140
|
-
// mintTokenY: typeY,
|
|
141
|
-
// reserveTokenX: new BigNumber(liquidityPoolData.coin_x_reserve.value),
|
|
142
|
-
// reserveTokenY: new BigNumber(liquidityPoolData.coin_y_reserve.value),
|
|
143
|
-
// };
|
|
144
|
-
// promises.push(
|
|
145
|
-
// computeAndStoreLpPrice(cache, poolData, NetworkId.aptos, platformId)
|
|
146
|
-
// );
|
|
133
|
+
promises.push(lpSource);
|
|
147
134
|
}
|
|
148
|
-
|
|
135
|
+
yield (0, runInBatch_1.default)(promises.map((tokenPriceSource) => () => cache.setTokenPriceSource(tokenPriceSource)));
|
|
149
136
|
});
|
|
150
137
|
const job = {
|
|
151
138
|
id: `${constants_1.platformId}-aptos-lp`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAAuD;AAIvD,
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,25 +20,13 @@ const filters_1 = require("./filters");
|
|
|
20
20
|
const solana_1 = require("../../utils/solana");
|
|
21
21
|
const clients_1 = require("../../utils/clients");
|
|
22
22
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
23
|
-
const
|
|
23
|
+
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
24
24
|
const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
-
var _a;
|
|
26
25
|
const client = (0, clients_1.getClientSolana)();
|
|
27
26
|
const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, MarginfiAccount_1.marginfiAccountStruct, constants_1.MarginfiProgram, (0, filters_1.accountsFilter)(owner));
|
|
28
27
|
if (accounts.length === 0)
|
|
29
28
|
return [];
|
|
30
|
-
const
|
|
31
|
-
if (!lendingAccountBalances || lendingAccountBalances.length === 0)
|
|
32
|
-
return [];
|
|
33
|
-
const borrowedAssets = [];
|
|
34
|
-
const borrowedYields = [];
|
|
35
|
-
const suppliedAssets = [];
|
|
36
|
-
const suppliedYields = [];
|
|
37
|
-
const rewardAssets = [];
|
|
38
|
-
const suppliedLtvs = [];
|
|
39
|
-
const borrowedWeights = [];
|
|
40
|
-
const balancesAddresses = lendingAccountBalances.map((lendingAccountBalance) => lendingAccountBalance.bankPk.toString());
|
|
41
|
-
const banksInfo = yield cache.getItems(balancesAddresses, {
|
|
29
|
+
const banksInfo = yield cache.getAllItems({
|
|
42
30
|
prefix: constants_1.prefix,
|
|
43
31
|
networkId: portfolio_core_1.NetworkId.solana,
|
|
44
32
|
});
|
|
@@ -52,80 +40,86 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
|
|
|
52
40
|
banksInfoByAddress.set(bankInfo.pubkey.toString(), bankInfo);
|
|
53
41
|
tokensAddresses.add(bankInfo.mint.toString());
|
|
54
42
|
});
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
const
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
.
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
43
|
+
const tokenPriceById = yield (0, getTokensPricesMap_1.default)(Array.from(tokensAddresses), portfolio_core_1.NetworkId.solana, cache);
|
|
44
|
+
const elements = [];
|
|
45
|
+
for (const account of accounts) {
|
|
46
|
+
const lendingAccountBalances = account.lendingAccount.balances;
|
|
47
|
+
if (!lendingAccountBalances || lendingAccountBalances.length === 0)
|
|
48
|
+
return [];
|
|
49
|
+
const borrowedAssets = [];
|
|
50
|
+
const borrowedYields = [];
|
|
51
|
+
const suppliedAssets = [];
|
|
52
|
+
const suppliedYields = [];
|
|
53
|
+
const rewardAssets = [];
|
|
54
|
+
const suppliedLtvs = [];
|
|
55
|
+
const borrowedWeights = [];
|
|
56
|
+
for (let index = 0; index < lendingAccountBalances.length; index += 1) {
|
|
57
|
+
const accountBalanceInfo = lendingAccountBalances[index];
|
|
58
|
+
const bankInfo = banksInfoByAddress.get(accountBalanceInfo.bankPk.toString());
|
|
59
|
+
if (!bankInfo)
|
|
60
|
+
continue;
|
|
61
|
+
const { lendingApr, borrowingApr } = (0, helpers_1.getInterestRates)(bankInfo);
|
|
62
|
+
const tokenPrice = tokenPriceById.get(bankInfo.mint.toString());
|
|
63
|
+
if (!tokenPrice)
|
|
64
|
+
continue;
|
|
65
|
+
if (!accountBalanceInfo.assetShares.value.isZero()) {
|
|
66
|
+
suppliedLtvs.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.assetWeightMaint)
|
|
67
|
+
.decimalPlaces(2)
|
|
68
|
+
.toNumber());
|
|
69
|
+
const suppliedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.assetShares)
|
|
70
|
+
.times(bankInfo.dividedAssetShareValue)
|
|
71
|
+
.toNumber();
|
|
72
|
+
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), suppliedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
|
|
73
|
+
const bankLendingYields = [
|
|
74
|
+
{
|
|
75
|
+
apr: lendingApr,
|
|
76
|
+
apy: (0, portfolio_core_1.aprToApy)(lendingApr),
|
|
77
|
+
},
|
|
78
|
+
];
|
|
79
|
+
suppliedYields.push(bankLendingYields);
|
|
80
|
+
}
|
|
81
|
+
if (!accountBalanceInfo.liabilityShares.value.isZero()) {
|
|
82
|
+
borrowedWeights.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.liabilityWeightMaint)
|
|
83
|
+
.decimalPlaces(2)
|
|
84
|
+
.toNumber());
|
|
85
|
+
const borrowedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.liabilityShares)
|
|
86
|
+
.times(bankInfo.dividedLiabilityShareValue)
|
|
87
|
+
.toNumber();
|
|
88
|
+
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), borrowedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
|
|
89
|
+
const bankBorrowedYields = [
|
|
90
|
+
{
|
|
91
|
+
apr: borrowingApr,
|
|
92
|
+
apy: (0, portfolio_core_1.aprToApy)(borrowingApr),
|
|
93
|
+
},
|
|
94
|
+
];
|
|
95
|
+
borrowedYields.push(bankBorrowedYields);
|
|
96
|
+
}
|
|
88
97
|
}
|
|
89
|
-
if (
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const bankBorrowedYields = [
|
|
98
|
-
{
|
|
99
|
-
apr: borrowingApr,
|
|
100
|
-
apy: (0, portfolio_core_1.aprToApy)(borrowingApr),
|
|
101
|
-
},
|
|
102
|
-
];
|
|
103
|
-
borrowedYields.push(bankBorrowedYields);
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
107
|
-
return [];
|
|
108
|
-
const { borrowedValue, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
109
|
-
const element = {
|
|
110
|
-
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
111
|
-
networkId: portfolio_core_1.NetworkId.solana,
|
|
112
|
-
platformId: constants_1.platformId,
|
|
113
|
-
label: 'Lending',
|
|
114
|
-
value,
|
|
115
|
-
data: {
|
|
116
|
-
borrowedAssets,
|
|
117
|
-
borrowedValue,
|
|
118
|
-
borrowedYields,
|
|
119
|
-
suppliedAssets,
|
|
120
|
-
suppliedValue,
|
|
121
|
-
suppliedYields,
|
|
122
|
-
collateralRatio: null,
|
|
123
|
-
healthRatio,
|
|
124
|
-
rewardAssets,
|
|
98
|
+
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
99
|
+
return [];
|
|
100
|
+
const { borrowedValue, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
101
|
+
const element = {
|
|
102
|
+
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
103
|
+
networkId: portfolio_core_1.NetworkId.solana,
|
|
104
|
+
platformId: constants_1.platformId,
|
|
105
|
+
label: 'Lending',
|
|
125
106
|
value,
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
107
|
+
data: {
|
|
108
|
+
borrowedAssets,
|
|
109
|
+
borrowedValue,
|
|
110
|
+
borrowedYields,
|
|
111
|
+
suppliedAssets,
|
|
112
|
+
suppliedValue,
|
|
113
|
+
suppliedYields,
|
|
114
|
+
collateralRatio: null,
|
|
115
|
+
healthRatio,
|
|
116
|
+
rewardAssets,
|
|
117
|
+
value,
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
elements.push(element);
|
|
121
|
+
}
|
|
122
|
+
return elements;
|
|
129
123
|
});
|
|
130
124
|
exports.default = fetcherExecutor;
|
|
131
125
|
//# sourceMappingURL=fetcherExecutor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
61
61
|
const [tokenPriceX, tokenPriceY] = yield cache.getTokenPrices([typeX, typeY], portfolio_core_1.NetworkId.aptos);
|
|
62
62
|
if (!tokenPriceX || !tokenPriceY)
|
|
63
63
|
continue;
|
|
64
|
-
const source = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, constants_2.platformId, constants_2.platformId,
|
|
64
|
+
const source = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, constants_2.platformId, constants_2.platformId, undefined, {
|
|
65
65
|
address: lpType,
|
|
66
66
|
decimals: lpDecimals,
|
|
67
67
|
supplyRaw: lpSupply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/sushiswap/aptos/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAAuD;AACvD,oDAAwD;AAGxD,2CAAmE;AACnE,gDAK8B;AAC9B,4CAA0C;AAE1C,kGAA0E;AAE1E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAChC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,MAAM,EAAE,0BAAc,CAAC,CAAC;IACpE,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,MAAM,eAAe,GAAuC,IAAI,GAAG,EAAE,CAAC;IACtE,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7B,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,gCAAoB,CAAC;YAAE,SAAS;QAE9D,MAAM,UAAU,GAAG,IAAA,uBAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,EAAE,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC;QAC5C,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAoB,CAAC;QACjD,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QACxE,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,QAAQ,CAAC,MAAM,EAAE;YAAE,SAAS;QAEhC,MAAM,YAAY,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAA,MAAA,YAAY,CAAC,IAAI,0CAAE,EAAE,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAA,MAAA,YAAY,CAAC,IAAI,0CAAE,EAAE,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC;QAC7C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK;YAAE,SAAS;QAE/B,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAC3C,GAAG,0BAAc,6BAA6B,KAAK,KAAK,KAAK,GAAG,CACd,CAAC;QACrD,IAAI,CAAC,iBAAiB;YAAE,SAAS;QACjC,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAC7C,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,KAAK,GAAG;YAAE,SAAS;QACpD,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,KAAK,GAAG;YAAE,SAAS;QAEpD,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,KAAK,CAAC,cAAc,CAC3D,CAAC,KAAK,EAAE,KAAK,CAAC,EACd,0BAAS,CAAC,KAAK,CAChB,CAAC;QACF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3C,MAAM,MAAM,GAAG,IAAA,6BAAmB,EAChC,0BAAS,CAAC,KAAK,EACf,sBAAU,EACV,sBAAU,EACV,
|
|
1
|
+
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/sushiswap/aptos/poolsJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,5 @@ type LpDetails = {
|
|
|
10
10
|
decimals: number;
|
|
11
11
|
supply: number;
|
|
12
12
|
};
|
|
13
|
-
export default function getLpTokenSource(networkId: NetworkIdType, sourceId: string, platformId: string, elementName: string, lpDetails: LpDetails, poolUnderlyings: PoolUnderlying[]): TokenPriceSource;
|
|
13
|
+
export default function getLpTokenSource(networkId: NetworkIdType, sourceId: string, platformId: string, elementName: string | undefined, lpDetails: LpDetails, poolUnderlyings: PoolUnderlying[]): TokenPriceSource;
|
|
14
14
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLpTokenSource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpTokenSource.ts"],"names":[],"mappings":";;AAeA,SAAwB,gBAAgB,CACtC,SAAwB,EACxB,QAAgB,EAChB,UAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"getLpTokenSource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpTokenSource.ts"],"names":[],"mappings":";;AAeA,SAAwB,gBAAgB,CACtC,SAAwB,EACxB,QAAgB,EAChB,UAAkB,EAClB,WAA+B,EAC/B,SAAoB,EACpB,eAAiC;IAEjC,MAAM,KAAK,GACT,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACtE,SAAS,CAAC,MAAM,CAAC;IAEnB,OAAO;QACL,SAAS;QACT,UAAU;QACV,EAAE,EAAE,QAAQ;QACZ,WAAW;QACX,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,KAAK;QACL,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,WAAW,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvC,SAAS;YACT,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,WAAW,EAAE,CAAC,CAAC,aAAa,GAAG,SAAS,CAAC,MAAM;YAC/C,QAAQ,EAAE,CAAC,CAAC,QAAQ;SACrB,CAAC,CAAC;QACH,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;AACJ,CAAC;AA9BD,mCA8BC"}
|
|
@@ -11,5 +11,5 @@ type LpDetailsRaw = {
|
|
|
11
11
|
decimals: number;
|
|
12
12
|
supplyRaw: BigNumber;
|
|
13
13
|
};
|
|
14
|
-
export default function getLpTokenSourceRaw(networkId: NetworkIdType, sourceId: string, platformId: string, elementName: string, lpDetailsRaw: LpDetailsRaw, poolUnderlyingsRaw: PoolUnderlyingRaw[]): TokenPriceSource;
|
|
14
|
+
export default function getLpTokenSourceRaw(networkId: NetworkIdType, sourceId: string, platformId: string, elementName: string | undefined, lpDetailsRaw: LpDetailsRaw, poolUnderlyingsRaw: PoolUnderlyingRaw[]): TokenPriceSource;
|
|
15
15
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLpTokenSourceRaw.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpTokenSourceRaw.ts"],"names":[],"mappings":";;;;;AAEA,0EAAkD;AAelD,SAAwB,mBAAmB,CACzC,SAAwB,EACxB,QAAgB,EAChB,UAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"getLpTokenSourceRaw.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpTokenSourceRaw.ts"],"names":[],"mappings":";;;;;AAEA,0EAAkD;AAelD,SAAwB,mBAAmB,CACzC,SAAwB,EACxB,QAAgB,EAChB,UAAkB,EAClB,WAA+B,EAC/B,YAA0B,EAC1B,kBAAuC;IAEvC,OAAO,IAAA,0BAAgB,EACrB,SAAS,EACT,QAAQ,EACR,UAAU,EACV,WAAW,kCAEN,YAAY,KACf,MAAM,EAAE,YAAY,CAAC,SAAS;aAC3B,GAAG,CAAC,SAAA,EAAE,EAAI,YAAY,CAAC,QAAQ,CAAA,CAAC;aAChC,QAAQ,EAAE,KAEf,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACzB,CAAC,KACJ,aAAa,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,CAAC,CAAC,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,IAClE,CAAC,CACJ,CAAC;AACJ,CAAC;AAxBD,sCAwBC"}
|