@kamino-finance/kliquidity-sdk 6.0.0 → 6.2.0
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.
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { BN } from "@coral-xyz/anchor";
|
|
2
2
|
import { u64 } from "@solana/spl-token";
|
|
3
3
|
import { PublicKey } from "@solana/web3.js";
|
|
4
|
-
import { Percentage } from
|
|
5
|
-
import { RemoveLiquidityQuote } from "@orca-so/whirlpool-sdk";
|
|
4
|
+
import { Percentage, RemoveLiquidityQuote } from '@orca-so/whirlpool-sdk';
|
|
6
5
|
export type InternalRemoveLiquidityQuoteParam = {
|
|
7
6
|
positionAddress: PublicKey;
|
|
8
7
|
tickCurrentIndex: number;
|
|
@@ -6,8 +6,8 @@ exports.getRemoveLiquidityQuote = getRemoveLiquidityQuote;
|
|
|
6
6
|
* Added roundUp flag to accurately estimate token holdings for deposits
|
|
7
7
|
*/
|
|
8
8
|
const whirlpool_client_sdk_1 = require("@orca-so/whirlpool-client-sdk");
|
|
9
|
-
const sdk_1 = require("@orca-so/sdk");
|
|
10
9
|
const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
|
|
10
|
+
const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
|
|
11
11
|
function getRemoveLiquidityQuote(param, roundUp = false) {
|
|
12
12
|
const positionStatus = whirlpool_sdk_1.PositionUtil.getPositionStatus(param.tickCurrentIndex, param.tickLowerIndex, param.tickUpperIndex);
|
|
13
13
|
switch (positionStatus) {
|
|
@@ -30,9 +30,9 @@ function getRemoveLiquidityQuoteWhenPositionIsBelowRange(param, roundUp = false)
|
|
|
30
30
|
return {
|
|
31
31
|
positionAddress,
|
|
32
32
|
minTokenA,
|
|
33
|
-
minTokenB:
|
|
33
|
+
minTokenB: raydium_sdk_1.ZERO,
|
|
34
34
|
estTokenA,
|
|
35
|
-
estTokenB:
|
|
35
|
+
estTokenB: raydium_sdk_1.ZERO,
|
|
36
36
|
liquidity,
|
|
37
37
|
};
|
|
38
38
|
}
|
|
@@ -62,9 +62,9 @@ function getRemoveLiquidityQuoteWhenPositionIsAboveRange(param, roundUp = false)
|
|
|
62
62
|
const minTokenB = (0, whirlpool_sdk_1.adjustForSlippage)(estTokenB, slippageTolerance, roundUp);
|
|
63
63
|
return {
|
|
64
64
|
positionAddress,
|
|
65
|
-
minTokenA:
|
|
65
|
+
minTokenA: raydium_sdk_1.ZERO,
|
|
66
66
|
minTokenB,
|
|
67
|
-
estTokenA:
|
|
67
|
+
estTokenA: raydium_sdk_1.ZERO,
|
|
68
68
|
estTokenB,
|
|
69
69
|
liquidity,
|
|
70
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-liquidity.js","sourceRoot":"","sources":["../../../src/whirlpools-client/shim/remove-liquidity.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"remove-liquidity.js","sourceRoot":"","sources":["../../../src/whirlpools-client/shim/remove-liquidity.ts"],"names":[],"mappings":"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","sourcesContent":["// Source: https://raw.githubusercontent.com/orca-so/whirlpool-sdk/main/src/position/quotes/remove-liquidity.ts\n/**\n * Added roundUp flag to accurately estimate token holdings for deposits\n */\nimport { tickIndexToSqrtPriceX64 } from \"@orca-so/whirlpool-client-sdk\";\nimport { BN } from \"@coral-xyz/anchor\";\nimport { u64 } from \"@solana/spl-token\";\nimport { PublicKey } from \"@solana/web3.js\";\nimport {\n adjustForSlippage, getTokenAFromLiquidity,\n getTokenBFromLiquidity, Percentage, PositionStatus, PositionUtil, RemoveLiquidityQuote,\n} from '@orca-so/whirlpool-sdk';\nimport { ZERO } from '@raydium-io/raydium-sdk';\n\nexport type InternalRemoveLiquidityQuoteParam = {\n positionAddress: PublicKey;\n tickCurrentIndex: number;\n sqrtPrice: BN;\n tickLowerIndex: number;\n tickUpperIndex: number;\n liquidity: u64;\n slippageTolerance: Percentage;\n};\n\nexport function getRemoveLiquidityQuote(\n param: InternalRemoveLiquidityQuoteParam,\n roundUp: boolean = false,\n): RemoveLiquidityQuote {\n const positionStatus = PositionUtil.getPositionStatus(\n param.tickCurrentIndex,\n param.tickLowerIndex,\n param.tickUpperIndex\n );\n\n switch (positionStatus) {\n case PositionStatus.BelowRange:\n return getRemoveLiquidityQuoteWhenPositionIsBelowRange(param, roundUp);\n case PositionStatus.InRange:\n return getRemoveLiquidityQuoteWhenPositionIsInRange(param, roundUp);\n case PositionStatus.AboveRange:\n return getRemoveLiquidityQuoteWhenPositionIsAboveRange(param, roundUp);\n default:\n throw new Error(`type ${positionStatus} is an unknown PositionStatus`);\n }\n}\n\nfunction getRemoveLiquidityQuoteWhenPositionIsBelowRange(\n param: InternalRemoveLiquidityQuoteParam,\n roundUp: boolean = false,\n): RemoveLiquidityQuote {\n const { positionAddress, tickLowerIndex, tickUpperIndex, liquidity, slippageTolerance } = param;\n\n const sqrtPriceLowerX64 = tickIndexToSqrtPriceX64(tickLowerIndex);\n const sqrtPriceUpperX64 = tickIndexToSqrtPriceX64(tickUpperIndex);\n\n const estTokenA = getTokenAFromLiquidity(liquidity, sqrtPriceLowerX64, sqrtPriceUpperX64, roundUp);\n const minTokenA = adjustForSlippage(estTokenA, slippageTolerance, roundUp);\n\n return {\n positionAddress,\n minTokenA,\n minTokenB: ZERO,\n estTokenA,\n estTokenB: ZERO,\n liquidity,\n };\n}\n\nfunction getRemoveLiquidityQuoteWhenPositionIsInRange(\n param: InternalRemoveLiquidityQuoteParam,\n roundUp: boolean = false,\n): RemoveLiquidityQuote {\n const {\n positionAddress,\n sqrtPrice,\n tickLowerIndex,\n tickUpperIndex,\n liquidity,\n slippageTolerance,\n } = param;\n\n const sqrtPriceX64 = sqrtPrice;\n const sqrtPriceLowerX64 = tickIndexToSqrtPriceX64(tickLowerIndex);\n const sqrtPriceUpperX64 = tickIndexToSqrtPriceX64(tickUpperIndex);\n\n const estTokenA = getTokenAFromLiquidity(liquidity, sqrtPriceX64, sqrtPriceUpperX64, roundUp);\n const minTokenA = adjustForSlippage(estTokenA, slippageTolerance, roundUp);\n\n const estTokenB = getTokenBFromLiquidity(liquidity, sqrtPriceLowerX64, sqrtPriceX64, roundUp);\n const minTokenB = adjustForSlippage(estTokenB, slippageTolerance, roundUp);\n\n return {\n positionAddress,\n minTokenA,\n minTokenB,\n estTokenA,\n estTokenB,\n liquidity,\n };\n}\n\nfunction getRemoveLiquidityQuoteWhenPositionIsAboveRange(\n param: InternalRemoveLiquidityQuoteParam,\n roundUp: boolean = false,\n\n): RemoveLiquidityQuote {\n const {\n positionAddress,\n tickLowerIndex,\n tickUpperIndex,\n liquidity,\n slippageTolerance: slippageTolerance,\n } = param;\n\n const sqrtPriceLowerX64 = tickIndexToSqrtPriceX64(tickLowerIndex);\n const sqrtPriceUpperX64 = tickIndexToSqrtPriceX64(tickUpperIndex);\n\n const estTokenB = getTokenBFromLiquidity(liquidity, sqrtPriceLowerX64, sqrtPriceUpperX64, roundUp);\n const minTokenB = adjustForSlippage(estTokenB, slippageTolerance, roundUp);\n\n return {\n positionAddress,\n minTokenA: ZERO,\n minTokenB,\n estTokenA: ZERO,\n estTokenB,\n liquidity,\n };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kamino-finance/kliquidity-sdk",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"description": "Typescript SDK for interacting with the Kamino Liquidity (kliquidity) protocol",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,7 +49,6 @@
|
|
|
49
49
|
"@hubbleprotocol/hubble-config": "^5.0.0",
|
|
50
50
|
"@hubbleprotocol/scope-sdk": "^5.0.20",
|
|
51
51
|
"@jup-ag/api": "^6.0.24",
|
|
52
|
-
"@orca-so/sdk": "^1.2.26",
|
|
53
52
|
"@orca-so/whirlpool-client-sdk": "^0.0.8",
|
|
54
53
|
"@orca-so/whirlpool-sdk": "^0.4.2",
|
|
55
54
|
"@raydium-io/raydium-sdk": "=1.3.1-beta.5",
|