@kamino-finance/kliquidity-sdk 7.0.9 → 7.0.11
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/dist/Kamino.d.ts +2 -1
- package/dist/Kamino.d.ts.map +1 -1
- package/dist/Kamino.js +38 -34
- package/dist/Kamino.js.map +1 -1
- package/dist/rebalance_methods/autodriftRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/autodriftRebalance.js +5 -5
- package/dist/rebalance_methods/autodriftRebalance.js.map +1 -1
- package/dist/rebalance_methods/driftRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/driftRebalance.js +5 -5
- package/dist/rebalance_methods/driftRebalance.js.map +1 -1
- package/dist/rebalance_methods/takeProfitRebalance.js +3 -3
- package/dist/rebalance_methods/takeProfitRebalance.js.map +1 -1
- package/dist/services/JupService.d.ts +6 -5
- package/dist/services/JupService.d.ts.map +1 -1
- package/dist/services/JupService.js +16 -12
- package/dist/services/JupService.js.map +1 -1
- package/dist/services/RaydiumPoolsResponse.d.ts +2 -2
- package/dist/services/RaydiumPoolsResponse.d.ts.map +1 -1
- package/dist/services/RaydiumService.d.ts +2 -0
- package/dist/services/RaydiumService.d.ts.map +1 -1
- package/dist/services/RaydiumService.js +20 -23
- package/dist/services/RaydiumService.js.map +1 -1
- package/dist/utils/utils.d.ts +1 -0
- package/dist/utils/utils.d.ts.map +1 -1
- package/dist/utils/utils.js +6 -5
- package/dist/utils/utils.js.map +1 -1
- package/dist/whirlpools-client/shim/remove-liquidity.js +5 -5
- package/dist/whirlpools-client/shim/remove-liquidity.js.map +1 -1
- package/package.json +3 -3
- package/src/Kamino.ts +25 -14
- package/src/rebalance_methods/autodriftRebalance.ts +1 -1
- package/src/rebalance_methods/driftRebalance.ts +1 -1
- package/src/rebalance_methods/takeProfitRebalance.ts +1 -1
- package/src/services/JupService.ts +25 -12
- package/src/services/RaydiumPoolsResponse.ts +2 -2
- package/src/services/RaydiumService.ts +27 -26
- package/src/utils/utils.ts +3 -1
- package/src/whirlpools-client/shim/remove-liquidity.ts +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autodriftRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/autodriftRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,GAAG,EAAmB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"autodriftRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/autodriftRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,GAAG,EAAmB,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtD,eAAO,MAAM,6BAA6B,SAAiB,CAAC;AAC5D,eAAO,MAAM,uBAAuB,SAAkB,CAAC;AACvD,eAAO,MAAM,uBAAuB,SAAkB,CAAC;AACvD,eAAO,MAAM,+BAA+B,SAAsB,CAAC;AACnE,eAAO,MAAM,6BAA6B,SAAiB,CAAC;AAC5D,eAAO,MAAM,6BAA6B,SAAiB,CAAC;AAC5D,eAAO,MAAM,iBAAiB,SAAiB,CAAC;AAChD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AAEtD,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,OAAO,EACpB,sBAAsB,EAAE,OAAO,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,qBAAqB,EAAE,OAAO,EAC9B,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,qBAAqB,EAAE,OAAO,EAC9B,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CA4FtB;AAED,wBAAgB,mCAAmC,CACjD,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,MAAM,GAClB,aAAa,CAyCf;AAGD,wBAAgB,sCAAsC,CACpD,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,OAAO,EACd,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,kBAAkB,EAAE,CAkBtB;AAED,wBAAgB,wCAAwC,CAAC,YAAY,EAAE,YAAY,GAAG,mBAAmB,CAaxG;AAED,wBAAgB,0CAA0C,CAAC,YAAY,EAAE,YAAY,uBAsBpF;AAED,wBAAgB,uCAAuC,CACrD,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,YAAY,wBA6D3B;AAED,wBAAgB,8CAA8C,CAC5D,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAkBtB;AAED,wBAAgB,8CAA8C,CAC5D,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAkBtB"}
|
|
@@ -15,10 +15,10 @@ exports.deserializeAutodriftRebalanceWithStateOverride = deserializeAutodriftReb
|
|
|
15
15
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
16
16
|
const utils_1 = require("../utils");
|
|
17
17
|
const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
|
|
18
|
-
const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
|
|
19
18
|
const consts_1 = require("./consts");
|
|
20
19
|
const utils_2 = require("./utils");
|
|
21
20
|
const meteora_1 = require("../utils/meteora");
|
|
21
|
+
const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
|
|
22
22
|
exports.DEFAULT_DRIFT_TICKS_PER_EPOCH = new decimal_js_1.default(1);
|
|
23
23
|
exports.DEFAULT_TICKS_BELOW_MID = new decimal_js_1.default(10);
|
|
24
24
|
exports.DEFAULT_TICKS_ABOVE_MID = new decimal_js_1.default(10);
|
|
@@ -118,8 +118,8 @@ function getPositionRangeFromAutodriftParams(dex, tokenADecimals, tokenBDecimals
|
|
|
118
118
|
return { lowerPrice, upperPrice };
|
|
119
119
|
}
|
|
120
120
|
else if (dex == 'RAYDIUM') {
|
|
121
|
-
const lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
122
|
-
const upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
121
|
+
const lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
122
|
+
const upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
123
123
|
return { lowerPrice, upperPrice };
|
|
124
124
|
}
|
|
125
125
|
else if (dex == 'METEORA') {
|
|
@@ -183,8 +183,8 @@ function readAutodriftRebalanceStateFromStrategy(dex, tokenADecimals, tokenBDeci
|
|
|
183
183
|
upperPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
|
|
184
184
|
}
|
|
185
185
|
else if (dex == 'RAYDIUM') {
|
|
186
|
-
lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
187
|
-
upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
186
|
+
lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
187
|
+
upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
188
188
|
}
|
|
189
189
|
else if (dex == 'METEORA') {
|
|
190
190
|
lowerPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(lowerTickIndex.toNumber(), tickSpacing, tokenADecimals, tokenBDecimals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autodriftRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/autodriftRebalance.ts"],"names":[],"mappings":";;;;;;AAmBA,0EA0GC;AAED,kFAiDC;AAGD,wFAwBC;AAED,4FAaC;AAED,gGAsBC;AAED,0FAkEC;AAED,wGAwBC;AAED,wGAwBC;AA1WD,4DAAiC;AAEjC,oCAAgD;AAChD,0DAAiG;
|
|
1
|
+
{"version":3,"file":"autodriftRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/autodriftRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driftRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/driftRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"driftRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/driftRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtD,eAAO,MAAM,uBAAuB,SAAkB,CAAC;AACvD,eAAO,MAAM,uBAAuB,SAAkB,CAAC;AACvD,eAAO,MAAM,wBAAwB,SAAgC,CAAC;AACtE,eAAO,MAAM,iBAAiB,SAAiB,CAAC;AAChD,eAAO,MAAM,sBAAsB,UAAU,CAAC;AAE9C,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,OAAO,EAClB,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CAuEtB;AAED,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GACrB,aAAa,CAyCf;AAGD,wBAAgB,kCAAkC,CAChD,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,OAAO,EACd,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,kBAAkB,EAAE,CAetB;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,GAAG,mBAAmB,CAWpG;AAED,wBAAgB,sCAAsC,CAAC,YAAY,EAAE,YAAY,uBAShF;AAED,wBAAgB,mCAAmC,CACjD,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,wBA6D3B;AAED,wBAAgB,0CAA0C,CACxD,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CActB;AAED,wBAAgB,0CAA0C,CACxD,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAkBtB"}
|
|
@@ -14,10 +14,10 @@ exports.deserializeDriftRebalanceFromOnchainParams = deserializeDriftRebalanceFr
|
|
|
14
14
|
exports.deserializeDriftRebalanceWithStateOverride = deserializeDriftRebalanceWithStateOverride;
|
|
15
15
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
16
16
|
const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
|
|
17
|
-
const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
|
|
18
17
|
const consts_1 = require("./consts");
|
|
19
18
|
const utils_1 = require("./utils");
|
|
20
19
|
const meteora_1 = require("../utils/meteora");
|
|
20
|
+
const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
|
|
21
21
|
exports.DEFAULT_TICKS_BELOW_MID = new decimal_js_1.default(10);
|
|
22
22
|
exports.DEFAULT_TICKS_ABOVE_MID = new decimal_js_1.default(10);
|
|
23
23
|
exports.DEFAULT_SECONDS_PER_TICK = new decimal_js_1.default(60 * 60 * 24 * 3); // 3 days; todo: get a reasonable default from Matt
|
|
@@ -93,8 +93,8 @@ function getPositionRangeFromDriftParams(dex, tickSpacing, tokenADecimals, token
|
|
|
93
93
|
return { lowerPrice, upperPrice };
|
|
94
94
|
}
|
|
95
95
|
else if (dex == 'RAYDIUM') {
|
|
96
|
-
const lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
97
|
-
const upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
96
|
+
const lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
97
|
+
const upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
98
98
|
return { lowerPrice, upperPrice };
|
|
99
99
|
}
|
|
100
100
|
else if (dex == 'METEORA') {
|
|
@@ -144,8 +144,8 @@ function readDriftRebalanceStateFromStrategy(dex, tickSpacing, tokenADecimals, t
|
|
|
144
144
|
upperPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
|
|
145
145
|
}
|
|
146
146
|
else if (dex == 'RAYDIUM') {
|
|
147
|
-
lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
148
|
-
upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(
|
|
147
|
+
lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
148
|
+
upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals);
|
|
149
149
|
}
|
|
150
150
|
else if (dex == 'METEORA') {
|
|
151
151
|
lowerPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(lowerTickIndex.toNumber(), tickSpacing, tokenADecimals, tokenBDecimals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driftRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/driftRebalance.ts"],"names":[],"mappings":";;;;;;AAgBA,kEAkFC;AAED,0EAiDC;AAGD,gFAqBC;AAED,oFAWC;AAED,wFASC;AAED,kFAkEC;AAED,gGAoBC;AAED,gGAwBC;AAzTD,4DAAiC;AAGjC,0DAAiG;
|
|
1
|
+
{"version":3,"file":"driftRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/driftRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ const CreationParameters_1 = require("../utils/CreationParameters");
|
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
16
|
const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
|
|
17
17
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
|
-
const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
|
|
19
18
|
const meteora_1 = require("../utils/meteora");
|
|
19
|
+
const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
|
|
20
20
|
exports.DEFAULT_LOWER_RANGE_PRICE_DIFF_BPS = new decimal_js_1.default(500);
|
|
21
21
|
exports.DEFAULT_UPPER_RANGE_PRICE_DIFF_BPS = new decimal_js_1.default(500);
|
|
22
22
|
exports.DEFAULT_DESTINATION_TOKEN = new decimal_js_1.default(1);
|
|
@@ -81,8 +81,8 @@ function getDefaultTakeProfitRebalanceFieldsInfos(price) {
|
|
|
81
81
|
function readTakeProfitRebalanceParamsFromStrategy(tokenADecimals, tokenBDecimals, rebalanceRaw) {
|
|
82
82
|
const paramsBuffer = Buffer.from(rebalanceRaw.params);
|
|
83
83
|
const params = {};
|
|
84
|
-
params['lowerRangePrice'] =
|
|
85
|
-
params['upperRangePrice'] =
|
|
84
|
+
params['lowerRangePrice'] = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(new bn_js_1.default((0, utils_1.readBigUint128LE)(paramsBuffer, 0).toString()), tokenADecimals, tokenBDecimals);
|
|
85
|
+
params['upperRangePrice'] = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(new bn_js_1.default((0, utils_1.readBigUint128LE)(paramsBuffer, 16).toString()), tokenADecimals, tokenBDecimals);
|
|
86
86
|
params['destinationToken'] = new decimal_js_1.default(paramsBuffer.readUint8(32));
|
|
87
87
|
return params;
|
|
88
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"takeProfitRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":";;;;;;AAeA,8EAqCC;AAED,oFAsBC;AAED,4FAKC;AAED,8FAqBC;AAED,4FAOC;AAED,0GAYC;AAjID,4DAAiC;AAEjC,oEAA6D;AAC7D,oCAAiD;AACjD,0DAA6D;AAC7D,kDAAuB;AAEvB,
|
|
1
|
+
{"version":3,"file":"takeProfitRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":";;;;;;AAeA,8EAqCC;AAED,oFAsBC;AAED,4FAKC;AAED,8FAqBC;AAED,4FAOC;AAED,0GAYC;AAjID,4DAAiC;AAEjC,oEAA6D;AAC7D,oCAAiD;AACjD,0DAA6D;AAC7D,kDAAuB;AAEvB,8CAAwD;AACxD,wDAA+D;AAElD,QAAA,kCAAkC,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,CAAC;AACtD,QAAA,kCAAkC,GAAG,IAAI,oBAAO,CAAC,GAAG,CAAC,CAAC;AACtD,QAAA,yBAAyB,GAAG,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC;AAC3C,QAAA,2BAA2B,GAAG,YAAY,CAAC;AAExD,SAAgB,iCAAiC,CAC/C,eAAwB,EACxB,eAAwB,EACxB,gBAAyB,EACzB,UAAmB,IAAI;IAEvB,MAAM,aAAa,GAAuB;QACxC,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,mCAA2B;QAClC,OAAO;KACR,CAAC;IACF,MAAM,iCAAiC,GAAuB;QAC5D,KAAK,EAAE,iBAAiB;QACxB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,eAAe;QACtB,OAAO;KACR,CAAC;IACF,MAAM,iCAAiC,GAAuB;QAC5D,KAAK,EAAE,iBAAiB;QACxB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,eAAe;QACtB,OAAO;KACR,CAAC;IACF,MAAM,kCAAkC,GAAuB;QAC7D,KAAK,EAAE,kBAAkB;QACzB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,gBAAgB;QACvB,OAAO;KACR,CAAC;IAEF,OAAO;QACL,aAAa;QACb,iCAAiC;QACjC,iCAAiC;QACjC,kCAAkC;KACnC,CAAC;AACJ,CAAC;AAED,SAAgB,oCAAoC,CAClD,GAAQ,EACR,cAAsB,EACtB,cAAsB,EACtB,iBAA0B,EAC1B,iBAA0B;IAE1B,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,IAAI,eAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC7G,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,IAAI,eAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC7G,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;SAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,IAAI,eAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC7G,MAAM,UAAU,GAAG,IAAA,mCAAmB,EAAC,IAAI,eAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC7G,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;SAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAA,8BAAoB,EAAC,IAAI,oBAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QACnH,MAAM,UAAU,GAAG,IAAA,8BAAoB,EAAC,IAAI,oBAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QACnH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAgB,wCAAwC,CAAC,KAAc;IACrE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,mCAAc,CAAC,GAAG,CAAC,0CAAkC,CAAC,CAAC,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC;IACzG,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,mCAAc,CAAC,GAAG,CAAC,0CAAkC,CAAC,CAAC,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC;IAEzG,OAAO,iCAAiC,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC;AAED,SAAgB,yCAAyC,CACvD,cAAsB,EACtB,cAAsB,EACtB,YAA0B;IAE1B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,MAAM,CAAC,iBAAiB,CAAC,GAAG,mBAAa,CAAC,mBAAmB,CAC3D,IAAI,eAAE,CAAC,IAAA,wBAAgB,EAAC,YAAY,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EACpD,cAAc,EACd,cAAc,CACf,CAAC;IACF,MAAM,CAAC,iBAAiB,CAAC,GAAG,mBAAa,CAAC,mBAAmB,CAC3D,IAAI,eAAE,CAAC,IAAA,wBAAgB,EAAC,YAAY,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,EACrD,cAAc,EACd,cAAc,CACf,CAAC;IACF,MAAM,CAAC,kBAAkB,CAAC,GAAG,IAAI,oBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IAErE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,wCAAwC,CAAC,YAA0B;IACjF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,oBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,+CAA+C,CAC7D,cAAsB,EACtB,cAAsB,EACtB,YAA0B;IAE1B,MAAM,MAAM,GAAG,yCAAyC,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IAEvG,OAAO,iCAAiC,CACtC,MAAM,CAAC,iBAAiB,CAAC,EACzB,MAAM,CAAC,iBAAiB,CAAC,EACzB,MAAM,CAAC,kBAAkB,CAAC,CAC3B,CAAC;AACJ,CAAC"}
|
|
@@ -4,6 +4,7 @@ import Decimal from 'decimal.js';
|
|
|
4
4
|
import { DeserializedVersionedTransaction } from '../utils';
|
|
5
5
|
import { QuoteResponse, SwapInstructionsResponse, SwapResponse } from '@jup-ag/api';
|
|
6
6
|
import { PubkeyHashMap } from '../utils/pubkey';
|
|
7
|
+
export declare const DEFAULT_JUP_API_ENDPOINT = "https://api.jup.ag";
|
|
7
8
|
export type SwapTransactionsResponse = {
|
|
8
9
|
setupTransaction: string | undefined;
|
|
9
10
|
swapTransaction: string;
|
|
@@ -14,12 +15,12 @@ export declare class JupService {
|
|
|
14
15
|
private readonly _cluster;
|
|
15
16
|
constructor(connection: Connection, cluster: SolanaCluster);
|
|
16
17
|
static getBestRouteV6: (userPublicKey: PublicKey, amount: Decimal, inputMint: PublicKey, outputMint: PublicKey, slippageBps: number, asLegacyTransaction?: boolean, maxAccounts?: number, onlyDirectRoutes?: boolean) => Promise<SwapResponse>;
|
|
17
|
-
static getBestRouteQuoteV6: (amount: Decimal, inputMint: PublicKey, outputMint: PublicKey, slippageBps: number, asLegacyTransaction?: boolean, maxAccounts?: number, onlyDirectRoutes?: boolean) => Promise<QuoteResponse>;
|
|
18
|
+
static getBestRouteQuoteV6: (amount: Decimal, inputMint: PublicKey, outputMint: PublicKey, slippageBps: number, asLegacyTransaction?: boolean, maxAccounts?: number, onlyDirectRoutes?: boolean, jupEndpoint?: string) => Promise<QuoteResponse>;
|
|
18
19
|
static getSwapIxsFromQuote: (userPublicKey: PublicKey, quote: QuoteResponse, wrapUnwrapSOL?: boolean, asLegacyTransaction?: boolean) => Promise<SwapInstructionsResponse>;
|
|
19
|
-
static getPrice: (inputMint: PublicKey | string, outputMint: PublicKey | string) => Promise<number>;
|
|
20
|
-
static getPrices: (inputMints: (PublicKey | string)[], outputMint: PublicKey | string) => Promise<PubkeyHashMap<PublicKey, Decimal>>;
|
|
21
|
-
static getDollarPrices(inputMints: (PublicKey | string)[]): Promise<PubkeyHashMap<PublicKey, Decimal>>;
|
|
22
|
-
static getDollarPrice: (inputMint: PublicKey | string) => Promise<number>;
|
|
20
|
+
static getPrice: (inputMint: PublicKey | string, outputMint: PublicKey | string, jupEndpoint?: string) => Promise<number>;
|
|
21
|
+
static getPrices: (inputMints: (PublicKey | string)[], outputMint: PublicKey | string, jupEndpoint?: string) => Promise<PubkeyHashMap<PublicKey, Decimal>>;
|
|
22
|
+
static getDollarPrices(inputMints: (PublicKey | string)[], jupEndpoint?: string): Promise<PubkeyHashMap<PublicKey, Decimal>>;
|
|
23
|
+
static getDollarPrice: (inputMint: PublicKey | string, jupEndpoint?: string) => Promise<number>;
|
|
23
24
|
static buildTransactionsFromSerialized: (serializedTransactions: Array<string | undefined>) => Transaction[];
|
|
24
25
|
static deserealizeVersionedTransactions: (connection: Connection, serializedTransactions: Array<string | undefined>) => Promise<DeserializedVersionedTransaction>;
|
|
25
26
|
static getLookupTableAccount: (connection: Connection, address: string | PublicKey) => Promise<import("@solana/web3.js").AddressLookupTableAccount | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupService.d.ts","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAA4C,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,YAAY,EAA0B,MAAM,aAAa,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,MAAM,MAAM,wBAAwB,GAAG;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,CAAC;AAEF,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;gBAE7B,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa;IAM1D,MAAM,CAAC,cAAc,kBACJ,SAAS,UAChB,OAAO,aACJ,SAAS,cACR,SAAS,eACR,MAAM,wBACG,OAAO,gBACf,MAAM,qBACD,OAAO,KACzB,OAAO,CAAC,YAAY,CAAC,CA6BtB;IAEF,MAAM,CAAC,mBAAmB,WAChB,OAAO,aACJ,SAAS,cACR,SAAS,eACR,MAAM,wBACG,OAAO,gBACf,MAAM,qBACD,OAAO,
|
|
1
|
+
{"version":3,"file":"JupService.d.ts","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAA4C,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,YAAY,EAA0B,MAAM,aAAa,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,eAAO,MAAM,wBAAwB,uBAAuB,CAAC;AAE7D,MAAM,MAAM,wBAAwB,GAAG;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,CAAC;AAEF,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;gBAE7B,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa;IAM1D,MAAM,CAAC,cAAc,kBACJ,SAAS,UAChB,OAAO,aACJ,SAAS,cACR,SAAS,eACR,MAAM,wBACG,OAAO,gBACf,MAAM,qBACD,OAAO,KACzB,OAAO,CAAC,YAAY,CAAC,CA6BtB;IAEF,MAAM,CAAC,mBAAmB,WAChB,OAAO,aACJ,SAAS,cACR,SAAS,eACR,MAAM,wBACG,OAAO,gBACf,MAAM,qBACD,OAAO,gBACZ,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,CAmBvB;IAEF,MAAM,CAAC,mBAAmB,kBACT,SAAS,SACjB,aAAa,iDAEE,OAAO,KAC5B,OAAO,CAAC,wBAAwB,CAAC,CAgBlC;IAEF,MAAM,CAAC,QAAQ,cACF,SAAS,GAAG,MAAM,cACjB,SAAS,GAAG,MAAM,gBAChB,MAAM,KACnB,OAAO,CAAC,MAAM,CAAC,CAehB;IAEF,MAAM,CAAC,SAAS,eACF,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,cACtB,SAAS,GAAG,MAAM,gBAChB,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAyB3C;IAEF,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,EAClC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAI7C,MAAM,CAAC,cAAc,cAAqB,SAAS,GAAG,MAAM,gBAAgB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAElG;IAEF,MAAM,CAAC,+BAA+B,2BAA4B,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,KAAG,WAAW,EAAE,CAKzG;IAEF,MAAM,CAAC,gCAAgC,eACzB,UAAU,0BACE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,KAChD,OAAO,CAAC,gCAAgC,CAAC,CA6B1C;IAEF,MAAM,CAAC,qBAAqB,eAAsB,UAAU,WAAW,MAAM,GAAG,SAAS,yEAEvF;CACH"}
|
|
@@ -3,13 +3,14 @@ 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.JupService = void 0;
|
|
6
|
+
exports.JupService = exports.DEFAULT_JUP_API_ENDPOINT = void 0;
|
|
7
7
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
8
|
const axios_1 = __importDefault(require("axios"));
|
|
9
9
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
10
10
|
const api_1 = require("@jup-ag/api");
|
|
11
11
|
const pubkey_1 = require("../utils/pubkey");
|
|
12
12
|
const USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
|
|
13
|
+
exports.DEFAULT_JUP_API_ENDPOINT = 'https://api.jup.ag';
|
|
13
14
|
class JupService {
|
|
14
15
|
_connection;
|
|
15
16
|
_cluster;
|
|
@@ -37,9 +38,8 @@ class JupService {
|
|
|
37
38
|
throw error;
|
|
38
39
|
}
|
|
39
40
|
};
|
|
40
|
-
static getBestRouteQuoteV6 = async (amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes) => {
|
|
41
|
+
static getBestRouteQuoteV6 = async (amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes, jupEndpoint) => {
|
|
41
42
|
try {
|
|
42
|
-
const jupiterQuoteApi = (0, api_1.createJupiterApiClient)(); // config is optional
|
|
43
43
|
const params = {
|
|
44
44
|
inputMint: inputMint.toString(),
|
|
45
45
|
outputMint: outputMint.toString(),
|
|
@@ -49,7 +49,9 @@ class JupService {
|
|
|
49
49
|
asLegacyTransaction,
|
|
50
50
|
maxAccounts,
|
|
51
51
|
};
|
|
52
|
-
|
|
52
|
+
const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
|
|
53
|
+
const res = await axios_1.default.get(`${baseURL}/swap/v1/quote`, { params });
|
|
54
|
+
return res.data;
|
|
53
55
|
}
|
|
54
56
|
catch (error) {
|
|
55
57
|
console.log('getBestRouteQuoteV6 error', error);
|
|
@@ -73,7 +75,7 @@ class JupService {
|
|
|
73
75
|
throw error;
|
|
74
76
|
}
|
|
75
77
|
};
|
|
76
|
-
static getPrice = async (inputMint, outputMint) => {
|
|
78
|
+
static getPrice = async (inputMint, outputMint, jupEndpoint) => {
|
|
77
79
|
const params = {
|
|
78
80
|
ids: inputMint.toString(),
|
|
79
81
|
vsToken: outputMint.toString(),
|
|
@@ -83,10 +85,11 @@ class JupService {
|
|
|
83
85
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
84
86
|
params.vsAmount = 100;
|
|
85
87
|
}
|
|
86
|
-
const
|
|
88
|
+
const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
|
|
89
|
+
const res = await axios_1.default.get(`${baseURL}/price/v2`, { params });
|
|
87
90
|
return res.data.data[inputMint.toString()].price;
|
|
88
91
|
};
|
|
89
|
-
static getPrices = async (inputMints, outputMint) => {
|
|
92
|
+
static getPrices = async (inputMints, outputMint, jupEndpoint) => {
|
|
90
93
|
const mintsCommaSeparated = inputMints.map((mint) => mint.toString()).join(',');
|
|
91
94
|
const params = {
|
|
92
95
|
ids: mintsCommaSeparated,
|
|
@@ -97,7 +100,8 @@ class JupService {
|
|
|
97
100
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
98
101
|
params.vsAmount = 100;
|
|
99
102
|
}
|
|
100
|
-
const
|
|
103
|
+
const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
|
|
104
|
+
const res = await axios_1.default.get(`${baseURL}/price/v2`, { params });
|
|
101
105
|
const prices = new pubkey_1.PubkeyHashMap();
|
|
102
106
|
for (const mint of inputMints) {
|
|
103
107
|
try {
|
|
@@ -109,11 +113,11 @@ class JupService {
|
|
|
109
113
|
}
|
|
110
114
|
return prices;
|
|
111
115
|
};
|
|
112
|
-
static getDollarPrices(inputMints) {
|
|
113
|
-
return this.getPrices(inputMints, USDC_MINT);
|
|
116
|
+
static getDollarPrices(inputMints, jupEndpoint) {
|
|
117
|
+
return this.getPrices(inputMints, USDC_MINT, jupEndpoint);
|
|
114
118
|
}
|
|
115
|
-
static getDollarPrice = async (inputMint) => {
|
|
116
|
-
return this.getPrice(inputMint, USDC_MINT);
|
|
119
|
+
static getDollarPrice = async (inputMint, jupEndpoint) => {
|
|
120
|
+
return this.getPrice(inputMint, USDC_MINT, jupEndpoint);
|
|
117
121
|
};
|
|
118
122
|
static buildTransactionsFromSerialized = (serializedTransactions) => {
|
|
119
123
|
return serializedTransactions.filter(Boolean).map((tx) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupService.js","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA+G;AAE/G,kDAA0B;AAC1B,4DAAiC;AAEjC,qCAA4G;AAC5G,4CAAgD;AAEhD,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"JupService.js","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ClmmConfigInfo } from "@raydium-io/raydium-sdk-v2/lib";
|
|
2
2
|
export interface RaydiumPoolsResponse {
|
|
3
3
|
data: Pool[];
|
|
4
4
|
}
|
|
@@ -10,7 +10,7 @@ export interface Pool {
|
|
|
10
10
|
vaultB: string;
|
|
11
11
|
mintDecimalsA: number;
|
|
12
12
|
mintDecimalsB: number;
|
|
13
|
-
ammConfig:
|
|
13
|
+
ammConfig: ClmmConfigInfo;
|
|
14
14
|
tvl: number;
|
|
15
15
|
day: Day;
|
|
16
16
|
week: Week;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumPoolsResponse.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumPoolsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RaydiumPoolsResponse.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumPoolsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,IAAI,EAAE,CAAC;CACd;AAED,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,cAAc,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,UAAU,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,KAAK;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,UAAU,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -4,12 +4,14 @@ import Decimal from 'decimal.js';
|
|
|
4
4
|
import { WhirlpoolAprApy } from './WhirlpoolAprApy';
|
|
5
5
|
import { WhirlpoolStrategy } from '../kamino-client/accounts';
|
|
6
6
|
import { GenericPoolInfo, LiquidityDistribution } from '../utils';
|
|
7
|
+
import { ApiV3PoolInfoConcentratedItem } from '@raydium-io/raydium-sdk-v2/lib';
|
|
7
8
|
export declare class RaydiumService {
|
|
8
9
|
private readonly _connection;
|
|
9
10
|
private readonly _raydiumProgramId;
|
|
10
11
|
constructor(connection: Connection, raydiumProgramId?: PublicKey);
|
|
11
12
|
getRaydiumProgramId(): PublicKey;
|
|
12
13
|
getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse>;
|
|
14
|
+
getRaydiumPoolInfo(poolPubkey: PublicKey): Promise<ApiV3PoolInfoConcentratedItem>;
|
|
13
15
|
getRaydiumPoolLiquidityDistribution(pool: PublicKey, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
|
|
14
16
|
getStrategyWhirlpoolPoolAprApy: (strategy: WhirlpoolStrategy, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
|
|
15
17
|
getRaydiumPositionAprApy: (poolPubkey: PublicKey, priceLower: Decimal, priceUpper: Decimal, pools?: Pool[]) => Promise<WhirlpoolAprApy>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"RaydiumService.d.ts","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,IAAI,EACJ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,6BAA6B,EAQ9B,MAAM,gCAAgC,CAAC;AAExC,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAY;gBAElC,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAE,SAA8B;IAKpF,mBAAmB,IAAI,SAAS;IAI1B,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIrD,kBAAkB,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC;IASjF,mCAAmC,CACvC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAuDjC,8BAA8B,aAAoB,iBAAiB,UAAU,IAAI,EAAE,KAAG,OAAO,CAAC,eAAe,CAAC,CAsE5G;IAEF,wBAAwB,eACV,SAAS,cACT,OAAO,cACP,OAAO,UACX,IAAI,EAAE,KACb,OAAO,CAAC,eAAe,CAAC,CA+EzB;IAEI,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAmCnF,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAWhE"}
|
|
@@ -7,12 +7,12 @@ exports.RaydiumService = void 0;
|
|
|
7
7
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
8
|
const raydium_client_1 = require("../raydium_client");
|
|
9
9
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
10
|
-
const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
|
|
11
10
|
const utils_1 = require("../utils");
|
|
12
11
|
const axios_1 = __importDefault(require("axios"));
|
|
13
12
|
const CreationParameters_1 = require("../utils/CreationParameters");
|
|
14
13
|
const programId_1 = require("../raydium_client/programId");
|
|
15
14
|
const raydium_1 = require("../utils/raydium");
|
|
15
|
+
const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
|
|
16
16
|
class RaydiumService {
|
|
17
17
|
_connection;
|
|
18
18
|
_raydiumProgramId;
|
|
@@ -26,13 +26,21 @@ class RaydiumService {
|
|
|
26
26
|
async getRaydiumWhirlpools() {
|
|
27
27
|
return (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/ammPools`)).data;
|
|
28
28
|
}
|
|
29
|
+
async getRaydiumPoolInfo(poolPubkey) {
|
|
30
|
+
const raydiumLoadParams = { connection: this._connection };
|
|
31
|
+
const raydium = await lib_1.Raydium.load(raydiumLoadParams);
|
|
32
|
+
const rayClmm = new lib_1.Clmm({ scope: raydium, moduleName: '' });
|
|
33
|
+
const otherPoolInfo = await rayClmm.getPoolInfoFromRpc(poolPubkey.toString());
|
|
34
|
+
console.log('otherPoolInfo', otherPoolInfo);
|
|
35
|
+
return otherPoolInfo.poolInfo;
|
|
36
|
+
}
|
|
29
37
|
async getRaydiumPoolLiquidityDistribution(pool, keepOrder = true, lowestTick, highestTick) {
|
|
30
38
|
const raydiumLiqDistribution = (await axios_1.default.get(`https://api.kamino.finance/v2/raydium/positionLine/${pool.toString()}`)).data;
|
|
31
39
|
const poolState = await raydium_client_1.PoolState.fetch(this._connection, pool);
|
|
32
40
|
if (!poolState) {
|
|
33
41
|
throw Error(`Raydium pool state ${pool} does not exist`);
|
|
34
42
|
}
|
|
35
|
-
const poolPrice =
|
|
43
|
+
const poolPrice = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(poolState.sqrtPriceX64, poolState.mintDecimals0, poolState.mintDecimals1);
|
|
36
44
|
const liqDistribution = {
|
|
37
45
|
currentPrice: poolPrice,
|
|
38
46
|
currentTickIndex: poolState.tickCurrent,
|
|
@@ -82,13 +90,6 @@ class RaydiumService {
|
|
|
82
90
|
if (!raydiumPool) {
|
|
83
91
|
throw Error(`Could not get find Raydium amm pool ${strategy.pool} from Raydium API`);
|
|
84
92
|
}
|
|
85
|
-
const poolInfo = (await raydium_sdk_1.AmmV3.fetchMultiplePoolInfos({
|
|
86
|
-
connection: this._connection,
|
|
87
|
-
// @ts-ignore
|
|
88
|
-
poolKeys: [raydiumPool],
|
|
89
|
-
batchRequest: true,
|
|
90
|
-
chainTime: new Date().getTime() / 1000,
|
|
91
|
-
}))[strategy.pool.toString()].state;
|
|
92
93
|
const priceRange = (0, utils_1.getStrategyPriceRangeRaydium)(position.tickLowerIndex, position.tickUpperIndex, Number(poolState.tickCurrent.toString()), Number(strategy.tokenAMintDecimals.toString()), Number(strategy.tokenBMintDecimals.toString()));
|
|
93
94
|
if (priceRange.strategyOutOfRange) {
|
|
94
95
|
return {
|
|
@@ -101,13 +102,15 @@ class RaydiumService {
|
|
|
101
102
|
totalApr: utils_1.ZERO,
|
|
102
103
|
};
|
|
103
104
|
}
|
|
105
|
+
const raydiumPoolInfo = await this.getRaydiumPoolInfo(strategy.pool);
|
|
106
|
+
console.log('raydiumPoolInfo', raydiumPoolInfo);
|
|
104
107
|
const params = {
|
|
105
|
-
poolInfo,
|
|
108
|
+
poolInfo: raydiumPoolInfo,
|
|
106
109
|
aprType: 'day',
|
|
107
110
|
positionTickLowerIndex: position.tickLowerIndex,
|
|
108
111
|
positionTickUpperIndex: position.tickUpperIndex,
|
|
109
112
|
};
|
|
110
|
-
const { apr, feeApr, rewardsApr } =
|
|
113
|
+
const { apr, feeApr, rewardsApr } = lib_1.PoolUtils.estimateAprsForPriceRangeMultiplier(params);
|
|
111
114
|
const totalApr = new decimal_js_1.default(apr).div(100);
|
|
112
115
|
const fee = new decimal_js_1.default(feeApr).div(100);
|
|
113
116
|
const rewards = rewardsApr.map((reward) => new decimal_js_1.default(reward).div(100));
|
|
@@ -136,15 +139,8 @@ class RaydiumService {
|
|
|
136
139
|
if (!raydiumPool) {
|
|
137
140
|
throw Error(`Could not get find Raydium amm pool ${poolPubkey.toString()} from Raydium API`);
|
|
138
141
|
}
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
-
// @ts-ignore
|
|
142
|
-
poolKeys: [raydiumPool],
|
|
143
|
-
batchRequest: true,
|
|
144
|
-
chainTime: new Date().getTime() / 1000,
|
|
145
|
-
}))[poolPubkey.toString()].state;
|
|
146
|
-
const tickLowerIndex = raydium_sdk_1.TickMath.getTickWithPriceAndTickspacing(priceLower, poolState.tickSpacing, poolState.mintDecimals0, poolState.mintDecimals1);
|
|
147
|
-
const tickUpperIndex = raydium_sdk_1.TickMath.getTickWithPriceAndTickspacing(priceUpper, poolState.tickSpacing, poolState.mintDecimals0, poolState.mintDecimals1);
|
|
142
|
+
const tickLowerIndex = lib_1.TickMath.getTickWithPriceAndTickspacing(priceLower, poolState.tickSpacing, poolState.mintDecimals0, poolState.mintDecimals1);
|
|
143
|
+
const tickUpperIndex = lib_1.TickMath.getTickWithPriceAndTickspacing(priceUpper, poolState.tickSpacing, poolState.mintDecimals0, poolState.mintDecimals1);
|
|
148
144
|
const priceRange = (0, utils_1.getStrategyPriceRangeRaydium)(tickLowerIndex, tickUpperIndex, Number(poolState.tickCurrent.toString()), raydiumPool.mintDecimalsA, raydiumPool.mintDecimalsB);
|
|
149
145
|
if (priceRange.strategyOutOfRange) {
|
|
150
146
|
return {
|
|
@@ -157,13 +153,14 @@ class RaydiumService {
|
|
|
157
153
|
totalApr: utils_1.ZERO,
|
|
158
154
|
};
|
|
159
155
|
}
|
|
156
|
+
const poolInfo = await this.getRaydiumPoolInfo(poolPubkey);
|
|
160
157
|
const params = {
|
|
161
158
|
poolInfo,
|
|
162
159
|
aprType: 'day',
|
|
163
160
|
positionTickLowerIndex: tickLowerIndex,
|
|
164
161
|
positionTickUpperIndex: tickUpperIndex,
|
|
165
162
|
};
|
|
166
|
-
const { apr, feeApr, rewardsApr } =
|
|
163
|
+
const { apr, feeApr, rewardsApr } = lib_1.PoolUtils.estimateAprsForPriceRangeMultiplier(params);
|
|
167
164
|
const totalApr = new decimal_js_1.default(apr).div(100);
|
|
168
165
|
const fee = new decimal_js_1.default(feeApr).div(100);
|
|
169
166
|
const rewards = rewardsApr.map((reward) => new decimal_js_1.default(reward).div(100));
|
|
@@ -211,8 +208,8 @@ class RaydiumService {
|
|
|
211
208
|
const positions = await this._connection.getProgramAccounts(this._raydiumProgramId, {
|
|
212
209
|
commitment: 'confirmed',
|
|
213
210
|
filters: [
|
|
214
|
-
{ dataSize:
|
|
215
|
-
{ memcmp: { bytes: pool.toBase58(), offset:
|
|
211
|
+
{ dataSize: lib_1.PositionInfoLayout.span },
|
|
212
|
+
{ memcmp: { bytes: pool.toBase58(), offset: lib_1.PositionInfoLayout.offsetOf('poolId') } },
|
|
216
213
|
],
|
|
217
214
|
});
|
|
218
215
|
return positions.length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumService.js","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAwD;AAMxD,sDAAqE;AACrE,4DAAiC;
|
|
1
|
+
{"version":3,"file":"RaydiumService.js","sourceRoot":"","sources":["../../src/services/RaydiumService.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/utils.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import BN from 'bn.js';
|
|
|
7
7
|
export declare const DolarBasedMintingMethod: Decimal;
|
|
8
8
|
export declare const ProportionalMintingMethod: Decimal;
|
|
9
9
|
export declare const RebalanceParamOffset: Decimal;
|
|
10
|
+
export declare const ZERO_BN: BN;
|
|
10
11
|
export declare function sleep(ms: number): Promise<unknown>;
|
|
11
12
|
export declare const Dex: readonly ["ORCA", "RAYDIUM", "METEORA"];
|
|
12
13
|
export type Dex = (typeof Dex)[number];
|