@crypticdot/defituna-client 3.1.16 → 3.1.18

package/dist/index.js

@@ -10323,10 +10323,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);
+    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)
@@ -10334,16 +10334,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 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 = reverseApplyTunaProtocolFee(
-      increaseAmount - borrowInPositionTokenWithFeesApplied,
-      protocolFeeRateOnCollateral
-    );
+    collateral = increaseAmount - borrowInPositionTokenWithFeesApplied;
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
     swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
     estimatedAmount = increaseAmount;
   }
@@ -10499,16 +10497,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);
     }
-    return collateral + borrow;
+    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);
@@ -10523,7 +10517,7 @@ function getTradableAmount(args) {
       }
     } else {
       const positionAmountInCollateralToken = collateralToken == positionToken ? positionAmount : BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      let positionCollateral = collateralToken == positionToken ? positionAmount - (0, import_fusionamm_core4.swapQuoteByOutputToken)(positionDebt, positionToken == 1 /* B */, 0, fusionPool, tickArrays).tokenEstIn : (0, import_fusionamm_core4.swapQuoteByInputToken)(positionAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays).tokenEstOut - positionDebt;
+      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);
     }

package/dist/index.mjs

@@ -10493,10 +10493,10 @@ function getIncreaseSpotPositionQuote(args) {
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-    const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-    collateral = reverseApplyTunaProtocolFee(increaseAmount - borrowWithFeesApplied, protocolFeeRateOnCollateral);
+    borrow = BigInt(Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage));
+    collateral = increaseAmount - tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
     collateral = tryReverseApplySwapFee(collateral, fusionPool.feeRate);
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
     swapInputAmount = increaseAmount;
     estimatedAmount = BigInt(
       Math.round(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
@@ -10504,16 +10504,14 @@ function getIncreaseSpotPositionQuote(args) {
   } else {
     const price = 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 borrowInPositionToken = Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage);
+    borrow = BigInt(Math.ceil(borrowInPositionToken * positionToBorrowedTokenPrice));
     const borrowInPositionTokenWithFeesApplied = tryApplySwapFee2(
       applyTunaProtocolFee(BigInt(Math.floor(borrowInPositionToken)), protocolFeeRate),
       fusionPool.feeRate
     );
-    collateral = reverseApplyTunaProtocolFee(
-      increaseAmount - borrowInPositionTokenWithFeesApplied,
-      protocolFeeRateOnCollateral
-    );
+    collateral = increaseAmount - borrowInPositionTokenWithFeesApplied;
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
     swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
     estimatedAmount = increaseAmount;
   }
@@ -10669,16 +10667,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 = tryApplySwapFee2(borrow, fusionPool.feeRate);
     if (collateralToken != newPositionToken) {
       collateral = tryApplySwapFee2(collateral, fusionPool.feeRate);
     }
-    return collateral + borrow;
+    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);
@@ -10693,7 +10687,7 @@ function getTradableAmount(args) {
       }
     } else {
       const positionAmountInCollateralToken = collateralToken == positionToken ? positionAmount : BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      let positionCollateral = collateralToken == positionToken ? positionAmount - swapQuoteByOutputToken(positionDebt, positionToken == 1 /* B */, 0, fusionPool, tickArrays).tokenEstIn : swapQuoteByInputToken(positionAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays).tokenEstOut - positionDebt;
+      let positionCollateral = collateralToken == positionToken ? positionAmount - (positionDebt > 0n ? swapQuoteByOutputToken(positionDebt, positionToken == 1 /* B */, 0, fusionPool, tickArrays).tokenEstIn : 0n) : positionAmount > 0n ? swapQuoteByInputToken(positionAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays).tokenEstOut - positionDebt : 0n;
       if (positionCollateral < 0n) positionCollateral = 0n;
       availableToTrade = positionAmountInCollateralToken + addLeverage(availableBalance + positionCollateral);
     }

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.16",
+  "version": "3.1.18",
   "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": "^4.0.1",
     "@orca-so/whirlpools": "^4.0.0",
-    "@crypticdot/fusionamm-core": "^1.0.66",
-    "@crypticdot/fusionamm-client": "^1.0.66",
-    "@crypticdot/fusionamm-sdk": "^1.0.66",
+    "@crypticdot/fusionamm-core": "^1.0.67",
+    "@crypticdot/fusionamm-client": "^1.0.67",
+    "@crypticdot/fusionamm-sdk": "^1.0.67",
     "@solana/kit": "^2.1.0",
     "@solana/sysvars": "^2.1.0",
     "@solana-program/compute-budget": "^0.7.0",
@@ -51,11 +51,11 @@
     "rimraf": "^6.0.1",
     "vitest": "^3.1.1",
     "solana-bankrun": "^0.4.0",
-    "@crypticdot/defituna-program": "3.1.3"
+    "@crypticdot/defituna-program": "3.1.4"
   },
   "scripts": {
     "build": "node ./codama.mjs && tsup src/index.ts --format cjs,esm --dts",
-    "test": "vitest run tests --no-cache",
+    "test": "RUST_LOG=error vitest run tests --no-cache",
     "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
     "eslint": "eslint \"src/**/*.ts\"",
     "eslint:fix": "eslint \"src/**/*.ts\" --fix",