@crypticdot/defituna-client 3.1.6 → 3.1.8

package/dist/index.d.mts

@@ -6762,6 +6762,8 @@ type IncreaseSpotPositionQuoteResult = {
     borrow: bigint;
     /** Estimated position size in the position token. */
     estimatedAmount: bigint;
+    /** Swap input amount. */
+    swapInputAmount: bigint;
     /** Protocol fee in token A */
     protocolFeeA: bigint;
     /** Protocol fee in token B */
@@ -6805,6 +6807,8 @@ type DecreaseSpotPositionQuoteResult = {
     collateral: bigint;
     /** Required amount to borrow */
     borrow: bigint;
+    /** Swap input amount. */
+    swapInputAmount: bigint;
     /** Estimated total amount of the new position */
     estimatedAmount: bigint;
     /** Protocol fee in token A */

package/dist/index.d.ts

@@ -6762,6 +6762,8 @@ type IncreaseSpotPositionQuoteResult = {
     borrow: bigint;
     /** Estimated position size in the position token. */
     estimatedAmount: bigint;
+    /** Swap input amount. */
+    swapInputAmount: bigint;
     /** Protocol fee in token A */
     protocolFeeA: bigint;
     /** Protocol fee in token B */
@@ -6805,6 +6807,8 @@ type DecreaseSpotPositionQuoteResult = {
     collateral: bigint;
     /** Required amount to borrow */
     borrow: bigint;
+    /** Swap input amount. */
+    swapInputAmount: bigint;
     /** Estimated total amount of the new position */
     estimatedAmount: bigint;
     /** Protocol fee in token A */

package/dist/index.js

@@ -10315,24 +10315,19 @@ function getIncreaseSpotPositionQuote(args) {
   if (increaseAmount <= 0) {
     throw new Error("increaseAmount must be greater than zero");
   }
-  let borrow;
+  let borrow = 0n;
   let collateral;
   let estimatedAmount;
+  let swapInputAmount = 0n;
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
     collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : increaseAmount;
     borrow = increaseAmount - collateral;
+    swapInputAmount = increaseAmount;
     estimatedAmount = BigInt(
       Math.floor(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
     );
-    nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(
-      increaseAmount,
-      collateralToken == 0 /* A */,
-      0,
-      fusionPool,
-      tickArrays
-    ).nextSqrtPrice;
   } else {
     if (leverage > 1) {
       const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
@@ -10342,20 +10337,17 @@ function getIncreaseSpotPositionQuote(args) {
           collateralToken == 0 /* A */ ? Number(increaseAmount - collateral) * price : Number(increaseAmount - collateral) / price
         )
       );
+      swapInputAmount = borrow;
       estimatedAmount = increaseAmount;
-      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByOutputToken)(
-        increaseAmount - collateral,
-        positionToken == 0 /* A */,
-        0,
-        fusionPool,
-        tickArrays
-      ).nextSqrtPrice;
     } else {
       collateral = increaseAmount;
-      borrow = 0n;
       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 collateralExcludingFee = collateral;
   const borrowExcludingFee = borrow;
   collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
@@ -10368,6 +10360,7 @@ function getIncreaseSpotPositionQuote(args) {
   return {
     collateral,
     borrow,
+    swapInputAmount,
     estimatedAmount,
     protocolFeeA,
     protocolFeeB,
@@ -10402,49 +10395,58 @@ function getDecreaseSpotPositionQuote(args) {
   }
   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);
-  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)
-      );
-    }
+  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(
+    Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
+  );
+  if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
+    decreaseAmountInPositionToken = positionAmount;
+  }
+  if (decreaseAmountInPositionToken <= positionAmount) {
     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;
+    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));
+      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(
+        swapInputAmount,
+        positionToken == 0 /* A */,
+        0,
+        fusionPool,
+        tickArrays
+      ).nextSqrtPrice;
+    }
   } else {
     decreasePercent = HUNDRED_PERCENT;
-    const positionTokenIsA = positionToken == 0 /* A */;
+    const posTokenIsA = positionToken == 0 /* A */;
     newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
-    const increaseAmount = decreaseAmount - positionAmount;
+    const increaseAmount = decreaseAmountInPositionToken - positionAmount;
     if (positionToken == collateralToken) {
       estimatedAmount = BigInt(
-        Math.floor(positionTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
+        Math.floor(posTokenIsA ? 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;
+      if (positionDebt > 0) {
+        const swapQuote = (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, !posTokenIsA, 0, fusionPool, tickArrays);
+        swapInputAmount = swapQuote.tokenEstIn;
+      }
+      swapInputAmount += increaseAmount;
+      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
     } else {
       if (leverage > 1) {
         const collateralInPositionToken = BigInt(Math.floor(Number(increaseAmount) / leverage));
@@ -10458,13 +10460,8 @@ function getDecreaseSpotPositionQuote(args) {
           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;
+        swapInputAmount = positionAmount + borrow;
+        nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
       } else {
         collateral = increaseAmount;
         borrow = 0n;
@@ -10484,8 +10481,9 @@ function getDecreaseSpotPositionQuote(args) {
     collateralToken,
     positionToken: newPositionToken,
     collateral,
-    estimatedAmount,
     borrow,
+    swapInputAmount,
+    estimatedAmount,
     protocolFeeA,
     protocolFeeB,
     priceImpact

package/dist/index.mjs

@@ -10484,24 +10484,19 @@ function getIncreaseSpotPositionQuote(args) {
   if (increaseAmount <= 0) {
     throw new Error("increaseAmount must be greater than zero");
   }
-  let borrow;
+  let borrow = 0n;
   let collateral;
   let estimatedAmount;
+  let swapInputAmount = 0n;
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
     collateral = leverage > 1 ? BigInt(Math.floor(Number(increaseAmount) / leverage)) : increaseAmount;
     borrow = increaseAmount - collateral;
+    swapInputAmount = increaseAmount;
     estimatedAmount = BigInt(
       Math.floor(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
     );
-    nextSqrtPrice = swapQuoteByInputToken(
-      increaseAmount,
-      collateralToken == 0 /* A */,
-      0,
-      fusionPool,
-      tickArrays
-    ).nextSqrtPrice;
   } else {
     if (leverage > 1) {
       const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
@@ -10511,20 +10506,17 @@ function getIncreaseSpotPositionQuote(args) {
           collateralToken == 0 /* A */ ? Number(increaseAmount - collateral) * price : Number(increaseAmount - collateral) / price
         )
       );
+      swapInputAmount = borrow;
       estimatedAmount = increaseAmount;
-      nextSqrtPrice = swapQuoteByOutputToken(
-        increaseAmount - collateral,
-        positionToken == 0 /* A */,
-        0,
-        fusionPool,
-        tickArrays
-      ).nextSqrtPrice;
     } else {
       collateral = increaseAmount;
-      borrow = 0n;
       estimatedAmount = increaseAmount;
     }
   }
+  if (swapInputAmount > 0) {
+    const is_token_a = positionToken == 1 /* B */;
+    nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, is_token_a, 0, fusionPool, tickArrays).nextSqrtPrice;
+  }
   const collateralExcludingFee = collateral;
   const borrowExcludingFee = borrow;
   collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
@@ -10537,6 +10529,7 @@ function getIncreaseSpotPositionQuote(args) {
   return {
     collateral,
     borrow,
+    swapInputAmount,
     estimatedAmount,
     protocolFeeA,
     protocolFeeB,
@@ -10571,49 +10564,58 @@ function getDecreaseSpotPositionQuote(args) {
   }
   let collateral = 0n;
   let borrow = 0n;
+  let swapInputAmount = 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)
-      );
-    }
+  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(
+    Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
+  );
+  if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
+    decreaseAmountInPositionToken = positionAmount;
+  }
+  if (decreaseAmountInPositionToken <= positionAmount) {
     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;
+    estimatedAmount = positionAmount - decreaseAmountInPositionToken;
+    if (collateralToken == positionToken) {
+      if (positionDebt > 0) {
+        const swapOut = BigInt(Math.floor(Number(positionDebt) * decreasePercent / HUNDRED_PERCENT));
+        const swapQuote = 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));
+      nextSqrtPrice = swapQuoteByInputToken(
+        swapInputAmount,
+        positionToken == 0 /* A */,
+        0,
+        fusionPool,
+        tickArrays
+      ).nextSqrtPrice;
+    }
   } else {
     decreasePercent = HUNDRED_PERCENT;
-    const positionTokenIsA = positionToken == 0 /* A */;
+    const posTokenIsA = positionToken == 0 /* A */;
     newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
-    const increaseAmount = decreaseAmount - positionAmount;
+    const increaseAmount = decreaseAmountInPositionToken - positionAmount;
     if (positionToken == collateralToken) {
       estimatedAmount = BigInt(
-        Math.floor(positionTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
+        Math.floor(posTokenIsA ? 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;
+      if (positionDebt > 0) {
+        const swapQuote = swapQuoteByOutputToken(positionDebt, !posTokenIsA, 0, fusionPool, tickArrays);
+        swapInputAmount = swapQuote.tokenEstIn;
+      }
+      swapInputAmount += increaseAmount;
+      nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
     } else {
       if (leverage > 1) {
         const collateralInPositionToken = BigInt(Math.floor(Number(increaseAmount) / leverage));
@@ -10627,13 +10629,8 @@ function getDecreaseSpotPositionQuote(args) {
           Math.floor(newPositionToken == 1 /* B */ ? Number(borrow) * price : Number(borrow) / price)
         );
         estimatedAmount = collateral + borrowInNewPositionToken;
-        nextSqrtPrice = swapQuoteByInputToken(
-          positionAmount + borrow,
-          positionTokenIsA,
-          0,
-          fusionPool,
-          tickArrays
-        ).nextSqrtPrice;
+        swapInputAmount = positionAmount + borrow;
+        nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
       } else {
         collateral = increaseAmount;
         borrow = 0n;
@@ -10653,8 +10650,9 @@ function getDecreaseSpotPositionQuote(args) {
     collateralToken,
     positionToken: newPositionToken,
     collateral,
-    estimatedAmount,
     borrow,
+    swapInputAmount,
+    estimatedAmount,
     protocolFeeA,
     protocolFeeB,
     priceImpact

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.6",
+  "version": "3.1.8",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",