@crypticdot/defituna-client 3.1.3 → 3.1.5

package/dist/index.mjs

@@ -10458,6 +10458,7 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
 // src/utils/spotPositionMath.ts
 import {
   sqrtPriceToPrice,
+  swapQuoteByInputToken,
   swapQuoteByOutputToken
 } from "@crypticdot/fusionamm-core";
 function getIncreaseSpotPositionQuote(args) {
@@ -10467,7 +10468,7 @@ function getIncreaseSpotPositionQuote(args) {
     leverage,
     protocolFeeRate,
     protocolFeeRateOnCollateral,
-    totalAmount,
+    increaseAmount,
     collateralToken,
     positionToken
   } = args;
@@ -10480,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;
@@ -10540,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
@@ -12000,7 +12115,7 @@ import {
   AccountRole as AccountRole8
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS8 } from "@solana-program/memo";
-import { fetchAllMaybeMint as fetchAllMaybeMint11, findAssociatedTokenPda as findAssociatedTokenPda13 } from "@solana-program/token-2022";
+import { fetchAllMaybeMint as fetchAllMaybeMint11, fetchAllToken, findAssociatedTokenPda as findAssociatedTokenPda13 } from "@solana-program/token-2022";
 import assert11 from "assert";
 async function closeActiveTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args, createInstructions, cleanupInstructions) {
   const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPoolAddress))[0];
@@ -12018,30 +12133,42 @@ async function closeActiveTunaSpotPositionFusionInstructions(rpc, authority, fus
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
-  const createUserAtaInstructions = await getCreateAtaInstructions(
-    rpc,
-    authority,
-    collateralTokenMint.address,
-    authority.address,
-    collateralTokenMint.programAddress
-  );
-  createInstructions.push(...createUserAtaInstructions.init);
+  const tunaPositionAtaAAddress = (await findAssociatedTokenPda13({
+    owner: tunaPosition.address,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionAtaBAddress = (await findAssociatedTokenPda13({
+    owner: tunaPosition.address,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const [tunaPositionAtaA, tunaPositionAtaB] = await fetchAllToken(rpc, [
+    tunaPositionAtaAAddress,
+    tunaPositionAtaBAddress
+  ]);
+  const createUserAtaAInstructions = tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionAtaA.data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintA.address, authority.address, mintA.programAddress) : void 0;
+  if (createUserAtaAInstructions) createInstructions.push(...createUserAtaAInstructions.init);
+  const createUserAtaBInstructions = tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionAtaB.data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintB.address, authority.address, mintB.programAddress) : void 0;
+  if (createUserAtaBInstructions) createInstructions.push(...createUserAtaBInstructions.init);
   const ix = await closeActiveTunaSpotPositionFusionInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     mintA,
     mintB,
     vaultA,
     vaultB,
     fusionPool,
+    createUserAtaAInstructions != void 0,
+    createUserAtaBInstructions != void 0,
     { ...args }
   );
   instructions.push(ix);
-  cleanupInstructions.push(...createUserAtaInstructions.cleanup);
+  if (createUserAtaAInstructions) cleanupInstructions.push(...createUserAtaAInstructions.cleanup);
+  if (createUserAtaBInstructions) cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return instructions;
 }
-async function closeActiveTunaSpotPositionFusionInstruction(authority, tunaPositionAddress, mintA, mintB, vaultA, vaultB, fusionPool, args) {
+async function closeActiveTunaSpotPositionFusionInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, fusionPool, setTunaPositionOwnerAtaA, setTunaPositionOwnerAtaB, args) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const tunaPositionOwnerAtaA = (await findAssociatedTokenPda13({
@@ -12055,12 +12182,12 @@ async function closeActiveTunaSpotPositionFusionInstruction(authority, tunaPosit
     tokenProgram: mintB.programAddress
   }))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda13({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await findAssociatedTokenPda13({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -12105,9 +12232,9 @@ async function closeActiveTunaSpotPositionFusionInstruction(authority, tunaPosit
     tunaConfig,
     tunaPositionAtaA,
     tunaPositionAtaB,
-    tunaPositionOwnerAtaA,
-    tunaPositionOwnerAtaB,
-    tunaPosition: tunaPositionAddress,
+    ...setTunaPositionOwnerAtaA && { tunaPositionOwnerAtaA },
+    ...setTunaPositionOwnerAtaB && { tunaPositionOwnerAtaB },
+    tunaPosition: tunaPosition.address,
     fusionPool: fusionPool.address,
     fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS6,
     tokenProgramA: mintA.programAddress,
@@ -12130,7 +12257,7 @@ import {
   AccountRole as AccountRole9
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS9 } from "@solana-program/memo";
-import { fetchAllMaybeMint as fetchAllMaybeMint12, findAssociatedTokenPda as findAssociatedTokenPda14 } from "@solana-program/token-2022";
+import { fetchAllMaybeMint as fetchAllMaybeMint12, fetchAllToken as fetchAllToken2, findAssociatedTokenPda as findAssociatedTokenPda14 } from "@solana-program/token-2022";
 import assert12 from "assert";
 async function closeActiveTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args, createInstructions, cleanupInstructions) {
   const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpoolAddress))[0];
@@ -12148,30 +12275,42 @@ async function closeActiveTunaSpotPositionOrcaInstructions(rpc, authority, whirl
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
-  const createUserAtaInstructions = await getCreateAtaInstructions(
-    rpc,
-    authority,
-    collateralTokenMint.address,
-    authority.address,
-    collateralTokenMint.programAddress
-  );
-  createInstructions.push(...createUserAtaInstructions.init);
+  const tunaPositionAtaAAddress = (await findAssociatedTokenPda14({
+    owner: tunaPosition.address,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionAtaBAddress = (await findAssociatedTokenPda14({
+    owner: tunaPosition.address,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const [tunaPositionAtaA, tunaPositionAtaB] = await fetchAllToken2(rpc, [
+    tunaPositionAtaAAddress,
+    tunaPositionAtaBAddress
+  ]);
+  const createUserAtaAInstructions = tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionAtaA.data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintA.address, authority.address, mintA.programAddress) : void 0;
+  if (createUserAtaAInstructions) createInstructions.push(...createUserAtaAInstructions.init);
+  const createUserAtaBInstructions = tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionAtaB.data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintB.address, authority.address, mintB.programAddress) : void 0;
+  if (createUserAtaBInstructions) createInstructions.push(...createUserAtaBInstructions.init);
   const ix = await closeActiveTunaSpotPositionOrcaInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     mintA,
     mintB,
     vaultA,
     vaultB,
     whirlpool,
+    createUserAtaAInstructions != void 0,
+    createUserAtaBInstructions != void 0,
     { ...args }
   );
   instructions.push(ix);
-  cleanupInstructions.push(...createUserAtaInstructions.cleanup);
+  if (createUserAtaAInstructions) cleanupInstructions.push(...createUserAtaAInstructions.cleanup);
+  if (createUserAtaBInstructions) cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return instructions;
 }
-async function closeActiveTunaSpotPositionOrcaInstruction(authority, tunaPositionAddress, mintA, mintB, vaultA, vaultB, whirlpool, args) {
+async function closeActiveTunaSpotPositionOrcaInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, setTunaPositionOwnerAtaA, setTunaPositionOwnerAtaB, args) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress3(whirlpool.address))[0];
@@ -12186,12 +12325,12 @@ async function closeActiveTunaSpotPositionOrcaInstruction(authority, tunaPositio
     tokenProgram: mintB.programAddress
   }))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda14({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await findAssociatedTokenPda14({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -12238,9 +12377,9 @@ async function closeActiveTunaSpotPositionOrcaInstruction(authority, tunaPositio
     tunaConfig,
     tunaPositionAtaA,
     tunaPositionAtaB,
-    tunaPositionOwnerAtaA,
-    tunaPositionOwnerAtaB,
-    tunaPosition: tunaPositionAddress,
+    ...setTunaPositionOwnerAtaA && { tunaPositionOwnerAtaA },
+    ...setTunaPositionOwnerAtaB && { tunaPositionOwnerAtaB },
+    tunaPosition: tunaPosition.address,
     whirlpool: whirlpool.address,
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS6,
     tokenProgramA: mintA.programAddress,
@@ -12572,7 +12711,7 @@ import {
   AccountRole as AccountRole12
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS12 } from "@solana-program/memo";
-import { fetchAllMaybeMint as fetchAllMaybeMint15, fetchAllToken, findAssociatedTokenPda as findAssociatedTokenPda17 } from "@solana-program/token-2022";
+import { fetchAllMaybeMint as fetchAllMaybeMint15, fetchAllToken as fetchAllToken3, findAssociatedTokenPda as findAssociatedTokenPda17 } from "@solana-program/token-2022";
 import assert15 from "assert";
 async function decreaseTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
@@ -12590,39 +12729,24 @@ async function decreaseTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoo
     (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
     (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
   ]);
-  const tunaPositionAtaA = (await findAssociatedTokenPda17({
+  const tunaPositionAtaAAddress = (await findAssociatedTokenPda17({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda17({
+  const tunaPositionAtaBAddress = (await findAssociatedTokenPda17({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionTokenAccounts = await fetchAllToken(rpc, [tunaPositionAtaA, tunaPositionAtaB]);
-  let createUserAtaAInstructions = void 0;
-  if (tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionTokenAccounts[0].data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n)) {
-    createUserAtaAInstructions = await getCreateAtaInstructions(
-      rpc,
-      authority,
-      mintA.address,
-      authority.address,
-      mintA.programAddress
-    );
-    createInstructions.push(...createUserAtaAInstructions.init);
-  }
-  let createUserAtaBInstructions = void 0;
-  if (tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionTokenAccounts[1].data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n)) {
-    createUserAtaBInstructions = await getCreateAtaInstructions(
-      rpc,
-      authority,
-      mintB.address,
-      authority.address,
-      mintB.programAddress
-    );
-    createInstructions.push(...createUserAtaBInstructions.init);
-  }
+  const [tunaPositionAtaA, tunaPositionAtaB] = await fetchAllToken3(rpc, [
+    tunaPositionAtaAAddress,
+    tunaPositionAtaBAddress
+  ]);
+  const createUserAtaAInstructions = tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionAtaA.data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintA.address, authority.address, mintA.programAddress) : void 0;
+  if (createUserAtaAInstructions) createInstructions.push(...createUserAtaAInstructions.init);
+  const createUserAtaBInstructions = tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionAtaB.data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintB.address, authority.address, mintB.programAddress) : void 0;
+  if (createUserAtaBInstructions) createInstructions.push(...createUserAtaBInstructions.init);
   const ix = await decreaseTunaSpotPositionOrcaInstruction(
     authority,
     tunaPosition,
@@ -12641,7 +12765,7 @@ async function decreaseTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoo
   if (createUserAtaBInstructions) cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return instructions;
 }
-async function decreaseTunaSpotPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, passTunaPositionOwnerAtaA, passTunaPositionOwnerAtaB, args) {
+async function decreaseTunaSpotPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, setTunaPositionOwnerAtaA, setTunaPositionOwnerAtaB, args) {
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress5(whirlpool.address))[0];
   const tunaPositionOwnerAtaA = (await findAssociatedTokenPda17({
@@ -12710,8 +12834,8 @@ async function decreaseTunaSpotPositionOrcaInstruction(authority, tunaPosition,
     tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
-    tunaPositionOwnerAtaA: passTunaPositionOwnerAtaA ? tunaPositionOwnerAtaA : void 0,
-    tunaPositionOwnerAtaB: passTunaPositionOwnerAtaB ? tunaPositionOwnerAtaB : void 0,
+    ...setTunaPositionOwnerAtaA && { tunaPositionOwnerAtaA },
+    ...setTunaPositionOwnerAtaB && { tunaPositionOwnerAtaB },
     whirlpool: whirlpool.address,
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS8,
     memoProgram: MEMO_PROGRAM_ADDRESS12,
@@ -12728,7 +12852,7 @@ import {
   AccountRole as AccountRole13
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS13 } from "@solana-program/memo";
-import { fetchAllMaybeMint as fetchAllMaybeMint16, fetchAllToken as fetchAllToken2, findAssociatedTokenPda as findAssociatedTokenPda18 } from "@solana-program/token-2022";
+import { fetchAllMaybeMint as fetchAllMaybeMint16, fetchAllToken as fetchAllToken4, findAssociatedTokenPda as findAssociatedTokenPda18 } from "@solana-program/token-2022";
 import assert16 from "assert";
 async function decreaseTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
@@ -12746,39 +12870,24 @@ async function decreaseTunaSpotPositionFusionInstructions(rpc, authority, fusion
     (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
     (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
   ]);
-  const tunaPositionAtaA = (await findAssociatedTokenPda18({
+  const tunaPositionAtaAAddress = (await findAssociatedTokenPda18({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda18({
+  const tunaPositionAtaBAddress = (await findAssociatedTokenPda18({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionTokenAccounts = await fetchAllToken2(rpc, [tunaPositionAtaA, tunaPositionAtaB]);
-  let createUserAtaAInstructions = void 0;
-  if (tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionTokenAccounts[0].data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n)) {
-    createUserAtaAInstructions = await getCreateAtaInstructions(
-      rpc,
-      authority,
-      mintA.address,
-      authority.address,
-      mintA.programAddress
-    );
-    createInstructions.push(...createUserAtaAInstructions.init);
-  }
-  let createUserAtaBInstructions = void 0;
-  if (tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionTokenAccounts[1].data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n)) {
-    createUserAtaBInstructions = await getCreateAtaInstructions(
-      rpc,
-      authority,
-      mintB.address,
-      authority.address,
-      mintB.programAddress
-    );
-    createInstructions.push(...createUserAtaBInstructions.init);
-  }
+  const [tunaPositionAtaA, tunaPositionAtaB] = await fetchAllToken4(rpc, [
+    tunaPositionAtaAAddress,
+    tunaPositionAtaBAddress
+  ]);
+  const createUserAtaAInstructions = tunaPosition.data.collateralToken == 0 /* A */ || tunaPositionAtaA.data.amount > (tunaPosition.data.positionToken == 0 /* A */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintA.address, authority.address, mintA.programAddress) : void 0;
+  if (createUserAtaAInstructions) createInstructions.push(...createUserAtaAInstructions.init);
+  const createUserAtaBInstructions = tunaPosition.data.collateralToken == 1 /* B */ || tunaPositionAtaB.data.amount > (tunaPosition.data.positionToken == 1 /* B */ ? tunaPosition.data.amount : 0n) ? await getCreateAtaInstructions(rpc, authority, mintB.address, authority.address, mintB.programAddress) : void 0;
+  if (createUserAtaBInstructions) createInstructions.push(...createUserAtaBInstructions.init);
   const ix = await decreaseTunaSpotPositionFusionInstruction(
     authority,
     tunaPosition,
@@ -12797,7 +12906,7 @@ async function decreaseTunaSpotPositionFusionInstructions(rpc, authority, fusion
   if (createUserAtaBInstructions) cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return instructions;
 }
-async function decreaseTunaSpotPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, passTunaPositionOwnerAtaA, passTunaPositionOwnerAtaB, args) {
+async function decreaseTunaSpotPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, setTunaPositionOwnerAtaA, setTunaPositionOwnerAtaB, args) {
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const tunaPositionOwnerAtaA = (await findAssociatedTokenPda18({
     owner: authority.address,
@@ -12863,8 +12972,8 @@ async function decreaseTunaSpotPositionFusionInstruction(authority, tunaPosition
     tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
-    tunaPositionOwnerAtaA: passTunaPositionOwnerAtaA ? tunaPositionOwnerAtaA : void 0,
-    tunaPositionOwnerAtaB: passTunaPositionOwnerAtaB ? tunaPositionOwnerAtaB : void 0,
+    ...setTunaPositionOwnerAtaA && { tunaPositionOwnerAtaA },
+    ...setTunaPositionOwnerAtaB && { tunaPositionOwnerAtaB },
     fusionPool: fusionPool.address,
     fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS8,
     memoProgram: MEMO_PROGRAM_ADDRESS13,
@@ -16003,6 +16112,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.3",
+  "version": "3.1.5",
   "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",