@crypticdot/defituna-client 3.1.19 → 3.2.1

package/dist/index.mjs

@@ -10418,273 +10418,6 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
   return collateralAmount * BigInt(protocolFeeRateOnCollateral) / BigInt(HUNDRED_PERCENT) + borrowAmount * BigInt(protocolFeeRate) / BigInt(HUNDRED_PERCENT);
 }
 
-// src/utils/spotPositionMath.ts
-import {
-  sqrtPriceToPrice,
-  swapQuoteByInputToken,
-  swapQuoteByOutputToken
-} from "@crypticdot/fusionamm-core";
-function getIncreaseSpotPositionQuote(args) {
-  const {
-    fusionPool,
-    tickArrays,
-    leverage,
-    protocolFeeRate,
-    protocolFeeRateOnCollateral,
-    increaseAmount,
-    collateralToken,
-    positionToken
-  } = args;
-  if (leverage < 1) {
-    throw new Error("leverage must be greater or equal than 1.0");
-  }
-  if (protocolFeeRate < 0 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (increaseAmount <= 0) {
-    throw new Error("increaseAmount must be greater than zero");
-  }
-  let borrow;
-  let collateral;
-  let estimatedAmount;
-  let swapInputAmount;
-  let nextSqrtPrice = fusionPool.sqrtPrice;
-  if (positionToken != collateralToken) {
-    const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    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)
-    );
-  } else {
-    const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    const positionToBorrowedTokenPrice = collateralToken == 0 /* A */ ? price : 1 / price;
-    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 = increaseAmount - borrowInPositionTokenWithFeesApplied;
-    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
-    swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
-    estimatedAmount = increaseAmount;
-  }
-  if (swapInputAmount > 0) {
-    const is_token_a = positionToken == 1 /* B */;
-    nextSqrtPrice = swapQuoteByInputToken(swapInputAmount, is_token_a, 0, fusionPool, tickArrays).nextSqrtPrice;
-  }
-  const protocolFeeA = (collateralToken == 0 /* A */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 1 /* B */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 0 /* A */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const oldPrice = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-  const newPrice = sqrtPriceToPrice(nextSqrtPrice, 1, 1);
-  const priceImpact = Math.abs(newPrice / oldPrice - 1) * 100;
-  return {
-    collateral,
-    borrow,
-    swapInputAmount,
-    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 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (decreaseAmount <= 0) {
-    throw new Error("decreaseAmount must be greater than zero");
-  }
-  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);
-  const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
-  let decreaseAmountInPositionToken = collateralToken == positionToken ? decreaseAmount : BigInt(Math.round(Number(decreaseAmount) / positionToOppositeTokenPrice));
-  if (reduceOnly && decreaseAmountInPositionToken > positionAmount) {
-    decreaseAmountInPositionToken = positionAmount;
-  }
-  if (decreaseAmountInPositionToken <= positionAmount) {
-    decreasePercent = Math.min(
-      Math.floor(Number(decreaseAmountInPositionToken) * HUNDRED_PERCENT / Number(positionAmount)),
-      HUNDRED_PERCENT
-    );
-    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));
-      const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-    }
-  } else {
-    decreasePercent = HUNDRED_PERCENT;
-    newPositionToken = positionToken == 0 /* A */ ? 1 /* B */ : 0 /* A */;
-    const increaseAmount = decreaseAmountInPositionToken - positionAmount;
-    if (positionToken == collateralToken) {
-      estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
-      borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-      collateral = increaseAmount - borrowWithFeesApplied;
-      if (positionDebt > 0) {
-        const swapQuote2 = swapQuoteByOutputToken(positionDebt, positionToken != 0 /* A */, 0, fusionPool, tickArrays);
-        swapInputAmount = swapQuote2.tokenEstIn;
-      }
-      swapInputAmount += collateral + applyTunaProtocolFee(borrow, protocolFeeRate);
-      const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
-      nextSqrtPrice = swapQuote.nextSqrtPrice;
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
-    } else {
-      estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
-      borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-      collateral = increaseAmount - borrowWithFeesApplied;
-      collateral = BigInt(Math.round(Number(collateral) * positionToOppositeTokenPrice));
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
-      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);
-  const protocolFeeB = (collateralToken == 1 /* B */ ? collateral - applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral) : 0n) + (positionToken == 0 /* A */ ? borrow - applyTunaProtocolFee(borrow, protocolFeeRate) : 0n);
-  const newPrice = sqrtPriceToPrice(nextSqrtPrice, 1, 1);
-  const priceImpact = Math.abs(newPrice / price - 1) * 100;
-  return {
-    decreasePercent,
-    collateralToken,
-    positionToken: newPositionToken,
-    collateral,
-    borrow,
-    swapInputAmount,
-    estimatedAmount,
-    protocolFeeA,
-    protocolFeeB,
-    priceImpact
-  };
-}
-function getTradableAmount(args) {
-  const {
-    collateralToken,
-    newPositionToken,
-    positionToken,
-    positionAmount,
-    positionDebt,
-    reduceOnly,
-    fusionPool,
-    tickArrays,
-    leverage,
-    availableBalance,
-    protocolFeeRate,
-    protocolFeeRateOnCollateral
-  } = args;
-  if (leverage < 1) {
-    throw new Error("leverage must be greater or equal than 1.0");
-  }
-  if (protocolFeeRateOnCollateral < 0 || protocolFeeRateOnCollateral >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (protocolFeeRate < 0 || protocolFeeRate >= HUNDRED_PERCENT) {
-    throw new Error("protocolFeeRate must be greater or equal than zero and less than HUNDRED_PERCENT");
-  }
-  if (positionAmount == 0n && newPositionToken != positionToken) {
-    throw new Error("positionToken must be set to newPositionToken if positionAmount is zero");
-  }
-  let availableToTrade = 0n;
-  const addLeverage = (collateral) => {
-    collateral = applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    if (collateralToken != newPositionToken) {
-      collateral = applySwapFee(collateral, fusionPool.feeRate);
-    }
-    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);
-  } else {
-    const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    const positionToOppositeTokenPrice = positionToken == 0 /* A */ ? price : 1 / price;
-    if (reduceOnly) {
-      if (collateralToken == positionToken) {
-        availableToTrade = positionAmount;
-      } else {
-        availableToTrade = BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      }
-    } else {
-      const positionAmountInCollateralToken = collateralToken == positionToken ? positionAmount : BigInt(Math.round(Number(positionAmount) * positionToOppositeTokenPrice));
-      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);
-    }
-  }
-  return availableToTrade;
-}
-function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold) {
-  if (debt < 0) {
-    throw new Error("debt must be greater or equal than zero");
-  }
-  if (amount < 0) {
-    throw new Error("position amount must be greater or equal than zero");
-  }
-  if (liquidationThreshold <= 0 || liquidationThreshold >= 1) {
-    throw new Error("liquidationThreshold must be greater than zero and less than one");
-  }
-  if (debt == 0 || amount == 0) return 0;
-  if (positionToken == 0 /* A */) {
-    return debt / (amount * liquidationThreshold);
-  } else {
-    return amount * liquidationThreshold / debt;
-  }
-}
-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 reverseApplySwapFee(amount, feeRate, roundUp = true) {
-  return mulDiv(amount, 1000000n, BigInt(1e6 - feeRate), roundUp);
-}
-
 // src/txbuilder/increaseTunaLpPositionOrca.ts
 import {
   fetchMaybeWhirlpool,
@@ -15836,6 +15569,24 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   ix.accounts.push(...remainingAccounts);
   return ix;
 }
+
+// src/casts.ts
+function toPoolTokenFacade(token) {
+  switch (token) {
+    case 0 /* A */:
+      return "a";
+    case 1 /* B */:
+      return "b";
+  }
+}
+function fromPoolTokenFacade(token) {
+  switch (token) {
+    case "a":
+      return 0 /* A */;
+    case "b":
+      return 1 /* B */;
+  }
+}
 export {
   AccountsType,
   CLOSE_ACTIVE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR,
@@ -16063,6 +15814,7 @@ export {
   fetchTunaLpPosition,
   fetchTunaSpotPosition,
   fetchVault,
+  fromPoolTokenFacade,
   getAccountsTypeCodec,
   getAccountsTypeDecoder,
   getAccountsTypeEncoder,
@@ -16133,7 +15885,6 @@ export {
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
-  getDecreaseSpotPositionQuote,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -16160,7 +15911,6 @@ export {
   getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder,
   getIncreaseLpPositionQuote,
-  getIncreaseSpotPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -16208,7 +15958,6 @@ export {
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidationPrice,
   getMarketAddress,
   getMarketCodec,
   getMarketDecoder,
@@ -16358,7 +16107,6 @@ export {
   getSetTunaSpotPositionLimitOrdersInstructionDataCodec,
   getSetTunaSpotPositionLimitOrdersInstructionDataDecoder,
   getSetTunaSpotPositionLimitOrdersInstructionDataEncoder,
-  getTradableAmount,
   getTunaConfigAddress,
   getTunaConfigCodec,
   getTunaConfigDecoder,
@@ -16504,6 +16252,7 @@ export {
   resetTunaSpotPositionInstruction,
   setTunaLpPositionLimitOrdersInstruction,
   setTunaSpotPositionLimitOrdersInstruction,
+  toPoolTokenFacade,
   tunaLpPositionAuthorityFilter,
   tunaLpPositionMarketMakerFilter,
   tunaLpPositionMintAFilter,

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.19",
+  "version": "3.2.1",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",
@@ -29,7 +29,8 @@
     "@solana-program/token": "^0.5.1",
     "@solana-program/token-2022": "^0.4.2",
     "@solana-program/memo": "^0.7.0",
-    "@solana-program/address-lookup-table": "^0.7.0"
+    "@solana-program/address-lookup-table": "^0.7.0",
+    "@crypticdot/defituna-core": "3.2.1"
   },
   "devDependencies": {
     "@crypticdot/typescript-config": "^1.0.0",