npm - @crypticdot/defituna-client - Versions diffs - 3.1.12 → 3.1.14 - Mend

@crypticdot/defituna-client 3.1.12 → 3.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -6819,7 +6819,7 @@ type DecreaseSpotPositionQuoteResult = {
     priceImpact: number;
 };
 declare function getDecreaseSpotPositionQuote(args: DecreaseSpotPositionQuoteArgs): DecreaseSpotPositionQuoteResult;
-declare function getPositionSizeByCollateralAndLeverage(collateral: bigint, leverage: number, swapFeeRate: number, protocolFeeRateOnCollateral: number, protocolFeeRate: number): bigint;
+declare function getPositionSizeByCollateralAndLeverage(collateral: bigint, leverage: number, swapCollateral: boolean, swapFeeRate: number, protocolFeeRateOnCollateral: number, protocolFeeRate: number): bigint;
 declare function getLiquidationPrice(positionToken: PoolToken, amount: number, debt: number, liquidationThreshold: number): Number;
 type IncreaseTunaLpPositionOrcaInstructionsArgs = Omit<IncreaseTunaLpPositionOrcaInstructionDataArgs, "remainingAccountsInfo" | "minAddedAmountA" | "minAddedAmountB"> & {

package/dist/index.d.ts CHANGED Viewed

@@ -6819,7 +6819,7 @@ type DecreaseSpotPositionQuoteResult = {
     priceImpact: number;
 };
 declare function getDecreaseSpotPositionQuote(args: DecreaseSpotPositionQuoteArgs): DecreaseSpotPositionQuoteResult;
-declare function getPositionSizeByCollateralAndLeverage(collateral: bigint, leverage: number, swapFeeRate: number, protocolFeeRateOnCollateral: number, protocolFeeRate: number): bigint;
+declare function getPositionSizeByCollateralAndLeverage(collateral: bigint, leverage: number, swapCollateral: boolean, swapFeeRate: number, protocolFeeRateOnCollateral: number, protocolFeeRate: number): bigint;
 declare function getLiquidationPrice(positionToken: PoolToken, amount: number, debt: number, liquidationThreshold: number): Number;
 type IncreaseTunaLpPositionOrcaInstructionsArgs = Omit<IncreaseTunaLpPositionOrcaInstructionDataArgs, "remainingAccountsInfo" | "minAddedAmountA" | "minAddedAmountB"> & {

package/dist/index.js CHANGED Viewed

@@ -10400,9 +10400,8 @@ function getDecreaseSpotPositionQuote(args) {
   let newPositionToken = positionToken;
   let decreasePercent;
   const price = (0, import_fusionamm_core4.sqrtPriceToPrice)(fusionPool.sqrtPrice, 1, 1);
-  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(
-    Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
-  );
+  const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
+  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(Math.floor(Number(decreaseAmount) / positionToOppositeTokenPrice));
   if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
     decreaseAmountInPositionToken = positionAmount;
   }
@@ -10421,49 +10420,36 @@ function getDecreaseSpotPositionQuote(args) {
       }
     } 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;
+      const swapQuote = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
+      nextSqrtPrice = swapQuote.nextSqrtPrice;
     }
   } else {
     decreasePercent = HUNDRED_PERCENT;
-    const posTokenIsA = positionToken == 0 /* A */;
     newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
     const increaseAmount = decreaseAmountInPositionToken - positionAmount;
     if (positionToken == collateralToken) {
-      estimatedAmount = BigInt(
-        Math.floor(posTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
-      );
-      collateral = BigInt(Math.floor(Number(increaseAmount) / leverage));
-      borrow = increaseAmount - collateral;
+      estimatedAmount = BigInt(Math.floor(Number(increaseAmount) * positionToOppositeTokenPrice));
+      borrow = BigInt(Math.floor(Number(increaseAmount) * (leverage - 1)) / leverage);
+      const borrowWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      collateral = increaseAmount - borrowWithFeesApplied;
       if (positionDebt > 0) {
-        const swapQuote = (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, !posTokenIsA, 0, fusionPool, tickArrays);
-        swapInputAmount = swapQuote.tokenEstIn;
+        const swapQuote2 = (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, positionToken != 0 /* A */, 0, fusionPool, tickArrays);
+        swapInputAmount = swapQuote2.tokenEstIn;
       }
-      swapInputAmount += increaseAmount;
-      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
+      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);
-      borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
     } else {
-      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;
-      swapInputAmount = positionAmount + borrow;
-      nextSqrtPrice = (0, import_fusionamm_core4.swapQuoteByInputToken)(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
+      estimatedAmount = BigInt(Math.floor(Number(increaseAmount) * positionToOppositeTokenPrice));
+      borrow = BigInt(Math.floor(Number(increaseAmount) * (leverage - 1) / leverage));
+      const borrowWithFeesApplied = (0, import_fusionamm_core4.tryApplySwapFee)(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      collateral = increaseAmount - borrowWithFeesApplied;
+      collateral = BigInt(Math.floor(Number(collateral) * positionToOppositeTokenPrice));
       collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-      borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
+      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);
@@ -10483,7 +10469,7 @@ function getDecreaseSpotPositionQuote(args) {
     priceImpact
   };
 }
-function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapFeeRate, protocolFeeRateOnCollateral, protocolFeeRate) {
+function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapCollateral, swapFeeRate, protocolFeeRateOnCollateral, protocolFeeRate) {
   if (leverage < 1) {
     throw new Error("leverage must be greater or equal than 1.0");
   }
@@ -10500,6 +10486,9 @@ function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapFeeRat
   );
   borrow = applyTunaProtocolFee(borrow, protocolFeeRate);
   borrow = (0, import_fusionamm_core4.tryApplySwapFee)(borrow, swapFeeRate);
+  if (swapCollateral) {
+    collateral = (0, import_fusionamm_core4.tryApplySwapFee)(collateral, swapFeeRate);
+  }
   return collateral + borrow;
 }
 function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold) {

package/dist/index.mjs CHANGED Viewed

@@ -10570,9 +10570,8 @@ function getDecreaseSpotPositionQuote(args) {
   let newPositionToken = positionToken;
   let decreasePercent;
   const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(
-    Math.floor(collateralToken == 0 /* A */ ? Number(decreaseAmount) * price : Number(decreaseAmount) / price)
-  );
+  const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
+  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(Math.floor(Number(decreaseAmount) / positionToOppositeTokenPrice));
   if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
     decreaseAmountInPositionToken = positionAmount;
   }
@@ -10591,49 +10590,36 @@ function getDecreaseSpotPositionQuote(args) {
       }
     } else {
       swapInputAmount = positionAmount - BigInt(Math.floor(Number(positionAmount) * (HUNDRED_PERCENT - decreasePercent) / HUNDRED_PERCENT));
-      nextSqrtPrice = swapQuoteByInputToken(
-        swapInputAmount,
-        positionToken == 0 /* A */,
-        0,
-        fusionPool,
-        tickArrays
-      ).nextSqrtPrice;
+      const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
+      nextSqrtPrice = swapQuote.nextSqrtPrice;
     }
   } else {
     decreasePercent = HUNDRED_PERCENT;
-    const posTokenIsA = positionToken == 0 /* A */;
     newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
     const increaseAmount = decreaseAmountInPositionToken - positionAmount;
     if (positionToken == collateralToken) {
-      estimatedAmount = BigInt(
-        Math.floor(posTokenIsA ? Number(increaseAmount) * price : Number(increaseAmount) / price)
-      );
-      collateral = BigInt(Math.floor(Number(increaseAmount) / leverage));
-      borrow = increaseAmount - collateral;
+      estimatedAmount = BigInt(Math.floor(Number(increaseAmount) * positionToOppositeTokenPrice));
+      borrow = BigInt(Math.floor(Number(increaseAmount) * (leverage - 1)) / leverage);
+      const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      collateral = increaseAmount - borrowWithFeesApplied;
       if (positionDebt > 0) {
-        const swapQuote = swapQuoteByOutputToken(positionDebt, !posTokenIsA, 0, fusionPool, tickArrays);
-        swapInputAmount = swapQuote.tokenEstIn;
+        const swapQuote2 = swapQuoteByOutputToken(positionDebt, positionToken != 0 /* A */, 0, fusionPool, tickArrays);
+        swapInputAmount = swapQuote2.tokenEstIn;
       }
-      swapInputAmount += increaseAmount;
-      nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
+      swapInputAmount += collateral + applyTunaProtocolFee(borrow, protocolFeeRate);
+      const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
+      nextSqrtPrice = swapQuote.nextSqrtPrice;
       collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-      borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
     } else {
-      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;
-      swapInputAmount = positionAmount + borrow;
-      nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, posTokenIsA, 0, fusionPool, tickArrays).nextSqrtPrice;
+      estimatedAmount = BigInt(Math.floor(Number(increaseAmount) * positionToOppositeTokenPrice));
+      borrow = BigInt(Math.floor(Number(increaseAmount) * (leverage - 1) / leverage));
+      const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      collateral = increaseAmount - borrowWithFeesApplied;
+      collateral = BigInt(Math.floor(Number(collateral) * positionToOppositeTokenPrice));
       collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-      borrow = reverseApplyTunaProtocolFee(borrow, protocolFeeRate);
+      swapInputAmount = positionAmount + applyTunaProtocolFee(borrow, protocolFeeRate);
+      const swapQuote = 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);
@@ -10653,7 +10639,7 @@ function getDecreaseSpotPositionQuote(args) {
     priceImpact
   };
 }
-function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapFeeRate, protocolFeeRateOnCollateral, protocolFeeRate) {
+function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapCollateral, swapFeeRate, protocolFeeRateOnCollateral, protocolFeeRate) {
   if (leverage < 1) {
     throw new Error("leverage must be greater or equal than 1.0");
   }
@@ -10670,6 +10656,9 @@ function getPositionSizeByCollateralAndLeverage(collateral, leverage, swapFeeRat
   );
   borrow = applyTunaProtocolFee(borrow, protocolFeeRate);
   borrow = tryApplySwapFee2(borrow, swapFeeRate);
+  if (swapCollateral) {
+    collateral = tryApplySwapFee2(collateral, swapFeeRate);
+  }
   return collateral + borrow;
 }
 function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold) {

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@crypticdot/defituna-client",
   "description": "Typescript client to interact with DefiTuna's on-chain program.",
-  "version": "3.1.12",
+  "version": "3.1.14",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",