@sonarwatch/portfolio-plugins 0.11.28 → 0.11.29
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/kamino/helpers/apr.d.ts +3 -2
- package/src/plugins/kamino/helpers/apr.js +11 -11
- package/src/plugins/kamino/helpers/apr.js.map +1 -1
- package/src/plugins/kamino/lendsFetcher.js +18 -18
- package/src/plugins/kamino/lendsFetcher.js.map +1 -1
- package/src/plugins/orca/whirlpoolsJob.js +3 -5
- package/src/plugins/orca/whirlpoolsJob.js.map +1 -1
- package/src/plugins/orders/clobs-solana/constants.d.ts +3 -0
- package/src/plugins/orders/clobs-solana/constants.js +7 -1
- package/src/plugins/orders/clobs-solana/constants.js.map +1 -1
- package/src/plugins/raydium/index.js +1 -2
- package/src/plugins/raydium/index.js.map +1 -1
- package/src/plugins/raydium/lpTokensJob.js +37 -95
- package/src/plugins/raydium/lpTokensJob.js.map +1 -1
- package/src/utils/clmm/tokenPricesFromSqrt.js +3 -5
- package/src/utils/clmm/tokenPricesFromSqrt.js.map +1 -1
- package/src/utils/misc/getLpUnderlyingTokenSource.d.ts +1 -0
- package/src/utils/misc/getLpUnderlyingTokenSource.js +3 -2
- package/src/utils/misc/getLpUnderlyingTokenSource.js.map +1 -1
- package/src/utils/misc/getTokensPricesMap.js +19 -2
- package/src/utils/misc/getTokensPricesMap.js.map +1 -1
- package/src/plugins/orders/clobs-solana/helpers.d.ts +0 -3
- package/src/plugins/orders/clobs-solana/helpers.js +0 -15
- package/src/plugins/orders/clobs-solana/helpers.js.map +0 -1
- package/src/plugins/raydium/testJob.d.ts +0 -3
- package/src/plugins/raydium/testJob.js +0 -29
- package/src/plugins/raydium/testJob.js.map +0 -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.29](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.28...plugins-0.11.29) (2023-12-22)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.11.28](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.27...plugins-0.11.28) (2023-12-21)
|
|
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.29",
|
|
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.29"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Reserve } from '../structs/klend';
|
|
2
|
-
|
|
3
|
-
export declare function
|
|
2
|
+
import { ParsedAccount } from '../../../utils/solana';
|
|
3
|
+
export declare function calculateSupplyAPR(reserve: ParsedAccount<Reserve>): number;
|
|
4
|
+
export declare function calculateBorrowAPR(reserve: ParsedAccount<Reserve>): number;
|
|
4
5
|
export declare const interpolate: (x: number, x0: number, x1: number, y0: number, y1: number) => number;
|
|
5
6
|
export declare const getBorrowRate: (currentUtilization: number, curve: [
|
|
6
7
|
number,
|
|
@@ -14,7 +14,7 @@ function calculateUtilizationRatio(liquidity) {
|
|
|
14
14
|
return totalBorrows.dividedBy(totalSupply).toNumber();
|
|
15
15
|
}
|
|
16
16
|
function getBorrowedAmount(liquidity) {
|
|
17
|
-
return new decimal_js_1.default(liquidity.borrowedAmountSf.toString());
|
|
17
|
+
return new decimal_js_1.default(liquidity.borrowedAmountSf.dividedBy(Math.pow(2, 60)).toString());
|
|
18
18
|
}
|
|
19
19
|
function getTotalSupply(liquidity) {
|
|
20
20
|
return getLiquidityAvailableAmount(liquidity)
|
|
@@ -27,24 +27,24 @@ function getLiquidityAvailableAmount(liquidity) {
|
|
|
27
27
|
return new decimal_js_1.default(liquidity.availableAmount.toString());
|
|
28
28
|
}
|
|
29
29
|
function getAccumulatedProtocolFees(liquidity) {
|
|
30
|
-
return new decimal_js_1.default(liquidity.accumulatedProtocolFeesSf.toString());
|
|
30
|
+
return new decimal_js_1.default(liquidity.accumulatedProtocolFeesSf.dividedBy(Math.pow(2, 60)).toString());
|
|
31
31
|
}
|
|
32
32
|
function getAccumulatedReferrerFees(liquidity) {
|
|
33
|
-
return new decimal_js_1.default(liquidity.accumulatedReferrerFeesSf.toString());
|
|
33
|
+
return new decimal_js_1.default(liquidity.accumulatedReferrerFeesSf.dividedBy(Math.pow(2, 60)).toString());
|
|
34
34
|
}
|
|
35
35
|
function getPendingReferrerFees(liquidity) {
|
|
36
|
-
return new decimal_js_1.default(liquidity.pendingReferrerFeesSf.toString());
|
|
36
|
+
return new decimal_js_1.default(liquidity.pendingReferrerFeesSf.dividedBy(Math.pow(2, 60)).toString());
|
|
37
37
|
}
|
|
38
38
|
function calculateSupplyAPR(reserve) {
|
|
39
39
|
const currentUtilization = calculateUtilizationRatio(reserve.liquidity);
|
|
40
40
|
const borrowAPR = calculateBorrowAPR(reserve);
|
|
41
|
-
return
|
|
41
|
+
return currentUtilization * borrowAPR;
|
|
42
42
|
}
|
|
43
43
|
exports.calculateSupplyAPR = calculateSupplyAPR;
|
|
44
44
|
function calculateBorrowAPR(reserve) {
|
|
45
45
|
const currentUtilization = calculateUtilizationRatio(reserve.liquidity);
|
|
46
46
|
const curve = truncateBorrowCurve(reserve.config.borrowRateCurve.points);
|
|
47
|
-
return (0, exports.getBorrowRate)(currentUtilization, curve)
|
|
47
|
+
return (0, exports.getBorrowRate)(currentUtilization, curve);
|
|
48
48
|
}
|
|
49
49
|
exports.calculateBorrowAPR = calculateBorrowAPR;
|
|
50
50
|
const truncateBorrowCurve = (points) => {
|
|
@@ -66,19 +66,19 @@ const interpolate = (x, x0, x1, y0, y1) => {
|
|
|
66
66
|
exports.interpolate = interpolate;
|
|
67
67
|
const getBorrowRate = (currentUtilization, curve) => {
|
|
68
68
|
let [x0, y0, x1, y1] = [0, 0, 0, 0];
|
|
69
|
-
let currentUse = currentUtilization;
|
|
70
69
|
if (curve.length < 2) {
|
|
71
70
|
// throw 'Invalid borrow rate curve, only one point';
|
|
72
71
|
}
|
|
73
72
|
if (currentUtilization > 1) {
|
|
74
|
-
|
|
73
|
+
// eslint-disable-next-line no-param-reassign
|
|
74
|
+
currentUtilization = 1;
|
|
75
75
|
}
|
|
76
76
|
for (let i = 1; i < curve.length; i++) {
|
|
77
77
|
const [pointUtilization, pointRate] = curve[i];
|
|
78
|
-
if (pointUtilization ===
|
|
78
|
+
if (pointUtilization === currentUtilization) {
|
|
79
79
|
return pointRate;
|
|
80
80
|
}
|
|
81
|
-
if (
|
|
81
|
+
if (currentUtilization <= pointUtilization) {
|
|
82
82
|
[x0, y0] = curve[i - 1];
|
|
83
83
|
[x1, y1] = curve[i];
|
|
84
84
|
break;
|
|
@@ -90,7 +90,7 @@ const getBorrowRate = (currentUtilization, curve) => {
|
|
|
90
90
|
if (x0 >= x1 || y0 > y1) {
|
|
91
91
|
// throw 'Invalid borrow rate curve, curve is not uniformly increasing';
|
|
92
92
|
}
|
|
93
|
-
return (0, exports.interpolate)(
|
|
93
|
+
return (0, exports.interpolate)(currentUtilization, x0, x1, y0, y1);
|
|
94
94
|
};
|
|
95
95
|
exports.getBorrowRate = getBorrowRate;
|
|
96
96
|
//# sourceMappingURL=apr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apr.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/kamino/helpers/apr.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;
|
|
1
|
+
{"version":3,"file":"apr.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/kamino/helpers/apr.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAiC;AAIjC,SAAS,yBAAyB,CAAC,SAA2B;IAC5D,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,iBAAiB,CAAC,SAA2B;IACpD,OAAO,IAAI,oBAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,SAAA,CAAC,EAAI,EAAE,CAAA,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,cAAc,CAAC,SAA2B;IACjD,OAAO,2BAA2B,CAAC,SAAS,CAAC;SAC1C,GAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;SACjC,GAAG,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;SAC1C,GAAG,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;SAC1C,GAAG,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,2BAA2B,CAAC,SAA2B;IAC9D,OAAO,IAAI,oBAAO,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,0BAA0B,CAAC,SAA2B;IAC7D,OAAO,IAAI,oBAAO,CAChB,SAAS,CAAC,yBAAyB,CAAC,SAAS,CAAC,SAAA,CAAC,EAAI,EAAE,CAAA,CAAC,CAAC,QAAQ,EAAE,CAClE,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,SAA2B;IAC7D,OAAO,IAAI,oBAAO,CAChB,SAAS,CAAC,yBAAyB,CAAC,SAAS,CAAC,SAAA,CAAC,EAAI,EAAE,CAAA,CAAC,CAAC,QAAQ,EAAE,CAClE,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,SAA2B;IACzD,OAAO,IAAI,oBAAO,CAChB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,SAAA,CAAC,EAAI,EAAE,CAAA,CAAC,CAAC,QAAQ,EAAE,CAC9D,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAA+B;IAChE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,kBAAkB,GAAG,SAAS,CAAC;AACxC,CAAC;AAJD,gDAIC;AAED,SAAgB,kBAAkB,CAAC,OAA+B;IAChE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACzE,OAAO,IAAA,qBAAa,EAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAJD,gDAIC;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAoB,EAAsB,EAAE;IACvE,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,KAAK,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,IAAI,MAAM,EAAE,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,CAAC,kBAAkB,GAAG,KAAM,EAAE,aAAa,GAAG,KAAM,CAAC,CAAC,CAAC;QAElE,IAAI,kBAAkB,KAAK,KAAM,EAAE,CAAC;YAClC,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,CACzB,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAE;IACF,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACX,mCAAmC;IACrC,CAAC;IAED,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB;AAEK,MAAM,aAAa,GAAG,CAC3B,kBAA0B,EAC1B,KAAyB,EACjB,EAAE;IACV,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,qDAAqD;IACvD,CAAC;IAED,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;QAC3B,6CAA6C;QAC7C,kBAAkB,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,gBAAgB,KAAK,kBAAkB,EAAE,CAAC;YAC5C,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,kBAAkB,IAAI,gBAAgB,EAAE,CAAC;YAC3C,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACjD,mFAAmF;IACrF,CAAC;IAED,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;QACxB,wEAAwE;IAC1E,CAAC;IAED,OAAO,IAAA,mBAAW,EAAC,kBAAkB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AArCW,QAAA,aAAa,iBAqCxB"}
|
|
@@ -67,9 +67,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
67
67
|
.toNumber();
|
|
68
68
|
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
69
69
|
suppliedLtvs.push(reserve.config.liquidationThresholdPct / 100);
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
suppliedYields.push([
|
|
71
|
+
{ apr: reserve.supplyApr, apy: (0, portfolio_core_1.aprToApy)(reserve.supplyApr) },
|
|
72
|
+
]);
|
|
73
73
|
}
|
|
74
74
|
for (const borrow of lendingAccount.borrows) {
|
|
75
75
|
if (borrow.borrowReserve.toString() ===
|
|
@@ -87,9 +87,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
87
87
|
.toNumber();
|
|
88
88
|
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
89
89
|
borrowedWeights.push(Number(reserve.config.borrowFactorPct) / 100);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
borrowedYields.push([
|
|
91
|
+
{ apr: -reserve.borrowApr, apy: -(0, portfolio_core_1.aprToApy)(reserve.borrowApr) },
|
|
92
|
+
]);
|
|
93
93
|
}
|
|
94
94
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
95
95
|
const { borrowedValue, suppliedValue, value, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
@@ -143,9 +143,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
143
143
|
.toNumber();
|
|
144
144
|
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
145
145
|
suppliedLtvs.push(reserve.config.liquidationThresholdPct / 100);
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
146
|
+
suppliedYields.push([
|
|
147
|
+
{ apr: reserve.supplyApr, apy: (0, portfolio_core_1.aprToApy)(reserve.supplyApr) },
|
|
148
|
+
]);
|
|
149
149
|
}
|
|
150
150
|
for (const borrow of multiplyAccount.borrows) {
|
|
151
151
|
if (borrow.borrowReserve.toString() ===
|
|
@@ -163,9 +163,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
163
163
|
.toNumber();
|
|
164
164
|
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
165
165
|
borrowedWeights.push(Number(reserve.config.borrowFactorPct) / 100);
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
166
|
+
borrowedYields.push([
|
|
167
|
+
{ apr: -reserve.borrowApr, apy: -(0, portfolio_core_1.aprToApy)(reserve.borrowApr) },
|
|
168
|
+
]);
|
|
169
169
|
}
|
|
170
170
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
171
171
|
const { borrowedValue, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
@@ -220,9 +220,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
220
220
|
.toNumber();
|
|
221
221
|
suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
222
222
|
suppliedLtvs.push(reserve.config.liquidationThresholdPct / 100);
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
223
|
+
suppliedYields.push([
|
|
224
|
+
{ apr: reserve.supplyApr, apy: (0, portfolio_core_1.aprToApy)(reserve.supplyApr) },
|
|
225
|
+
]);
|
|
226
226
|
}
|
|
227
227
|
for (const borrow of leverageAccount.borrows) {
|
|
228
228
|
if (borrow.borrowReserve.toString() ===
|
|
@@ -240,9 +240,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
240
240
|
.toNumber();
|
|
241
241
|
borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(mint, amount, networkId, tokenPrice));
|
|
242
242
|
borrowedWeights.push(Number(reserve.config.borrowFactorPct) / 100);
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
243
|
+
borrowedYields.push([
|
|
244
|
+
{ apr: -reserve.borrowApr, apy: -(0, portfolio_core_1.aprToApy)(reserve.borrowApr) },
|
|
245
|
+
]);
|
|
246
246
|
}
|
|
247
247
|
if (suppliedAssets.length !== 0 || borrowedAssets.length !== 0) {
|
|
248
248
|
const { borrowedValue, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lendsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/lendsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"lendsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/lendsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,20 +23,18 @@ const tokenPricesFromSqrt_1 = __importDefault(require("../../utils/clmm/tokenPri
|
|
|
23
23
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
const client = (0, clients_1.getClientSolana)();
|
|
25
25
|
const whirlpoolsInfo = yield (0, solana_1.getParsedProgramAccounts)(client, whirlpool_1.whirlpoolStruct, constants_1.whirlpoolProgram, filters_1.whirlpoolFilters);
|
|
26
|
-
const promises = [];
|
|
27
26
|
for (let id = 0; id < whirlpoolsInfo.length; id++) {
|
|
28
27
|
const whirlpoolInfo = whirlpoolsInfo[id];
|
|
29
28
|
if (whirlpoolInfo.liquidity.isZero())
|
|
30
29
|
continue;
|
|
31
30
|
const reserveX = yield client.getBalance(whirlpoolInfo.tokenVaultA);
|
|
32
31
|
const reserveY = yield client.getBalance(whirlpoolInfo.tokenVaultB);
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
yield (0, tokenPricesFromSqrt_1.default)(cache, portfolio_core_1.NetworkId.solana, whirlpoolInfo.pubkey.toString(), new bignumber_js_1.default(reserveX), new bignumber_js_1.default(reserveY), whirlpoolInfo.sqrtPrice, whirlpoolInfo.tokenMintA.toString(), whirlpoolInfo.tokenMintB.toString());
|
|
33
|
+
yield cache.setItem(whirlpoolInfo.pubkey.toString(), whirlpoolInfo, {
|
|
35
34
|
prefix: constants_1.whirlpoolPrefix,
|
|
36
35
|
networkId: portfolio_core_1.NetworkId.solana,
|
|
37
|
-
})
|
|
36
|
+
});
|
|
38
37
|
}
|
|
39
|
-
yield Promise.allSettled(promises);
|
|
40
38
|
});
|
|
41
39
|
const job = {
|
|
42
40
|
id: `${constants_1.platformId}-whirlpools`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whirlpoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/whirlpoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,2CAA4E;AAC5E,+CAA8D;AAC9D,iDAAsD;AACtD,mDAAsD;AACtD,uCAA6C;AAG7C,+FAA4E;AAE5E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAwB,EACnD,MAAM,EACN,2BAAe,EACf,4BAAgB,EAChB,0BAAgB,CACjB,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"whirlpoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/whirlpoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,2CAA4E;AAC5E,+CAA8D;AAC9D,iDAAsD;AACtD,mDAAsD;AACtD,uCAA6C;AAG7C,+FAA4E;AAE5E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAwB,EACnD,MAAM,EACN,2BAAe,EACf,4BAAgB,EAChB,0BAAgB,CACjB,CAAC;IAEF,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QAClD,MAAM,aAAa,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE;YAAE,SAAS;QAE/C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,IAAA,6BAAwB,EAC5B,KAAK,EACL,0BAAS,CAAC,MAAM,EAChB,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC/B,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EACnC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CACpC,CAAC;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE;YAClE,MAAM,EAAE,2BAAe;YACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Platform } from '@sonarwatch/portfolio-core';
|
|
2
|
+
import { BeetStruct } from '@metaplex-foundation/beet';
|
|
3
|
+
import { CLOBOrderStruct } from './structs';
|
|
2
4
|
import { CLOBVersion } from './types';
|
|
3
5
|
export declare const openbookPlatform: Platform;
|
|
4
6
|
export declare const serumPlatform: Platform;
|
|
@@ -8,3 +10,4 @@ export declare const clobVersions: {
|
|
|
8
10
|
serumV3: CLOBVersion;
|
|
9
11
|
openbookV1: CLOBVersion;
|
|
10
12
|
};
|
|
13
|
+
export declare const orderStructByProgramId: Map<string, BeetStruct<CLOBOrderStruct, Partial<CLOBOrderStruct>>>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.clobVersions = exports.serumPlatform = exports.openbookPlatform = void 0;
|
|
3
|
+
exports.orderStructByProgramId = exports.clobVersions = exports.serumPlatform = exports.openbookPlatform = void 0;
|
|
4
4
|
const structs_1 = require("./structs");
|
|
5
5
|
const openOrders_1 = require("../../raydium/structs/openOrders");
|
|
6
6
|
exports.openbookPlatform = {
|
|
@@ -51,4 +51,10 @@ exports.clobVersions = {
|
|
|
51
51
|
// prefix: openbookMarketsPrefix,
|
|
52
52
|
// } as CLOBProgramInfo,
|
|
53
53
|
};
|
|
54
|
+
exports.orderStructByProgramId = new Map([
|
|
55
|
+
['4ckmDgGdxQoPDLUkDT3vHgSAkzA3QRdNq5ywwY4sUSJn', openOrders_1.openOrdersV1Struct],
|
|
56
|
+
['EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o', structs_1.openOrdersV2Struct],
|
|
57
|
+
['9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin', structs_1.openOrdersV2Struct],
|
|
58
|
+
['srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX', structs_1.openOrdersV2Struct],
|
|
59
|
+
]);
|
|
54
60
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/constants.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/constants.ts"],"names":[],"mappings":";;;AAEA,uCAMmB;AAEnB,iEAAsE;AAEzD,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,UAAU;CACxB,CAAC;AACW,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,OAAO;IACX,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,OAAO;CACrB,CAAC;AACW,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,+BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,8CAA8C;QACzD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,qBAAa,CAAC,EAAE,YAAY;KACzB;IAChB,UAAU,EAAE;QACV,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,6CAA6C;QACxD,MAAM,EAAE,6BAAmB;QAC3B,WAAW,EAAE,4BAAkB;QAC/B,MAAM,EAAE,GAAG,wBAAgB,CAAC,EAAE,UAAU;KAC1B;IAChB,gBAAgB;IAChB,8DAA8D;IAC9D,oCAAoC;IACpC,qCAAqC;IACrC,mCAAmC;IACnC,wBAAwB;CACzB,CAAC;AAEW,QAAA,sBAAsB,GAG/B,IAAI,GAAG,CAAC;IACV,CAAC,8CAA8C,EAAE,+BAAkB,CAAC;IACpE,CAAC,8CAA8C,EAAE,4BAAkB,CAAC;IACpE,CAAC,8CAA8C,EAAE,4BAAkB,CAAC;IACpE,CAAC,6CAA6C,EAAE,4BAAkB,CAAC;CACpE,CAAC,CAAC"}
|
|
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.fetchers = exports.jobs = exports.platforms = void 0;
|
|
7
7
|
const lpTokensJob_1 = __importDefault(require("./lpTokensJob"));
|
|
8
8
|
const clmmJob_1 = __importDefault(require("./clmmJob"));
|
|
9
|
-
const testJob_1 = __importDefault(require("./testJob"));
|
|
10
9
|
const constants_1 = require("./constants");
|
|
11
10
|
exports.platforms = [constants_1.raydiumPlatform];
|
|
12
|
-
exports.jobs = [lpTokensJob_1.default, clmmJob_1.default
|
|
11
|
+
exports.jobs = [lpTokensJob_1.default, clmmJob_1.default];
|
|
13
12
|
exports.fetchers = [];
|
|
14
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,wDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,wDAAgC;AAChC,2CAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,2BAAe,CAAC,CAAC;AAC1C,QAAA,IAAI,GAAU,CAAC,qBAAW,EAAE,iBAAO,CAAC,CAAC;AACrC,QAAA,QAAQ,GAAc,EAAE,CAAC"}
|
|
@@ -19,10 +19,12 @@ const amms_1 = require("./structs/amms");
|
|
|
19
19
|
const solana_1 = require("../../utils/solana");
|
|
20
20
|
const filters_1 = require("./filters");
|
|
21
21
|
const types_1 = require("./types");
|
|
22
|
+
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
22
23
|
const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
|
|
23
|
-
const helpers_1 = require("../orders/clobs-solana/helpers");
|
|
24
24
|
const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
|
|
25
25
|
const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
|
|
26
|
+
const constants_2 = require("../orders/clobs-solana/constants");
|
|
27
|
+
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
26
28
|
const ammsDetails = [
|
|
27
29
|
{
|
|
28
30
|
versionId: 4,
|
|
@@ -31,13 +33,13 @@ const ammsDetails = [
|
|
|
31
33
|
filters: filters_1.ammV4Filter,
|
|
32
34
|
name: 'Pools V4',
|
|
33
35
|
},
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
{
|
|
37
|
+
versionId: 5,
|
|
38
|
+
struct: amms_1.ammInfoV5Struct,
|
|
39
|
+
programId: constants_1.AMM_PROGRAM_ID_V5,
|
|
40
|
+
filters: filters_1.ammV5Filter,
|
|
41
|
+
name: 'Pools V5',
|
|
42
|
+
},
|
|
41
43
|
];
|
|
42
44
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
45
|
const client = (0, clients_1.getClientSolana)();
|
|
@@ -46,12 +48,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
46
48
|
const ammDetails = ammsDetails[id];
|
|
47
49
|
const { struct, programId, filters, versionId, name: ammName } = ammDetails;
|
|
48
50
|
const ammsRes = yield client.getProgramAccounts(programId, { filters });
|
|
49
|
-
console.log('constexecutor:JobExecutor= ~ ammsRes:', ammsRes.length);
|
|
50
51
|
const cAmms = ammsRes.map((poolRes) => (Object.assign(Object.assign({}, struct.deserialize(poolRes.account.data)[0]), { versionId,
|
|
51
52
|
ammName })));
|
|
52
53
|
ammsRaws.push(...cAmms);
|
|
53
54
|
}
|
|
54
|
-
console.log('check 1');
|
|
55
55
|
const ammsAccounts = ammsRaws.filter((a) => {
|
|
56
56
|
if (a.status.toNumber() === types_1.LiquidityPoolStatus.Disabled)
|
|
57
57
|
return false;
|
|
@@ -63,7 +63,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
63
63
|
return false;
|
|
64
64
|
return true;
|
|
65
65
|
});
|
|
66
|
-
console.log('check 2');
|
|
67
66
|
const mints = new Set();
|
|
68
67
|
const addresses = [];
|
|
69
68
|
ammsAccounts.forEach((amm) => {
|
|
@@ -74,7 +73,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
74
73
|
const tokenAccountsMap = new Map();
|
|
75
74
|
const ammsOpenOrdersMap = new Map();
|
|
76
75
|
const mintAccountsMap = new Map();
|
|
77
|
-
console.log('check 3');
|
|
78
76
|
const accountsRes = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, addresses);
|
|
79
77
|
for (let i = 0; i < accountsRes.length; i += 4) {
|
|
80
78
|
const poolCoinTokenAccountInfo = accountsRes[i];
|
|
@@ -88,44 +86,20 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
88
86
|
continue;
|
|
89
87
|
tokenAccountsMap.set(addresses[i].toString(), solana_1.tokenAccountStruct.deserialize(poolCoinTokenAccountInfo.data)[0]);
|
|
90
88
|
tokenAccountsMap.set(addresses[i + 1].toString(), solana_1.tokenAccountStruct.deserialize(poolPcTokenAccountInfo.data)[0]);
|
|
91
|
-
const orderStruct =
|
|
92
|
-
if (!orderStruct)
|
|
93
|
-
console.log('Didnt found an OrderStruct for program : ', ammsAccounts[i / 4].serumProgramId.toString());
|
|
89
|
+
const orderStruct = constants_2.orderStructByProgramId.get(ammsAccounts[i / 4].serumProgramId.toString());
|
|
90
|
+
if (!orderStruct)
|
|
94
91
|
continue;
|
|
95
|
-
}
|
|
96
92
|
ammsOpenOrdersMap.set(addresses[i + 2].toString(), orderStruct.deserialize(ammOpenOrdersInfo.data)[0]);
|
|
97
|
-
// if (
|
|
98
|
-
// ammsAccounts[i / 4].serumProgramId.toString() ===
|
|
99
|
-
// '9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin'
|
|
100
|
-
// ) {
|
|
101
|
-
// ammsOpenOrdersMap.set(
|
|
102
|
-
// addresses[i + 2].toString(),
|
|
103
|
-
// openOrdersV1Struct.deserialize(ammOpenOrdersInfo.data)[0]
|
|
104
|
-
// );
|
|
105
|
-
// } else {
|
|
106
|
-
// ammsOpenOrdersMap.set(
|
|
107
|
-
// addresses[i + 2].toString(),
|
|
108
|
-
// openOrdersV2Struct.deserialize(ammOpenOrdersInfo.data)[0]
|
|
109
|
-
// );
|
|
110
|
-
// }
|
|
111
93
|
mintAccountsMap.set(addresses[i + 3].toString(), solana_1.mintAccountStruct.deserialize(lpMintAddressInfo.data)[0]);
|
|
112
94
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
// [...mints].map((mint) => () => cache.getTokenPrice(mint, NetworkId.solana))
|
|
116
|
-
// );
|
|
117
|
-
// const tokenPrices: Map<string, TokenPrice> = new Map();
|
|
118
|
-
// tokenPriceResults.forEach((r) => {
|
|
119
|
-
// if (r.status === 'rejected') return;
|
|
120
|
-
// if (!r.value) return;
|
|
121
|
-
// tokenPrices.set(r.value.address, r.value);
|
|
122
|
-
// });
|
|
95
|
+
const tokenPrices = yield (0, getTokensPricesMap_1.default)([...mints], portfolio_core_1.NetworkId.solana, cache);
|
|
96
|
+
const tokenPriceSources = [];
|
|
123
97
|
for (let i = 0; i < ammsAccounts.length; i += 1) {
|
|
124
98
|
const amm = ammsAccounts[i];
|
|
125
|
-
const mintA = amm.
|
|
126
|
-
const mintB = amm.
|
|
127
|
-
const tokenAccountA = tokenAccountsMap.get(
|
|
128
|
-
const tokenAccountB = tokenAccountsMap.get(
|
|
99
|
+
const mintA = amm.coinMintAddress.toString();
|
|
100
|
+
const mintB = amm.pcMintAddress.toString();
|
|
101
|
+
const tokenAccountA = tokenAccountsMap.get(amm.poolCoinTokenAccount.toString());
|
|
102
|
+
const tokenAccountB = tokenAccountsMap.get(amm.poolPcTokenAccount.toString());
|
|
129
103
|
const ammOpenOrders = ammsOpenOrdersMap.get(amm.ammOpenOrders.toString());
|
|
130
104
|
if (!tokenAccountA || !tokenAccountB || !ammOpenOrders)
|
|
131
105
|
continue;
|
|
@@ -141,9 +115,12 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
141
115
|
const { needTakePnlCoin, needTakePnlPc } = amm;
|
|
142
116
|
tokenAmountAWei = tokenAmountAWei.minus(needTakePnlCoin);
|
|
143
117
|
tokenAmountBWei = tokenAmountBWei.minus(needTakePnlPc);
|
|
144
|
-
const tokenAmountA = tokenAmountAWei
|
|
145
|
-
const tokenAmountB = tokenAmountBWei
|
|
146
|
-
const [tokenPriceA, tokenPriceB] =
|
|
118
|
+
const tokenAmountA = tokenAmountAWei;
|
|
119
|
+
const tokenAmountB = tokenAmountBWei;
|
|
120
|
+
const [tokenPriceA, tokenPriceB] = [
|
|
121
|
+
tokenPrices.get(mintA),
|
|
122
|
+
tokenPrices.get(mintB),
|
|
123
|
+
];
|
|
147
124
|
const lpMint = amm.lpMintAddress;
|
|
148
125
|
const underlyingSource = (0, getLpUnderlyingTokenSource_1.default)(lpMint.toString(), constants_1.platformId, portfolio_core_1.NetworkId.solana, {
|
|
149
126
|
address: mintA,
|
|
@@ -156,73 +133,38 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
156
133
|
reserveAmountRaw: tokenAmountB,
|
|
157
134
|
tokenPrice: tokenPriceB,
|
|
158
135
|
});
|
|
159
|
-
if (underlyingSource)
|
|
136
|
+
if (underlyingSource) {
|
|
160
137
|
yield cache.setTokenPriceSource(underlyingSource);
|
|
138
|
+
}
|
|
161
139
|
if (!tokenPriceB || !tokenPriceA)
|
|
162
140
|
continue;
|
|
163
|
-
// const coinValueLocked = tokenAmountA.multipliedBy(tokenPriceA.price);
|
|
164
|
-
// const pcValueLocked = tokenAmountB.multipliedBy(tokenPriceB.price);
|
|
165
141
|
const lpMintAccount = mintAccountsMap.get(lpMint.toString());
|
|
166
142
|
if (!lpMintAccount)
|
|
167
143
|
continue;
|
|
168
144
|
const lpDecimals = lpMintAccount.decimals;
|
|
169
|
-
const lpSupply = lpMintAccount.supply
|
|
170
|
-
if (
|
|
145
|
+
const lpSupply = lpMintAccount.supply;
|
|
146
|
+
if (lpSupply.isZero())
|
|
171
147
|
continue;
|
|
172
|
-
|
|
148
|
+
tokenPriceSources.push((0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.solana, lpMint.toString(), constants_1.platformId, amm.ammName, {
|
|
149
|
+
address: lpMint.toString(),
|
|
150
|
+
decimals: lpDecimals,
|
|
151
|
+
supplyRaw: lpSupply,
|
|
152
|
+
}, [
|
|
173
153
|
{
|
|
174
154
|
address: tokenPriceA.address,
|
|
175
155
|
decimals: tokenPriceA.decimals,
|
|
176
156
|
price: tokenPriceA.price,
|
|
177
|
-
reserveAmountRaw:
|
|
157
|
+
reserveAmountRaw: tokenAmountA,
|
|
178
158
|
},
|
|
179
159
|
{
|
|
180
160
|
address: tokenPriceB.address,
|
|
181
161
|
decimals: tokenPriceB.decimals,
|
|
182
162
|
price: tokenPriceB.price,
|
|
183
|
-
reserveAmountRaw:
|
|
163
|
+
reserveAmountRaw: tokenAmountB,
|
|
184
164
|
},
|
|
185
|
-
]);
|
|
186
|
-
yield cache.setTokenPriceSource(lpSource);
|
|
187
|
-
if (lpMint.toString() === 'CQurpF3WS3yEqFEt1Bu8s5zmZqznQG3EJkcYvsyg3sLc') {
|
|
188
|
-
console.log('Serum Program Id', amm.serumProgramId.toString());
|
|
189
|
-
console.log('constexecutor:JobExecutor= ~ amm.pcMintAddress.toString():', amm.pcMintAddress.toString());
|
|
190
|
-
console.log('constexecutor:JobExecutor= ~ amm.coinMintAddress.toString():', amm.coinMintAddress.toString());
|
|
191
|
-
console.log('constexecutor:JobExecutor= ~ pcAmount:', tokenAmountB.toNumber());
|
|
192
|
-
console.log('constexecutor:JobExecutor= ~ coinAmount:', tokenAmountA.toNumber());
|
|
193
|
-
console.log('constexecutor:JobExecutor= ~ lpSupply:', lpSupply.toNumber());
|
|
194
|
-
}
|
|
195
|
-
// const tvl = coinValueLocked.plus(pcValueLocked);
|
|
196
|
-
// const price = tvl.div(lpSupply).toNumber();
|
|
197
|
-
// const underlyings: TokenPriceUnderlying[] = [];
|
|
198
|
-
// underlyings.push({
|
|
199
|
-
// networkId: NetworkId.solana,
|
|
200
|
-
// address: tokenPriceA.address,
|
|
201
|
-
// decimals: tokenPriceA.decimals,
|
|
202
|
-
// price: tokenPriceA.price,
|
|
203
|
-
// amountPerLp: tokenAmountA.div(lpSupply).toNumber(),
|
|
204
|
-
// });
|
|
205
|
-
// underlyings.push({
|
|
206
|
-
// networkId: NetworkId.solana,
|
|
207
|
-
// address: tokenPriceB.address,
|
|
208
|
-
// decimals: tokenPriceB.decimals,
|
|
209
|
-
// price: tokenPriceB.price,
|
|
210
|
-
// amountPerLp: tokenAmountB.div(lpSupply).toNumber(),
|
|
211
|
-
// });
|
|
212
|
-
// await cache.setTokenPriceSource({
|
|
213
|
-
// id: platformId,
|
|
214
|
-
// weight: 1,
|
|
215
|
-
// address: lpMint.toString(),
|
|
216
|
-
// networkId: NetworkId.solana,
|
|
217
|
-
// platformId,
|
|
218
|
-
// decimals: lpDecimals,
|
|
219
|
-
// price,
|
|
220
|
-
// underlyings,
|
|
221
|
-
// elementName: amm.ammName,
|
|
222
|
-
// timestamp: Date.now(),
|
|
223
|
-
// });
|
|
165
|
+
]));
|
|
224
166
|
}
|
|
225
|
-
|
|
167
|
+
yield (0, runInBatch_1.default)(tokenPriceSources.map((tokenPriceSource) => () => cache.setTokenPriceSource(tokenPriceSource)));
|
|
226
168
|
});
|
|
227
169
|
const job = {
|
|
228
170
|
id: `${constants_1.platformId}-lp-tokens`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/lpTokensJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/lpTokensJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,12 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
|
17
17
|
const getDecimalsForToken_1 = require("../misc/getDecimalsForToken");
|
|
18
18
|
const constants_1 = require("../../plugins/tokens/constants");
|
|
19
19
|
const getSourceWeight_1 = __importDefault(require("../misc/getSourceWeight"));
|
|
20
|
-
const checkComputeAndStoreTokensPrices_1 = require("../misc/checkComputeAndStoreTokensPrices");
|
|
21
20
|
const computeAndStoreLpPrice_1 = require("../misc/computeAndStoreLpPrice");
|
|
21
|
+
const getLpUnderlyingTokenSource_1 = require("../misc/getLpUnderlyingTokenSource");
|
|
22
22
|
function storeTokenPricesFromSqrt(cache, networkId, source, reserveX, reserveY, sqrtPrice, mintX, mintY, tempDecimalsX, tempDecimalsY) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return undefined;
|
|
27
|
-
if (!tokensToRelyOn.includes(mintX) && !tokensToRelyOn.includes(mintY))
|
|
24
|
+
if (!getLpUnderlyingTokenSource_1.defaultAcceptedPairs.includes(mintX) &&
|
|
25
|
+
!getLpUnderlyingTokenSource_1.defaultAcceptedPairs.includes(mintY))
|
|
28
26
|
return undefined;
|
|
29
27
|
const tokensPrices = yield cache.getTokenPrices([mintX, mintY], networkId);
|
|
30
28
|
const tokenPriceX = tokensPrices[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenPricesFromSqrt.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clmm/tokenPricesFromSqrt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,4DAAiC;AAEjC,qEAAkE;AAClE,8DAAsE;AACtE,8EAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"tokenPricesFromSqrt.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clmm/tokenPricesFromSqrt.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,6 @@ type PoolUnderlyingRaw = {
|
|
|
17
17
|
decimals: number;
|
|
18
18
|
tokenPrice: TokenPrice | undefined;
|
|
19
19
|
};
|
|
20
|
+
export declare const defaultAcceptedPairs: string[];
|
|
20
21
|
export default function getLpUnderlyingTokenSource(sourceId: string, platformId: string, networkId: NetworkIdType, poolUnderlyingsA: PoolUnderlyingRaw, poolUnderlyingsB: PoolUnderlyingRaw, minTvl?: number, acceptedPairs?: string[]): TokenPriceSource | null;
|
|
21
22
|
export {};
|
|
@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.defaultAcceptedPairs = void 0;
|
|
6
7
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
7
8
|
const getSourceWeight_1 = __importDefault(require("./getSourceWeight"));
|
|
8
9
|
const constants_1 = require("../../plugins/tokens/constants");
|
|
9
|
-
|
|
10
|
+
exports.defaultAcceptedPairs = [
|
|
10
11
|
// Sei Addresses
|
|
11
12
|
portfolio_core_1.seiNativeAddress,
|
|
12
13
|
'ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518', // OSMO
|
|
@@ -26,7 +27,7 @@ const defaultAcceptedPairs = [
|
|
|
26
27
|
'0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN', // USDCet
|
|
27
28
|
'0x6864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS', // CETUS
|
|
28
29
|
];
|
|
29
|
-
function getLpUnderlyingTokenSource(sourceId, platformId, networkId, poolUnderlyingsA, poolUnderlyingsB, minTvl = 5000, acceptedPairs = defaultAcceptedPairs) {
|
|
30
|
+
function getLpUnderlyingTokenSource(sourceId, platformId, networkId, poolUnderlyingsA, poolUnderlyingsB, minTvl = 5000, acceptedPairs = exports.defaultAcceptedPairs) {
|
|
30
31
|
var _a, _b;
|
|
31
32
|
if (!poolUnderlyingsA.tokenPrice && !poolUnderlyingsB.tokenPrice)
|
|
32
33
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLpUnderlyingTokenSource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpUnderlyingTokenSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLpUnderlyingTokenSource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getLpUnderlyingTokenSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const runInBatch_1 = __importDefault(require("./runInBatch"));
|
|
12
16
|
function getTokenPricesMap(tokensAddresses, networkId, cache) {
|
|
13
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const
|
|
18
|
+
const tokensGroups = [];
|
|
19
|
+
for (let i = 0; i < tokensAddresses.length; i += 10) {
|
|
20
|
+
tokensGroups.push(tokensAddresses.slice(i, i + 10));
|
|
21
|
+
}
|
|
15
22
|
const tokenPriceById = new Map();
|
|
16
|
-
|
|
23
|
+
const res = yield (0, runInBatch_1.default)(tokensGroups.map((group) => () => cache.getTokenPrices(group, networkId)));
|
|
24
|
+
res.forEach((r) => {
|
|
25
|
+
if (r.status === 'rejected')
|
|
26
|
+
return;
|
|
27
|
+
if (!r.value)
|
|
28
|
+
return;
|
|
29
|
+
r.value.forEach((tokenPrice) => {
|
|
30
|
+
if (tokenPrice)
|
|
31
|
+
tokenPriceById.set(tokenPrice.address, tokenPrice);
|
|
32
|
+
});
|
|
33
|
+
});
|
|
17
34
|
return tokenPriceById;
|
|
18
35
|
});
|
|
19
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTokensPricesMap.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getTokensPricesMap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getTokensPricesMap.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getTokensPricesMap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,8DAAsC;AAEtC,SAA8B,iBAAiB,CAC7C,eAAyB,EACzB,SAAwB,EACxB,KAAY;;QAEZ,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACpD,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAU,EAC1B,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAC1E,CAAC;QACF,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAChB,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;gBAAE,OAAO;YACpC,IAAI,CAAC,CAAC,CAAC,KAAK;gBAAE,OAAO;YACrB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC7B,IAAI,UAAU;oBAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AArBD,oCAqBC"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCLOBStructByProgramId = void 0;
|
|
4
|
-
const structs_1 = require("./structs");
|
|
5
|
-
const orderStructByProgramId = new Map([
|
|
6
|
-
['4ckmDgGdxQoPDLUkDT3vHgSAkzA3QRdNq5ywwY4sUSJn', structs_1.openOrdersV1Struct],
|
|
7
|
-
['EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o', structs_1.openOrdersV2Struct],
|
|
8
|
-
['9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin', structs_1.openOrdersV2Struct],
|
|
9
|
-
['srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX', structs_1.openOrdersV2Struct],
|
|
10
|
-
]);
|
|
11
|
-
function getCLOBStructByProgramId(programId) {
|
|
12
|
-
return orderStructByProgramId.get(programId);
|
|
13
|
-
}
|
|
14
|
-
exports.getCLOBStructByProgramId = getCLOBStructByProgramId;
|
|
15
|
-
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/clobs-solana/helpers.ts"],"names":[],"mappings":";;;AACA,uCAImB;AAEnB,MAAM,sBAAsB,GAGxB,IAAI,GAAG,CAAC;IACV,CAAC,8CAA8C,EAAE,4BAAkB,CAAC;IACpE,CAAC,8CAA8C,EAAE,4BAAkB,CAAC;IACpE,CAAC,8CAA8C,EAAE,4BAAkB,CAAC;IACpE,CAAC,6CAA6C,EAAE,4BAAkB,CAAC;CACpE,CAAC,CAAC;AAEH,SAAgB,wBAAwB,CACtC,SAAiB;IAEjB,OAAO,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC;AAJD,4DAIC"}
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const web3_js_1 = require("@solana/web3.js");
|
|
13
|
-
const clients_1 = require("../../utils/clients");
|
|
14
|
-
const constants_1 = require("./constants");
|
|
15
|
-
const solana_1 = require("../../utils/solana");
|
|
16
|
-
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
-
const client = (0, clients_1.getClientSolana)();
|
|
18
|
-
const res = yield client.getAccountInfo(new web3_js_1.PublicKey('CQurpF3WS3yEqFEt1Bu8s5zmZqznQG3EJkcYvsyg3sLc'));
|
|
19
|
-
if (!res)
|
|
20
|
-
return;
|
|
21
|
-
const parsed = solana_1.mintAccountStruct.deserialize(res.data)[0];
|
|
22
|
-
console.log('constexecutor:JobExecutor= ~ res:', parsed);
|
|
23
|
-
});
|
|
24
|
-
const job = {
|
|
25
|
-
id: `${constants_1.platformId}-test`,
|
|
26
|
-
executor,
|
|
27
|
-
};
|
|
28
|
-
exports.default = job;
|
|
29
|
-
//# sourceMappingURL=testJob.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/testJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6CAA4C;AAG5C,iDAAsD;AAEtD,2CAAyC;AACzC,+CAA2E;AAE3E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,cAAc,CACrC,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAC9D,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,MAAM,MAAM,GAAG,0BAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
|