@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.
Files changed (77) hide show
  1. package/dist/Kamino.d.ts +12 -12
  2. package/dist/Kamino.d.ts.map +1 -1
  3. package/dist/Kamino.js +101 -120
  4. package/dist/Kamino.js.map +1 -1
  5. package/dist/constants/numericalValues.d.ts +3 -0
  6. package/dist/constants/numericalValues.d.ts.map +1 -1
  7. package/dist/constants/numericalValues.js +4 -1
  8. package/dist/constants/numericalValues.js.map +1 -1
  9. package/dist/rebalance_methods/autodriftRebalance.d.ts.map +1 -1
  10. package/dist/rebalance_methods/autodriftRebalance.js +10 -10
  11. package/dist/rebalance_methods/autodriftRebalance.js.map +1 -1
  12. package/dist/rebalance_methods/driftRebalance.d.ts.map +1 -1
  13. package/dist/rebalance_methods/driftRebalance.js +10 -10
  14. package/dist/rebalance_methods/driftRebalance.js.map +1 -1
  15. package/dist/rebalance_methods/expanderRebalance.d.ts.map +1 -1
  16. package/dist/rebalance_methods/expanderRebalance.js +3 -4
  17. package/dist/rebalance_methods/expanderRebalance.js.map +1 -1
  18. package/dist/rebalance_methods/pricePercentageRebalance.d.ts.map +1 -1
  19. package/dist/rebalance_methods/pricePercentageRebalance.js +5 -6
  20. package/dist/rebalance_methods/pricePercentageRebalance.js.map +1 -1
  21. package/dist/rebalance_methods/pricePercentageWithResetRebalance.d.ts.map +1 -1
  22. package/dist/rebalance_methods/pricePercentageWithResetRebalance.js +5 -6
  23. package/dist/rebalance_methods/pricePercentageWithResetRebalance.js.map +1 -1
  24. package/dist/rebalance_methods/takeProfitRebalance.d.ts.map +1 -1
  25. package/dist/rebalance_methods/takeProfitRebalance.js +5 -5
  26. package/dist/rebalance_methods/takeProfitRebalance.js.map +1 -1
  27. package/dist/services/OrcaService.d.ts +7 -11
  28. package/dist/services/OrcaService.d.ts.map +1 -1
  29. package/dist/services/OrcaService.js +132 -100
  30. package/dist/services/OrcaService.js.map +1 -1
  31. package/dist/services/OrcaWhirlpoolsResponse.d.ts +63 -92
  32. package/dist/services/OrcaWhirlpoolsResponse.d.ts.map +1 -1
  33. package/dist/utils/farms.d.ts +1 -0
  34. package/dist/utils/farms.d.ts.map +1 -0
  35. package/dist/utils/farms.js +2 -0
  36. package/dist/utils/farms.js.map +1 -0
  37. package/dist/utils/index.d.ts +1 -0
  38. package/dist/utils/index.d.ts.map +1 -1
  39. package/dist/utils/index.js +1 -0
  40. package/dist/utils/index.js.map +1 -1
  41. package/dist/utils/orca.d.ts +37 -1
  42. package/dist/utils/orca.d.ts.map +1 -1
  43. package/dist/utils/orca.js +242 -0
  44. package/dist/utils/orca.js.map +1 -1
  45. package/dist/utils/tokenUtils.d.ts +5 -5
  46. package/dist/utils/tokenUtils.d.ts.map +1 -1
  47. package/dist/utils/tokenUtils.js +11 -7
  48. package/dist/utils/tokenUtils.js.map +1 -1
  49. package/dist/utils/types.d.ts +5 -0
  50. package/dist/utils/types.d.ts.map +1 -1
  51. package/dist/utils/types.js.map +1 -1
  52. package/dist/utils/utils.d.ts +0 -1
  53. package/dist/utils/utils.d.ts.map +1 -1
  54. package/dist/utils/utils.js +3 -4
  55. package/dist/utils/utils.js.map +1 -1
  56. package/dist/utils/whirlpools.d.ts +12 -1
  57. package/dist/utils/whirlpools.d.ts.map +1 -1
  58. package/dist/utils/whirlpools.js +30 -29
  59. package/dist/utils/whirlpools.js.map +1 -1
  60. package/package.json +4 -3
  61. package/src/Kamino.ts +252 -205
  62. package/src/constants/numericalValues.ts +5 -0
  63. package/src/rebalance_methods/autodriftRebalance.ts +30 -22
  64. package/src/rebalance_methods/driftRebalance.ts +30 -22
  65. package/src/rebalance_methods/expanderRebalance.ts +7 -4
  66. package/src/rebalance_methods/pricePercentageRebalance.ts +13 -6
  67. package/src/rebalance_methods/pricePercentageWithResetRebalance.ts +13 -6
  68. package/src/rebalance_methods/takeProfitRebalance.ts +13 -5
  69. package/src/services/OrcaService.ts +162 -125
  70. package/src/services/OrcaWhirlpoolsResponse.ts +69 -101
  71. package/src/utils/farms.ts +0 -0
  72. package/src/utils/index.ts +1 -0
  73. package/src/utils/orca.ts +377 -1
  74. package/src/utils/tokenUtils.ts +5 -5
  75. package/src/utils/types.ts +7 -0
  76. package/src/utils/utils.ts +2 -4
  77. package/src/utils/whirlpools.ts +50 -31
@@ -20,4 +20,5 @@ __exportStar(require("./utils"), exports);
20
20
  __exportStar(require("./math"), exports);
21
21
  __exportStar(require("./types"), exports);
22
22
  __exportStar(require("./orca"), exports);
23
+ __exportStar(require("./compat"), exports);
23
24
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB;AACvB,2CAAyB"}
@@ -1,4 +1,40 @@
1
- import { Address } from '@solana/kit';
1
+ import { BN } from '@coral-xyz/anchor';
2
+ import { Address, GetAccountInfoApi, GetMultipleAccountsApi, Rpc } from '@solana/kit';
2
3
  import { ProgramDerivedAddress } from '@solana/addresses/dist/types/program-derived-address';
4
+ import { Percentage } from './types';
5
+ import { IncreaseLiquidityQuoteParam } from '@orca-so/whirlpools';
6
+ import { Whirlpool } from '../@codegen/whirlpools/accounts';
7
+ import { IncreaseLiquidityQuote, TransferFee } from '@orca-so/whirlpools-core';
8
+ import { Whirlpool as WhirlpoolAPIResponse } from '../services/OrcaWhirlpoolsResponse';
9
+ import Decimal from 'decimal.js/decimal';
10
+ export declare const defaultSlippagePercentageBPS = 10;
3
11
  export declare function getTickArray(programId: Address, whirlpoolAddress: Address, startTick: number): Promise<ProgramDerivedAddress>;
12
+ export declare function getTokenAFromLiquidity(liquidity: BN, sqrtPrice0X64: BN, sqrtPrice1X64: BN, roundUp: boolean): BN;
13
+ export declare function getTokenBFromLiquidity(liquidity: BN, sqrtPrice0X64: BN, sqrtPrice1X64: BN, roundUp: boolean): BN;
14
+ export declare function getNearestValidTickIndexFromTickIndex(tickIndex: number, tickSpacing: number): number;
15
+ export declare function getIncreaseLiquidityQuote(param: IncreaseLiquidityQuoteParam, pool: Whirlpool, tickLowerIndex: number, tickUpperIndex: number, slippageToleranceBps: number, transferFeeA: TransferFee | undefined, transferFeeB: TransferFee | undefined): IncreaseLiquidityQuote;
16
+ export declare function adjustForSlippage(n: BN, { numerator, denominator }: Percentage, adjustUp: boolean): BN;
17
+ export type EstimatedAprs = {
18
+ fee: number;
19
+ rewards: number[];
20
+ };
21
+ export declare const ZERO_APR: {
22
+ fee: number;
23
+ rewards: number[];
24
+ };
25
+ export declare function estimateAprsForPriceRange(pool: WhirlpoolAPIResponse, tokenPrices: Map<Address, Decimal>, fees24h: number, tickLowerIndex: number, tickUpperIndex: number, rewardsDecimals: Map<Address, number>): EstimatedAprs;
26
+ export declare function getLowestInitializedTickArrayTickIndex(rpc: Rpc<GetAccountInfoApi>, whirlpoolAddress: Address, tickSpacing: number): Promise<number>;
27
+ export declare function getHighestInitializedTickArrayTickIndex(rpc: Rpc<GetAccountInfoApi>, whirlpoolAddress: Address, tickSpacing: number): Promise<number>;
28
+ export type LiquidityDataPoint = {
29
+ liquidity: Decimal;
30
+ price: Decimal;
31
+ tickIndex: number;
32
+ };
33
+ export type WhirlpoolLiquidityDistribution = {
34
+ currentPrice: Decimal;
35
+ currentTickIndex: number;
36
+ datapoints: LiquidityDataPoint[];
37
+ };
38
+ export declare function getLiquidityDistribution(rpc: Rpc<GetMultipleAccountsApi>, poolAddress: Address, poolData: WhirlpoolAPIResponse, tickLower: number, tickUpper: number, whirlpoolProgramId: Address): Promise<WhirlpoolLiquidityDistribution>;
39
+ export declare function getTickArrayPda(programId: Address, poolAddress: Address, startIndex: number): Promise<[Address, number]>;
4
40
  //# sourceMappingURL=orca.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA+C,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAI7F,wBAAsB,YAAY,CAChC,SAAS,EAAE,OAAO,EAClB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAKhC"}
1
+ {"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,254 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ZERO_APR = exports.defaultSlippagePercentageBPS = void 0;
3
7
  exports.getTickArray = getTickArray;
8
+ exports.getTokenAFromLiquidity = getTokenAFromLiquidity;
9
+ exports.getTokenBFromLiquidity = getTokenBFromLiquidity;
10
+ exports.getNearestValidTickIndexFromTickIndex = getNearestValidTickIndexFromTickIndex;
11
+ exports.getIncreaseLiquidityQuote = getIncreaseLiquidityQuote;
12
+ exports.adjustForSlippage = adjustForSlippage;
13
+ exports.estimateAprsForPriceRange = estimateAprsForPriceRange;
14
+ exports.getLowestInitializedTickArrayTickIndex = getLowestInitializedTickArrayTickIndex;
15
+ exports.getHighestInitializedTickArrayTickIndex = getHighestInitializedTickArrayTickIndex;
16
+ exports.getLiquidityDistribution = getLiquidityDistribution;
17
+ exports.getTickArrayPda = getTickArrayPda;
18
+ const anchor_1 = require("@coral-xyz/anchor");
4
19
  const kit_1 = require("@solana/kit");
20
+ const constants_1 = require("../constants");
21
+ const whirlpools_1 = require("@orca-so/whirlpools");
22
+ const accounts_1 = require("../@codegen/whirlpools/accounts");
23
+ const whirlpools_core_1 = require("@orca-so/whirlpools-core");
24
+ const whirlpools_core_2 = require("@orca-so/whirlpools-core");
25
+ const decimal_1 = __importDefault(require("decimal.js/decimal"));
26
+ const whirlpools_2 = require("./whirlpools");
27
+ const CreationParameters_1 = require("./CreationParameters");
28
+ const whirlpools_client_1 = require("@orca-so/whirlpools-client");
29
+ const utils_1 = require("./utils");
30
+ const math_1 = require("./math");
31
+ exports.defaultSlippagePercentageBPS = 10;
5
32
  const addressEncoder = (0, kit_1.getAddressEncoder)();
33
+ const TICK_ARRAY_SIZE = 88;
34
+ const SECONDS_PER_YEAR = 60 * // SECONDS
35
+ 60 * // MINUTES
36
+ 24 * // HOURS
37
+ 365; // DAYS
38
+ function estimateRewardApr(reward, rewardTokenDecimals, concentratedValue, tokenPrices) {
39
+ const { mint } = reward;
40
+ const rewardTokenPrice = tokenPrices.get((0, kit_1.address)(mint));
41
+ const emissionsPerSecond = new decimal_1.default(reward.emissionsPerSecond).div(new decimal_1.default(10).pow(rewardTokenDecimals));
42
+ if (emissionsPerSecond.eq(math_1.ZERO) || !rewardTokenPrice) {
43
+ return 0;
44
+ }
45
+ const res = emissionsPerSecond.mul(SECONDS_PER_YEAR).mul(rewardTokenPrice).div(concentratedValue).toNumber();
46
+ return res;
47
+ }
6
48
  async function getTickArray(programId, whirlpoolAddress, startTick) {
7
49
  return await (0, kit_1.getProgramDerivedAddress)({
8
50
  seeds: [Buffer.from('tick_array'), addressEncoder.encode(whirlpoolAddress), Buffer.from(startTick.toString())],
9
51
  programAddress: programId,
10
52
  });
11
53
  }
54
+ function getTokenAFromLiquidity(liquidity, sqrtPrice0X64, sqrtPrice1X64, roundUp) {
55
+ const [sqrtPriceLowerX64, sqrtPriceUpperX64] = orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64);
56
+ const numerator = liquidity.mul(sqrtPriceUpperX64.sub(sqrtPriceLowerX64)).shln(64);
57
+ const denominator = sqrtPriceUpperX64.mul(sqrtPriceLowerX64);
58
+ if (roundUp) {
59
+ return divRoundUp(numerator, denominator);
60
+ }
61
+ else {
62
+ return numerator.div(denominator);
63
+ }
64
+ }
65
+ function getTokenBFromLiquidity(liquidity, sqrtPrice0X64, sqrtPrice1X64, roundUp) {
66
+ const [sqrtPriceLowerX64, sqrtPriceUpperX64] = orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64);
67
+ const result = liquidity.mul(sqrtPriceUpperX64.sub(sqrtPriceLowerX64));
68
+ if (roundUp) {
69
+ return shiftRightRoundUp(result);
70
+ }
71
+ else {
72
+ return result.shrn(64);
73
+ }
74
+ }
75
+ function getNearestValidTickIndexFromTickIndex(tickIndex, tickSpacing) {
76
+ return tickIndex - (tickIndex % tickSpacing);
77
+ }
78
+ function getIncreaseLiquidityQuote(param, pool, tickLowerIndex, tickUpperIndex, slippageToleranceBps, transferFeeA, transferFeeB) {
79
+ if ('liquidity' in param) {
80
+ return (0, whirlpools_core_2.increaseLiquidityQuote)(param.liquidity, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
81
+ }
82
+ else if ('tokenA' in param) {
83
+ return (0, whirlpools_core_2.increaseLiquidityQuoteA)(param.tokenA, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
84
+ }
85
+ else {
86
+ return (0, whirlpools_core_2.increaseLiquidityQuoteB)(param.tokenB, slippageToleranceBps, BigInt(pool.sqrtPrice.toString()), tickLowerIndex, tickUpperIndex, transferFeeA, transferFeeB);
87
+ }
88
+ }
89
+ function orderSqrtPrice(sqrtPrice0X64, sqrtPrice1X64) {
90
+ if (sqrtPrice0X64.lt(sqrtPrice1X64)) {
91
+ return [sqrtPrice0X64, sqrtPrice1X64];
92
+ }
93
+ else {
94
+ return [sqrtPrice1X64, sqrtPrice0X64];
95
+ }
96
+ }
97
+ function shiftRightRoundUp(n) {
98
+ let result = n.shrn(64);
99
+ if (n.mod(new anchor_1.BN(constants_1.U64_MAX)).gt(constants_1.ZERO_BN)) {
100
+ result = result.add(constants_1.ONE_BN);
101
+ }
102
+ return result;
103
+ }
104
+ function divRoundUp(n0, n1) {
105
+ const hasRemainder = !n0.mod(n1).eq(constants_1.ZERO_BN);
106
+ if (hasRemainder) {
107
+ return n0.div(n1).add(constants_1.ONE_BN);
108
+ }
109
+ else {
110
+ return n0.div(n1);
111
+ }
112
+ }
113
+ function adjustForSlippage(n, { numerator, denominator }, adjustUp) {
114
+ if (adjustUp) {
115
+ return n.mul(denominator.add(numerator)).div(denominator);
116
+ }
117
+ else {
118
+ return n.mul(denominator).div(denominator.add(numerator));
119
+ }
120
+ }
121
+ exports.ZERO_APR = {
122
+ fee: 0,
123
+ rewards: [0, 0, 0],
124
+ };
125
+ function estimateAprsForPriceRange(pool, tokenPrices, fees24h, tickLowerIndex, tickUpperIndex, rewardsDecimals) {
126
+ const tokenPriceA = tokenPrices.get((0, kit_1.address)(pool.tokenMintA));
127
+ const tokenPriceB = tokenPrices.get((0, kit_1.address)(pool.tokenMintB));
128
+ if (!fees24h || !tokenPriceA || !tokenPriceB || tickLowerIndex >= tickUpperIndex) {
129
+ return exports.ZERO_APR;
130
+ }
131
+ // Value of liquidity if the entire liquidity were concentrated between tickLower/Upper
132
+ // Since this is virtual liquidity, concentratedValue should actually be less than totalValue
133
+ const { minTokenA, minTokenB } = (0, whirlpools_2.getRemoveLiquidityQuote)({
134
+ positionAddress: whirlpools_1.DEFAULT_ADDRESS,
135
+ tickCurrentIndex: pool.tickCurrentIndex,
136
+ sqrtPrice: new anchor_1.BN(pool.sqrtPrice.toString()),
137
+ tickLowerIndex,
138
+ tickUpperIndex,
139
+ liquidity: new anchor_1.BN(pool.liquidity.toString()),
140
+ slippageTolerance: { numerator: constants_1.ZERO_BN, denominator: new anchor_1.BN(CreationParameters_1.FullBPS) },
141
+ });
142
+ const tokenValueA = getTokenValue(minTokenA, pool.tokenA.decimals, tokenPriceA);
143
+ const tokenValueB = getTokenValue(minTokenB, pool.tokenB.decimals, tokenPriceB);
144
+ const concentratedValue = tokenValueA.add(tokenValueB);
145
+ const feesPerYear = new decimal_1.default(fees24h).mul(365).div(new decimal_1.default(10).pow(6)); // scale from lamports of USDC to tokens
146
+ const feeApr = feesPerYear.div(concentratedValue).toNumber();
147
+ const rewards = pool.rewards.map((reward) => {
148
+ if (rewardsDecimals.has((0, kit_1.address)(reward.mint))) {
149
+ return estimateRewardApr(reward, rewardsDecimals.get((0, kit_1.address)(reward.mint)), concentratedValue, tokenPrices);
150
+ }
151
+ else {
152
+ return 0;
153
+ }
154
+ });
155
+ return { fee: feeApr, rewards };
156
+ }
157
+ function getTokenValue(tokenAmount, decimals, tokenPrice) {
158
+ return tokenPrice.mul(new decimal_1.default(tokenAmount.toString()).div(new decimal_1.default(10).pow(decimals)));
159
+ }
160
+ async function getLowestInitializedTickArrayTickIndex(rpc, whirlpoolAddress, tickSpacing) {
161
+ const minTick = (0, whirlpools_core_1._MIN_TICK_INDEX)();
162
+ let startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(minTick, tickSpacing);
163
+ // eslint-disable-next-line
164
+ while (true) {
165
+ const [tickArrayAddress] = await (0, whirlpools_client_1.getTickArrayAddress)(whirlpoolAddress, startTickIndex);
166
+ const tickArray = await (0, whirlpools_client_1.fetchMaybeTickArray)(rpc, tickArrayAddress);
167
+ if (tickArray.exists) {
168
+ return startTickIndex;
169
+ }
170
+ startTickIndex += TICK_ARRAY_SIZE * tickSpacing;
171
+ await (0, utils_1.sleep)(500);
172
+ }
173
+ }
174
+ async function getHighestInitializedTickArrayTickIndex(rpc, whirlpoolAddress, tickSpacing) {
175
+ const maxTick = (0, whirlpools_core_1._MAX_TICK_INDEX)();
176
+ let startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(maxTick, tickSpacing);
177
+ // eslint-disable-next-line
178
+ while (true) {
179
+ const [tickArrayAddress] = await (0, whirlpools_client_1.getTickArrayAddress)(whirlpoolAddress, startTickIndex);
180
+ const tickArray = await (0, whirlpools_client_1.fetchMaybeTickArray)(rpc, tickArrayAddress);
181
+ if (tickArray.exists) {
182
+ return startTickIndex;
183
+ }
184
+ startTickIndex -= TICK_ARRAY_SIZE * tickSpacing;
185
+ await (0, utils_1.sleep)(500);
186
+ }
187
+ }
188
+ async function getLiquidityDistribution(rpc, poolAddress, poolData, tickLower, tickUpper, whirlpoolProgramId) {
189
+ const datapoints = [];
190
+ const tokenDecimalsA = poolData.tokenA.decimals;
191
+ const tokenDecimalsB = poolData.tokenB.decimals;
192
+ const tickArrayAddresses = await getSurroundingTickArrayAddresses(poolAddress, poolData, tickLower, tickUpper, whirlpoolProgramId);
193
+ const tickArrays = await accounts_1.TickArray.fetchMultiple(rpc, tickArrayAddresses, whirlpoolProgramId);
194
+ const currentLiquidity = new decimal_1.default(poolData.liquidity.toString());
195
+ let relativeLiquidity = currentLiquidity;
196
+ let minLiquidity = new decimal_1.default(0);
197
+ let liquidity = new decimal_1.default(0);
198
+ tickArrays.forEach((tickArray) => {
199
+ if (!tickArray) {
200
+ return;
201
+ }
202
+ const startIndex = tickArray.startTickIndex;
203
+ tickArray.ticks.forEach((tick, index) => {
204
+ const tickIndex = startIndex + index * poolData.tickSpacing;
205
+ const price = (0, whirlpools_core_1.tickIndexToPrice)(tickIndex, tokenDecimalsA, tokenDecimalsB);
206
+ const liquidityNet = new decimal_1.default(tick.liquidityNet.toString());
207
+ liquidity = liquidity.add(liquidityNet);
208
+ datapoints.push({ liquidity: new decimal_1.default(liquidity), price: new decimal_1.default(price), tickIndex });
209
+ minLiquidity = liquidity.lt(minLiquidity) ? liquidity : minLiquidity;
210
+ if (tickIndex === poolData.tickCurrentIndex) {
211
+ relativeLiquidity = relativeLiquidity.sub(liquidityNet);
212
+ }
213
+ });
214
+ });
215
+ if (!relativeLiquidity.eq(currentLiquidity)) {
216
+ minLiquidity = minLiquidity.add(relativeLiquidity);
217
+ datapoints.forEach((datapoint) => {
218
+ datapoint.liquidity = datapoint.liquidity.add(relativeLiquidity);
219
+ });
220
+ }
221
+ if (minLiquidity.lt(0)) {
222
+ datapoints.forEach((datapoint) => {
223
+ datapoint.liquidity = datapoint.liquidity.add(minLiquidity.neg());
224
+ });
225
+ }
226
+ return {
227
+ currentPrice: new decimal_1.default(poolData.price),
228
+ currentTickIndex: poolData.tickCurrentIndex,
229
+ datapoints,
230
+ };
231
+ }
232
+ async function getSurroundingTickArrayAddresses(poolAddress, pool, tickLower, tickUpper, programId) {
233
+ const tickArrayAddresses = [];
234
+ let startIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(tickLower, pool.tickSpacing);
235
+ while (startIndex <= tickUpper) {
236
+ const [address, _bump] = await getTickArrayPda(programId, poolAddress, startIndex);
237
+ tickArrayAddresses.push(address);
238
+ try {
239
+ startIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(startIndex, pool.tickSpacing);
240
+ }
241
+ catch (_e) {
242
+ return tickArrayAddresses;
243
+ }
244
+ }
245
+ return tickArrayAddresses;
246
+ }
247
+ async function getTickArrayPda(programId, poolAddress, startIndex) {
248
+ const pdaWithBump = await (0, kit_1.getProgramDerivedAddress)({
249
+ seeds: [Buffer.from('tick_array'), addressEncoder.encode(poolAddress), Buffer.from(startIndex.toString())],
250
+ programAddress: programId,
251
+ });
252
+ return [pdaWithBump[0], pdaWithBump[1]];
253
+ }
12
254
  //# sourceMappingURL=orca.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"orca.js","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":";;AAKA,oCASC;AAdD,qCAAmF;AAGnF,MAAM,cAAc,GAAG,IAAA,uBAAiB,GAAE,CAAC;AAEpC,KAAK,UAAU,YAAY,CAChC,SAAkB,EAClB,gBAAyB,EACzB,SAAiB;IAEjB,OAAO,MAAM,IAAA,8BAAwB,EAAC;QACpC,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,cAAc,EAAE,SAAS;KAC1B,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"orca.js","sourceRoot":"","sources":["../../src/utils/orca.ts"],"names":[],"mappings":";;;;;;AA4DA,oCASC;AAED,wDAUC;AAED,wDASC;AAED,sFAEC;AAED,8DAwCC;AA6BD,8CAMC;AAYD,8DA0CC;AAMD,wFAoBC;AAED,0FAoBC;AAaD,4DAkEC;AAyBD,0CAWC;AAtYD,8CAAuC;AACvC,qCAQqB;AAErB,4CAAwD;AAExD,oDAAmF;AACnF,8DAAuE;AACvE,8DAOkC;AAClC,8DAAoH;AAEpH,iEAAyC;AACzC,6CAAuD;AACvD,6DAA+C;AAC/C,kEAAsF;AACtF,mCAAgC;AAChC,iCAA8B;AAEjB,QAAA,4BAA4B,GAAG,EAAE,CAAC;AAC/C,MAAM,cAAc,GAAG,IAAA,uBAAiB,GAAE,CAAC;AAE3C,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,MAAM,gBAAgB,GACpB,EAAE,GAAG,UAAU;IACf,EAAE,GAAG,UAAU;IACf,EAAE,GAAG,QAAQ;IACb,GAAG,CAAC,CAAC,OAAO;AAEd,SAAS,iBAAiB,CACxB,MAAuB,EACvB,mBAA2B,EAC3B,iBAA0B,EAC1B,WAAkC;IAElC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAA,aAAO,EAAC,IAAI,CAAC,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,IAAI,iBAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAChH,IAAI,kBAAkB,CAAC,EAAE,CAAC,WAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7G,OAAO,GAAG,CAAC;AACb,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,SAAkB,EAClB,gBAAyB,EACzB,SAAiB;IAEjB,OAAO,MAAM,IAAA,8BAAwB,EAAC;QACpC,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,cAAc,EAAE,SAAS;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB,CAAC,SAAa,EAAE,aAAiB,EAAE,aAAiB,EAAE,OAAgB;IAC1G,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,cAAc,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAE5F,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnF,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7D,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,SAAa,EAAE,aAAiB,EAAE,aAAiB,EAAE,OAAgB;IAC1G,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,cAAc,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAE5F,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACvE,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAgB,qCAAqC,CAAC,SAAiB,EAAE,WAAmB;IAC1F,OAAO,SAAS,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,yBAAyB,CACvC,KAAkC,EAClC,IAAe,EACf,cAAsB,EACtB,cAAsB,EACtB,oBAA4B,EAC5B,YAAqC,EACrC,YAAqC;IAErC,IAAI,WAAW,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,IAAA,wCAAsB,EAC3B,KAAK,CAAC,SAAS,EACf,oBAAoB,EACpB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EACjC,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,CAAC;SAAM,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,OAAO,IAAA,yCAAuB,EAC5B,KAAK,CAAC,MAAM,EACZ,oBAAoB,EACpB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EACjC,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,IAAA,yCAAuB,EAC5B,KAAK,CAAC,MAAM,EACZ,oBAAoB,EACpB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EACjC,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,aAAiB,EAAE,aAAiB;IAC1D,IAAI,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAK;IAC9B,IAAI,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,WAAE,CAAC,mBAAO,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAO,CAAC,EAAE,CAAC;QACvC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAM,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,EAAM,EAAE,EAAM;IAChC,MAAM,YAAY,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,mBAAO,CAAC,CAAC;IAC7C,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAM,CAAC,CAAC;IAChC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,CAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAc,EAAE,QAAiB;IAChG,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAOY,QAAA,QAAQ,GAAG;IACtB,GAAG,EAAE,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CACnB,CAAC;AAEF,SAAgB,yBAAyB,CACvC,IAA0B,EAC1B,WAAkC,EAClC,OAAe,EACf,cAAsB,EACtB,cAAsB,EACtB,eAAqC;IAErC,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,IAAA,aAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,IAAA,aAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9D,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,IAAI,cAAc,IAAI,cAAc,EAAE,CAAC;QACjF,OAAO,gBAAQ,CAAC;IAClB,CAAC;IAED,uFAAuF;IACvF,6FAA6F;IAC7F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,oCAAuB,EAAC;QACvD,eAAe,EAAE,4BAAe;QAChC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,SAAS,EAAE,IAAI,WAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC5C,cAAc;QACd,cAAc;QACd,SAAS,EAAE,IAAI,WAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC5C,iBAAiB,EAAE,EAAE,SAAS,EAAE,mBAAO,EAAE,WAAW,EAAE,IAAI,WAAE,CAAC,4BAAO,CAAC,EAAE;KACxE,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,wCAAwC;IACvH,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE7D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1C,IAAI,eAAe,CAAC,GAAG,CAAC,IAAA,aAAO,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9C,OAAO,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,IAAA,aAAO,EAAC,MAAM,CAAC,IAAI,CAAC,CAAE,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;QAC/G,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,WAAe,EAAE,QAAgB,EAAE,UAAmB;IAC3E,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAChG,CAAC;AAEM,KAAK,UAAU,sCAAsC,CAC1D,GAA2B,EAC3B,gBAAyB,EACzB,WAAmB;IAEnB,MAAM,OAAO,GAAG,IAAA,iCAAe,GAAE,CAAC;IAClC,IAAI,cAAc,GAAG,IAAA,4CAA0B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAEtE,2BAA2B;IAC3B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,IAAA,uCAAmB,EAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACvF,MAAM,SAAS,GAAG,MAAM,IAAA,uCAAmB,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAEnE,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,cAAc,IAAI,eAAe,GAAG,WAAW,CAAC;QAChD,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,uCAAuC,CAC3D,GAA2B,EAC3B,gBAAyB,EACzB,WAAmB;IAEnB,MAAM,OAAO,GAAG,IAAA,iCAAe,GAAE,CAAC;IAClC,IAAI,cAAc,GAAG,IAAA,4CAA0B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAEtE,2BAA2B;IAC3B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,IAAA,uCAAmB,EAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACvF,MAAM,SAAS,GAAG,MAAM,IAAA,uCAAmB,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAEnE,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,cAAc,IAAI,eAAe,GAAG,WAAW,CAAC;QAChD,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAaM,KAAK,UAAU,wBAAwB,CAC5C,GAAgC,EAChC,WAAoB,EACpB,QAA8B,EAC9B,SAAiB,EACjB,SAAiB,EACjB,kBAA2B;IAE3B,MAAM,UAAU,GAAyB,EAAE,CAAC;IAE5C,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;IAChD,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEhD,MAAM,kBAAkB,GAAG,MAAM,gCAAgC,CAC/D,WAAW,EACX,QAAQ,EACR,SAAS,EACT,SAAS,EACT,kBAAkB,CACnB,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,oBAAS,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IAE9F,MAAM,gBAAgB,GAAG,IAAI,iBAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,IAAI,iBAAiB,GAAG,gBAAgB,CAAC;IACzC,IAAI,YAAY,GAAG,IAAI,iBAAO,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,SAAS,GAAG,IAAI,iBAAO,CAAC,CAAC,CAAC,CAAC;IAE/B,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,SAAS,CAAC,cAAc,CAAC;QAC5C,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACtC,MAAM,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC5D,MAAM,KAAK,GAAG,IAAA,kCAAgB,EAAC,SAAS,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;YAC1E,MAAM,YAAY,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/D,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACxC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,iBAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,iBAAO,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAE7F,YAAY,GAAG,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;YAErE,IAAI,SAAS,KAAK,QAAQ,CAAC,gBAAgB,EAAE,CAAC;gBAC5C,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC5C,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACnD,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC/B,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvB,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC/B,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,YAAY,EAAE,IAAI,iBAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;QACzC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,UAAU;KACX,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gCAAgC,CAC7C,WAAoB,EACpB,IAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,SAAkB;IAElB,MAAM,kBAAkB,GAAc,EAAE,CAAC;IAEzC,IAAI,UAAU,GAAG,IAAA,4CAA0B,EAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACzE,OAAO,UAAU,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QACnF,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjC,IAAI,CAAC;YACH,UAAU,GAAG,IAAA,4CAA0B,EAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,kBAAkB,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,SAAkB,EAClB,WAAoB,EACpB,UAAkB;IAElB,MAAM,WAAW,GAAG,MAAM,IAAA,8BAAwB,EAAC;QACjD,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1G,cAAc,EAAE,SAAS;KAC1B,CAAC,CAAC;IAEH,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC"}
@@ -7,12 +7,12 @@ export declare const SOL_MINTS: (Address<"So111111111111111111111111111111111111
7
7
  export declare const DECIMALS_SOL = 9;
8
8
  export declare function getAssociatedTokenAddressAndAccount(connection: Rpc<GetAccountInfoApi>, mint: Address, owner: Address, programId?: Address): Promise<[Address, Account<Token> | null]>;
9
9
  export declare function getAssociatedTokenAddress(mint: Address, owner: Address, programId?: Address, associatedTokenProgramId?: Address): Promise<Address>;
10
- export declare function createAssociatedTokenAccountInstruction(payer: TransactionSigner, associatedToken: Address, owner: Address, mint: Address, programId?: Address, associatedTokenProgramId?: Address): IInstruction;
10
+ export declare function createAssociatedTokenAccountInstruction(payer: TransactionSigner, associatedTokenAddress: Address, owner: Address, mint: Address, programId?: Address, associatedTokenProgramId?: Address): IInstruction;
11
11
  export declare function createComputeUnitLimitIx(units?: number): IInstruction;
12
12
  export declare function getStrategyPriceRangeOrca(tickLowerIndex: number, tickUpperIndex: number, strategy: WhirlpoolStrategy, poolPrice: Decimal): {
13
- priceLower: Decimal;
13
+ priceLower: number;
14
14
  poolPrice: Decimal;
15
- priceUpper: Decimal;
15
+ priceUpper: number;
16
16
  strategyOutOfRange: boolean;
17
17
  };
18
18
  export declare function getStrategyPriceRangeRaydium(tickLowerIndex: number, tickUpperIndex: number, tickCurrent: number, tokenADecimals: number, tokenBDecimals: number): {
@@ -32,8 +32,8 @@ export declare function getMeteoraPriceLowerUpper(tickLowerIndex: number, tickUp
32
32
  priceUpper: Decimal;
33
33
  };
34
34
  export declare function getPriceLowerUpper(tickLowerIndex: number, tickUpperIndex: number, tokenAMintDecimals: number, tokenBMintDecimals: number): {
35
- priceLower: Decimal;
36
- priceUpper: Decimal;
35
+ priceLower: number;
36
+ priceUpper: number;
37
37
  };
38
38
  export declare function getTokenNameFromCollateralInfo(collateralInfo: CollateralInfo): string;
39
39
  export declare const isSOLMint: (mint: Address) => boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"tokenUtils.d.ts","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAW,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAML,KAAK,EACN,MAAM,4BAA4B,CAAC;AAIpC,eAAO,MAAM,SAAS,qHAGrB,CAAC;AACF,eAAO,MAAM,YAAY,IAAI,CAAC;AAE9B,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAClC,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,GACzC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAI3C;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,iBAAiB,EACxB,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,YAAY,CAYd;AAED,wBAAgB,wBAAwB,CAAC,KAAK,GAAE,MAAe,GAAG,YAAY,CAE7E;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,EAAE,OAAO;;;;;EAUnB;AAED,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM;;;;;EAMvB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;;;;;EAKlB;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,MAAM;;;EAKhB;AAED,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM;;;EAa3B;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,cAAc,UAE5E;AAED,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,OAEzC,CAAC;AAEF,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CASjG"}
1
+ {"version":3,"file":"tokenUtils.d.ts","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAW,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAML,KAAK,EACN,MAAM,4BAA4B,CAAC;AAKpC,eAAO,MAAM,SAAS,qHAGrB,CAAC;AACF,eAAO,MAAM,YAAY,IAAI,CAAC;AAE9B,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAClC,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,GACzC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAI3C;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,iBAAiB,EACxB,sBAAsB,EAAE,OAAO,EAC/B,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAA+B,EAC1C,wBAAwB,GAAE,OAA0C,GACnE,YAAY,CAYd;AAED,wBAAgB,wBAAwB,CAAC,KAAK,GAAE,MAAe,GAAG,YAAY,CAE7E;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,EAAE,OAAO;;;;;EAUnB;AAED,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM;;;;;EAMvB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;;;;;EAKlB;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,MAAM;;;EAKhB;AAED,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM;;;EAa3B;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,cAAc,UAE5E;AAED,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,OAEzC,CAAC;AAEF,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CASjG"}
@@ -1,4 +1,7 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.isSOLMint = exports.DECIMALS_SOL = exports.SOL_MINTS = void 0;
4
7
  exports.getAssociatedTokenAddressAndAccount = getAssociatedTokenAddressAndAccount;
@@ -13,12 +16,13 @@ exports.getPriceLowerUpper = getPriceLowerUpper;
13
16
  exports.getTokenNameFromCollateralInfo = getTokenNameFromCollateralInfo;
14
17
  exports.getMintDecimals = getMintDecimals;
15
18
  const kit_1 = require("@solana/kit");
16
- const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
19
+ const decimal_js_1 = __importDefault(require("decimal.js"));
17
20
  const meteora_1 = require("./meteora");
18
21
  const token_1 = require("@solana-program/token");
19
22
  const token_2022_1 = require("@solana-program/token-2022");
20
23
  const system_1 = require("@solana-program/system");
21
24
  const compute_budget_1 = require("@solana-program/compute-budget");
25
+ const whirlpools_core_1 = require("@orca-so/whirlpools-core");
22
26
  exports.SOL_MINTS = [
23
27
  (0, kit_1.address)('So11111111111111111111111111111111111111111'),
24
28
  (0, kit_1.address)('So11111111111111111111111111111111111111112'),
@@ -37,11 +41,11 @@ async function getAssociatedTokenAddress(mint, owner, programId = token_1.TOKEN_
37
41
  }, { programAddress: associatedTokenProgramId });
38
42
  return ata;
39
43
  }
40
- function createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, programId = token_1.TOKEN_PROGRAM_ADDRESS, associatedTokenProgramId = token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS) {
44
+ function createAssociatedTokenAccountInstruction(payer, associatedTokenAddress, owner, mint, programId = token_1.TOKEN_PROGRAM_ADDRESS, associatedTokenProgramId = token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS) {
41
45
  return (0, token_2022_1.getCreateAssociatedTokenInstruction)({
42
46
  mint,
43
47
  owner,
44
- ata: associatedToken,
48
+ ata: associatedTokenAddress,
45
49
  payer: payer,
46
50
  tokenProgram: programId,
47
51
  systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
@@ -57,9 +61,9 @@ function getStrategyPriceRangeOrca(tickLowerIndex, tickUpperIndex, strategy, poo
57
61
  }
58
62
  function getStrategyPriceRangeRaydium(tickLowerIndex, tickUpperIndex, tickCurrent, tokenADecimals, tokenBDecimals) {
59
63
  const { priceLower, priceUpper } = getPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenADecimals, tokenBDecimals);
60
- const poolPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(tickCurrent, tokenADecimals, tokenBDecimals);
64
+ const poolPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(tickCurrent, tokenADecimals, tokenBDecimals));
61
65
  const strategyOutOfRange = poolPrice.lt(priceLower) || poolPrice.gt(priceUpper);
62
- return { priceLower, poolPrice, priceUpper, strategyOutOfRange };
66
+ return { priceLower: new decimal_js_1.default(priceLower), poolPrice, priceUpper: new decimal_js_1.default(priceUpper), strategyOutOfRange };
63
67
  }
64
68
  function getStrategyPriceRangeMeteora(priceLower, priceUpper, activeBinId, binStep, decimalsA, decimalsB) {
65
69
  const poolPrice = (0, meteora_1.getPriceOfBinByBinIdWithDecimals)(activeBinId, binStep, decimalsA, decimalsB);
@@ -72,8 +76,8 @@ function getMeteoraPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenAMintDec
72
76
  return { priceLower, priceUpper };
73
77
  }
74
78
  function getPriceLowerUpper(tickLowerIndex, tickUpperIndex, tokenAMintDecimals, tokenBMintDecimals) {
75
- const priceLower = (0, whirlpool_sdk_1.tickIndexToPrice)(tickLowerIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
76
- const priceUpper = (0, whirlpool_sdk_1.tickIndexToPrice)(tickUpperIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
79
+ const priceLower = (0, whirlpools_core_1.tickIndexToPrice)(tickLowerIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
80
+ const priceUpper = (0, whirlpools_core_1.tickIndexToPrice)(tickUpperIndex, Number(tokenAMintDecimals.toString()), Number(tokenBMintDecimals.toString()));
77
81
  return { priceLower, priceUpper };
78
82
  }
79
83
  function getTokenNameFromCollateralInfo(collateralInfo) {
@@ -1 +1 @@
1
- {"version":3,"file":"tokenUtils.js","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokenUtils.js","sourceRoot":"","sources":["../../src/utils/tokenUtils.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { BN } from '@coral-xyz/anchor';
1
2
  import { Address, IInstruction, TransactionMessage, TransactionSigner } from '@solana/kit';
2
3
  import { WhirlpoolStrategy } from '../@codegen/kliquidity/accounts';
3
4
  import { Dex } from './utils';
@@ -176,4 +177,8 @@ export interface InitPoolTickIfNeeded {
176
177
  tick: Address;
177
178
  initTickIx: IInstruction | undefined;
178
179
  }
180
+ export type Percentage = {
181
+ numerator: BN;
182
+ denominator: BN;
183
+ };
179
184
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,6 @@ import BN from 'bn.js';
6
6
  export declare const DollarBasedMintingMethod: Decimal;
7
7
  export declare const ProportionalMintingMethod: Decimal;
8
8
  export declare const RebalanceParamOffset: Decimal;
9
- export declare const ZERO_BN: BN;
10
9
  export declare function sleep(ms: number): Promise<unknown>;
11
10
  export declare const Dex: readonly ["ORCA", "RAYDIUM", "METEORA"];
12
11
  export type Dex = (typeof Dex)[number];
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ 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.ReferencePriceType = exports.Dex = exports.ZERO_BN = exports.RebalanceParamOffset = exports.ProportionalMintingMethod = exports.DollarBasedMintingMethod = void 0;
6
+ exports.ReferencePriceType = exports.Dex = exports.RebalanceParamOffset = exports.ProportionalMintingMethod = exports.DollarBasedMintingMethod = void 0;
7
7
  exports.sleep = sleep;
8
8
  exports.dexToNumber = dexToNumber;
9
9
  exports.numberToDex = numberToDex;
@@ -31,15 +31,14 @@ const types_1 = require("../@codegen/kliquidity/types");
31
31
  const instructions_1 = require("../@codegen/kliquidity/instructions");
32
32
  const bn_js_1 = __importDefault(require("bn.js"));
33
33
  const priceReferenceTypes_1 = require("./priceReferenceTypes");
34
- const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
35
34
  const numericalValues_1 = require("../constants/numericalValues");
36
35
  const math_1 = require("@raydium-io/raydium-sdk-v2/lib/raydium/clmm/utils/math");
37
36
  const pubkeys_1 = require("../constants/pubkeys");
38
37
  const system_1 = require("@solana-program/system");
38
+ const whirlpools_core_1 = require("@orca-so/whirlpools-core");
39
39
  exports.DollarBasedMintingMethod = new decimal_js_1.default(0);
40
40
  exports.ProportionalMintingMethod = new decimal_js_1.default(1);
41
41
  exports.RebalanceParamOffset = new decimal_js_1.default(256);
42
- exports.ZERO_BN = new bn_js_1.default(0);
43
42
  function sleep(ms) {
44
43
  return new Promise((resolve) => setTimeout(resolve, ms));
45
44
  }
@@ -259,7 +258,7 @@ function isVaultInitialized(vault, decimals) {
259
258
  function sqrtPriceToPrice(sqrtPrice, dexNo, decimalsA, decimalsB) {
260
259
  const dex = numberToDex(dexNo);
261
260
  if (dex == 'ORCA') {
262
- return (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(sqrtPrice, decimalsA, decimalsB);
261
+ return new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(sqrtPrice.toString()), decimalsA, decimalsB));
263
262
  }
264
263
  if (dex == 'RAYDIUM') {
265
264
  return math_1.SqrtPriceMath.sqrtPriceX64ToPrice(sqrtPrice, decimalsA, decimalsB);