@crypticdot/defituna-client 3.0.4 → 3.1.0

package/dist/index.js

@@ -49,7 +49,6 @@ __export(index_exports, {
   DECREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR: () => DECREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR,
   DECREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR: () => DECREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR,
   DEFAULT_ADDRESS: () => DEFAULT_ADDRESS,
-  DEFAULT_MAX_AMOUNT_SLIPPAGE: () => DEFAULT_MAX_AMOUNT_SLIPPAGE,
   DEFAULT_MAX_SWAP_SLIPPAGE: () => DEFAULT_MAX_SWAP_SLIPPAGE,
   DEFAULT_PUSH_ORACLE_PROGRAM_ID: () => DEFAULT_PUSH_ORACLE_PROGRAM_ID,
   DEPOSIT_DISCRIMINATOR: () => DEPOSIT_DISCRIMINATOR,
@@ -349,6 +348,7 @@ __export(index_exports, {
   getDepositInstructionDataCodec: () => getDepositInstructionDataCodec,
   getDepositInstructionDataDecoder: () => getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder: () => getDepositInstructionDataEncoder,
+  getIncreaseLpPositionQuote: () => getIncreaseLpPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes: () => getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction: () => getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec: () => getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -396,7 +396,6 @@ __export(index_exports, {
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec: () => getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder: () => getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder: () => getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidityIncreaseQuote: () => getLiquidityIncreaseQuote,
   getMarketAddress: () => getMarketAddress,
   getMarketCodec: () => getMarketCodec,
   getMarketDecoder: () => getMarketDecoder,
@@ -699,7 +698,6 @@ __export(index_exports, {
   tunaSpotPositionAuthorityFilter: () => tunaSpotPositionAuthorityFilter,
   tunaSpotPositionMintAFilter: () => tunaSpotPositionMintAFilter,
   tunaSpotPositionMintBFilter: () => tunaSpotPositionMintBFilter,
-  tunaSpotPositionMintFilter: () => tunaSpotPositionMintFilter,
   tunaSpotPositionPoolFilter: () => tunaSpotPositionPoolFilter,
   updateMarketInstruction: () => updateMarketInstruction,
   updateVaultInstruction: () => updateVaultInstruction,
@@ -1250,7 +1248,6 @@ function getTunaSpotPositionEncoder() {
       ["pool", (0, import_kit11.getAddressEncoder)()],
       ["mintA", (0, import_kit11.getAddressEncoder)()],
       ["mintB", (0, import_kit11.getAddressEncoder)()],
-      ["positionMint", (0, import_kit11.getAddressEncoder)()],
       ["marketMaker", getMarketMakerEncoder()],
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
@@ -1276,7 +1273,6 @@ function getTunaSpotPositionDecoder() {
     ["pool", (0, import_kit11.getAddressDecoder)()],
     ["mintA", (0, import_kit11.getAddressDecoder)()],
     ["mintB", (0, import_kit11.getAddressDecoder)()],
-    ["positionMint", (0, import_kit11.getAddressDecoder)()],
     ["marketMaker", getMarketMakerDecoder()],
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
@@ -1328,7 +1324,7 @@ async function fetchAllMaybeTunaSpotPosition(rpc, addresses, config) {
   );
 }
 function getTunaSpotPositionSize() {
-  return 379;
+  return 347;
 }
 
 // src/generated/accounts/vault.ts
@@ -6738,10 +6734,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
@@ -6806,7 +6798,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),
@@ -6829,7 +6820,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;
@@ -6857,7 +6848,6 @@ function parseOpenAndIncreaseTunaSpotPositionFusionInstruction(instruction) {
       vaultAAta: getNextAccount(),
       vaultBAta: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       tunaPositionOwnerAtaA: getNextOptionalAccount(),
@@ -6941,10 +6931,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
@@ -7009,7 +6995,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),
@@ -7032,7 +7017,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;
@@ -7060,7 +7045,6 @@ function parseOpenAndIncreaseTunaSpotPositionOrcaInstruction(instruction) {
       vaultAAta: getNextAccount(),
       vaultBAta: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       tunaPositionOwnerAtaA: getNextOptionalAccount(),
@@ -7559,10 +7543,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
@@ -7592,7 +7572,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),
@@ -7607,7 +7586,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;
@@ -7625,7 +7604,6 @@ function parseOpenTunaSpotPositionFusionInstruction(instruction) {
       tokenProgramA: getNextAccount(),
       tokenProgramB: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       fusionPool: getNextAccount(),
@@ -7696,10 +7674,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
@@ -7729,7 +7703,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),
@@ -7744,7 +7717,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;
@@ -7762,7 +7735,6 @@ function parseOpenTunaSpotPositionOrcaInstruction(instruction) {
       tokenProgramA: getNextAccount(),
       tokenProgramB: getNextAccount(),
       tunaPosition: getNextAccount(),
-      tunaPositionMint: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
       whirlpool: getNextAccount(),
@@ -9767,10 +9739,10 @@ async function getLendingVaultAddress(mint) {
     seeds: ["vault", (0, import_kit72.getAddressEncoder)().encode(mint)]
   });
 }
-async function getLendingPositionAddress(wallet, mint) {
+async function getLendingPositionAddress(authority, mint) {
   return await (0, import_kit72.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["lending_position", (0, import_kit72.getAddressEncoder)().encode(wallet), (0, import_kit72.getAddressEncoder)().encode(mint)]
+    seeds: ["lending_position", (0, import_kit72.getAddressEncoder)().encode(authority), (0, import_kit72.getAddressEncoder)().encode(mint)]
   });
 }
 async function getTunaLpPositionAddress(positionMint) {
@@ -9779,10 +9751,10 @@ async function getTunaLpPositionAddress(positionMint) {
     seeds: ["tuna_position", (0, import_kit72.getAddressEncoder)().encode(positionMint)]
   });
 }
-async function getTunaSpotPositionAddress(positionMint) {
+async function getTunaSpotPositionAddress(authority, pool) {
   return await (0, import_kit72.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_spot_position", (0, import_kit72.getAddressEncoder)().encode(positionMint)]
+    seeds: ["tuna_spot_position", (0, import_kit72.getAddressEncoder)().encode(authority), (0, import_kit72.getAddressEncoder)().encode(pool)]
   });
 }
 async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
@@ -9935,15 +9907,6 @@ function tunaSpotPositionMintBFilter(address4) {
     }
   };
 }
-function tunaSpotPositionMintFilter(address4) {
-  return {
-    memcmp: {
-      offset: 139n,
-      bytes: (0, import_kit75.getBase58Decoder)().decode((0, import_kit75.getAddressEncoder)().encode(address4)),
-      encoding: "base58"
-    }
-  };
-}
 async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
   const discriminator = (0, import_kit75.getBase58Decoder)().decode(TUNA_SPOT_POSITION_DISCRIMINATOR);
   const discriminatorFilter = {
@@ -10161,10 +10124,9 @@ async function createAddressLookupTableInstructions(authority, addresses, recent
   return { instructions: [createInstruction, extendInstruction], lookupTableAddress: pda[0] };
 }
 
-// src/utils/positionMath.ts
+// src/utils/lpPositionMath.ts
 var import_fusionamm_core3 = require("@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) {
@@ -10176,7 +10138,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 = (0, import_fusionamm_core3.tickIndexToSqrtPrice)(tickLowerIndex);
@@ -10292,7 +10254,7 @@ async function increaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const [mintA, mintB] = await (0, import_token_20222.fetchAllMaybeMint)(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   (0, import_assert.default)(mintA.exists, "Token A not found");
   (0, import_assert.default)(mintB.exists, "Token B not found");
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -10523,7 +10485,7 @@ async function increaseTunaLpPositionFusionInstructions(rpc, authority, position
   const [mintA, mintB] = await (0, import_token_20223.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert2.default)(mintA.exists, "Token A not found");
   (0, import_assert2.default)(mintB.exists, "Token B not found");
-  const increaseAmounts = getLiquidityIncreaseQuote({
+  const increaseAmounts = getIncreaseLpPositionQuote({
     collateralA: BigInt(args.collateralA),
     collateralB: BigInt(args.collateralB),
     borrowA: BigInt(args.borrowA),
@@ -11637,8 +11599,9 @@ var import_kit86 = require("@solana/kit");
 var import_memo8 = require("@solana-program/memo");
 var import_token_202213 = require("@solana-program/token-2022");
 var import_assert11 = __toESM(require("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 (0, import_fusionamm_client7.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
@@ -11760,8 +11723,9 @@ var import_kit87 = require("@solana/kit");
 var import_memo9 = require("@solana-program/memo");
 var import_token_202214 = require("@solana-program/token-2022");
 var import_assert12 = __toESM(require("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 (0, import_whirlpools_client7.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
@@ -11886,11 +11850,12 @@ var import_kit88 = require("@solana/kit");
 var import_memo10 = require("@solana-program/memo");
 var import_token_202215 = require("@solana-program/token-2022");
 var import_assert13 = __toESM(require("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 (0, import_whirlpools_client8.fetchWhirlpool)(rpc, tunaPosition.data.pool);
@@ -12041,11 +12006,12 @@ var import_kit89 = require("@solana/kit");
 var import_memo11 = require("@solana-program/memo");
 var import_token_202216 = require("@solana-program/token-2022");
 var import_assert14 = __toESM(require("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 (0, import_fusionamm_client8.fetchFusionPool)(rpc, tunaPosition.data.pool);
@@ -12193,11 +12159,12 @@ var import_kit90 = require("@solana/kit");
 var import_memo12 = require("@solana-program/memo");
 var import_token_202217 = require("@solana-program/token-2022");
 var import_assert15 = __toESM(require("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 (0, import_whirlpools_client9.fetchWhirlpool)(rpc, tunaPosition.data.pool);
@@ -12346,11 +12313,12 @@ var import_kit91 = require("@solana/kit");
 var import_memo13 = require("@solana-program/memo");
 var import_token_202218 = require("@solana-program/token-2022");
 var import_assert16 = __toESM(require("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 (0, import_fusionamm_client9.fetchFusionPool)(rpc, tunaPosition.data.pool);
@@ -12493,17 +12461,18 @@ async function decreaseTunaSpotPositionFusionInstruction(authority, tunaPosition
 // src/txbuilder/closeTunaSpotPosition.ts
 var import_token_202219 = require("@solana-program/token-2022");
 var import_assert17 = __toESM(require("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 (0, import_token_202219.fetchAllMaybeMint)(rpc, [tunaPosition.data.mintA, tunaPosition.data.mintB]);
   (0, import_assert17.default)(mintA.exists, "Token A account not found");
   (0, import_assert17.default)(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 (0, import_token_202219.findAssociatedTokenPda)({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -12873,7 +12842,7 @@ async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPositi
   instructions.push(...createFeeRecipientAtaInstructions.init);
   const ix = await liquidateTunaSpotPositionFusionInstruction(
     authority,
-    tunaPosition.data.positionMint,
+    tunaPosition.address,
     tunaConfig,
     mintA,
     mintB,
@@ -12885,8 +12854,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 (0, import_token_202223.findAssociatedTokenPda)({
     owner: tunaPositionAddress,
@@ -12982,7 +12950,7 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
   instructions.push(...createFeeRecipientAtaInstructions.init);
   const ix = await liquidateTunaSpotPositionOrcaInstruction(
     authority,
-    tunaPosition.data.positionMint,
+    tunaPosition.address,
     tunaConfig,
     mintA,
     mintB,
@@ -12994,8 +12962,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 (0, import_whirlpools_client11.getOracleAddress)(whirlpool.address))[0];
   const tunaPositionAtaA = (await (0, import_token_202224.findAssociatedTokenPda)({
@@ -13215,7 +13182,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),
@@ -13453,7 +13420,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),
@@ -13669,7 +13636,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstructions(rpc, authority,
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const positionMint = await (0, import_kit98.generateKeyPairSigner)();
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const fusionPool = await (0, import_fusionamm_client15.fetchMaybeFusionPool)(rpc, fusionPoolAddress);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
@@ -13708,7 +13674,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstructions(rpc, authority,
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await openAndIncreaseTunaSpotPositionFusionInstruction(
     authority,
-    positionMint,
     tunaConfig,
     mintA,
     mintB,
@@ -13719,13 +13684,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 (0, import_token_202229.findAssociatedTokenPda)({
     owner: authority.address,
@@ -13799,7 +13761,6 @@ async function openAndIncreaseTunaSpotPositionFusionInstruction(authority, posit
     vaultB: vaultB.address,
     vaultBAta,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     tunaPositionOwnerAtaA: args.collateralToken == 0 /* A */ ? tunaPositionOwnerAtaA : void 0,
@@ -13827,7 +13788,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstructions(rpc, authority, w
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
-  const positionMint = await (0, import_kit99.generateKeyPairSigner)();
   const tunaConfig = await fetchTunaConfig(rpc, (await getTunaConfigAddress())[0]);
   const whirlpool = await (0, import_whirlpools_client14.fetchMaybeWhirlpool)(rpc, whirlpoolAddress);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
@@ -13866,7 +13826,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstructions(rpc, authority, w
   createInstructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await openAndIncreaseTunaSpotPositionOrcaInstruction(
     authority,
-    positionMint,
     tunaConfig,
     mintA,
     mintB,
@@ -13877,13 +13836,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 (0, import_whirlpools_client14.getOracleAddress)(whirlpool.address))[0];
   const tunaPositionOwnerAtaA = (await (0, import_token_202230.findAssociatedTokenPda)({
@@ -13960,7 +13916,6 @@ async function openAndIncreaseTunaSpotPositionOrcaInstruction(authority, positio
     vaultB: vaultB.address,
     vaultBAta,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     tunaPositionOwnerAtaA: args.collateralToken == 0 /* A */ ? tunaPositionOwnerAtaA : void 0,
@@ -13982,24 +13937,17 @@ async function openAndIncreaseTunaSpotPositionOrcaInstruction(authority, positio
 var import_fusionamm_client16 = require("@crypticdot/fusionamm-client");
 var import_token_202231 = require("@solana-program/token-2022");
 var import_assert24 = __toESM(require("assert"));
-async function openTunaSpotPositionFusionInstructions(rpc, authority, positionMint, fusionPoolAddress, args) {
+async function openTunaSpotPositionFusionInstructions(rpc, authority, fusionPoolAddress, args) {
   const fusionPool = await (0, import_fusionamm_client16.fetchMaybeFusionPool)(rpc, fusionPoolAddress);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
   const [mintA, mintB] = await (0, import_token_202231.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert24.default)(mintA.exists, "Token A account not found");
   (0, import_assert24.default)(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 (0, import_token_202231.findAssociatedTokenPda)({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -14017,7 +13965,6 @@ async function openTunaSpotPositionFusionInstruction(authority, positionMint, mi
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     fusionPool: fusionPoolAddress,
@@ -14030,17 +13977,17 @@ async function openTunaSpotPositionFusionInstruction(authority, positionMint, mi
 var import_whirlpools_client15 = require("@orca-so/whirlpools-client");
 var import_token_202232 = require("@solana-program/token-2022");
 var import_assert25 = __toESM(require("assert"));
-async function openTunaSpotPositionOrcaInstructions(rpc, authority, positionMint, whirlpoolAddress, args) {
+async function openTunaSpotPositionOrcaInstructions(rpc, authority, whirlpoolAddress, args) {
   const whirlpool = await (0, import_whirlpools_client15.fetchMaybeWhirlpool)(rpc, whirlpoolAddress);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
   const [mintA, mintB] = await (0, import_token_202232.fetchAllMaybeMint)(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   (0, import_assert25.default)(mintA.exists, "Token A account not found");
   (0, import_assert25.default)(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 (0, import_token_202232.findAssociatedTokenPda)({
     owner: tunaPositionAddress,
     mint: mintA.address,
@@ -14058,7 +14005,6 @@ async function openTunaSpotPositionOrcaInstruction(authority, positionMint, mint
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
     tunaPosition: tunaPositionAddress,
-    tunaPositionMint: positionMint,
     tunaPositionAtaA,
     tunaPositionAtaB,
     whirlpool: whirlpoolAddress,
@@ -14475,13 +14421,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,
@@ -14492,13 +14433,8 @@ async function setTunaSpotPositionLimitOrdersInstruction(authority, args, positi
 // src/txbuilder/resetTunaSpotPosition.ts
 var import_token_202236 = require("@solana-program/token-2022");
 var import_assert28 = __toESM(require("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 (0, import_token_202236.fetchAllMaybeMint)(rpc, [tunaPosition.data.mintA, tunaPosition.data.mintB]);
   (0, import_assert28.default)(mintA.exists, "Token A not found");
@@ -15164,7 +15100,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   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,
@@ -15464,6 +15399,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getDepositInstructionDataCodec,
   getDepositInstructionDataDecoder,
   getDepositInstructionDataEncoder,
+  getIncreaseLpPositionQuote,
   getIncreaseTunaLpPositionFusionDiscriminatorBytes,
   getIncreaseTunaLpPositionFusionInstruction,
   getIncreaseTunaLpPositionFusionInstructionDataCodec,
@@ -15511,7 +15447,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getLiquidateTunaSpotPositionOrcaInstructionDataCodec,
   getLiquidateTunaSpotPositionOrcaInstructionDataDecoder,
   getLiquidateTunaSpotPositionOrcaInstructionDataEncoder,
-  getLiquidityIncreaseQuote,
   getMarketAddress,
   getMarketCodec,
   getMarketDecoder,
@@ -15814,7 +15749,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   tunaSpotPositionAuthorityFilter,
   tunaSpotPositionMintAFilter,
   tunaSpotPositionMintBFilter,
-  tunaSpotPositionMintFilter,
   tunaSpotPositionPoolFilter,
   updateMarketInstruction,
   updateVaultInstruction,