@crypticdot/defituna-client 3.1.18 → 3.2.0

package/dist/index.js

@@ -255,6 +255,7 @@ __export(index_exports, {
   fetchTunaLpPosition: () => fetchTunaLpPosition,
   fetchTunaSpotPosition: () => fetchTunaSpotPosition,
   fetchVault: () => fetchVault,
+  fromPoolTokenFacade: () => fromPoolTokenFacade,
   getAccountsTypeCodec: () => getAccountsTypeCodec,
   getAccountsTypeDecoder: () => getAccountsTypeDecoder,
   getAccountsTypeEncoder: () => getAccountsTypeEncoder,
@@ -325,7 +326,6 @@ __export(index_exports, {
   getCreateVaultInstructionDataCodec: () => getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder: () => getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder: () => getCreateVaultInstructionDataEncoder,
-  getDecreaseSpotPositionQuote: () => getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes: () => getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction: () => getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec: () => getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -352,7 +352,6 @@ __export(index_exports, {
   getDepositInstructionDataDecoder: () => getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder: () => getDepositInstructionDataEncoder,
   getIncreaseLpPositionQuote: () => getIncreaseLpPositionQuote,
-  getIncreaseSpotPositionQuote: () => getIncreaseSpotPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes: () => getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction: () => getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec: () => getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -400,7 +399,6 @@ __export(index_exports, {
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec: () => getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder: () => getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder: () => getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidationPrice: () => getLiquidationPrice,
   getMarketAddress: () => getMarketAddress,
   getMarketCodec: () => getMarketCodec,
   getMarketDecoder: () => getMarketDecoder,
@@ -550,7 +548,6 @@ __export(index_exports, {
   getSetTunaSpotPositionLimitOrdersInstructionDataCodec: () => getSetTunaSpotPositionLimitOrdersInstructionDataCodec,
   getSetTunaSpotPositionLimitOrdersInstructionDataDecoder: () => getSetTunaSpotPositionLimitOrdersInstructionDataDecoder,
   getSetTunaSpotPositionLimitOrdersInstructionDataEncoder: () => getSetTunaSpotPositionLimitOrdersInstructionDataEncoder,
-  getTradableAmount: () => getTradableAmount,
   getTunaConfigAddress: () => getTunaConfigAddress,
   getTunaConfigCodec: () => getTunaConfigCodec,
   getTunaConfigDecoder: () => getTunaConfigDecoder,
@@ -614,6 +611,7 @@ __export(index_exports, {
   liquidateTunaSpotPositionFusionInstructions: () => liquidateTunaSpotPositionFusionInstructions,
   liquidateTunaSpotPositionOrcaInstruction: () => liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions: () => liquidateTunaSpotPositionOrcaInstructions,
+  mulDiv: () => mulDiv,
   openAndIncreaseTunaLpPositionFusionInstruction: () => openAndIncreaseTunaLpPositionFusionInstruction,
   openAndIncreaseTunaLpPositionFusionInstructions: () => openAndIncreaseTunaLpPositionFusionInstructions,
   openAndIncreaseTunaLpPositionOrcaInstruction: () => openAndIncreaseTunaLpPositionOrcaInstruction,
@@ -695,6 +693,7 @@ __export(index_exports, {
   resetTunaSpotPositionInstruction: () => resetTunaSpotPositionInstruction,
   setTunaLpPositionLimitOrdersInstruction: () => setTunaLpPositionLimitOrdersInstruction,
   setTunaSpotPositionLimitOrdersInstruction: () => setTunaSpotPositionLimitOrdersInstruction,
+  toPoolTokenFacade: () => toPoolTokenFacade,
   tunaLpPositionAuthorityFilter: () => tunaLpPositionAuthorityFilter,
   tunaLpPositionMarketMakerFilter: () => tunaLpPositionMarketMakerFilter,
   tunaLpPositionMintAFilter: () => tunaLpPositionMintAFilter,
@@ -2251,7 +2250,7 @@ function getCloseActiveTunaSpotPositionFusionInstructionDataEncoder() {
   return (0, import_kit16.transformEncoder)(
     (0, import_kit16.getStructEncoder)([
       ["discriminator", (0, import_kit16.fixEncoderSize)((0, import_kit16.getBytesEncoder)(), 8)],
-      ["maxSwapSlippage", (0, import_kit16.getU32Encoder)()],
+      ["maxSwapAmountIn", (0, import_kit16.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -2263,7 +2262,7 @@ function getCloseActiveTunaSpotPositionFusionInstructionDataEncoder() {
 function getCloseActiveTunaSpotPositionFusionInstructionDataDecoder() {
   return (0, import_kit16.getStructDecoder)([
     ["discriminator", (0, import_kit16.fixDecoderSize)((0, import_kit16.getBytesDecoder)(), 8)],
-    ["maxSwapSlippage", (0, import_kit16.getU32Decoder)()],
+    ["maxSwapAmountIn", (0, import_kit16.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -2410,7 +2409,7 @@ function getCloseActiveTunaSpotPositionOrcaInstructionDataEncoder() {
   return (0, import_kit17.transformEncoder)(
     (0, import_kit17.getStructEncoder)([
       ["discriminator", (0, import_kit17.fixEncoderSize)((0, import_kit17.getBytesEncoder)(), 8)],
-      ["maxSwapSlippage", (0, import_kit17.getU32Encoder)()],
+      ["maxSwapAmountIn", (0, import_kit17.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -2422,7 +2421,7 @@ function getCloseActiveTunaSpotPositionOrcaInstructionDataEncoder() {
 function getCloseActiveTunaSpotPositionOrcaInstructionDataDecoder() {
   return (0, import_kit17.getStructDecoder)([
     ["discriminator", (0, import_kit17.fixDecoderSize)((0, import_kit17.getBytesDecoder)(), 8)],
-    ["maxSwapSlippage", (0, import_kit17.getU32Decoder)()],
+    ["maxSwapAmountIn", (0, import_kit17.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4363,7 +4362,7 @@ function getDecreaseTunaSpotPositionFusionInstructionDataEncoder() {
     (0, import_kit31.getStructEncoder)([
       ["discriminator", (0, import_kit31.fixEncoderSize)((0, import_kit31.getBytesEncoder)(), 8)],
       ["withdrawPercent", (0, import_kit31.getU32Encoder)()],
-      ["maxSwapSlippage", (0, import_kit31.getU32Encoder)()],
+      ["maxSwapAmountIn", (0, import_kit31.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4376,7 +4375,7 @@ function getDecreaseTunaSpotPositionFusionInstructionDataDecoder() {
   return (0, import_kit31.getStructDecoder)([
     ["discriminator", (0, import_kit31.fixDecoderSize)((0, import_kit31.getBytesDecoder)(), 8)],
     ["withdrawPercent", (0, import_kit31.getU32Decoder)()],
-    ["maxSwapSlippage", (0, import_kit31.getU32Decoder)()],
+    ["maxSwapAmountIn", (0, import_kit31.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4539,7 +4538,7 @@ function getDecreaseTunaSpotPositionOrcaInstructionDataEncoder() {
     (0, import_kit32.getStructEncoder)([
       ["discriminator", (0, import_kit32.fixEncoderSize)((0, import_kit32.getBytesEncoder)(), 8)],
       ["withdrawPercent", (0, import_kit32.getU32Encoder)()],
-      ["maxSwapSlippage", (0, import_kit32.getU32Encoder)()],
+      ["maxSwapAmountIn", (0, import_kit32.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4552,7 +4551,7 @@ function getDecreaseTunaSpotPositionOrcaInstructionDataDecoder() {
   return (0, import_kit32.getStructDecoder)([
     ["discriminator", (0, import_kit32.fixDecoderSize)((0, import_kit32.getBytesDecoder)(), 8)],
     ["withdrawPercent", (0, import_kit32.getU32Decoder)()],
-    ["maxSwapSlippage", (0, import_kit32.getU32Decoder)()],
+    ["maxSwapAmountIn", (0, import_kit32.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5205,7 +5204,7 @@ function getIncreaseTunaSpotPositionFusionInstructionDataEncoder() {
       ["discriminator", (0, import_kit36.fixEncoderSize)((0, import_kit36.getBytesEncoder)(), 8)],
       ["collateralAmount", (0, import_kit36.getU64Encoder)()],
       ["borrowAmount", (0, import_kit36.getU64Encoder)()],
-      ["maxSwapSlippage", (0, import_kit36.getU32Encoder)()],
+      ["minSwapAmountOut", (0, import_kit36.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5219,7 +5218,7 @@ function getIncreaseTunaSpotPositionFusionInstructionDataDecoder() {
     ["discriminator", (0, import_kit36.fixDecoderSize)((0, import_kit36.getBytesDecoder)(), 8)],
     ["collateralAmount", (0, import_kit36.getU64Decoder)()],
     ["borrowAmount", (0, import_kit36.getU64Decoder)()],
-    ["maxSwapSlippage", (0, import_kit36.getU32Decoder)()],
+    ["minSwapAmountOut", (0, import_kit36.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5395,7 +5394,7 @@ function getIncreaseTunaSpotPositionOrcaInstructionDataEncoder() {
       ["discriminator", (0, import_kit37.fixEncoderSize)((0, import_kit37.getBytesEncoder)(), 8)],
       ["collateralAmount", (0, import_kit37.getU64Encoder)()],
       ["borrowAmount", (0, import_kit37.getU64Encoder)()],
-      ["maxSwapSlippage", (0, import_kit37.getU32Encoder)()],
+      ["minSwapAmountOut", (0, import_kit37.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5409,7 +5408,7 @@ function getIncreaseTunaSpotPositionOrcaInstructionDataDecoder() {
     ["discriminator", (0, import_kit37.fixDecoderSize)((0, import_kit37.getBytesDecoder)(), 8)],
     ["collateralAmount", (0, import_kit37.getU64Decoder)()],
     ["borrowAmount", (0, import_kit37.getU64Decoder)()],
-    ["maxSwapSlippage", (0, import_kit37.getU32Decoder)()],
+    ["minSwapAmountOut", (0, import_kit37.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6745,10 +6744,7 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstructionDataEncoder() {
       ["collateralToken", getPoolTokenEncoder()],
       ["collateralAmount", (0, import_kit44.getU64Encoder)()],
       ["borrowAmount", (0, import_kit44.getU64Encoder)()],
-      ["lowerLimitOrderSqrtPrice", (0, import_kit44.getU128Encoder)()],
-      ["upperLimitOrderSqrtPrice", (0, import_kit44.getU128Encoder)()],
-      ["flags", (0, import_kit44.getU32Encoder)()],
-      ["maxSwapSlippage", (0, import_kit44.getU32Encoder)()],
+      ["minSwapAmountOut", (0, import_kit44.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6764,10 +6760,7 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstructionDataDecoder() {
     ["collateralToken", getPoolTokenDecoder()],
     ["collateralAmount", (0, import_kit44.getU64Decoder)()],
     ["borrowAmount", (0, import_kit44.getU64Decoder)()],
-    ["lowerLimitOrderSqrtPrice", (0, import_kit44.getU128Decoder)()],
-    ["upperLimitOrderSqrtPrice", (0, import_kit44.getU128Decoder)()],
-    ["flags", (0, import_kit44.getU32Decoder)()],
-    ["maxSwapSlippage", (0, import_kit44.getU32Decoder)()],
+    ["minSwapAmountOut", (0, import_kit44.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6942,10 +6935,7 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstructionDataEncoder() {
       ["collateralToken", getPoolTokenEncoder()],
       ["collateralAmount", (0, import_kit45.getU64Encoder)()],
       ["borrowAmount", (0, import_kit45.getU64Encoder)()],
-      ["lowerLimitOrderSqrtPrice", (0, import_kit45.getU128Encoder)()],
-      ["upperLimitOrderSqrtPrice", (0, import_kit45.getU128Encoder)()],
-      ["flags", (0, import_kit45.getU32Encoder)()],
-      ["maxSwapSlippage", (0, import_kit45.getU32Encoder)()],
+      ["minSwapAmountOut", (0, import_kit45.getU64Encoder)()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6961,10 +6951,7 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstructionDataDecoder() {
     ["collateralToken", getPoolTokenDecoder()],
     ["collateralAmount", (0, import_kit45.getU64Decoder)()],
     ["borrowAmount", (0, import_kit45.getU64Decoder)()],
-    ["lowerLimitOrderSqrtPrice", (0, import_kit45.getU128Decoder)()],
-    ["upperLimitOrderSqrtPrice", (0, import_kit45.getU128Decoder)()],
-    ["flags", (0, import_kit45.getU32Decoder)()],
-    ["maxSwapSlippage", (0, import_kit45.getU32Decoder)()],
+    ["minSwapAmountOut", (0, import_kit45.getU64Decoder)()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -7565,10 +7552,7 @@ function getOpenTunaSpotPositionFusionInstructionDataEncoder() {
     (0, import_kit49.getStructEncoder)([
       ["discriminator", (0, import_kit49.fixEncoderSize)((0, import_kit49.getBytesEncoder)(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", (0, import_kit49.getU128Encoder)()],
-      ["upperLimitOrderSqrtPrice", (0, import_kit49.getU128Encoder)()],
-      ["flags", (0, import_kit49.getU32Encoder)()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -7580,10 +7564,7 @@ function getOpenTunaSpotPositionFusionInstructionDataDecoder() {
   return (0, import_kit49.getStructDecoder)([
     ["discriminator", (0, import_kit49.fixDecoderSize)((0, import_kit49.getBytesDecoder)(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", (0, import_kit49.getU128Decoder)()],
-    ["upperLimitOrderSqrtPrice", (0, import_kit49.getU128Decoder)()],
-    ["flags", (0, import_kit49.getU32Decoder)()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getOpenTunaSpotPositionFusionInstructionDataCodec() {
@@ -7696,10 +7677,7 @@ function getOpenTunaSpotPositionOrcaInstructionDataEncoder() {
     (0, import_kit50.getStructEncoder)([
       ["discriminator", (0, import_kit50.fixEncoderSize)((0, import_kit50.getBytesEncoder)(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", (0, import_kit50.getU128Encoder)()],
-      ["upperLimitOrderSqrtPrice", (0, import_kit50.getU128Encoder)()],
-      ["flags", (0, import_kit50.getU32Encoder)()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -7711,10 +7689,7 @@ function getOpenTunaSpotPositionOrcaInstructionDataDecoder() {
   return (0, import_kit50.getStructDecoder)([
     ["discriminator", (0, import_kit50.fixDecoderSize)((0, import_kit50.getBytesDecoder)(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", (0, import_kit50.getU128Decoder)()],
-    ["upperLimitOrderSqrtPrice", (0, import_kit50.getU128Decoder)()],
-    ["flags", (0, import_kit50.getU32Decoder)()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getOpenTunaSpotPositionOrcaInstructionDataCodec() {
@@ -8399,9 +8374,7 @@ function getResetTunaSpotPositionInstructionDataEncoder() {
     (0, import_kit55.getStructEncoder)([
       ["discriminator", (0, import_kit55.fixEncoderSize)((0, import_kit55.getBytesEncoder)(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", (0, import_kit55.getU128Encoder)()],
-      ["upperLimitOrderSqrtPrice", (0, import_kit55.getU128Encoder)()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -8413,9 +8386,7 @@ function getResetTunaSpotPositionInstructionDataDecoder() {
   return (0, import_kit55.getStructDecoder)([
     ["discriminator", (0, import_kit55.fixDecoderSize)((0, import_kit55.getBytesDecoder)(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", (0, import_kit55.getU128Decoder)()],
-    ["upperLimitOrderSqrtPrice", (0, import_kit55.getU128Decoder)()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getResetTunaSpotPositionInstructionDataCodec() {
@@ -10037,6 +10008,15 @@ async function fetchAllMarketWithFilter(rpc, ...filters) {
   return fetchDecodedProgramAccounts(rpc, TUNA_PROGRAM_ADDRESS, [discriminatorFilter, ...filters], getMarketDecoder());
 }
 
+// src/utils/math.ts
+function mulDiv(x, y, d, roundUp = false) {
+  if (!roundUp) {
+    return x * y / d;
+  } else {
+    return (x * y + (d - 1n)) / d;
+  }
+}
+
 // src/utils/orca.ts
 var import_fusionamm_core = require("@crypticdot/fusionamm-core");
 var import_whirlpools_client = require("@orca-so/whirlpools-client");
@@ -10291,263 +10271,6 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
   return collateralAmount * BigInt(protocolFeeRateOnCollateral) / BigInt(HUNDRED_PERCENT) + borrowAmount * BigInt(protocolFeeRate) / BigInt(HUNDRED_PERCENT);
 }
 
-// src/utils/spotPositionMath.ts
-var import_fusionamm_core4 = require("@crypticdot/fusionamm-core");
-function getIncreaseSpotPositionQuote(args) {
-  const {
-    fusionPool,
-    tickArrays,
-    leverage,
-    protocolFeeRate,
-    protocolFeeRateOnCollateral,
-    increaseAmount,
-    collateralToken,
-    positionToken
-  } = args;
-  if (leverage < 1) {
-    throw new Error("leverage must be greater or equal than 1.0");
-  }
-  if (protocolFeeRate < 0 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (increaseAmount <= 0) {
-    throw new Error("increaseAmount must be greater than zero");
-  }
-  let borrow;
-  let collateral;
-  let estimatedAmount;
-  let swapInputAmount;
-  let nextSqrtPrice = fusionPool.sqrtPrice;
-  if (positionToken != collateralToken) {
-    const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-    borrow = BigInt(Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage));
-    collateral = increaseAmount - (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-    collateral = (0, import_fusionamm_core4.tryReverseApplySwapFee)(collateral, fusionPool.feeRate);
-    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    swapInputAmount = increaseAmount;
-    estimatedAmount = BigInt(
-      Math.round(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
-    );
-  } else {
-    const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-    const positionToBorrowedTokenPrice = collateralToken == 0 /* A */ ? price : 1 / price;
-    const borrowInPositionToken = Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage);
-    borrow = BigInt(Math.ceil(borrowInPositionToken * positionToBorrowedTokenPrice));
-    const borrowInPositionTokenWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(
-      applyTunaProtocolFee(BigInt(Math.floor(borrowInPositionToken)), protocolFeeRate),
-      fusionPool.feeRate
-    );
-    collateral = increaseAmount - borrowInPositionTokenWithFeesApplied;
-    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
-    estimatedAmount = increaseAmount;
-  }
-  if (swapInputAmount > 0) {
-    const is_token_a = positionToken == 1 /* B */;
-    nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, is_token_a, 0, fusionPool, tickArrays).nextSqrtPrice;
-  }
-  const protocolFeeA = (collateralToken == 0 /* A */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 1 /* B */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 0 /* A */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const oldPrice = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-  const newPrice = (0, import_fusionamm_core4.sqrtPriceToPrice)(nextSqrtPrice, 1, 1);
-  const priceImpact = Math.abs(newPrice / oldPrice - 1) * 100;
-  return {
-    collateral,
-    borrow,
-    swapInputAmount,
-    estimatedAmount,
-    protocolFeeA,
-    protocolFeeB,
-    priceImpact
-  };
-}
-function getDecreaseSpotPositionQuote(args) {
-  const {
-    fusionPool,
-    tickArrays,
-    leverage,
-    protocolFeeRate,
-    protocolFeeRateOnCollateral,
-    decreaseAmount,
-    collateralToken,
-    positionToken,
-    positionAmount,
-    positionDebt,
-    reduceOnly
-  } = args;
-  if (leverage < 1) {
-    throw new Error("leverage must be greater or equal than 1.0");
-  }
-  if (protocolFeeRate < 0 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (decreaseAmount <= 0) {
-    throw new Error("decreaseAmount must be greater than zero");
-  }
-  let collateral = 0n;
-  let borrow = 0n;
-  let swapInputAmount = 0n;
-  let estimatedAmount = 0n;
-  let nextSqrtPrice = fusionPool.sqrtPrice;
-  let newPositionToken = positionToken;
-  let decreasePercent;
-  const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-  const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
-  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(Math.round(Number(decreaseAmount) / positionToOppositeTokenPrice));
-  if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
-    decreaseAmountInPositionToken = positionAmount;
-  }
-  if (decreaseAmountInPositionToken <= positionAmount) {
-    decreasePercent = Math.min(
-      Math.floor(Number(decreaseAmountInPositionToken) * HUNDRED_PERCENT / Number(positionAmount)),
-      HUNDRED_PERCENT
-    );
-    estimatedAmount = positionAmount - decreaseAmountInPositionToken;
-    if (collateralToken == positionToken) {
-      if (positionDebt > 0) {
-        const swapOut = BigInt(Math.floor(Number(positionDebt) * decreasePercent / HUNDRED_PERCENT));
-        const swapQuote = (0, import_fusionamm_core4.swapQuoteByOutputToken)(swapOut, positionToken == 1 /* B */, 0, fusionPool, tickArrays);
-        nextSqrtPrice = swapQuote.nextSqrtPrice;
-        swapInputAmount = swapQuote.tokenEstIn;
-      }
-    } else {
-      swapInputAmount = positionAmount - BigInt(Math.floor(Number(positionAmount) * (HUNDRED_PERCENT - decreasePercent) / HUNDRED_PERCENT));
-      const swapQuote = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-    }
-  } else {
-    decreasePercent = HUNDRED_PERCENT;
-    newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
-    const increaseAmount = decreaseAmountInPositionToken - positionAmount;
-    if (positionToken == collateralToken) {
-      estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
-      borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-      collateral = increaseAmount - borrowWithFeesApplied;
-      if (positionDebt > 0) {
-        const swapQuote2 = (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, positionToken != 0 /* A */, 0, fusionPool, tickArrays);
-        swapInputAmount = swapQuote2.tokenEstIn;
-      }
-      swapInputAmount += collateral + applyTunaProtocolFee(borrow, protocolFeeRate);
-      const swapQuote = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    } else {
-      estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
-      borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-      collateral = increaseAmount - borrowWithFeesApplied;
-      collateral = BigInt(Math.round(Number(collateral) * positionToOppositeTokenPrice));
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-      swapInputAmount = positionAmount + applyTunaProtocolFee(borrow, protocolFeeRate);
-      const swapQuote = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-    }
-  }
-  const protocolFeeA = (collateralToken == 0 /* A */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 1 /* B */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 0 /* A */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const newPrice = (0, import_fusionamm_core4.sqrtPriceToPrice)(nextSqrtPrice, 1, 1);
-  const priceImpact = Math.abs(newPrice / price - 1) * 100;
-  return {
-    decreasePercent,
-    collateralToken,
-    positionToken: newPositionToken,
-    collateral,
-    borrow,
-    swapInputAmount,
-    estimatedAmount,
-    protocolFeeA,
-    protocolFeeB,
-    priceImpact
-  };
-}
-function getTradableAmount(args) {
-  const {
-    collateralToken,
-    newPositionToken,
-    positionToken,
-    positionAmount,
-    positionDebt,
-    reduceOnly,
-    fusionPool,
-    tickArrays,
-    leverage,
-    availableBalance,
-    protocolFeeRate,
-    protocolFeeRateOnCollateral
-  } = args;
-  if (leverage < 1) {
-    throw new Error("leverage must be greater or equal than 1.0");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRate < 0 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (positionAmount == 0n && newPositionToken != positionToken) {
-    throw new Error("positionToken must be set to newPositionToken if positionAmount is zero");
-  }
-  let availableToTrade = 0n;
-  const addLeverage = (collateral) => {
-    collateral = applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    if (collateralToken != newPositionToken) {
-      collateral = (0, import_fusionamm_core4.tryApplySwapFee)(collateral, fusionPool.feeRate);
-    }
-    const feeMultiplier = (1 - protocolFeeRate / HUNDRED_PERCENT) * (1 - fusionPool.feeRate / 1e6);
-    const total = Number(collateral) / (1 - feeMultiplier * (leverage - 1) / leverage);
-    return BigInt(Math.floor(total));
-  };
-  if (newPositionToken == positionToken) {
-    availableToTrade = addLeverage(availableBalance);
-  } else {
-    const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-    const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
-    if (reduceOnly) {
-      if (collateralToken == positionToken) {
-        availableToTrade = positionAmount;
-      } else {
-        availableToTrade = BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      }
-    } else {
-      const positionAmountInCollateralToken = collateralToken == positionToken ? positionAmount : BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      let positionCollateral = collateralToken == positionToken ? positionAmount - (positionDebt > 0n ? (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, positionToken == 1 /* B */, 0, fusionPool, tickArrays).tokenEstIn : 0n) : positionAmount > 0n ? (0, import_fusionamm_core4.swapQuoteByInputToken)(positionAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays).tokenEstOut - positionDebt : 0n;
-      if (positionCollateral < 0n) positionCollateral = 0n;
-      availableToTrade = positionAmountInCollateralToken + addLeverage(availableBalance + positionCollateral);
-    }
-  }
-  return availableToTrade;
-}
-function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold) {
-  if (debt < 0) {
-    throw new Error("debt must be greater or equal than zero");
-  }
-  if (amount < 0) {
-    throw new Error("position amount must be greater or equal than zero");
-  }
-  if (liquidationThreshold <= 0 || liquidationThreshold >= 1) {
-    throw new Error("liquidationThreshold must be greater than zero and less than one");
-  }
-  if (debt == 0 || amount == 0) return 0;
-  if (positionToken == 0 /* A */) {
-    return debt / (amount * liquidationThreshold);
-  } else {
-    return amount * liquidationThreshold / debt;
-  }
-}
-function applyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT - protocolFeeRate) / BigInt(HUNDRED_PERCENT);
-}
-function reverseApplyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT) / BigInt(HUNDRED_PERCENT - protocolFeeRate);
-}
-
 // src/txbuilder/increaseTunaLpPositionOrca.ts
 var import_whirlpools_client2 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core2 = require("@orca-so/whirlpools-core");
@@ -10781,7 +10504,7 @@ async function increaseTunaLpPositionOrcaInstruction(authority, tunaPosition, tu
 
 // src/txbuilder/increaseTunaLpPositionFusion.ts
 var import_fusionamm_client2 = require("@crypticdot/fusionamm-client");
-var import_fusionamm_core5 = require("@crypticdot/fusionamm-core");
+var import_fusionamm_core4 = require("@crypticdot/fusionamm-core");
 var import_kit80 = require("@solana/kit");
 var import_memo2 = require("@solana-program/memo");
 var import_token_20223 = require("@solana-program/token-2022");
@@ -10851,12 +10574,12 @@ async function increaseTunaLpPositionFusionInstructions(rpc, authority, position
     mintB.programAddress
   );
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
-  const lowerTickArrayStartIndex = (0, import_fusionamm_core5.getTickArrayStartTickIndex)(
+  const lowerTickArrayStartIndex = (0, import_fusionamm_core4.getTickArrayStartTickIndex)(
     tunaPosition.data.tickLowerIndex,
     fusionPool.data.tickSpacing
   );
   const [lowerTickArrayAddress] = await (0, import_fusionamm_client2.getTickArrayAddress)(fusionPool.address, lowerTickArrayStartIndex);
-  const upperTickArrayStartIndex = (0, import_fusionamm_core5.getTickArrayStartTickIndex)(
+  const upperTickArrayStartIndex = (0, import_fusionamm_core4.getTickArrayStartTickIndex)(
     tunaPosition.data.tickUpperIndex,
     fusionPool.data.tickSpacing
   );
@@ -13774,7 +13497,7 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
 
 // src/txbuilder/openAndIncreaseTunaLpPositionFusion.ts
 var import_fusionamm_client14 = require("@crypticdot/fusionamm-client");
-var import_fusionamm_core6 = require("@crypticdot/fusionamm-core");
+var import_fusionamm_core5 = require("@crypticdot/fusionamm-core");
 var import_kit97 = require("@solana/kit");
 var import_sysvars2 = require("@solana/sysvars");
 var import_memo19 = require("@solana-program/memo");
@@ -13846,9 +13569,9 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, f
     mintB.programAddress
   );
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
-  const lowerTickArrayIndex = (0, import_fusionamm_core6.getTickArrayStartTickIndex)(args.tickLowerIndex, fusionPool.data.tickSpacing);
+  const lowerTickArrayIndex = (0, import_fusionamm_core5.getTickArrayStartTickIndex)(args.tickLowerIndex, fusionPool.data.tickSpacing);
   const [lowerTickArrayAddress] = await (0, import_fusionamm_client14.getTickArrayAddress)(fusionPool.address, lowerTickArrayIndex);
-  const upperTickArrayIndex = (0, import_fusionamm_core6.getTickArrayStartTickIndex)(args.tickUpperIndex, fusionPool.data.tickSpacing);
+  const upperTickArrayIndex = (0, import_fusionamm_core5.getTickArrayStartTickIndex)(args.tickUpperIndex, fusionPool.data.tickSpacing);
   const [upperTickArrayAddress] = await (0, import_fusionamm_client14.getTickArrayAddress)(fusionPool.address, upperTickArrayIndex);
   const [lowerTickArray, upperTickArray] = await (0, import_fusionamm_client14.fetchAllMaybeTickArray)(rpc, [
     lowerTickArrayAddress,
@@ -15471,6 +15194,24 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   ix.accounts.push(...remainingAccounts);
   return ix;
 }
+
+// src/casts.ts
+function toPoolTokenFacade(token) {
+  switch (token) {
+    case 0 /* A */:
+      return "a";
+    case 1 /* B */:
+      return "b";
+  }
+}
+function fromPoolTokenFacade(token) {
+  switch (token) {
+    case "a":
+      return 0 /* A */;
+    case "b":
+      return 1 /* B */;
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AccountsType,
@@ -15699,6 +15440,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   fetchTunaLpPosition,
   fetchTunaSpotPosition,
   fetchVault,
+  fromPoolTokenFacade,
   getAccountsTypeCodec,
   getAccountsTypeDecoder,
   getAccountsTypeEncoder,
@@ -15769,7 +15511,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
-  getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -15796,7 +15537,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder,
   getIncreaseLpPositionQuote,
-  getIncreaseSpotPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -15844,7 +15584,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidationPrice,
   getMarketAddress,
   getMarketCodec,
   getMarketDecoder,
@@ -15994,7 +15733,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getSetTunaSpotPositionLimitOrdersInstructionDataCodec,
   getSetTunaSpotPositionLimitOrdersInstructionDataDecoder,
   getSetTunaSpotPositionLimitOrdersInstructionDataEncoder,
-  getTradableAmount,
   getTunaConfigAddress,
   getTunaConfigCodec,
   getTunaConfigDecoder,
@@ -16058,6 +15796,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   liquidateTunaSpotPositionFusionInstructions,
   liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions,
+  mulDiv,
   openAndIncreaseTunaLpPositionFusionInstruction,
   openAndIncreaseTunaLpPositionFusionInstructions,
   openAndIncreaseTunaLpPositionOrcaInstruction,
@@ -16139,6 +15878,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   resetTunaSpotPositionInstruction,
   setTunaLpPositionLimitOrdersInstruction,
   setTunaSpotPositionLimitOrdersInstruction,
+  toPoolTokenFacade,
   tunaLpPositionAuthorityFilter,
   tunaLpPositionMarketMakerFilter,
   tunaLpPositionMintAFilter,