@crypticdot/defituna-client 3.0.4 → 3.1.0

package/dist/index.mjs

@@ -688,7 +688,6 @@ function getTunaSpotPositionEncoder() {
       ["pool", getAddressEncoder5()],
       ["mintA", getAddressEncoder5()],
       ["mintB", getAddressEncoder5()],
-      ["positionMint", getAddressEncoder5()],
       ["marketMaker", getMarketMakerEncoder()],
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
@@ -714,7 +713,6 @@ function getTunaSpotPositionDecoder() {
     ["pool", getAddressDecoder5()],
     ["mintA", getAddressDecoder5()],
     ["mintB", getAddressDecoder5()],
-    ["positionMint", getAddressDecoder5()],
     ["marketMaker", getMarketMakerDecoder()],
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
@@ -766,7 +764,7 @@ async function fetchAllMaybeTunaSpotPosition(rpc, addresses, config) {
   );
 }
 function getTunaSpotPositionSize() {
-  return 379;
+  return 347;
 }
 
 // src/generated/accounts/vault.ts
@@ -6560,10 +6558,6 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstruction(input, config) {
     vaultAAta: { value: input.vaultAAta ?? null, isWritable: true },
     vaultBAta: { value: input.vaultBAta ?? null, isWritable: true },
     tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: false
-    },
     tunaPositionAtaA: {
       value: input.tunaPositionAtaA ?? null,
       isWritable: true
@@ -6628,7 +6622,6 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstruction(input, config) {
       getAccountMeta(accounts.vaultAAta),
       getAccountMeta(accounts.vaultBAta),
       getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.tunaPositionOwnerAtaA),
@@ -6651,7 +6644,7 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstruction(input, config) {
   return instruction;
 }
 function parseOpenAndIncreaseTunaSpotPositionFusionInstruction(instruction) {
-  if (instruction.accounts.length < 26) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -6679,7 +6672,6 @@ function parseOpenAndIncreaseTunaSpotPositionFusionInstruction(instruction) {
       vaultAAta: getNextAccount(),
       vaultBAta: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       tunaPositionOwnerAtaA: getNextOptionalAccount(),
@@ -6778,10 +6770,6 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstruction(input, config) {
     vaultAAta: { value: input.vaultAAta ?? null, isWritable: true },
     vaultBAta: { value: input.vaultBAta ?? null, isWritable: true },
     tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: false
-    },
     tunaPositionAtaA: {
       value: input.tunaPositionAtaA ?? null,
       isWritable: true
@@ -6846,7 +6834,6 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.vaultAAta),
       getAccountMeta(accounts.vaultBAta),
       getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.tunaPositionOwnerAtaA),
@@ -6869,7 +6856,7 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstruction(input, config) {
   return instruction;
 }
 function parseOpenAndIncreaseTunaSpotPositionOrcaInstruction(instruction) {
-  if (instruction.accounts.length < 26) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -6897,7 +6884,6 @@ function parseOpenAndIncreaseTunaSpotPositionOrcaInstruction(instruction) {
       vaultAAta: getNextAccount(),
       vaultBAta: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       tunaPositionOwnerAtaA: getNextOptionalAccount(),
@@ -7448,10 +7434,6 @@ function getOpenTunaSpotPositionFusionInstruction(input, config) {
     tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
     tokenProgramB: { value: input.tokenProgramB ?? null, isWritable: false },
     tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: false
-    },
     tunaPositionAtaA: {
       value: input.tunaPositionAtaA ?? null,
       isWritable: true
@@ -7481,7 +7463,6 @@ function getOpenTunaSpotPositionFusionInstruction(input, config) {
       getAccountMeta(accounts.tokenProgramA),
       getAccountMeta(accounts.tokenProgramB),
       getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.fusionPool),
@@ -7496,7 +7477,7 @@ function getOpenTunaSpotPositionFusionInstruction(input, config) {
   return instruction;
 }
 function parseOpenTunaSpotPositionFusionInstruction(instruction) {
-  if (instruction.accounts.length < 12) {
+  if (instruction.accounts.length < 11) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -7514,7 +7495,6 @@ function parseOpenTunaSpotPositionFusionInstruction(instruction) {
       tokenProgramA: getNextAccount(),
       tokenProgramB: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       fusionPool: getNextAccount(),
@@ -7598,10 +7578,6 @@ function getOpenTunaSpotPositionOrcaInstruction(input, config) {
     tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
     tokenProgramB: { value: input.tokenProgramB ?? null, isWritable: false },
     tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: false
-    },
     tunaPositionAtaA: {
       value: input.tunaPositionAtaA ?? null,
       isWritable: true
@@ -7631,7 +7607,6 @@ function getOpenTunaSpotPositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.tokenProgramA),
       getAccountMeta(accounts.tokenProgramB),
       getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.whirlpool),
@@ -7646,7 +7621,7 @@ function getOpenTunaSpotPositionOrcaInstruction(input, config) {
   return instruction;
 }
 function parseOpenTunaSpotPositionOrcaInstruction(instruction) {
-  if (instruction.accounts.length < 12) {
+  if (instruction.accounts.length < 11) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -7664,7 +7639,6 @@ function parseOpenTunaSpotPositionOrcaInstruction(instruction) {
       tokenProgramA: getNextAccount(),
       tokenProgramB: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       whirlpool: getNextAccount(),
@@ -9897,10 +9871,10 @@ async function getLendingVaultAddress(mint) {
     seeds: ["vault", getAddressEncoder16().encode(mint)]
   });
 }
-async function getLendingPositionAddress(wallet, mint) {
+async function getLendingPositionAddress(authority, mint) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["lending_position", getAddressEncoder16().encode(wallet), getAddressEncoder16().encode(mint)]
+    seeds: ["lending_position", getAddressEncoder16().encode(authority), getAddressEncoder16().encode(mint)]
   });
 }
 async function getTunaLpPositionAddress(positionMint) {
@@ -9909,10 +9883,10 @@ async function getTunaLpPositionAddress(positionMint) {
     seeds: ["tuna_position", getAddressEncoder16().encode(positionMint)]
   });
 }
-async function getTunaSpotPositionAddress(positionMint) {
+async function getTunaSpotPositionAddress(authority, pool) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_spot_position", getAddressEncoder16().encode(positionMint)]
+    seeds: ["tuna_spot_position", getAddressEncoder16().encode(authority), getAddressEncoder16().encode(pool)]
   });
 }
 async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
@@ -10072,15 +10046,6 @@ function tunaSpotPositionMintBFilter(address4) {
     }
   };
 }
-function tunaSpotPositionMintFilter(address4) {
-  return {
-    memcmp: {
-      offset: 139n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder18().encode(address4)),
-      encoding: "base58"
-    }
-  };
-}
 async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
   const discriminator = getBase58Decoder2().decode(TUNA_SPOT_POSITION_DISCRIMINATOR);
   const discriminatorFilter = {
@@ -10321,7 +10286,7 @@ async function createAddressLookupTableInstructions(authority, addresses, recent
   return { instructions: [createInstruction, extendInstruction], lookupTableAddress: pda[0] };
 }
 
-// src/utils/positionMath.ts
+// src/utils/lpPositionMath.ts
 import {
   positionRatioX64,
   tickIndexToSqrtPrice,
@@ -10331,8 +10296,7 @@ import {
   tryGetTokenAFromLiquidity,
   tryGetTokenBFromLiquidity
 } from "@crypticdot/fusionamm-core";
-var DEFAULT_MAX_AMOUNT_SLIPPAGE = HUNDRED_PERCENT / 2;
-function getLiquidityIncreaseQuote(args) {
+function getIncreaseLpPositionQuote(args) {
   const { protocolFeeRate, protocolFeeRateOnCollateral, swapFeeRate, sqrtPrice, tickLowerIndex, tickUpperIndex } = args;
   let { collateralA, collateralB, borrowA, borrowB } = args;
   if (tickLowerIndex > tickUpperIndex) {
@@ -10344,7 +10308,7 @@ function getLiquidityIncreaseQuote(args) {
   if (args.collateralA == COMPUTED_AMOUNT && args.collateralB == COMPUTED_AMOUNT) {
     throw new Error("Both collateral amounts can't be set to COMPUTED_AMOUNT");
   }
-  const maxAmountSlippage = args.maxAmountSlippage > 0 ? BigInt(args.maxAmountSlippage) : BigInt(DEFAULT_MAX_AMOUNT_SLIPPAGE);
+  const maxAmountSlippage = BigInt(args.maxAmountSlippage);
   let maxCollateralA = BigInt(collateralA);
   let maxCollateralB = BigInt(collateralB);
   const lowerSqrtPrice = tickIndexToSqrtPrice(tickLowerIndex);
@@ -10473,7 +10437,7 @@ async function increaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const [mintA, mintB] = await fetchAllMaybeMint(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert(mintA.exists, "Token A not found");
   assert(mintB.exists, "Token B not found");
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -10717,7 +10681,7 @@ async function increaseTunaLpPositionFusionInstructions(rpc, authority, position
   const [mintA, mintB] = await fetchAllMaybeMint2(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert2(mintA.exists, "Token A not found");
   assert2(mintB.exists, "Token B not found");
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -11888,8 +11852,9 @@ import {
 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 assert11 from "assert";
-async function closeActiveTunaSpotPositionFusionInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+async function closeActiveTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args, createInstructions, cleanupInstructions) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await fetchMaybeFusionPool6(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
@@ -12017,8 +11982,9 @@ import {
 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 assert12 from "assert";
-async function closeActiveTunaSpotPositionOrcaInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+async function closeActiveTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args, createInstructions, cleanupInstructions) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await fetchMaybeWhirlpool6(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
@@ -12145,11 +12111,12 @@ import {
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS10 } from "@solana-program/memo";
 import { fetchAllMaybeMint as fetchAllMaybeMint13, findAssociatedTokenPda as findAssociatedTokenPda15 } from "@solana-program/token-2022";
 import assert13 from "assert";
-async function increaseTunaSpotPositionOrcaInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
+async function increaseTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const whirlpool = await fetchWhirlpool(rpc, tunaPosition.data.pool);
@@ -12302,11 +12269,12 @@ import {
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS11 } from "@solana-program/memo";
 import { fetchAllMaybeMint as fetchAllMaybeMint14, findAssociatedTokenPda as findAssociatedTokenPda16 } from "@solana-program/token-2022";
 import assert14 from "assert";
-async function increaseTunaSpotPositionFusionInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
+async function increaseTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const fusionPool = await fetchFusionPool(rpc, tunaPosition.data.pool);
@@ -12456,11 +12424,12 @@ import {
 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 assert15 from "assert";
-async function decreaseTunaSpotPositionOrcaInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
+async function decreaseTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const whirlpool = await fetchWhirlpool2(rpc, tunaPosition.data.pool);
@@ -12611,11 +12580,12 @@ import {
 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 assert16 from "assert";
-async function decreaseTunaSpotPositionFusionInstructions(rpc, authority, positionMint, args, createInstructions, cleanupInstructions) {
+async function decreaseTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args, createInstructions, cleanupInstructions) {
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, (await getTunaSpotPositionAddress(positionMint))[0]);
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPoolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const fusionPool = await fetchFusionPool2(rpc, tunaPosition.data.pool);
@@ -12758,17 +12728,18 @@ async function decreaseTunaSpotPositionFusionInstruction(authority, tunaPosition
 // src/txbuilder/closeTunaSpotPosition.ts
 import { fetchAllMaybeMint as fetchAllMaybeMint17, findAssociatedTokenPda as findAssociatedTokenPda19 } from "@solana-program/token-2022";
 import assert17 from "assert";
-async function closeTunaSpotPositionInstructions(rpc, authority, positionMint) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
-  const tunaPosition = await fetchTunaSpotPosition(rpc, tunaPositionAddress);
+async function closeTunaSpotPositionInstructions(rpc, authority, poolAddress) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
+  const tunaPosition = await fetchMaybeTunaSpotPosition(rpc, tunaPositionAddress);
+  if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const [mintA, mintB] = await fetchAllMaybeMint17(rpc, [tunaPosition.data.mintA, tunaPosition.data.mintB]);
   assert17(mintA.exists, "Token A account not found");
   assert17(mintB.exists, "Token B account not found");
-  const ix = await closeTunaSpotPositionInstruction(authority, positionMint, mintA, mintB);
+  const ix = await closeTunaSpotPositionInstruction(authority, poolAddress, mintA, mintB);
   return [ix];
 }
-async function closeTunaSpotPositionInstruction(authority, positionMint, mintA, mintB) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
+async function closeTunaSpotPositionInstruction(authority, poolAddress, mintA, mintB) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda19({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -13138,7 +13109,7 @@ async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPositi
   instructions.push(...createFeeRecipientAtaInstructions.init);
   const ix = await liquidateTunaSpotPositionFusionInstruction(
     authority,
-    tunaPosition.data.positionMint,
+    tunaPosition.address,
     tunaConfig,
     mintA,
     mintB,
@@ -13150,8 +13121,7 @@ async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPositi
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionFusionInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
+async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda23({
     owner: tunaPositionAddress,
@@ -13247,7 +13217,7 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
   instructions.push(...createFeeRecipientAtaInstructions.init);
   const ix = await liquidateTunaSpotPositionOrcaInstruction(
     authority,
-    tunaPosition.data.positionMint,
+    tunaPosition.address,
     tunaConfig,
     mintA,
     mintB,
@@ -13259,8 +13229,7 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionOrcaInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
+async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress7(whirlpool.address))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda24({
@@ -13508,7 +13477,7 @@ async function openAndIncreaseTunaLpPositionOrcaInstructions(rpc, authority, whi
     (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
     (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
   ]);
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -13764,7 +13733,7 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, f
     (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
     (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
   ]);
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -13973,8 +13942,7 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
 // src/txbuilder/openAndIncreaseTunaSpotPositionFusion.ts
 import { fetchMaybeFusionPool as fetchMaybeFusionPool9, FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS13 } from "@crypticdot/fusionamm-client";
 import {
-  AccountRole as AccountRole20,
-  generateKeyPairSigner as generateKeyPairSigner3
+  AccountRole as AccountRole20
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS20 } from "@solana-program/memo";
 import {
@@ -13987,7 +13955,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstructions(rpc, authority,
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const positionMint = await generateKeyPairSigner3();
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const fusionPool = await fetchMaybeFusionPool9(rpc, fusionPoolAddress);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
@@ -14026,7 +13993,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstructions(rpc, authority,
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await openAndIncreaseTunaSpotPositionFusionInstruction(
     authority,
-    positionMint,
     tunaConfig,
     mintA,
     mintB,
@@ -14037,13 +14003,10 @@ async function openAndIncreaseTunaSpotPositionFusionInstructions(rpc, authority,
   );
   instructions.push(ix);
   cleanupInstructions.push(...createUserAtaInstructions.cleanup);
-  return {
-    instructions,
-    positionMint: positionMint.address
-  };
+  return instructions;
 }
-async function openAndIncreaseTunaSpotPositionFusionInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, args) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint.address))[0];
+async function openAndIncreaseTunaSpotPositionFusionInstruction(authority, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPool.address))[0];
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const tunaPositionOwnerAtaA = (await findAssociatedTokenPda29({
     owner: authority.address,
@@ -14117,7 +14080,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstruction(authority, posit
     vaultB: vaultB.address,
     vaultBAta,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     tunaPositionOwnerAtaA: args.collateralToken == 0 /* A */ ? tunaPositionOwnerAtaA : void 0,
@@ -14142,8 +14104,7 @@ import {
   WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS13
 } from "@orca-so/whirlpools-client";
 import {
-  AccountRole as AccountRole21,
-  generateKeyPairSigner as generateKeyPairSigner4
+  AccountRole as AccountRole21
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS21 } from "@solana-program/memo";
 import {
@@ -14156,7 +14117,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstructions(rpc, authority, w
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const positionMint = await generateKeyPairSigner4();
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const whirlpool = await fetchMaybeWhirlpool9(rpc, whirlpoolAddress);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
@@ -14195,7 +14155,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstructions(rpc, authority, w
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await openAndIncreaseTunaSpotPositionOrcaInstruction(
     authority,
-    positionMint,
     tunaConfig,
     mintA,
     mintB,
@@ -14206,13 +14165,10 @@ async function openAndIncreaseTunaSpotPositionOrcaInstructions(rpc, authority, w
   );
   instructions.push(ix);
   cleanupInstructions.push(...createUserAtaInstructions.cleanup);
-  return {
-    instructions,
-    positionMint: positionMint.address
-  };
+  return instructions;
 }
-async function openAndIncreaseTunaSpotPositionOrcaInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, args) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint.address))[0];
+async function openAndIncreaseTunaSpotPositionOrcaInstruction(authority, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpool.address))[0];
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress9(whirlpool.address))[0];
   const tunaPositionOwnerAtaA = (await findAssociatedTokenPda30({
@@ -14289,7 +14245,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstruction(authority, positio
     vaultB: vaultB.address,
     vaultBAta,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     tunaPositionOwnerAtaA: args.collateralToken == 0 /* A */ ? tunaPositionOwnerAtaA : void 0,
@@ -14315,24 +14270,17 @@ import {
   findAssociatedTokenPda as findAssociatedTokenPda31
 } from "@solana-program/token-2022";
 import assert24 from "assert";
-async function openTunaSpotPositionFusionInstructions(rpc, authority, positionMint, fusionPoolAddress, args) {
+async function openTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args) {
   const fusionPool = await fetchMaybeFusionPool10(rpc, fusionPoolAddress);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
   const [mintA, mintB] = await fetchAllMaybeMint24(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert24(mintA.exists, "Token A account not found");
   assert24(mintB.exists, "Token B account not found");
-  const ix = await openTunaSpotPositionFusionInstruction(
-    authority,
-    positionMint,
-    mintA,
-    mintB,
-    fusionPoolAddress,
-    args
-  );
+  const ix = await openTunaSpotPositionFusionInstruction(authority, mintA, mintB, fusionPoolAddress, args);
   return [ix];
 }
-async function openTunaSpotPositionFusionInstruction(authority, positionMint, mintA, mintB, fusionPoolAddress, args) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint.address))[0];
+async function openTunaSpotPositionFusionInstruction(authority, mintA, mintB, fusionPoolAddress, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, fusionPoolAddress))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda31({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -14350,7 +14298,6 @@ async function openTunaSpotPositionFusionInstruction(authority, positionMint, mi
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     fusionPool: fusionPoolAddress,
@@ -14367,17 +14314,17 @@ import {
   findAssociatedTokenPda as findAssociatedTokenPda32
 } from "@solana-program/token-2022";
 import assert25 from "assert";
-async function openTunaSpotPositionOrcaInstructions(rpc, authority, positionMint, whirlpoolAddress, args) {
+async function openTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args) {
   const whirlpool = await fetchMaybeWhirlpool10(rpc, whirlpoolAddress);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
   const [mintA, mintB] = await fetchAllMaybeMint25(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert25(mintA.exists, "Token A account not found");
   assert25(mintB.exists, "Token B account not found");
-  const ix = await openTunaSpotPositionOrcaInstruction(authority, positionMint, mintA, mintB, whirlpoolAddress, args);
+  const ix = await openTunaSpotPositionOrcaInstruction(authority, mintA, mintB, whirlpoolAddress, args);
   return [ix];
 }
-async function openTunaSpotPositionOrcaInstruction(authority, positionMint, mintA, mintB, whirlpoolAddress, args) {
-  const tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint.address))[0];
+async function openTunaSpotPositionOrcaInstruction(authority, mintA, mintB, whirlpoolAddress, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, whirlpoolAddress))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda32({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -14395,7 +14342,6 @@ async function openTunaSpotPositionOrcaInstruction(authority, positionMint, mint
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     whirlpool: whirlpoolAddress,
@@ -14837,13 +14783,8 @@ async function setTunaLpPositionLimitOrdersInstruction(authority, args, position
 }
 
 // src/txbuilder/setTunaSpotPositionLimitOrders.ts
-async function setTunaSpotPositionLimitOrdersInstruction(authority, args, positionMint, tunaPositionAddress) {
-  if (tunaPositionAddress === void 0) {
-    if (positionMint === void 0) {
-      throw new Error("At least one of 'positionMint' or 'tunaPositionAddress' must be provided.");
-    }
-    tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
-  }
+async function setTunaSpotPositionLimitOrdersInstruction(authority, poolAddress, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
   return getSetTunaSpotPositionLimitOrdersInstruction({
     ...args,
     authority,
@@ -14854,13 +14795,8 @@ async function setTunaSpotPositionLimitOrdersInstruction(authority, args, positi
 // src/txbuilder/resetTunaSpotPosition.ts
 import { fetchAllMaybeMint as fetchAllMaybeMint28, findAssociatedTokenPda as findAssociatedTokenPda36 } from "@solana-program/token-2022";
 import assert28 from "assert";
-async function resetTunaSpotPositionInstruction(rpc, authority, args, positionMint, tunaPositionAddress) {
-  if (tunaPositionAddress === void 0) {
-    if (positionMint === void 0) {
-      throw new Error("At least one of 'positionMint' or 'tunaPositionAddress' must be provided.");
-    }
-    tunaPositionAddress = (await getTunaSpotPositionAddress(positionMint))[0];
-  }
+async function resetTunaSpotPositionInstruction(rpc, authority, poolAddress, args) {
+  const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
   const tunaPosition = await fetchTunaSpotPosition(rpc, tunaPositionAddress);
   const [mintA, mintB] = await fetchAllMaybeMint28(rpc, [tunaPosition.data.mintA, tunaPosition.data.mintB]);
   assert28(mintA.exists, "Token A not found");
@@ -15561,7 +15497,6 @@ export {
   DECREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR,
   DECREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR,
   DEFAULT_ADDRESS,
-  DEFAULT_MAX_AMOUNT_SLIPPAGE,
   DEFAULT_MAX_SWAP_SLIPPAGE,
   DEFAULT_PUSH_ORACLE_PROGRAM_ID,
   DEPOSIT_DISCRIMINATOR,
@@ -15861,6 +15796,7 @@ export {
   getDepositInstructionDataCodec,
   getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder,
+  getIncreaseLpPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -15908,7 +15844,6 @@ export {
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidityIncreaseQuote,
   getMarketAddress,
   getMarketCodec,
   getMarketDecoder,
@@ -16211,7 +16146,6 @@ export {
   tunaSpotPositionAuthorityFilter,
   tunaSpotPositionMintAFilter,
   tunaSpotPositionMintBFilter,
-  tunaSpotPositionMintFilter,
   tunaSpotPositionPoolFilter,
   updateMarketInstruction,
   updateVaultInstruction,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@crypticdot/defituna-client",
   "description": "Typescript client to interact with DefiTuna's on-chain program.",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",
@@ -51,7 +51,7 @@
     "rimraf": "^6.0.1",
     "vitest": "^3.1.1",
     "solana-bankrun": "^0.4.0",
-    "@crypticdot/defituna-program": "3.0.2"
+    "@crypticdot/defituna-program": "3.1.0"
   },
   "scripts": {
     "build": "node ./codama.mjs && tsup src/index.ts --format cjs,esm --dts",