@crypticdot/defituna-client 3.1.17 → 3.1.19

package/dist/index.js

@@ -614,6 +614,7 @@ __export(index_exports, {
   liquidateTunaSpotPositionFusionInstructions: () => liquidateTunaSpotPositionFusionInstructions,
   liquidateTunaSpotPositionOrcaInstruction: () => liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions: () => liquidateTunaSpotPositionOrcaInstructions,
+  mulDiv: () => mulDiv,
   openAndIncreaseTunaLpPositionFusionInstruction: () => openAndIncreaseTunaLpPositionFusionInstruction,
   openAndIncreaseTunaLpPositionFusionInstructions: () => openAndIncreaseTunaLpPositionFusionInstructions,
   openAndIncreaseTunaLpPositionOrcaInstruction: () => openAndIncreaseTunaLpPositionOrcaInstruction,
@@ -2251,7 +2252,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 +2264,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 +2411,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 +2423,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 +4364,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 +4377,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 +4540,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 +4553,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 +5206,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 +5220,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 +5396,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 +5410,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 +6746,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 +6762,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 +6937,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 +6953,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 +7554,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 +7566,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 +7679,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 +7691,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 +8376,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 +8388,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 +10010,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");
@@ -10323,10 +10305,10 @@ function getIncreaseSpotPositionQuote(args) {
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-    borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-    const borrowWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-    collateral = reverseApplyTunaProtocolFee(increaseAmount - borrowWithFeesApplied, protocolFeeRateOnCollateral);
-    collateral = (0, import_fusionamm_core4.tryReverseApplySwapFee)(collateral, fusionPool.feeRate);
+    borrow = BigInt(Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage));
+    collateral = increaseAmount - applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+    collateral = reverseApplySwapFee(collateral, fusionPool.feeRate, false);
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     swapInputAmount = increaseAmount;
     estimatedAmount = BigInt(
       Math.round(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
@@ -10334,16 +10316,14 @@ function getIncreaseSpotPositionQuote(args) {
   } else {
     const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
     const positionToBorrowedTokenPrice = collateralToken == 0 /* A */ ? price : 1 / price;
-    const borrowInPositionToken = Number(increaseAmount) * (leverage - 1) / leverage;
-    borrow = BigInt(Math.round(borrowInPositionToken * positionToBorrowedTokenPrice));
-    const borrowInPositionTokenWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(
-      applyTunaProtocolFee(BigInt(Math.floor(borrowInPositionToken)), protocolFeeRate),
+    const borrowInPositionToken = Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage);
+    borrow = BigInt(Math.ceil(borrowInPositionToken * positionToBorrowedTokenPrice));
+    const borrowInPositionTokenWithFeesApplied = applySwapFee(
+      applyTunaProtocolFee(BigInt(borrowInPositionToken), protocolFeeRate),
       fusionPool.feeRate
     );
-    collateral = reverseApplyTunaProtocolFee(
-      increaseAmount - borrowInPositionTokenWithFeesApplied,
-      protocolFeeRateOnCollateral
-    );
+    collateral = increaseAmount - borrowInPositionTokenWithFeesApplied;
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
     estimatedAmount = increaseAmount;
   }
@@ -10430,7 +10410,7 @@ function getDecreaseSpotPositionQuote(args) {
     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);
+      const borrowWithFeesApplied = applySwapFee(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);
@@ -10439,14 +10419,14 @@ function getDecreaseSpotPositionQuote(args) {
       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);
+      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     } 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);
+      const borrowWithFeesApplied = applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
       collateral = increaseAmount - borrowWithFeesApplied;
       collateral = BigInt(Math.round(Number(collateral) * positionToOppositeTokenPrice));
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
+      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
       swapInputAmount = positionAmount + applyTunaProtocolFee(borrow, protocolFeeRate);
       const swapQuote = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
       nextSqrtPrice = swapQuote.nextSqrtPrice;
@@ -10499,16 +10479,12 @@ function getTradableAmount(args) {
   let availableToTrade = 0n;
   const addLeverage = (collateral) => {
     collateral = applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    const feeMultiplier = (1 - protocolFeeRate / HUNDRED_PERCENT) * (1 - fusionPool.feeRate / 1e6);
-    let borrow = BigInt(
-      Math.round(Number(collateral) * (leverage - 1) / (leverage + feeMultiplier * (1 - leverage)))
-    );
-    borrow = applyTunaProtocolFee(borrow, protocolFeeRate);
-    borrow = (0, import_fusionamm_core4.tryApplySwapFee)(borrow, fusionPool.feeRate);
     if (collateralToken != newPositionToken) {
-      collateral = (0, import_fusionamm_core4.tryApplySwapFee)(collateral, fusionPool.feeRate);
+      collateral = applySwapFee(collateral, fusionPool.feeRate);
     }
-    return collateral + borrow;
+    const feeMultiplier = (1 - protocolFeeRate / HUNDRED_PERCENT) * (1 - fusionPool.feeRate / 1e6);
+    const total = Math.floor(Number(collateral) / (1 - feeMultiplier * (leverage - 1) / leverage));
+    return BigInt(total);
   };
   if (newPositionToken == positionToken) {
     availableToTrade = addLeverage(availableBalance);
@@ -10547,11 +10523,17 @@ function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold)
     return amount * liquidationThreshold / debt;
   }
 }
-function applyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT - protocolFeeRate) / BigInt(HUNDRED_PERCENT);
+function applyTunaProtocolFee(amount, protocolFeeRate, roundUp = false) {
+  return mulDiv(amount, BigInt(HUNDRED_PERCENT - protocolFeeRate), BigInt(HUNDRED_PERCENT), roundUp);
+}
+function reverseApplyTunaProtocolFee(amount, protocolFeeRate, roundUp = true) {
+  return mulDiv(amount, BigInt(HUNDRED_PERCENT), BigInt(HUNDRED_PERCENT - protocolFeeRate), roundUp);
+}
+function applySwapFee(amount, feeRate, roundUp = false) {
+  return mulDiv(amount, BigInt(1e6 - feeRate), 1000000n, roundUp);
 }
-function reverseApplyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT) / BigInt(HUNDRED_PERCENT - protocolFeeRate);
+function reverseApplySwapFee(amount, feeRate, roundUp = true) {
+  return mulDiv(amount, 1000000n, BigInt(1e6 - feeRate), roundUp);
 }
 
 // src/txbuilder/increaseTunaLpPositionOrca.ts
@@ -16064,6 +16046,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   liquidateTunaSpotPositionFusionInstructions,
   liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions,
+  mulDiv,
   openAndIncreaseTunaLpPositionFusionInstruction,
   openAndIncreaseTunaLpPositionFusionInstructions,
   openAndIncreaseTunaLpPositionOrcaInstruction,