@crypticdot/defituna-client 3.1.2 → 3.1.4

package/dist/index.js

@@ -137,6 +137,7 @@ __export(index_exports, {
   TUNA_ERROR__POSITION_IS_LIQUIDATED: () => TUNA_ERROR__POSITION_IS_LIQUIDATED,
   TUNA_ERROR__POSITION_IS_UNHEALTHY: () => TUNA_ERROR__POSITION_IS_UNHEALTHY,
   TUNA_ERROR__POSITION_NOT_EMPTY: () => TUNA_ERROR__POSITION_NOT_EMPTY,
+  TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED: () => TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED,
   TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE: () => TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE,
   TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET: () => TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET,
   TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET: () => TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET,
@@ -324,6 +325,7 @@ __export(index_exports, {
   getCreateVaultInstructionDataCodec: () => getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder: () => getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder: () => getCreateVaultInstructionDataEncoder,
+  getDecreaseSpotPositionQuote: () => getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes: () => getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction: () => getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec: () => getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -948,7 +950,9 @@ function getMarketEncoder() {
       ["borrowLimitB", (0, import_kit8.getU64Encoder)()],
       ["maxSwapSlippage", (0, import_kit8.getU32Encoder)()],
       ["rebalanceProtocolFee", (0, import_kit8.getU32Encoder)()],
-      ["reserved", (0, import_kit8.fixEncoderSize)((0, import_kit8.getBytesEncoder)(), 207)]
+      ["spotPositionSizeLimitA", (0, import_kit8.getU64Encoder)()],
+      ["spotPositionSizeLimitB", (0, import_kit8.getU64Encoder)()],
+      ["reserved", (0, import_kit8.fixEncoderSize)((0, import_kit8.getBytesEncoder)(), 191)]
     ]),
     (value) => ({ ...value, discriminator: MARKET_DISCRIMINATOR })
   );
@@ -975,7 +979,9 @@ function getMarketDecoder() {
     ["borrowLimitB", (0, import_kit8.getU64Decoder)()],
     ["maxSwapSlippage", (0, import_kit8.getU32Decoder)()],
     ["rebalanceProtocolFee", (0, import_kit8.getU32Decoder)()],
-    ["reserved", (0, import_kit8.fixDecoderSize)((0, import_kit8.getBytesDecoder)(), 207)]
+    ["spotPositionSizeLimitA", (0, import_kit8.getU64Decoder)()],
+    ["spotPositionSizeLimitB", (0, import_kit8.getU64Decoder)()],
+    ["reserved", (0, import_kit8.fixDecoderSize)((0, import_kit8.getBytesDecoder)(), 191)]
   ]);
 }
 function getMarketCodec() {
@@ -2111,6 +2117,7 @@ var TUNA_ERROR__POSITION_IS_AUTO_REBALANCEABLE = 6057;
 var TUNA_ERROR__INCORRECT_POSITION_DIRECTION = 6058;
 var TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET = 6059;
 var TUNA_ERROR__M_A_PRICE_DEVIATION_THRESHOLD_EXCEEDED = 6060;
+var TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED = 6061;
 var tunaErrorMessages;
 if (process.env.NODE_ENV !== "production") {
   tunaErrorMessages = {
@@ -2146,6 +2153,7 @@ if (process.env.NODE_ENV !== "production") {
     [TUNA_ERROR__POSITION_IS_LIQUIDATED]: `Position is already liquidated`,
     [TUNA_ERROR__POSITION_IS_UNHEALTHY]: `Position is unhealthy`,
     [TUNA_ERROR__POSITION_NOT_EMPTY]: `Position is not empty`,
+    [TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED]: `Position size exceeds the maximum allowed value`,
     [TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE]: `Protocol fee is out of range`,
     [TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET]: `Rebalance conditions are not met`,
     [TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET]: `Optional recipient account is not set`,
@@ -3683,7 +3691,9 @@ function getCreateMarketInstructionDataEncoder() {
       ["borrowLimitA", (0, import_kit26.getU64Encoder)()],
       ["borrowLimitB", (0, import_kit26.getU64Encoder)()],
       ["maxSwapSlippage", (0, import_kit26.getU32Encoder)()],
-      ["rebalanceProtocolFee", (0, import_kit26.getU32Encoder)()]
+      ["rebalanceProtocolFee", (0, import_kit26.getU32Encoder)()],
+      ["spotPositionSizeLimitA", (0, import_kit26.getU64Encoder)()],
+      ["spotPositionSizeLimitB", (0, import_kit26.getU64Encoder)()]
     ]),
     (value) => ({ ...value, discriminator: CREATE_MARKET_DISCRIMINATOR })
   );
@@ -3704,7 +3714,9 @@ function getCreateMarketInstructionDataDecoder() {
     ["borrowLimitA", (0, import_kit26.getU64Decoder)()],
     ["borrowLimitB", (0, import_kit26.getU64Decoder)()],
     ["maxSwapSlippage", (0, import_kit26.getU32Decoder)()],
-    ["rebalanceProtocolFee", (0, import_kit26.getU32Decoder)()]
+    ["rebalanceProtocolFee", (0, import_kit26.getU32Decoder)()],
+    ["spotPositionSizeLimitA", (0, import_kit26.getU64Decoder)()],
+    ["spotPositionSizeLimitB", (0, import_kit26.getU64Decoder)()]
   ]);
 }
 function getCreateMarketInstructionDataCodec() {
@@ -9470,7 +9482,9 @@ function getUpdateMarketInstructionDataEncoder() {
       ["borrowLimitA", (0, import_kit68.getU64Encoder)()],
       ["borrowLimitB", (0, import_kit68.getU64Encoder)()],
       ["maxSwapSlippage", (0, import_kit68.getU32Encoder)()],
-      ["rebalanceProtocolFee", (0, import_kit68.getU32Encoder)()]
+      ["rebalanceProtocolFee", (0, import_kit68.getU32Encoder)()],
+      ["spotPositionSizeLimitA", (0, import_kit68.getU64Encoder)()],
+      ["spotPositionSizeLimitB", (0, import_kit68.getU64Encoder)()]
     ]),
     (value) => ({ ...value, discriminator: UPDATE_MARKET_DISCRIMINATOR })
   );
@@ -9490,7 +9504,9 @@ function getUpdateMarketInstructionDataDecoder() {
     ["borrowLimitA", (0, import_kit68.getU64Decoder)()],
     ["borrowLimitB", (0, import_kit68.getU64Decoder)()],
     ["maxSwapSlippage", (0, import_kit68.getU32Decoder)()],
-    ["rebalanceProtocolFee", (0, import_kit68.getU32Decoder)()]
+    ["rebalanceProtocolFee", (0, import_kit68.getU32Decoder)()],
+    ["spotPositionSizeLimitA", (0, import_kit68.getU64Decoder)()],
+    ["spotPositionSizeLimitB", (0, import_kit68.getU64Decoder)()]
   ]);
 }
 function getUpdateMarketInstructionDataCodec() {
@@ -10282,7 +10298,7 @@ function getIncreaseSpotPositionQuote(args) {
     leverage,
     protocolFeeRate,
     protocolFeeRateOnCollateral,
-    totalAmount,
+    increaseAmount,
     collateralToken,
     positionToken
   } = args;
@@ -10295,52 +10311,48 @@ function getIncreaseSpotPositionQuote(args) {
   if (protocolFeeRateOnCollateral < 0) {
     throw new Error("protocolFeeRate must be greater or equal than zero");
   }
-  if (totalAmount < 0) {
-    throw new Error("totalAmount must be greater or equal than zero");
-  }
-  if (totalAmount == 0n) {
-    return {
-      collateral: 0n,
-      borrow: 0n,
-      protocolFeeA: 0n,
-      protocolFeeB: 0n,
-      priceImpact: 0
-    };
+  if (increaseAmount <= 0) {
+    throw new Error("increaseAmount must be greater than zero");
   }
   let borrow;
   let collateral;
+  let estimatedAmount;
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-    const totalAmountInOppositeToken = BigInt(
-      Math.floor(positionToken == 0 /* A */ ? Number(totalAmount) / price : Number(totalAmount) * price)
+    collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : increaseAmount;
+    borrow = increaseAmount - collateral;
+    estimatedAmount = BigInt(
+      Math.floor(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
     );
-    const swapQuote = (0, import_fusionamm_core4.swapQuoteByOutputToken)(
-      totalAmountInOppositeToken,
-      positionToken == 0 /* A */,
+    nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(
+      increaseAmount,
+      collateralToken == 0 /* A */,
       0,
       fusionPool,
       tickArrays
-    );
-    nextSqrtPrice = swapQuote.nextSqrtPrice;
-    const inputAmount = swapQuote.tokenEstIn;
-    collateral = leverage > 1 ? BigInt(Math.floor(Number(inputAmount) / leverage)) : inputAmount;
-    borrow = inputAmount - collateral;
+    ).nextSqrtPrice;
   } else {
     if (leverage > 1) {
-      collateral = BigInt(Math.floor(Number(totalAmount) / leverage));
-      const swapQuote = (0, import_fusionamm_core4.swapQuoteByOutputToken)(
-        totalAmount - collateral,
+      const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
+      collateral = BigInt(Math.floor(Number(increaseAmount) / leverage));
+      borrow = BigInt(
+        Math.floor(
+          collateralToken == 0 /* A */ ? Number(increaseAmount - collateral) * price : Number(increaseAmount - collateral) / price
+        )
+      );
+      estimatedAmount = increaseAmount;
+      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByOutputToken)(
+        increaseAmount - collateral,
         positionToken == 0 /* A */,
         0,
         fusionPool,
         tickArrays
-      );
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-      borrow = swapQuote.tokenEstIn;
+      ).nextSqrtPrice;
     } else {
-      collateral = totalAmount;
+      collateral = increaseAmount;
       borrow = 0n;
+      estimatedAmount = increaseAmount;
     }
   }
   const collateralExcludingFee = collateral;
@@ -10355,6 +10367,124 @@ function getIncreaseSpotPositionQuote(args) {
   return {
     collateral,
     borrow,
+    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) {
+    throw new Error("protocolFeeRate must be greater or equal than zero");
+  }
+  if (protocolFeeRateOnCollateral < 0) {
+    throw new Error("protocolFeeRate must be greater or equal than zero");
+  }
+  if (decreaseAmount <= 0) {
+    throw new Error("decreaseAmount must be greater than zero");
+  }
+  let collateral = 0n;
+  let borrow = 0n;
+  let estimatedAmount = 0n;
+  let nextSqrtPrice = fusionPool.sqrtPrice;
+  let newPositionToken = positionToken;
+  let decreasePercent;
+  const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
+  if (decreaseAmount <= positionAmount || reduceOnly) {
+    let decreaseAmountInPositionToken;
+    if (collateralToken == positionToken) {
+      decreaseAmountInPositionToken = decreaseAmount;
+    } else {
+      decreaseAmountInPositionToken = BigInt(
+        Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
+      );
+    }
+    decreasePercent = Math.min(
+      Math.floor(Number(decreaseAmountInPositionToken) * HUNDRED_PERCENT / Number(positionAmount)),
+      HUNDRED_PERCENT
+    );
+    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;
+    estimatedAmount = decreaseAmountInPositionToken <= positionAmount ? positionAmount - decreaseAmountInPositionToken : 0n;
+  } else {
+    decreasePercent = HUNDRED_PERCENT;
+    const positionTokenIsA = positionToken == 0 /* A */;
+    newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
+    const increaseAmount = decreaseAmount - positionAmount;
+    if (positionToken == collateralToken) {
+      estimatedAmount = BigInt(
+        Math.floor(positionTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
+      );
+      collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : estimatedAmount;
+      borrow = increaseAmount - collateral;
+      const borrowInNewPositionToken = BigInt(
+        Math.floor(positionTokenIsA ? Number(borrow) * price : Number(borrow) / price)
+      );
+      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(
+        positionDebt + borrowInNewPositionToken,
+        !positionTokenIsA,
+        0,
+        fusionPool,
+        tickArrays
+      ).nextSqrtPrice;
+    } else {
+      if (leverage > 1) {
+        const collateralInPositionToken = BigInt(Math.floor(Number(increaseAmount) / leverage));
+        borrow = increaseAmount - collateralInPositionToken;
+        collateral = BigInt(
+          Math.floor(
+            positionToken == 0 /* A */ ? Number(collateralInPositionToken) * price : Number(collateralInPositionToken) / price
+          )
+        );
+        const borrowInNewPositionToken = BigInt(
+          Math.floor(newPositionToken == 1 /* B */ ? Number(borrow) * price : Number(borrow) / price)
+        );
+        estimatedAmount = collateral + borrowInNewPositionToken;
+        nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(
+          positionAmount + borrow,
+          positionTokenIsA,
+          0,
+          fusionPool,
+          tickArrays
+        ).nextSqrtPrice;
+      } else {
+        collateral = increaseAmount;
+        borrow = 0n;
+      }
+    }
+  }
+  const collateralExcludingFee = collateral;
+  const borrowExcludingFee = borrow;
+  collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
+  borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
+  const protocolFeeA = (collateralToken == 0 /* A */ ? collateral - collateralExcludingFee : 0n) + (positionToken == 1 /* B */ ? borrow - borrowExcludingFee : 0n);
+  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - collateralExcludingFee : 0n) + (positionToken == 0 /* A */ ? borrow - borrowExcludingFee : 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,
+    estimatedAmount,
+    borrow,
     protocolFeeA,
     protocolFeeB,
     priceImpact
@@ -15403,6 +15533,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   TUNA_ERROR__POSITION_IS_LIQUIDATED,
   TUNA_ERROR__POSITION_IS_UNHEALTHY,
   TUNA_ERROR__POSITION_NOT_EMPTY,
+  TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED,
   TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE,
   TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET,
   TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET,
@@ -15590,6 +15721,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
+  getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,

package/dist/index.mjs

@@ -310,7 +310,9 @@ function getMarketEncoder() {
       ["borrowLimitB", getU64Encoder2()],
       ["maxSwapSlippage", getU32Encoder()],
       ["rebalanceProtocolFee", getU32Encoder()],
-      ["reserved", fixEncoderSize2(getBytesEncoder2(), 207)]
+      ["spotPositionSizeLimitA", getU64Encoder2()],
+      ["spotPositionSizeLimitB", getU64Encoder2()],
+      ["reserved", fixEncoderSize2(getBytesEncoder2(), 191)]
     ]),
     (value) => ({ ...value, discriminator: MARKET_DISCRIMINATOR })
   );
@@ -337,7 +339,9 @@ function getMarketDecoder() {
     ["borrowLimitB", getU64Decoder2()],
     ["maxSwapSlippage", getU32Decoder()],
     ["rebalanceProtocolFee", getU32Decoder()],
-    ["reserved", fixDecoderSize2(getBytesDecoder2(), 207)]
+    ["spotPositionSizeLimitA", getU64Decoder2()],
+    ["spotPositionSizeLimitB", getU64Decoder2()],
+    ["reserved", fixDecoderSize2(getBytesDecoder2(), 191)]
   ]);
 }
 function getMarketCodec() {
@@ -1575,6 +1579,7 @@ var TUNA_ERROR__POSITION_IS_AUTO_REBALANCEABLE = 6057;
 var TUNA_ERROR__INCORRECT_POSITION_DIRECTION = 6058;
 var TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET = 6059;
 var TUNA_ERROR__M_A_PRICE_DEVIATION_THRESHOLD_EXCEEDED = 6060;
+var TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED = 6061;
 var tunaErrorMessages;
 if (process.env.NODE_ENV !== "production") {
   tunaErrorMessages = {
@@ -1610,6 +1615,7 @@ if (process.env.NODE_ENV !== "production") {
     [TUNA_ERROR__POSITION_IS_LIQUIDATED]: `Position is already liquidated`,
     [TUNA_ERROR__POSITION_IS_UNHEALTHY]: `Position is unhealthy`,
     [TUNA_ERROR__POSITION_NOT_EMPTY]: `Position is not empty`,
+    [TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED]: `Position size exceeds the maximum allowed value`,
     [TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE]: `Protocol fee is out of range`,
     [TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET]: `Rebalance conditions are not met`,
     [TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET]: `Optional recipient account is not set`,
@@ -3271,7 +3277,9 @@ function getCreateMarketInstructionDataEncoder() {
       ["borrowLimitA", getU64Encoder6()],
       ["borrowLimitB", getU64Encoder6()],
       ["maxSwapSlippage", getU32Encoder7()],
-      ["rebalanceProtocolFee", getU32Encoder7()]
+      ["rebalanceProtocolFee", getU32Encoder7()],
+      ["spotPositionSizeLimitA", getU64Encoder6()],
+      ["spotPositionSizeLimitB", getU64Encoder6()]
     ]),
     (value) => ({ ...value, discriminator: CREATE_MARKET_DISCRIMINATOR })
   );
@@ -3292,7 +3300,9 @@ function getCreateMarketInstructionDataDecoder() {
     ["borrowLimitA", getU64Decoder6()],
     ["borrowLimitB", getU64Decoder6()],
     ["maxSwapSlippage", getU32Decoder7()],
-    ["rebalanceProtocolFee", getU32Decoder7()]
+    ["rebalanceProtocolFee", getU32Decoder7()],
+    ["spotPositionSizeLimitA", getU64Decoder6()],
+    ["spotPositionSizeLimitB", getU64Decoder6()]
   ]);
 }
 function getCreateMarketInstructionDataCodec() {
@@ -9576,7 +9586,9 @@ function getUpdateMarketInstructionDataEncoder() {
       ["borrowLimitA", getU64Encoder21()],
       ["borrowLimitB", getU64Encoder21()],
       ["maxSwapSlippage", getU32Encoder33()],
-      ["rebalanceProtocolFee", getU32Encoder33()]
+      ["rebalanceProtocolFee", getU32Encoder33()],
+      ["spotPositionSizeLimitA", getU64Encoder21()],
+      ["spotPositionSizeLimitB", getU64Encoder21()]
     ]),
     (value) => ({ ...value, discriminator: UPDATE_MARKET_DISCRIMINATOR })
   );
@@ -9596,7 +9608,9 @@ function getUpdateMarketInstructionDataDecoder() {
     ["borrowLimitA", getU64Decoder21()],
     ["borrowLimitB", getU64Decoder21()],
     ["maxSwapSlippage", getU32Decoder33()],
-    ["rebalanceProtocolFee", getU32Decoder33()]
+    ["rebalanceProtocolFee", getU32Decoder33()],
+    ["spotPositionSizeLimitA", getU64Decoder21()],
+    ["spotPositionSizeLimitB", getU64Decoder21()]
   ]);
 }
 function getUpdateMarketInstructionDataCodec() {
@@ -10444,6 +10458,7 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
 // src/utils/spotPositionMath.ts
 import {
   sqrtPriceToPrice,
+  swapQuoteByInputToken,
   swapQuoteByOutputToken
 } from "@crypticdot/fusionamm-core";
 function getIncreaseSpotPositionQuote(args) {
@@ -10453,7 +10468,7 @@ function getIncreaseSpotPositionQuote(args) {
     leverage,
     protocolFeeRate,
     protocolFeeRateOnCollateral,
-    totalAmount,
+    increaseAmount,
     collateralToken,
     positionToken
   } = args;
@@ -10466,52 +10481,48 @@ function getIncreaseSpotPositionQuote(args) {
   if (protocolFeeRateOnCollateral < 0) {
     throw new Error("protocolFeeRate must be greater or equal than zero");
   }
-  if (totalAmount < 0) {
-    throw new Error("totalAmount must be greater or equal than zero");
-  }
-  if (totalAmount == 0n) {
-    return {
-      collateral: 0n,
-      borrow: 0n,
-      protocolFeeA: 0n,
-      protocolFeeB: 0n,
-      priceImpact: 0
-    };
+  if (increaseAmount <= 0) {
+    throw new Error("increaseAmount must be greater than zero");
   }
   let borrow;
   let collateral;
+  let estimatedAmount;
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    const totalAmountInOppositeToken = BigInt(
-      Math.floor(positionToken == 0 /* A */ ? Number(totalAmount) / price : Number(totalAmount) * price)
+    collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : increaseAmount;
+    borrow = increaseAmount - collateral;
+    estimatedAmount = BigInt(
+      Math.floor(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
     );
-    const swapQuote = swapQuoteByOutputToken(
-      totalAmountInOppositeToken,
-      positionToken == 0 /* A */,
+    nextSqrtPrice = swapQuoteByInputToken(
+      increaseAmount,
+      collateralToken == 0 /* A */,
       0,
       fusionPool,
       tickArrays
-    );
-    nextSqrtPrice = swapQuote.nextSqrtPrice;
-    const inputAmount = swapQuote.tokenEstIn;
-    collateral = leverage > 1 ? BigInt(Math.floor(Number(inputAmount) / leverage)) : inputAmount;
-    borrow = inputAmount - collateral;
+    ).nextSqrtPrice;
   } else {
     if (leverage > 1) {
-      collateral = BigInt(Math.floor(Number(totalAmount) / leverage));
-      const swapQuote = swapQuoteByOutputToken(
-        totalAmount - collateral,
+      const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
+      collateral = BigInt(Math.floor(Number(increaseAmount) / leverage));
+      borrow = BigInt(
+        Math.floor(
+          collateralToken == 0 /* A */ ? Number(increaseAmount - collateral) * price : Number(increaseAmount - collateral) / price
+        )
+      );
+      estimatedAmount = increaseAmount;
+      nextSqrtPrice = swapQuoteByOutputToken(
+        increaseAmount - collateral,
         positionToken == 0 /* A */,
         0,
         fusionPool,
         tickArrays
-      );
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-      borrow = swapQuote.tokenEstIn;
+      ).nextSqrtPrice;
     } else {
-      collateral = totalAmount;
+      collateral = increaseAmount;
       borrow = 0n;
+      estimatedAmount = increaseAmount;
     }
   }
   const collateralExcludingFee = collateral;
@@ -10526,6 +10537,124 @@ function getIncreaseSpotPositionQuote(args) {
   return {
     collateral,
     borrow,
+    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) {
+    throw new Error("protocolFeeRate must be greater or equal than zero");
+  }
+  if (protocolFeeRateOnCollateral < 0) {
+    throw new Error("protocolFeeRate must be greater or equal than zero");
+  }
+  if (decreaseAmount <= 0) {
+    throw new Error("decreaseAmount must be greater than zero");
+  }
+  let collateral = 0n;
+  let borrow = 0n;
+  let estimatedAmount = 0n;
+  let nextSqrtPrice = fusionPool.sqrtPrice;
+  let newPositionToken = positionToken;
+  let decreasePercent;
+  const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
+  if (decreaseAmount <= positionAmount || reduceOnly) {
+    let decreaseAmountInPositionToken;
+    if (collateralToken == positionToken) {
+      decreaseAmountInPositionToken = decreaseAmount;
+    } else {
+      decreaseAmountInPositionToken = BigInt(
+        Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
+      );
+    }
+    decreasePercent = Math.min(
+      Math.floor(Number(decreaseAmountInPositionToken) * HUNDRED_PERCENT / Number(positionAmount)),
+      HUNDRED_PERCENT
+    );
+    const swapOut = BigInt(Math.floor(Number(positionDebt) * decreasePercent / HUNDRED_PERCENT));
+    const swapQuote = swapQuoteByOutputToken(swapOut, positionToken == 1 /* B */, 0, fusionPool, tickArrays);
+    nextSqrtPrice = swapQuote.nextSqrtPrice;
+    estimatedAmount = decreaseAmountInPositionToken <= positionAmount ? positionAmount - decreaseAmountInPositionToken : 0n;
+  } else {
+    decreasePercent = HUNDRED_PERCENT;
+    const positionTokenIsA = positionToken == 0 /* A */;
+    newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
+    const increaseAmount = decreaseAmount - positionAmount;
+    if (positionToken == collateralToken) {
+      estimatedAmount = BigInt(
+        Math.floor(positionTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
+      );
+      collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : estimatedAmount;
+      borrow = increaseAmount - collateral;
+      const borrowInNewPositionToken = BigInt(
+        Math.floor(positionTokenIsA ? Number(borrow) * price : Number(borrow) / price)
+      );
+      nextSqrtPrice = swapQuoteByInputToken(
+        positionDebt + borrowInNewPositionToken,
+        !positionTokenIsA,
+        0,
+        fusionPool,
+        tickArrays
+      ).nextSqrtPrice;
+    } else {
+      if (leverage > 1) {
+        const collateralInPositionToken = BigInt(Math.floor(Number(increaseAmount) / leverage));
+        borrow = increaseAmount - collateralInPositionToken;
+        collateral = BigInt(
+          Math.floor(
+            positionToken == 0 /* A */ ? Number(collateralInPositionToken) * price : Number(collateralInPositionToken) / price
+          )
+        );
+        const borrowInNewPositionToken = BigInt(
+          Math.floor(newPositionToken == 1 /* B */ ? Number(borrow) * price : Number(borrow) / price)
+        );
+        estimatedAmount = collateral + borrowInNewPositionToken;
+        nextSqrtPrice = swapQuoteByInputToken(
+          positionAmount + borrow,
+          positionTokenIsA,
+          0,
+          fusionPool,
+          tickArrays
+        ).nextSqrtPrice;
+      } else {
+        collateral = increaseAmount;
+        borrow = 0n;
+      }
+    }
+  }
+  const collateralExcludingFee = collateral;
+  const borrowExcludingFee = borrow;
+  collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
+  borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
+  const protocolFeeA = (collateralToken == 0 /* A */ ? collateral - collateralExcludingFee : 0n) + (positionToken == 1 /* B */ ? borrow - borrowExcludingFee : 0n);
+  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - collateralExcludingFee : 0n) + (positionToken == 0 /* A */ ? borrow - borrowExcludingFee : 0n);
+  const newPrice = sqrtPriceToPrice(nextSqrtPrice, 1, 1);
+  const priceImpact = Math.abs(newPrice / price - 1) * 100;
+  return {
+    decreasePercent,
+    collateralToken,
+    positionToken: newPositionToken,
+    collateral,
+    estimatedAmount,
+    borrow,
     protocolFeeA,
     protocolFeeB,
     priceImpact
@@ -15801,6 +15930,7 @@ export {
   TUNA_ERROR__POSITION_IS_LIQUIDATED,
   TUNA_ERROR__POSITION_IS_UNHEALTHY,
   TUNA_ERROR__POSITION_NOT_EMPTY,
+  TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED,
   TUNA_ERROR__PROTOCOL_FEE_IS_OUT_OF_RANGE,
   TUNA_ERROR__REBALANCE_CONDITIONS_NOT_MET,
   TUNA_ERROR__RECIPIENT_ACCOUNT_IS_NOT_SET,
@@ -15988,6 +16118,7 @@ export {
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
+  getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@crypticdot/defituna-client",
   "description": "Typescript client to interact with DefiTuna's on-chain program.",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",
@@ -19,9 +19,9 @@
     "@orca-so/whirlpools-core": "^2.0.0",
     "@orca-so/whirlpools-client": "^3.0.0",
     "@orca-so/whirlpools": "^3.0.0",
-    "@crypticdot/fusionamm-core": "^1.0.62",
-    "@crypticdot/fusionamm-client": "^1.0.62",
-    "@crypticdot/fusionamm-sdk": "^1.0.62",
+    "@crypticdot/fusionamm-core": "^1.0.63",
+    "@crypticdot/fusionamm-client": "^1.0.63",
+    "@crypticdot/fusionamm-sdk": "^1.0.63",
     "@solana/kit": "^2.1.0",
     "@solana/sysvars": "^2.1.0",
     "@solana-program/compute-budget": "^0.7.0",
@@ -51,7 +51,7 @@
     "rimraf": "^6.0.1",
     "vitest": "^3.1.1",
     "solana-bankrun": "^0.4.0",
-    "@crypticdot/defituna-program": "3.1.2"
+    "@crypticdot/defituna-program": "3.1.3"
   },
   "scripts": {
     "build": "node ./codama.mjs && tsup src/index.ts --format cjs,esm --dts",