@kamino-finance/kliquidity-sdk 8.3.1 → 8.3.2
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 +12 -12
- package/dist/Kamino.d.ts.map +1 -1
- package/dist/Kamino.js +101 -120
- package/dist/Kamino.js.map +1 -1
- package/dist/constants/numericalValues.d.ts +3 -0
- package/dist/constants/numericalValues.d.ts.map +1 -1
- package/dist/constants/numericalValues.js +4 -1
- package/dist/constants/numericalValues.js.map +1 -1
- package/dist/rebalance_methods/autodriftRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/autodriftRebalance.js +10 -10
- 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 +10 -10
- package/dist/rebalance_methods/driftRebalance.js.map +1 -1
- package/dist/rebalance_methods/expanderRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/expanderRebalance.js +3 -4
- package/dist/rebalance_methods/expanderRebalance.js.map +1 -1
- package/dist/rebalance_methods/pricePercentageRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/pricePercentageRebalance.js +5 -6
- package/dist/rebalance_methods/pricePercentageRebalance.js.map +1 -1
- package/dist/rebalance_methods/pricePercentageWithResetRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/pricePercentageWithResetRebalance.js +5 -6
- package/dist/rebalance_methods/pricePercentageWithResetRebalance.js.map +1 -1
- package/dist/rebalance_methods/takeProfitRebalance.d.ts.map +1 -1
- package/dist/rebalance_methods/takeProfitRebalance.js +5 -5
- package/dist/rebalance_methods/takeProfitRebalance.js.map +1 -1
- package/dist/services/OrcaService.d.ts +7 -11
- package/dist/services/OrcaService.d.ts.map +1 -1
- package/dist/services/OrcaService.js +132 -100
- package/dist/services/OrcaService.js.map +1 -1
- package/dist/services/OrcaWhirlpoolsResponse.d.ts +63 -92
- package/dist/services/OrcaWhirlpoolsResponse.d.ts.map +1 -1
- package/dist/utils/farms.d.ts +1 -0
- package/dist/utils/farms.d.ts.map +1 -0
- package/dist/utils/farms.js +2 -0
- package/dist/utils/farms.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/orca.d.ts +37 -1
- package/dist/utils/orca.d.ts.map +1 -1
- package/dist/utils/orca.js +242 -0
- package/dist/utils/orca.js.map +1 -1
- package/dist/utils/tokenUtils.d.ts +5 -5
- package/dist/utils/tokenUtils.d.ts.map +1 -1
- package/dist/utils/tokenUtils.js +11 -7
- package/dist/utils/tokenUtils.js.map +1 -1
- package/dist/utils/types.d.ts +5 -0
- package/dist/utils/types.d.ts.map +1 -1
- package/dist/utils/types.js.map +1 -1
- package/dist/utils/utils.d.ts +0 -1
- package/dist/utils/utils.d.ts.map +1 -1
- package/dist/utils/utils.js +3 -4
- package/dist/utils/utils.js.map +1 -1
- package/dist/utils/whirlpools.d.ts +12 -1
- package/dist/utils/whirlpools.d.ts.map +1 -1
- package/dist/utils/whirlpools.js +30 -29
- package/dist/utils/whirlpools.js.map +1 -1
- package/package.json +4 -3
- package/src/Kamino.ts +252 -205
- package/src/constants/numericalValues.ts +5 -0
- package/src/rebalance_methods/autodriftRebalance.ts +30 -22
- package/src/rebalance_methods/driftRebalance.ts +30 -22
- package/src/rebalance_methods/expanderRebalance.ts +7 -4
- package/src/rebalance_methods/pricePercentageRebalance.ts +13 -6
- package/src/rebalance_methods/pricePercentageWithResetRebalance.ts +13 -6
- package/src/rebalance_methods/takeProfitRebalance.ts +13 -5
- package/src/services/OrcaService.ts +162 -125
- package/src/services/OrcaWhirlpoolsResponse.ts +69 -101
- package/src/utils/farms.ts +0 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/orca.ts +377 -1
- package/src/utils/tokenUtils.ts +5 -5
- package/src/utils/types.ts +7 -0
- package/src/utils/utils.ts +2 -4
- package/src/utils/whirlpools.ts +50 -31
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numericalValues.d.ts","sourceRoot":"","sources":["../../src/constants/numericalValues.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"numericalValues.d.ts","sourceRoot":"","sources":["../../src/constants/numericalValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAEvC,eAAO,MAAM,OAAO,yBAAyB,CAAC;AAE9C,eAAO,MAAM,OAAO,IAAY,CAAC;AACjC,eAAO,MAAM,MAAM,IAAY,CAAC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.U64_MAX = void 0;
|
|
3
|
+
exports.ONE_BN = exports.ZERO_BN = exports.U64_MAX = void 0;
|
|
4
|
+
const anchor_1 = require("@coral-xyz/anchor");
|
|
4
5
|
exports.U64_MAX = '18446744073709551615';
|
|
6
|
+
exports.ZERO_BN = new anchor_1.BN(0);
|
|
7
|
+
exports.ONE_BN = new anchor_1.BN(1);
|
|
5
8
|
//# sourceMappingURL=numericalValues.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numericalValues.js","sourceRoot":"","sources":["../../src/constants/numericalValues.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"numericalValues.js","sourceRoot":"","sources":["../../src/constants/numericalValues.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AAE1B,QAAA,OAAO,GAAG,sBAAsB,CAAC;AAEjC,QAAA,OAAO,GAAG,IAAI,WAAE,CAAC,CAAC,CAAC,CAAC;AACpB,QAAA,MAAM,GAAG,IAAI,WAAE,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -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;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,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,
|
|
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,8BAA8B,CAAC;AAM5D,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,CA6Cf;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,wBAiE3B;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"}
|
|
@@ -14,7 +14,7 @@ exports.deserializeAutodriftRebalanceFromOnchainParams = deserializeAutodriftReb
|
|
|
14
14
|
exports.deserializeAutodriftRebalanceWithStateOverride = deserializeAutodriftRebalanceWithStateOverride;
|
|
15
15
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
16
16
|
const utils_1 = require("../utils");
|
|
17
|
-
const
|
|
17
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
18
18
|
const consts_1 = require("./consts");
|
|
19
19
|
const utils_2 = require("./utils");
|
|
20
20
|
const meteora_1 = require("../utils/meteora");
|
|
@@ -113,13 +113,13 @@ function getPositionRangeFromAutodriftParams(dex, tokenADecimals, tokenBDecimals
|
|
|
113
113
|
const lowerTickIndex = startMidTick.sub(ticksBelowMid);
|
|
114
114
|
const upperTickIndex = startMidTick.add(ticksAboveMid);
|
|
115
115
|
if (dex == 'ORCA') {
|
|
116
|
-
const lowerPrice = (0,
|
|
117
|
-
const upperPrice = (0,
|
|
116
|
+
const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
117
|
+
const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
118
118
|
return { lowerPrice, upperPrice };
|
|
119
119
|
}
|
|
120
120
|
else if (dex == 'RAYDIUM') {
|
|
121
|
-
const lowerPrice =
|
|
122
|
-
const upperPrice =
|
|
121
|
+
const lowerPrice = new decimal_js_1.default(lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals));
|
|
122
|
+
const upperPrice = new decimal_js_1.default(lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals));
|
|
123
123
|
return { lowerPrice, upperPrice };
|
|
124
124
|
}
|
|
125
125
|
else if (dex == 'METEORA') {
|
|
@@ -133,7 +133,7 @@ function getPositionRangeFromAutodriftParams(dex, tokenADecimals, tokenBDecimals
|
|
|
133
133
|
}
|
|
134
134
|
// todo(silviu): get sensible default params from Matt
|
|
135
135
|
function getDefaultAutodriftRebalanceFieldInfos(dex, price, tokenADecimals, tokenBDecimals, tickSpacing) {
|
|
136
|
-
const currentTickIndex = (0,
|
|
136
|
+
const currentTickIndex = (0, whirlpools_core_1.priceToTickIndex)(price.toNumber(), tokenADecimals, tokenBDecimals);
|
|
137
137
|
const startMidTick = new decimal_js_1.default(currentTickIndex);
|
|
138
138
|
return getAutodriftRebalanceFieldInfos(dex, tokenADecimals, tokenBDecimals, tickSpacing, startMidTick, exports.DEFAULT_DRIFT_TICKS_PER_EPOCH, exports.DEFAULT_TICKS_BELOW_MID, exports.DEFAULT_TICKS_ABOVE_MID, exports.DEFAULT_FRONTRUN_MULTIPLIER_BPS, exports.DEFAULT_STAKING_RATE_SOURCE_A, exports.DEFAULT_STAKING_RATE_SOURCE_B, exports.DEFAULT_DIRECTION);
|
|
139
139
|
}
|
|
@@ -179,12 +179,12 @@ function readAutodriftRebalanceStateFromStrategy(dex, tokenADecimals, tokenBDeci
|
|
|
179
179
|
const upperTickIndex = lastMidTick.add(ticksAboveMid);
|
|
180
180
|
let lowerPrice, upperPrice;
|
|
181
181
|
if (dex == 'ORCA') {
|
|
182
|
-
lowerPrice = (0,
|
|
183
|
-
upperPrice = (0,
|
|
182
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
183
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
184
184
|
}
|
|
185
185
|
else if (dex == 'RAYDIUM') {
|
|
186
|
-
lowerPrice = (0,
|
|
187
|
-
upperPrice = (0,
|
|
186
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()).toString()), tokenADecimals, tokenBDecimals));
|
|
187
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()).toString()), 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,
|
|
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;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,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,
|
|
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,8BAA8B,CAAC;AAM5D,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,CA6Cf;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,wBAiE3B;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"}
|
|
@@ -13,7 +13,7 @@ exports.readDriftRebalanceStateFromStrategy = readDriftRebalanceStateFromStrateg
|
|
|
13
13
|
exports.deserializeDriftRebalanceFromOnchainParams = deserializeDriftRebalanceFromOnchainParams;
|
|
14
14
|
exports.deserializeDriftRebalanceWithStateOverride = deserializeDriftRebalanceWithStateOverride;
|
|
15
15
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
16
|
-
const
|
|
16
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
17
17
|
const consts_1 = require("./consts");
|
|
18
18
|
const utils_1 = require("./utils");
|
|
19
19
|
const meteora_1 = require("../utils/meteora");
|
|
@@ -88,13 +88,13 @@ function getPositionRangeFromDriftParams(dex, tickSpacing, tokenADecimals, token
|
|
|
88
88
|
const lowerTickIndex = startMidTick.sub(ticksBelowMid);
|
|
89
89
|
const upperTickIndex = startMidTick.add(ticksAboveMid);
|
|
90
90
|
if (dex == 'ORCA') {
|
|
91
|
-
const lowerPrice = (0,
|
|
92
|
-
const upperPrice = (0,
|
|
91
|
+
const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
92
|
+
const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
93
93
|
return { lowerPrice, upperPrice };
|
|
94
94
|
}
|
|
95
95
|
else if (dex == 'RAYDIUM') {
|
|
96
|
-
const lowerPrice =
|
|
97
|
-
const upperPrice =
|
|
96
|
+
const lowerPrice = new decimal_js_1.default(lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()), tokenADecimals, tokenBDecimals));
|
|
97
|
+
const upperPrice = new decimal_js_1.default(lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()), tokenADecimals, tokenBDecimals));
|
|
98
98
|
return { lowerPrice, upperPrice };
|
|
99
99
|
}
|
|
100
100
|
else if (dex == 'METEORA') {
|
|
@@ -108,7 +108,7 @@ function getPositionRangeFromDriftParams(dex, tickSpacing, tokenADecimals, token
|
|
|
108
108
|
}
|
|
109
109
|
// todo(silviu): get sensible default params from Matt
|
|
110
110
|
function getDefaultDriftRebalanceFieldInfos(dex, tickSpacing, price, tokenADecimals, tokenBDecimals) {
|
|
111
|
-
const currentTickIndex = (0,
|
|
111
|
+
const currentTickIndex = (0, whirlpools_core_1.priceToTickIndex)(price.toNumber(), tokenADecimals, tokenBDecimals);
|
|
112
112
|
const startMidTick = new decimal_js_1.default(currentTickIndex);
|
|
113
113
|
return getDriftRebalanceFieldInfos(dex, tickSpacing, tokenADecimals, tokenBDecimals, startMidTick, exports.DEFAULT_TICKS_BELOW_MID, exports.DEFAULT_TICKS_ABOVE_MID, exports.DEFAULT_SECONDS_PER_TICK, exports.DEFAULT_DIRECTION);
|
|
114
114
|
}
|
|
@@ -140,12 +140,12 @@ function readDriftRebalanceStateFromStrategy(dex, tickSpacing, tokenADecimals, t
|
|
|
140
140
|
const upperTickIndex = lastMidTick.add(ticksAboveMid);
|
|
141
141
|
let lowerPrice, upperPrice;
|
|
142
142
|
if (dex == 'ORCA') {
|
|
143
|
-
lowerPrice = (0,
|
|
144
|
-
upperPrice = (0,
|
|
143
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
144
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
|
|
145
145
|
}
|
|
146
146
|
else if (dex == 'RAYDIUM') {
|
|
147
|
-
lowerPrice = (0,
|
|
148
|
-
upperPrice = (0,
|
|
147
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()).toString()), tokenADecimals, tokenBDecimals));
|
|
148
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()).toString()), 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,
|
|
1
|
+
{"version":3,"file":"driftRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/driftRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expanderRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/expanderRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"expanderRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/expanderRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;AAMjD,eAAO,MAAM,4BAA4B,SAAkB,CAAC;AAC5D,eAAO,MAAM,uBAAuB,SAAmB,CAAC;AACxD,eAAO,MAAM,wBAAwB,SAAiB,CAAC;AACvD,eAAO,MAAM,yBAAyB,aAAa,CAAC;AAEpD,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,uBAAuB,EAAE,OAAO,EAChC,uBAAuB,EAAE,OAAO,EAChC,YAAY,EAAE,OAAO,EACrB,qBAAqB,EAAE,OAAO,EAC9B,iBAAiB,EAAE,OAAO,EAC1B,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CAkGtB;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,uBAAuB,EAAE,OAAO,GAC/B,aAAa,CAEf;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,uBAAuB,EAAE,OAAO,EAChC,4BAA4B,EAAE,OAAO,EACrC,4BAA4B,EAAE,OAAO,GACpC,aAAa,CAQf;AAED,wBAAgB,qCAAqC,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,EAAE,CAW1F;AAED,wBAAgB,0CAA0C,CAAC,YAAY,EAAE,YAAY,uBAapF;AAED,wBAAgB,uCAAuC,CAAC,YAAY,EAAE,YAAY,GAAG,kBAAkB,EAAE,CA+DxG;AAED,wBAAgB,yCAAyC,CAAC,YAAY,EAAE,YAAY,uBAQnF;AAED,wBAAgB,sCAAsC,CACpD,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CA8EtB;AAED,wBAAgB,2CAA2C,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,wBAqBrG;AAED,wBAAgB,6CAA6C,CAC3D,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAMtB"}
|
|
@@ -18,8 +18,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
|
18
18
|
const CreationParameters_1 = require("../utils/CreationParameters");
|
|
19
19
|
const consts_1 = require("./consts");
|
|
20
20
|
const utils_1 = require("../utils");
|
|
21
|
-
const
|
|
22
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
21
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
23
22
|
const utils_2 = require("./utils");
|
|
24
23
|
const math_utils_1 = require("./math_utils");
|
|
25
24
|
const meteora_1 = require("../utils/meteora");
|
|
@@ -218,10 +217,10 @@ function readExpanderRebalanceStateFromStrategy(dex, tokenADecimals, tokenBDecim
|
|
|
218
217
|
const expansionCount = state['expansionCount'];
|
|
219
218
|
let initialPrice;
|
|
220
219
|
if (dex == 'ORCA') {
|
|
221
|
-
initialPrice = (0,
|
|
220
|
+
initialPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(initialPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
222
221
|
}
|
|
223
222
|
else if (dex == 'RAYDIUM') {
|
|
224
|
-
initialPrice = (0,
|
|
223
|
+
initialPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(initialPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
225
224
|
}
|
|
226
225
|
else if (dex == 'METEORA') {
|
|
227
226
|
initialPrice = (0, meteora_1.getPriceFromQ64Price)(new decimal_js_1.default(initialPriceX64.toString()), tokenADecimals, tokenBDecimals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expanderRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/expanderRebalance.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"expanderRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/expanderRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricePercentageRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"pricePercentageRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;AAMjD,eAAO,MAAM,gCAAgC,oBAAoB,CAAC;AAElE,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,OAAO,EAClB,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CA6CtB;AAED,wBAAgB,6CAA6C,CAC3D,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,aAAa,CAEf;AAED,wBAAgB,4CAA4C,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,EAAE,CAOjG;AAED,wBAAgB,8CAA8C,CAAC,YAAY,EAAE,YAAY,GAAG,kBAAkB,EAAE,CAiB/G;AAED,wBAAgB,gDAAgD,CAAC,YAAY,EAAE,YAAY,GAAG,kBAAkB,EAAE,CAgBjH;AAED,wBAAgB,6CAA6C,CAC3D,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAyCtB;AAED,wBAAgB,oDAAoD,CAClE,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAMtB;AAED,wBAAgB,oDAAoD,CAClE,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,YAAY,wBAO3B"}
|
|
@@ -17,8 +17,7 @@ const CreationParameters_1 = require("../utils/CreationParameters");
|
|
|
17
17
|
const consts_1 = require("./consts");
|
|
18
18
|
const utils_1 = require("../utils");
|
|
19
19
|
const utils_2 = require("./utils");
|
|
20
|
-
const
|
|
21
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
20
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
22
21
|
const math_utils_1 = require("./math_utils");
|
|
23
22
|
const meteora_1 = require("../utils/meteora");
|
|
24
23
|
exports.PricePercentageRebalanceTypeName = 'pricePercentage';
|
|
@@ -107,12 +106,12 @@ function readPricePercentageRebalanceStateFromStrategy(dex, tokenADecimals, toke
|
|
|
107
106
|
const upperSqrtPriceX64 = (0, utils_1.readBigUint128LE)(stateBuffer, 16).toString();
|
|
108
107
|
let lowerPrice, upperPrice;
|
|
109
108
|
if (dex == 'ORCA') {
|
|
110
|
-
lowerPrice = (0,
|
|
111
|
-
upperPrice = (0,
|
|
109
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
110
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
112
111
|
}
|
|
113
112
|
else if (dex == 'RAYDIUM') {
|
|
114
|
-
lowerPrice = (0,
|
|
115
|
-
upperPrice = (0,
|
|
113
|
+
lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
114
|
+
upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
116
115
|
}
|
|
117
116
|
else if (dex == 'METEORA') {
|
|
118
117
|
lowerPrice = (0, meteora_1.getPriceFromQ64Price)(new decimal_js_1.default(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricePercentageRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageRebalance.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"pricePercentageRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricePercentageWithResetRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageWithResetRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"pricePercentageWithResetRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageWithResetRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;AAMjD,eAAO,MAAM,yCAAyC,6BAA6B,CAAC;AAEpF,wBAAgB,8CAA8C,CAC5D,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,uBAAuB,EAAE,OAAO,EAChC,uBAAuB,EAAE,OAAO,EAChC,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CAkFtB;AAED,wBAAgB,kDAAkD,CAChE,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,aAAa,CAEf;AAED,wBAAgB,uDAAuD,CACrE,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,uBAAuB,EAAE,OAAO,EAChC,uBAAuB,EAAE,OAAO,GAC/B,aAAa,CAQf;AAED,wBAAgB,qDAAqD,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,EAAE,CAS1G;AAED,wBAAgB,uDAAuD,CACrE,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAkCtB;AAED,wBAAgB,yDAAyD,CACvE,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAgBtB;AAED,wBAAgB,sDAAsD,CACpE,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAsFtB;AAED,wBAAgB,6DAA6D,CAC3E,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAmBtB;AAED,wBAAgB,6DAA6D,CAC3E,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAWtB"}
|
|
@@ -17,8 +17,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
|
17
17
|
const CreationParameters_1 = require("../utils/CreationParameters");
|
|
18
18
|
const consts_1 = require("./consts");
|
|
19
19
|
const utils_1 = require("../utils");
|
|
20
|
-
const
|
|
21
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
20
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
22
21
|
const utils_2 = require("./utils");
|
|
23
22
|
const math_utils_1 = require("./math_utils");
|
|
24
23
|
const meteora_1 = require("../utils/meteora");
|
|
@@ -162,12 +161,12 @@ function readPricePercentageWithResetRebalanceStateFromStrategy(dex, tokenADecim
|
|
|
162
161
|
const upperResetSqrtPriceX64 = (0, utils_1.readBigUint128LE)(stateBuffer, 16).toString();
|
|
163
162
|
let lowerResetPrice, upperResetPrice;
|
|
164
163
|
if (dex == 'ORCA') {
|
|
165
|
-
lowerResetPrice = (0,
|
|
166
|
-
upperResetPrice = (0,
|
|
164
|
+
lowerResetPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
165
|
+
upperResetPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
167
166
|
}
|
|
168
167
|
else if (dex == 'RAYDIUM') {
|
|
169
|
-
lowerResetPrice = (0,
|
|
170
|
-
upperResetPrice = (0,
|
|
168
|
+
lowerResetPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
169
|
+
upperResetPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
171
170
|
}
|
|
172
171
|
else if (dex == 'METEORA') {
|
|
173
172
|
lowerResetPrice = (0, meteora_1.getPriceFromQ64Price)(new decimal_js_1.default(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricePercentageWithResetRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageWithResetRebalance.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"pricePercentageWithResetRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/pricePercentageWithResetRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"takeProfitRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExF,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI5D,eAAO,MAAM,kCAAkC,SAAmB,CAAC;AACnE,eAAO,MAAM,kCAAkC,SAAmB,CAAC;AACnE,eAAO,MAAM,yBAAyB,SAAiB,CAAC;AACxD,eAAO,MAAM,2BAA2B,eAAe,CAAC;AAExD,wBAAgB,iCAAiC,CAC/C,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,EACxB,gBAAgB,EAAE,OAAO,EACzB,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CAgCtB;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,OAAO,EAC1B,iBAAiB,EAAE,OAAO,GACzB,aAAa,
|
|
1
|
+
{"version":3,"file":"takeProfitRebalance.d.ts","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExF,OAAO,EAAE,GAAG,EAAoB,MAAM,UAAU,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI5D,eAAO,MAAM,kCAAkC,SAAmB,CAAC;AACnE,eAAO,MAAM,kCAAkC,SAAmB,CAAC;AACnE,eAAO,MAAM,yBAAyB,SAAiB,CAAC;AACxD,eAAO,MAAM,2BAA2B,eAAe,CAAC;AAExD,wBAAgB,iCAAiC,CAC/C,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,EACxB,gBAAgB,EAAE,OAAO,EACzB,OAAO,GAAE,OAAc,GACtB,kBAAkB,EAAE,CAgCtB;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,OAAO,EAC1B,iBAAiB,EAAE,OAAO,GACzB,aAAa,CAwBf;AAED,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,EAAE,CAK7F;AAED,wBAAgB,yCAAyC,CACvD,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,uBAkB3B;AAED,wBAAgB,wCAAwC,CAAC,YAAY,EAAE,YAAY,uBAOlF;AAED,wBAAgB,+CAA+C,CAC7D,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,GACzB,kBAAkB,EAAE,CAQtB"}
|
|
@@ -13,7 +13,7 @@ exports.deserializeTakeProfitRebalanceFromOnchainParams = deserializeTakeProfitR
|
|
|
13
13
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
14
14
|
const CreationParameters_1 = require("../utils/CreationParameters");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
|
-
const
|
|
16
|
+
const whirlpools_core_1 = require("@orca-so/whirlpools-core");
|
|
17
17
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
18
|
const meteora_1 = require("../utils/meteora");
|
|
19
19
|
const lib_1 = require("@raydium-io/raydium-sdk-v2/lib");
|
|
@@ -55,13 +55,13 @@ function getTakeProfitRebalanceFieldsInfos(lowerRangePrice, upperRangePrice, des
|
|
|
55
55
|
}
|
|
56
56
|
function getPositionRangeFromTakeProfitParams(dex, tokenADecimals, tokenBDecimals, lowerSqrtPriceX64, upperSqrtPriceX64) {
|
|
57
57
|
if (dex == 'ORCA') {
|
|
58
|
-
const lowerPrice = (0,
|
|
59
|
-
const upperPrice = (0,
|
|
58
|
+
const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
59
|
+
const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
60
60
|
return { lowerPrice, upperPrice };
|
|
61
61
|
}
|
|
62
62
|
else if (dex == 'RAYDIUM') {
|
|
63
|
-
const lowerPrice = (0,
|
|
64
|
-
const upperPrice = (0,
|
|
63
|
+
const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
64
|
+
const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals));
|
|
65
65
|
return { lowerPrice, upperPrice };
|
|
66
66
|
}
|
|
67
67
|
else if (dex == 'METEORA') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"takeProfitRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":";;;;;;AAeA,8EAqCC;AAED,
|
|
1
|
+
{"version":3,"file":"takeProfitRebalance.js","sourceRoot":"","sources":["../../src/rebalance_methods/takeProfitRebalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { Address, Rpc, SolanaRpcApi } from '@solana/kit';
|
|
2
2
|
import Decimal from 'decimal.js';
|
|
3
|
-
import {
|
|
4
|
-
import { OrcaWhirlpoolsResponse, Whirlpool } from './OrcaWhirlpoolsResponse';
|
|
5
|
-
import { SolanaCluster } from '@hubbleprotocol/hubble-config';
|
|
3
|
+
import { Whirlpool as WhirlpoolAPIResponse } from './OrcaWhirlpoolsResponse';
|
|
6
4
|
import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
|
|
7
5
|
import { WhirlpoolAprApy } from './WhirlpoolAprApy';
|
|
8
6
|
import { GenericPoolInfo, LiquidityDistribution } from '../utils';
|
|
@@ -11,13 +9,12 @@ import { KaminoPrices } from '../models';
|
|
|
11
9
|
import { Connection } from '@solana/web3.js';
|
|
12
10
|
export declare class OrcaService {
|
|
13
11
|
private readonly _rpc;
|
|
14
|
-
private readonly _legacyConnection;
|
|
15
12
|
private readonly _whirlpoolProgramId;
|
|
16
|
-
private readonly _orcaNetwork;
|
|
17
13
|
private readonly _orcaApiUrl;
|
|
18
|
-
constructor(rpc: Rpc<SolanaRpcApi>, legacyConnection: Connection,
|
|
14
|
+
constructor(rpc: Rpc<SolanaRpcApi>, legacyConnection: Connection, whirlpoolProgramId?: Address);
|
|
19
15
|
getWhirlpoolProgramId(): Address;
|
|
20
|
-
getOrcaWhirlpools(): Promise<
|
|
16
|
+
getOrcaWhirlpools(tokens?: Address[]): Promise<WhirlpoolAPIResponse[]>;
|
|
17
|
+
getOrcaWhirlpool(poolAddress: Address): Promise<WhirlpoolAPIResponse>;
|
|
21
18
|
/**
|
|
22
19
|
* Get token prices for a strategy - for use with orca sdk
|
|
23
20
|
* @param strategy
|
|
@@ -28,11 +25,10 @@ export declare class OrcaService {
|
|
|
28
25
|
*/
|
|
29
26
|
private getTokenPrices;
|
|
30
27
|
private getPoolTokensPrices;
|
|
31
|
-
|
|
32
|
-
getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices, whirlpools?: Whirlpool[]): Promise<WhirlpoolAprApy>;
|
|
28
|
+
getStrategyWhirlpoolPoolAprApy(strategy: WhirlpoolStrategy, collateralInfos: CollateralInfo[], prices: KaminoPrices): Promise<WhirlpoolAprApy>;
|
|
33
29
|
getWhirlpoolLiquidityDistribution(pool: Address, keepOrder?: boolean, lowestTick?: number, highestTick?: number): Promise<LiquidityDistribution>;
|
|
34
|
-
getWhirlpoolPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices,
|
|
35
|
-
getGenericPoolInfo(poolPubkey: Address
|
|
30
|
+
getWhirlpoolPositionAprApy(poolPubkey: Address, priceLower: Decimal, priceUpper: Decimal, prices: KaminoPrices, rewardsDecimals: Map<Address, number>): Promise<WhirlpoolAprApy>;
|
|
31
|
+
getGenericPoolInfo(poolPubkey: Address): Promise<GenericPoolInfo>;
|
|
36
32
|
getPositionsCountByPool(pool: Address): Promise<number>;
|
|
37
33
|
}
|
|
38
34
|
//# sourceMappingURL=OrcaService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAA0B,SAAS,IAAI,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAGL,eAAe,EAMf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGnC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EACtB,gBAAgB,EAAE,UAAU,EAC5B,kBAAkB,GAAE,OAA+B;IAOrD,qBAAqB,IAAI,OAAO;IAK1B,iBAAiB,CAAC,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqD1E,gBAAgB,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAW3E;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,eAAe,CAAC;IA6ErB,iCAAiC,CACrC,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAoD3B,0BAA0B,CAC9B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,eAAe,CAAC;IAiErB,kBAAkB,CAAC,UAAU,EAAE,OAAO;IAsBtC,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAc9D"}
|