@sonarwatch/portfolio-plugins 0.11.157 → 0.11.159
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +8 -0
- package/package.json +2 -2
- package/src/plugins/abex/marketsJob.js +2 -2
- package/src/plugins/abex/marketsJob.js.map +1 -1
- package/src/plugins/aftermath/poolsJob.js +36 -102
- package/src/plugins/aftermath/poolsJob.js.map +1 -1
- package/src/plugins/atrix/poolsV1Job.js +2 -2
- package/src/plugins/atrix/poolsV1Job.js.map +1 -1
- package/src/plugins/auxexchange/aptosLpJob.js +6 -4
- package/src/plugins/auxexchange/aptosLpJob.js.map +1 -1
- package/src/plugins/bskt/vestingFetcher.js +4 -24
- package/src/plugins/bskt/vestingFetcher.js.map +1 -1
- package/src/plugins/fluxbeam/poolsJob.js +6 -4
- package/src/plugins/fluxbeam/poolsJob.js.map +1 -1
- package/src/plugins/kai/vaultsJob.js +2 -2
- package/src/plugins/kai/vaultsJob.js.map +1 -1
- package/src/plugins/liquiditypools-sei/job.js +6 -4
- package/src/plugins/liquiditypools-sei/job.js.map +1 -1
- package/src/plugins/liquidswap/aptosLpJob.js +2 -2
- package/src/plugins/liquidswap/aptosLpJob.js.map +1 -1
- package/src/plugins/marginfi/banksJob.d.ts +3 -0
- package/src/plugins/marginfi/{jobExecutor.js → banksJob.js} +8 -3
- package/src/plugins/marginfi/banksJob.js.map +1 -0
- package/src/plugins/marginfi/depositsFetcher.d.ts +3 -0
- package/src/plugins/marginfi/{fetcherExecutor.js → depositsFetcher.js} +8 -3
- package/src/plugins/marginfi/{fetcherExecutor.js.map → depositsFetcher.js.map} +1 -1
- package/src/plugins/marginfi/index.js +4 -17
- package/src/plugins/marginfi/index.js.map +1 -1
- package/src/plugins/meteora/multiTokenPoolsJob.js +2 -2
- package/src/plugins/meteora/multiTokenPoolsJob.js.map +1 -1
- package/src/plugins/meteora/poolsJob.js +6 -4
- package/src/plugins/meteora/poolsJob.js.map +1 -1
- package/src/plugins/navi/collateralFetcher.js +5 -1
- package/src/plugins/navi/collateralFetcher.js.map +1 -1
- package/src/plugins/orca/lpTokensJob.js +6 -4
- package/src/plugins/orca/lpTokensJob.js.map +1 -1
- package/src/plugins/pancakeswap/aptosLpJob.js +6 -4
- package/src/plugins/pancakeswap/aptosLpJob.js.map +1 -1
- package/src/plugins/raydium/lpTokensJob.js +8 -10
- package/src/plugins/raydium/lpTokensJob.js.map +1 -1
- package/src/plugins/raydium/structs/amms.d.ts +5 -2
- package/src/plugins/raydium/structs/amms.js +6 -3
- package/src/plugins/raydium/structs/amms.js.map +1 -1
- package/src/plugins/sushiswap/aptos/poolsJob.js +2 -2
- package/src/plugins/sushiswap/aptos/poolsJob.js.map +1 -1
- package/src/plugins/symmetry/basketsJob.js +2 -2
- package/src/plugins/symmetry/basketsJob.js.map +1 -1
- package/src/plugins/tulip/lendingTokensJob.js +2 -2
- package/src/plugins/tulip/lendingTokensJob.js.map +1 -1
- package/src/plugins/tulip/strategyTokensJob.js +2 -2
- package/src/plugins/tulip/strategyTokensJob.js.map +1 -1
- package/src/utils/clmm/tokenPricesFromSqrt.js +11 -4
- package/src/utils/clmm/tokenPricesFromSqrt.js.map +1 -1
- package/src/utils/misc/getLpTokenSource.d.ts +13 -9
- package/src/utils/misc/getLpTokenSource.js +29 -8
- package/src/utils/misc/getLpTokenSource.js.map +1 -1
- package/src/utils/misc/getLpTokenSourceOld.d.ts +18 -0
- package/src/utils/misc/getLpTokenSourceOld.js +32 -0
- package/src/utils/misc/getLpTokenSourceOld.js.map +1 -0
- package/src/utils/misc/getLpTokenSourceRaw.d.ts +16 -5
- package/src/utils/misc/getLpTokenSourceRaw.js +22 -6
- package/src/utils/misc/getLpTokenSourceRaw.js.map +1 -1
- package/src/utils/misc/getLpTokenSourceRawOld.d.ts +25 -0
- package/src/utils/misc/getLpTokenSourceRawOld.js +20 -0
- package/src/utils/misc/getLpTokenSourceRawOld.js.map +1 -0
- package/src/utils/misc/getLpUnderlyingTokenSource.d.ts +14 -18
- package/src/utils/misc/getLpUnderlyingTokenSource.js +101 -70
- package/src/utils/misc/getLpUnderlyingTokenSource.js.map +1 -1
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.d.ts +26 -0
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.js +73 -0
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.js.map +1 -0
- package/src/plugins/marginfi/fetcherExecutor.d.ts +0 -3
- package/src/plugins/marginfi/jobExecutor.d.ts +0 -3
- package/src/plugins/marginfi/jobExecutor.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.11.159](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.158...plugins-0.11.159) (2024-04-03)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [0.11.158](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.157...plugins-0.11.158) (2024-04-02)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
5
13
|
## [0.11.157](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.156...plugins-0.11.157) (2024-04-02)
|
|
6
14
|
|
|
7
15
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.159",
|
|
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.159"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -18,7 +18,7 @@ const constants_1 = require("./constants");
|
|
|
18
18
|
const clients_1 = require("../../utils/clients");
|
|
19
19
|
const getDynamicFields_1 = require("../../utils/sui/getDynamicFields");
|
|
20
20
|
const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
|
|
21
|
-
const
|
|
21
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
22
22
|
const aptos_1 = require("../../utils/aptos");
|
|
23
23
|
const getObject_1 = require("../../utils/sui/getObject");
|
|
24
24
|
const constants_2 = require("../tokens/constants");
|
|
@@ -72,7 +72,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
72
72
|
price: tokenPrice.price,
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
|
-
const lpSource = (0,
|
|
75
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.sui, constants_1.platformId, constants_1.platformId, {
|
|
76
76
|
address: constants_1.alpType,
|
|
77
77
|
decimals: constants_1.alpDecimals,
|
|
78
78
|
supplyRaw: new bignumber_js_1.default(lpSupply),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/abex/marketsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA2E;AAC3E,gEAAqC;AAGrC,2CAQqB;AACrB,iDAAmD;AACnD,uEAAoE;AAEpE,qEAAkE;AAClE
|
|
1
|
+
{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/abex/marketsJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,17 +16,14 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
|
16
16
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
17
17
|
const clients_1 = require("../../utils/clients");
|
|
18
18
|
const constants_1 = require("./constants");
|
|
19
|
-
const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
|
|
20
19
|
const aptos_1 = require("../../utils/aptos");
|
|
21
|
-
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
22
|
-
const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
|
|
23
|
-
const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
|
|
24
20
|
const getDynamicFields_1 = require("../../utils/sui/getDynamicFields");
|
|
25
21
|
const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
|
|
22
|
+
const getLpTokenSourceRaw_1 = require("../../utils/misc/getLpTokenSourceRaw");
|
|
23
|
+
const networkId = portfolio_core_1.NetworkId.sui;
|
|
26
24
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
-
var _a, _b, _c, _d
|
|
25
|
+
var _a, _b, _c, _d;
|
|
28
26
|
const client = (0, clients_1.getClientSui)();
|
|
29
|
-
const networkId = portfolio_core_1.NetworkId.sui;
|
|
30
27
|
const coinsTableFields = yield (0, getDynamicFields_1.getDynamicFields)(client, constants_1.lpCoinsTable);
|
|
31
28
|
const poolFactoryIds = coinsTableFields.map((f) => f.objectId);
|
|
32
29
|
if (!poolFactoryIds.length)
|
|
@@ -46,15 +43,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
46
43
|
if (!poolsIds.length)
|
|
47
44
|
return;
|
|
48
45
|
const poolsInfo = yield (0, multiGetObjects_1.multiGetObjects)(client, poolsIds);
|
|
49
|
-
const tokenPriceById = yield
|
|
50
|
-
.map((pool) => {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
? ((_d = (_c = pool.data) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.fields).type_names
|
|
54
|
-
: [];
|
|
55
|
-
})
|
|
56
|
-
.flat()
|
|
57
|
-
.map((type) => `0x${type}`), networkId, cache);
|
|
46
|
+
const tokenPriceById = yield cache.getTokenPricesAsMap(poolsInfo
|
|
47
|
+
.map((pool) => { var _a, _b, _c; return ((_c = (_b = (_a = pool.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c.type_names) || []; })
|
|
48
|
+
.flat(), networkId);
|
|
49
|
+
const sources = [];
|
|
58
50
|
for (const pool of poolsInfo) {
|
|
59
51
|
if (!((_b = (_a = pool.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields))
|
|
60
52
|
continue;
|
|
@@ -64,96 +56,38 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
64
56
|
const moveType = (0, aptos_1.parseTypeString)(poolInfo.lp_supply.type);
|
|
65
57
|
if (!moveType.keys)
|
|
66
58
|
continue;
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
if (!
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const decimals = poolInfo.lp_decimals;
|
|
81
|
-
const poolSupply = new bignumber_js_1.default(poolInfo.lp_supply.fields.value).dividedBy(Math.pow(10, decimals));
|
|
82
|
-
let totalLiquidity = new bignumber_js_1.default(0);
|
|
83
|
-
const underlyings = [];
|
|
84
|
-
for (let i = 0; i < totalTokens; i++) {
|
|
85
|
-
const coinDecimal = poolInfo.coin_decimals[i];
|
|
86
|
-
const reserveAmount = new bignumber_js_1.default(poolInfo.normalized_balances[i])
|
|
87
|
-
.dividedBy(Math.pow(10, coinDecimal))
|
|
88
|
-
.dividedBy(poolInfo.decimal_scalars[i]);
|
|
89
|
-
const tokenLiquidity = reserveAmount.multipliedBy(tokenPriceRef);
|
|
90
|
-
const amountPerLp = reserveAmount.dividedBy(poolSupply).toNumber();
|
|
91
|
-
totalLiquidity = totalLiquidity.plus(tokenLiquidity);
|
|
92
|
-
underlyings.push({
|
|
93
|
-
address: mints[i],
|
|
94
|
-
amountPerLp,
|
|
95
|
-
decimals: coinDecimal,
|
|
96
|
-
networkId,
|
|
97
|
-
price: tokenPriceRef,
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
if (totalLiquidity.isLessThan(computeAndStoreLpPrice_1.minimumLiquidity))
|
|
101
|
-
continue;
|
|
102
|
-
const price = totalLiquidity.dividedBy(poolSupply).toNumber();
|
|
103
|
-
const tokenPriceSoure = {
|
|
104
|
-
id: constants_1.platformId,
|
|
105
|
-
weight: 1,
|
|
106
|
-
address,
|
|
107
|
-
networkId,
|
|
108
|
-
platformId: constants_1.platformId,
|
|
109
|
-
decimals,
|
|
110
|
-
price,
|
|
111
|
-
underlyings,
|
|
112
|
-
timestamp: Date.now(),
|
|
113
|
-
};
|
|
114
|
-
yield cache.setTokenPriceSource(tokenPriceSoure);
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
const tokenPriceA = tokenPriceById.get(`0x${poolInfo.type_names[0]}`);
|
|
118
|
-
const tokenPriceB = tokenPriceById.get(`0x${poolInfo.type_names[1]}`);
|
|
119
|
-
const reserveAmountRawA = new bignumber_js_1.default(poolInfo.normalized_balances[0]).dividedBy(poolInfo.decimal_scalars[0]);
|
|
120
|
-
const reserveAmountRawB = new bignumber_js_1.default(poolInfo.normalized_balances[1]).dividedBy(poolInfo.decimal_scalars[1]);
|
|
121
|
-
const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(address, networkId, {
|
|
122
|
-
address: `0x${poolInfo.type_names[0]}`,
|
|
123
|
-
decimals: poolInfo.coin_decimals[0],
|
|
124
|
-
reserveAmountRaw: reserveAmountRawA,
|
|
125
|
-
tokenPrice: tokenPriceA,
|
|
126
|
-
}, {
|
|
127
|
-
address: `0x${poolInfo.type_names[1]}`,
|
|
128
|
-
decimals: poolInfo.coin_decimals[1],
|
|
129
|
-
reserveAmountRaw: reserveAmountRawB,
|
|
130
|
-
tokenPrice: tokenPriceB,
|
|
59
|
+
const lpAddress = moveType.keys[0].type;
|
|
60
|
+
const poolUnderlyingsRaw = [];
|
|
61
|
+
poolInfo.normalized_balances.forEach((nBalance, i) => {
|
|
62
|
+
const caddress = (0, portfolio_core_1.formatTokenAddress)(`0x${poolInfo.type_names[i]}`, networkId);
|
|
63
|
+
const tokenPrice = tokenPriceById.get(caddress);
|
|
64
|
+
if (!tokenPrice)
|
|
65
|
+
return;
|
|
66
|
+
poolUnderlyingsRaw.push({
|
|
67
|
+
address: caddress,
|
|
68
|
+
decimals: poolInfo.coin_decimals[i],
|
|
69
|
+
reserveAmountRaw: new bignumber_js_1.default(poolInfo.normalized_balances[i]).dividedBy(poolInfo.decimal_scalars[i]),
|
|
70
|
+
tokenPrice,
|
|
71
|
+
weight: new bignumber_js_1.default(poolInfo.weights[i]).div(Math.pow(10, 18)).toNumber(),
|
|
131
72
|
});
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
73
|
+
});
|
|
74
|
+
if (poolUnderlyingsRaw.length !== poolInfo.normalized_balances.length)
|
|
75
|
+
continue;
|
|
76
|
+
const lpSources = (0, getLpTokenSourceRaw_1.getLpTokenSourceRaw)({
|
|
77
|
+
networkId,
|
|
78
|
+
platformId: constants_1.platformId,
|
|
79
|
+
lpDetails: {
|
|
80
|
+
address: lpAddress,
|
|
138
81
|
decimals: poolInfo.lp_decimals,
|
|
139
|
-
supplyRaw:
|
|
140
|
-
},
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
},
|
|
147
|
-
{
|
|
148
|
-
address: tokenPriceB.address,
|
|
149
|
-
decimals: tokenPriceB.decimals,
|
|
150
|
-
price: tokenPriceB.price,
|
|
151
|
-
reserveAmountRaw: reserveAmountRawB,
|
|
152
|
-
},
|
|
153
|
-
], '');
|
|
154
|
-
yield cache.setTokenPriceSource(lpSource);
|
|
155
|
-
}
|
|
82
|
+
supplyRaw: poolInfo.lp_supply.fields.value,
|
|
83
|
+
},
|
|
84
|
+
sourceId: lpAddress,
|
|
85
|
+
poolUnderlyingsRaw,
|
|
86
|
+
priceUnderlyings: true,
|
|
87
|
+
});
|
|
88
|
+
sources.push(...lpSources);
|
|
156
89
|
}
|
|
90
|
+
yield cache.setTokenPriceSources(sources);
|
|
157
91
|
});
|
|
158
92
|
const job = {
|
|
159
93
|
id: `${constants_1.platformId}-pools`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+
|
|
1
|
+
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/poolsJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ const structs_1 = require("../orders/clobs-solana/structs");
|
|
|
19
19
|
const constants_1 = require("./constants");
|
|
20
20
|
const structs_2 = require("./structs");
|
|
21
21
|
const fetchTokenSupplyAndDecimals_1 = require("../../utils/solana/fetchTokenSupplyAndDecimals");
|
|
22
|
-
const
|
|
22
|
+
const getLpTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceOld"));
|
|
23
23
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
const client = (0, clients_1.getClientSolana)();
|
|
25
25
|
const poolsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_2.poolStruct, constants_1.atrixV1);
|
|
@@ -93,7 +93,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
93
93
|
decimals,
|
|
94
94
|
supply,
|
|
95
95
|
};
|
|
96
|
-
const source = (0,
|
|
96
|
+
const source = (0, getLpTokenSourceOld_1.default)(portfolio_core_1.NetworkId.solana, pool.pubkey.toString(), constants_1.platformId, lpDetailsRaw, poolUnderlyings, 'V1 (Deprecated)');
|
|
97
97
|
sourcesPromises.push(cache.setTokenPriceSource(source));
|
|
98
98
|
}
|
|
99
99
|
yield Promise.allSettled(sourcesPromises);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolsV1Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/atrix/poolsV1Job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+DAAmE;AAGnE,iDAAsD;AACtD,+CAK4B;AAC5B,4DAGwC;AACxC,2CAAkD;AAClD,uCAAuC;AACvC,gGAA6F;AAC7F
|
|
1
|
+
{"version":3,"file":"poolsV1Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/atrix/poolsV1Job.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,8 @@ const aptos_1 = require("../../utils/aptos");
|
|
|
18
18
|
const clients_1 = require("../../utils/clients");
|
|
19
19
|
const constants_1 = require("./constants");
|
|
20
20
|
const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
21
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
22
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
23
23
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
25
25
|
const client = (0, clients_1.getClientAptos)();
|
|
@@ -76,22 +76,24 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
76
76
|
new bignumber_js_1.default(tokenPairData.x_reserve.value),
|
|
77
77
|
new bignumber_js_1.default(tokenPairData.y_reserve.value),
|
|
78
78
|
];
|
|
79
|
-
const underlyingSource = (0,
|
|
79
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpType, portfolio_core_1.NetworkId.aptos, {
|
|
80
80
|
address: typeX,
|
|
81
81
|
decimals: decimalsX,
|
|
82
82
|
reserveAmountRaw: reserveAmountRawX,
|
|
83
83
|
tokenPrice: tokenPriceX,
|
|
84
|
+
weight: 0.5,
|
|
84
85
|
}, {
|
|
85
86
|
address: typeY,
|
|
86
87
|
decimals: decimalsY,
|
|
87
88
|
reserveAmountRaw: reserveAmountRawY,
|
|
88
89
|
tokenPrice: tokenPriceY,
|
|
90
|
+
weight: 0.5,
|
|
89
91
|
});
|
|
90
92
|
if (underlyingSource)
|
|
91
93
|
lpSources.push(underlyingSource);
|
|
92
94
|
if (!tokenPriceX || !tokenPriceY)
|
|
93
95
|
continue;
|
|
94
|
-
const lpSource = (0,
|
|
96
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, {
|
|
95
97
|
address: lpType,
|
|
96
98
|
decimals: lpDecimals,
|
|
97
99
|
supplyRaw: lpSupply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAIoC;AAGpC,6CAK2B;AAC3B,iDAAqD;AACrD,2CAA+E;AAC/E,8EAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/auxexchange/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
36
36
|
const assets = [];
|
|
37
37
|
const totalAmount = new bignumber_js_1.default(res.data.amount);
|
|
38
38
|
const amountPerUnlock = new bignumber_js_1.default(totalAmount).dividedBy(30);
|
|
39
|
-
const daysSinceLaunch = new bignumber_js_1.default(
|
|
39
|
+
const daysSinceLaunch = new bignumber_js_1.default(endDate.getTime())
|
|
40
40
|
.minus(startDate.getTime())
|
|
41
41
|
.dividedBy(oneDay)
|
|
42
42
|
.decimalPlaces(0, bignumber_js_1.default.ROUND_DOWN);
|
|
@@ -67,29 +67,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
67
67
|
for (const vesting of vestingAccounts) {
|
|
68
68
|
if (vesting.totalAmount.isEqualTo(vesting.amountClaimed))
|
|
69
69
|
continue;
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
.decimalPlaces(0, bignumber_js_1.default.ROUND_DOWN)
|
|
74
|
-
.toNumber();
|
|
75
|
-
const amountAvailable = amountPerUnlock.times(daysSinceClaim);
|
|
76
|
-
const unlockedSince = new Date(lastClaimedTm + daysSinceClaim * oneDay);
|
|
77
|
-
if (!amountAvailable.isZero() && unlockedSince < endDate) {
|
|
78
|
-
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.bsktMint, amountAvailable.dividedBy(Math.pow(10, constants_1.bsktDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, bsktTokenPrice)), { attributes: {
|
|
79
|
-
lockedUntil: unlockedSince.getTime(),
|
|
80
|
-
} }));
|
|
81
|
-
}
|
|
82
|
-
const nextUnlock = new Date(lastClaimedTm + (daysSinceClaim + 1) * oneDay);
|
|
83
|
-
if (nextUnlock < endDate) {
|
|
84
|
-
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.bsktMint, amountPerUnlock.dividedBy(Math.pow(10, constants_1.bsktDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, bsktTokenPrice)), { attributes: {
|
|
85
|
-
lockedUntil: nextUnlock.getTime(),
|
|
86
|
-
} }));
|
|
87
|
-
}
|
|
88
|
-
const amountLockedLeft = vesting.totalAmount
|
|
89
|
-
.minus(vesting.amountClaimed)
|
|
90
|
-
.minus(amountAvailable);
|
|
91
|
-
if (!amountLockedLeft.isZero()) {
|
|
92
|
-
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.bsktMint, amountLockedLeft.dividedBy(Math.pow(10, constants_1.bsktDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, bsktTokenPrice)), { attributes: {
|
|
70
|
+
const amountLeft = vesting.totalAmount.minus(vesting.amountClaimed);
|
|
71
|
+
if (!amountLeft.isZero()) {
|
|
72
|
+
assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.bsktMint, amountLeft.dividedBy(Math.pow(10, constants_1.bsktDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, bsktTokenPrice)), { attributes: {
|
|
93
73
|
lockedUntil: endDate.getTime(),
|
|
94
74
|
} }));
|
|
95
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vestingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bskt/vestingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,kDAA6C;AAC7C,gEAAqC;AAGrC,2CAA0E;AAC1E,+CAA8D;AAC9D,uCAAiD;AACjD,uCAAiD;AACjD,iDAAsD;AACtD,qGAA6E;AAG7E,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACnC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC;AAC1C,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAE5D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,eAAe,GAAG,MAAM,IAAA,iCAAwB,EACpD,MAAM,EACN,8BAAoB,EACpB,mBAAO,EACP,IAAA,8BAAoB,EAAC,KAAK,CAAC,CAC5B,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE7E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAwC,MAAM,eAAK;aACzD,GAAG,CAAC,6CAA6C,KAAK,EAAE,CAAC;aACzD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAqB,EAAE,CAAC;YAEpC,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,eAAe,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"vestingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bskt/vestingFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,8 @@ const constants_1 = require("./constants");
|
|
|
18
18
|
const clients_1 = require("../../utils/clients");
|
|
19
19
|
const solana_1 = require("../../utils/solana");
|
|
20
20
|
const structs_1 = require("./structs");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
21
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
22
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
23
23
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
const connection = (0, clients_1.getClientSolana)();
|
|
25
25
|
let pools = yield (0, solana_1.getParsedProgramAccounts)(connection, structs_1.poolStruct, new web3_js_1.PublicKey(constants_1.fluxbeamPoolsPid), [{ dataSize: structs_1.poolStruct.byteSize }]);
|
|
@@ -71,23 +71,25 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
71
71
|
continue;
|
|
72
72
|
const tokenPriceA = tokenPrices.get(pool.tokenAMint.toString());
|
|
73
73
|
const tokenPriceB = tokenPrices.get(pool.tokenBMint.toString());
|
|
74
|
-
const underlyingsSource = (0,
|
|
74
|
+
const underlyingsSource = (0, getLpUnderlyingTokenSourceOld_1.default)(pool.poolMint.toString(), portfolio_core_1.NetworkId.solana, {
|
|
75
75
|
address: pool.tokenAMint.toString(),
|
|
76
76
|
decimals: mintAccountA.decimals,
|
|
77
77
|
reserveAmountRaw: tokenAccountA.amount,
|
|
78
78
|
tokenPrice: tokenPriceA,
|
|
79
|
+
weight: 0.5,
|
|
79
80
|
}, {
|
|
80
81
|
address: pool.tokenBMint.toString(),
|
|
81
82
|
decimals: mintAccountB.decimals,
|
|
82
83
|
reserveAmountRaw: tokenAccountB.amount,
|
|
83
84
|
tokenPrice: tokenPriceB,
|
|
85
|
+
weight: 0.5,
|
|
84
86
|
});
|
|
85
87
|
if (underlyingsSource) {
|
|
86
88
|
yield cache.setTokenPriceSource(underlyingsSource);
|
|
87
89
|
}
|
|
88
90
|
if (!tokenPriceA || !tokenPriceB)
|
|
89
91
|
continue;
|
|
90
|
-
const lpSource = (0,
|
|
92
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.solana, constants_1.platformId, constants_1.platformId, {
|
|
91
93
|
address: pool.poolMint.toString(),
|
|
92
94
|
decimals: poolMint.decimals,
|
|
93
95
|
supplyRaw: poolMint.supply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fluxbeam/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAmE;AAGnE,2CAA2D;AAC3D,iDAAsD;AACtD,+CAQ4B;AAC5B,uCAAuC;AACvC
|
|
1
|
+
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fluxbeam/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAmE;AAGnE,2CAA2D;AAC3D,iDAAsD;AACtD,+CAQ4B;AAC5B,uCAAuC;AACvC,qGAA6E;AAC7E,mHAA2F;AAE3F,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,IAAI,KAAK,GAAG,MAAM,IAAA,iCAAwB,EACxC,UAAU,EACV,oBAAU,EACV,IAAI,mBAAS,CAAC,4BAAgB,CAAC,EAC/B,CAAC,EAAE,QAAQ,EAAE,oBAAU,CAAC,QAAQ,EAAE,CAAC,CACpC,CAAC;IACF,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAEnD,MAAM,wBAAwB,GAAG,KAAK;SACnC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC,IAAI,EAAE,CAAC;IACV,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,2BAAkB,EAClB,wBAAwB,CACzB,CAAC;IACF,MAAM,gBAAgB,GAA6C,IAAI,GAAG,EAAE,CAAC;IAC7E,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QACrC,IAAI,CAAC,YAAY;YAAE,OAAO;QAC1B,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,IAAA,sCAA6B,EACnD,UAAU,EACV,0BAAiB,EACjB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC7B,CAAC;IAEF,MAAM,mBAAmB,GAAG;QAC1B,GAAG,IAAI,GAAG,CACR,KAAK;aACF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;aACvE,IAAI,EAAE,CACV;KACF,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,IAAA,sCAA6B,EAC5D,UAAU,EACV,0BAAiB,EACjB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,qBAAqB,GAGvB,IAAI,GAAG,EAAE,CAAC;IACd,kBAAkB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QAC9C,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAC9B,qBAAqB,CAAC,GAAG,CACvB,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAClC,gBAAgB,CACjB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,cAAc,CAClD,mBAAmB,EACnB,0BAAS,CAAC,MAAM,CACjB,CAAC;IACF,MAAM,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IACvD,iBAAiB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACvC,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,aAAa;YAAE,SAAS;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa;YAAE,SAAS;QAC/C,MAAM,YAAY,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY;YAAE,SAAS;QAC7C,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEhE,MAAM,iBAAiB,GAAG,IAAA,uCAA6B,EACrD,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EACxB,0BAAS,CAAC,MAAM,EAChB;YACE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,gBAAgB,EAAE,aAAa,CAAC,MAAM;YACtC,UAAU,EAAE,WAAW;YACvB,MAAM,EAAE,GAAG;SACZ,EACD;YACE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,gBAAgB,EAAE,aAAa,CAAC,MAAM;YACtC,UAAU,EAAE,WAAW;YACvB,MAAM,EAAE,GAAG;SACZ,CACF,CAAC;QACF,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW;YAAE,SAAS;QAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAsB,EACrC,0BAAS,CAAC,MAAM,EAChB,sBAAU,EACV,sBAAU,EACV;YACE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS,EAAE,QAAQ,CAAC,MAAM;SAC3B,EACD;YACE;gBACE,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,aAAa,CAAC,MAAM;aACvC;YACD;gBACE,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,aAAa,CAAC,MAAM;aACvC;SACF,EACD,OAAO,CACR,CAAC;QACF,MAAM,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -17,7 +17,7 @@ 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 multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
|
|
20
|
-
const
|
|
20
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
21
21
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
var _a, _b, _c;
|
|
23
23
|
const client = (0, clients_1.getClientSui)();
|
|
@@ -36,7 +36,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
36
36
|
(_c = (_b = object.data) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.fields.strategies.fields.contents.forEach((c) => {
|
|
37
37
|
amount = amount.plus(c.fields.value.fields.borrowed);
|
|
38
38
|
});
|
|
39
|
-
const lpSource = (0,
|
|
39
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.sui, constants_1.platformId, constants_1.platformId, {
|
|
40
40
|
address: vaultInfo.lpType,
|
|
41
41
|
decimals: vaultInfo.decimals,
|
|
42
42
|
supplyRaw: new bignumber_js_1.default(vault.lp_treasury.fields.total_supply.fields.value),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kai/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAA2E;AAG3E,2CAAqD;AACrD,iDAAmD;AACnD,qEAAkE;AAElE
|
|
1
|
+
{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kai/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAA2E;AAG3E,2CAAqD;AACrD,iDAAmD;AACnD,qEAAkE;AAElE,qGAA6E;AAE7E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAe,EACnC,MAAM,EACN,sBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC5B,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,sBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAC9B,0BAAS,CAAC,GAAG,CACd,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,sBAAU,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAChC,IAAA,mCAAkB,EAAC,SAAS,CAAC,KAAK,EAAE,0BAAS,CAAC,GAAG,CAAC,CACnD,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAA;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,gCAAsB,EACrC,0BAAS,CAAC,GAAG,EACb,sBAAU,EACV,sBAAU,EACV;YACE,OAAO,EAAE,SAAS,CAAC,MAAM;YACzB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,sBAAS,CACtB,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CACnD;SACF,EACD;YACE;gBACE,OAAO,EAAE,SAAS,CAAC,KAAK;gBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,gBAAgB,EAAE,MAAM;gBACxB,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB;SACF,EACD,QAAQ,CACT,CAAC;QACF,MAAM,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -20,8 +20,8 @@ const constants_2 = require("./constants");
|
|
|
20
20
|
const sei_1 = require("../../utils/sei");
|
|
21
21
|
const isAContract_1 = __importDefault(require("../../utils/sei/isAContract"));
|
|
22
22
|
const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
|
|
23
|
-
const
|
|
24
|
-
const
|
|
23
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
24
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
25
25
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
26
|
const cosmWasmClient = yield (0, core_1.getCosmWasmClient)((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.sei));
|
|
27
27
|
const pushedContractsByPlatform = new Map();
|
|
@@ -64,22 +64,24 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
64
64
|
];
|
|
65
65
|
if (!decimalsX || !decimalsY)
|
|
66
66
|
continue;
|
|
67
|
-
const underlyingSource = (0,
|
|
67
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpContract, portfolio_core_1.NetworkId.sei, {
|
|
68
68
|
address: poolInfo.mintX,
|
|
69
69
|
decimals: decimalsX,
|
|
70
70
|
reserveAmountRaw: reserveAmountRawX,
|
|
71
71
|
tokenPrice: tokenPriceX,
|
|
72
|
+
weight: 0.5,
|
|
72
73
|
}, {
|
|
73
74
|
address: poolInfo.mintY,
|
|
74
75
|
decimals: decimalsY,
|
|
75
76
|
reserveAmountRaw: reserveAmountRawY,
|
|
76
77
|
tokenPrice: tokenPriceY,
|
|
78
|
+
weight: 0.5,
|
|
77
79
|
});
|
|
78
80
|
if (underlyingSource)
|
|
79
81
|
yield cache.setTokenPriceSource(underlyingSource);
|
|
80
82
|
if (!tokenPriceX || !tokenPriceY)
|
|
81
83
|
continue;
|
|
82
|
-
const lpSource = (0,
|
|
84
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.sei, lpContract, platformId, {
|
|
83
85
|
address: lpContract,
|
|
84
86
|
decimals: lpTokenInfo.decimals,
|
|
85
87
|
supplyRaw: supply,
|
|
@@ -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,8EAAsD;AACtD,8EAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquiditypools-sei/job.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ 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 getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
21
21
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
var _a, _b, _c;
|
|
23
23
|
const client = (0, clients_1.getClientAptos)();
|
|
@@ -89,7 +89,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
89
89
|
];
|
|
90
90
|
if (!tokenPriceX || !tokenPriceY)
|
|
91
91
|
continue;
|
|
92
|
-
const lpSource = (0,
|
|
92
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, {
|
|
93
93
|
address: lpType,
|
|
94
94
|
decimals: lpDecimals,
|
|
95
95
|
supplyRaw: lpSupply,
|