@crypticdot/defituna-client 3.3.4 → 3.3.6

package/dist/index.mjs

@@ -312,7 +312,9 @@ function getMarketEncoder() {
       ["rebalanceProtocolFee", getU32Encoder()],
       ["spotPositionSizeLimitA", getU64Encoder2()],
       ["spotPositionSizeLimitB", getU64Encoder2()],
-      ["reserved", fixEncoderSize2(getBytesEncoder2(), 191)]
+      ["vaultA", getAddressEncoder2()],
+      ["vaultB", getAddressEncoder2()],
+      ["reserved", fixEncoderSize2(getBytesEncoder2(), 127)]
     ]),
     (value) => ({ ...value, discriminator: MARKET_DISCRIMINATOR })
   );
@@ -341,7 +343,9 @@ function getMarketDecoder() {
     ["rebalanceProtocolFee", getU32Decoder()],
     ["spotPositionSizeLimitA", getU64Decoder2()],
     ["spotPositionSizeLimitB", getU64Decoder2()],
-    ["reserved", fixDecoderSize2(getBytesDecoder2(), 191)]
+    ["vaultA", getAddressDecoder2()],
+    ["vaultB", getAddressDecoder2()],
+    ["reserved", fixDecoderSize2(getBytesDecoder2(), 127)]
   ]);
 }
 function getMarketCodec() {
@@ -1006,8 +1010,9 @@ var TunaInstruction = /* @__PURE__ */ ((TunaInstruction2) => {
   TunaInstruction2[TunaInstruction2["SetTunaLpPositionRebalanceThreshold"] = 45] = "SetTunaLpPositionRebalanceThreshold";
   TunaInstruction2[TunaInstruction2["SetTunaSpotPositionLimitOrders"] = 46] = "SetTunaSpotPositionLimitOrders";
   TunaInstruction2[TunaInstruction2["UpdateMarket"] = 47] = "UpdateMarket";
-  TunaInstruction2[TunaInstruction2["UpdateVault"] = 48] = "UpdateVault";
-  TunaInstruction2[TunaInstruction2["Withdraw"] = 49] = "Withdraw";
+  TunaInstruction2[TunaInstruction2["UpdateMarketVaults"] = 48] = "UpdateMarketVaults";
+  TunaInstruction2[TunaInstruction2["UpdateVault"] = 49] = "UpdateVault";
+  TunaInstruction2[TunaInstruction2["Withdraw"] = 50] = "Withdraw";
   return TunaInstruction2;
 })(TunaInstruction || {});
 function identifyTunaInstruction(instruction) {
@@ -1444,6 +1449,15 @@ function identifyTunaInstruction(instruction) {
   )) {
     return 47 /* UpdateMarket */;
   }
+  if (containsBytes(
+    data,
+    fixEncoderSize7(getBytesEncoder7(), 8).encode(
+      new Uint8Array([59, 187, 50, 173, 89, 41, 205, 228])
+    ),
+    0
+  )) {
+    return 48 /* UpdateMarketVaults */;
+  }
   if (containsBytes(
     data,
     fixEncoderSize7(getBytesEncoder7(), 8).encode(
@@ -1451,7 +1465,7 @@ function identifyTunaInstruction(instruction) {
     ),
     0
   )) {
-    return 48 /* UpdateVault */;
+    return 49 /* UpdateVault */;
   }
   if (containsBytes(
     data,
@@ -1460,7 +1474,7 @@ function identifyTunaInstruction(instruction) {
     ),
     0
   )) {
-    return 49 /* Withdraw */;
+    return 50 /* Withdraw */;
   }
   throw new Error(
     "The provided instruction could not be identified as a tuna instruction."
@@ -1532,10 +1546,12 @@ var TUNA_ERROR__M_A_PRICE_DEVIATION_THRESHOLD_EXCEEDED = 6060;
 var TUNA_ERROR__POSITION_SIZE_LIMIT_EXCEEDED = 6061;
 var TUNA_ERROR__INVALID_JUPITER_ROUTE = 6062;
 var TUNA_ERROR__INSUFFICIENT_SWAP_OUTPUT_AMOUNT = 6063;
-var TUNA_ERROR__ACCOUNT_NOT_INITIALIZED = 6064;
-var TUNA_ERROR__INVALID_ACCOUNT_DISCRIMINATOR = 6065;
-var TUNA_ERROR__INVALID_POOL = 6066;
-var TUNA_ERROR__POSITION_IS_EMPTY = 6067;
+var TUNA_ERROR__INCORRECT_SWAP_INPUT_AMOUNT = 6064;
+var TUNA_ERROR__INCORRECT_SWAP_OUTPUT_AMOUNT = 6065;
+var TUNA_ERROR__ACCOUNT_NOT_INITIALIZED = 6066;
+var TUNA_ERROR__INVALID_ACCOUNT_DISCRIMINATOR = 6067;
+var TUNA_ERROR__INVALID_POOL = 6068;
+var TUNA_ERROR__POSITION_IS_EMPTY = 6069;
 var tunaErrorMessages;
 if (process.env.NODE_ENV !== "production") {
   tunaErrorMessages = {
@@ -1543,6 +1559,8 @@ if (process.env.NODE_ENV !== "production") {
     [TUNA_ERROR__AMOUNT_SLIPPAGE_EXCEEDED]: `Amount slippage exceeded`,
     [TUNA_ERROR__BAD_DEBT]: `Bad debt is not allowed for the executed instruction`,
     [TUNA_ERROR__INCORRECT_POSITION_DIRECTION]: `Incorrect position direction`,
+    [TUNA_ERROR__INCORRECT_SWAP_INPUT_AMOUNT]: `Incorrect swap input amount`,
+    [TUNA_ERROR__INCORRECT_SWAP_OUTPUT_AMOUNT]: `Incorrect swap output amount`,
     [TUNA_ERROR__INSUFFICIENT_LIQUIDITY]: `Insufficient liquidity`,
     [TUNA_ERROR__INSUFFICIENT_SWAP_OUTPUT_AMOUNT]: `Insufficient swap output amount`,
     [TUNA_ERROR__INTEREST_RATE_IS_OUT_OF_RANGE]: `Interest rate is out of range`,
@@ -2886,7 +2904,6 @@ function getCreateMarketInstructionDataEncoder() {
   return transformEncoder15(
     getStructEncoder17([
       ["discriminator", fixEncoderSize16(getBytesEncoder16(), 8)],
-      ["marketMaker", getMarketMakerEncoder()],
       ["addressLookupTable", getAddressEncoder7()],
       ["maxLeverage", getU32Encoder5()],
       ["protocolFee", getU16Encoder7()],
@@ -2909,7 +2926,6 @@ function getCreateMarketInstructionDataEncoder() {
 function getCreateMarketInstructionDataDecoder() {
   return getStructDecoder17([
     ["discriminator", fixDecoderSize15(getBytesDecoder15(), 8)],
-    ["marketMaker", getMarketMakerDecoder()],
     ["addressLookupTable", getAddressDecoder7()],
     ["maxLeverage", getU32Decoder5()],
     ["protocolFee", getU16Decoder7()],
@@ -2939,6 +2955,8 @@ function getCreateMarketInstruction(input, config) {
     authority: { value: input.authority ?? null, isWritable: true },
     tunaConfig: { value: input.tunaConfig ?? null, isWritable: false },
     market: { value: input.market ?? null, isWritable: true },
+    vaultA: { value: input.vaultA ?? null, isWritable: false },
+    vaultB: { value: input.vaultB ?? null, isWritable: false },
     pool: { value: input.pool ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false }
   };
@@ -2953,6 +2971,8 @@ function getCreateMarketInstruction(input, config) {
       getAccountMeta(accounts.authority),
       getAccountMeta(accounts.tunaConfig),
       getAccountMeta(accounts.market),
+      getAccountMeta(accounts.vaultA),
+      getAccountMeta(accounts.vaultB),
       getAccountMeta(accounts.pool),
       getAccountMeta(accounts.systemProgram)
     ],
@@ -2964,7 +2984,7 @@ function getCreateMarketInstruction(input, config) {
   return instruction;
 }
 function parseCreateMarketInstruction(instruction) {
-  if (instruction.accounts.length < 5) {
+  if (instruction.accounts.length < 7) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -2979,6 +2999,8 @@ function parseCreateMarketInstruction(instruction) {
       authority: getNextAccount(),
       tunaConfig: getNextAccount(),
       market: getNextAccount(),
+      vaultA: getNextAccount(),
+      vaultB: getNextAccount(),
       pool: getNextAccount(),
       systemProgram: getNextAccount()
     },
@@ -8754,7 +8776,7 @@ function parseUpdateMarketInstruction(instruction) {
   };
 }
 
-// src/generated/instructions/updateVault.ts
+// src/generated/instructions/updateMarketVaults.ts
 import {
   combineCodec as combineCodec61,
   fixDecoderSize as fixDecoderSize55,
@@ -8765,9 +8787,106 @@ import {
   getBytesEncoder as getBytesEncoder56,
   getStructDecoder as getStructDecoder57,
   getStructEncoder as getStructEncoder57,
+  transformEncoder as transformEncoder55
+} from "@solana/kit";
+var UPDATE_MARKET_VAULTS_DISCRIMINATOR = new Uint8Array([
+  59,
+  187,
+  50,
+  173,
+  89,
+  41,
+  205,
+  228
+]);
+function getUpdateMarketVaultsDiscriminatorBytes() {
+  return fixEncoderSize56(getBytesEncoder56(), 8).encode(
+    UPDATE_MARKET_VAULTS_DISCRIMINATOR
+  );
+}
+function getUpdateMarketVaultsInstructionDataEncoder() {
+  return transformEncoder55(
+    getStructEncoder57([
+      ["discriminator", fixEncoderSize56(getBytesEncoder56(), 8)],
+      ["vaultA", getAddressEncoder15()],
+      ["vaultB", getAddressEncoder15()]
+    ]),
+    (value) => ({ ...value, discriminator: UPDATE_MARKET_VAULTS_DISCRIMINATOR })
+  );
+}
+function getUpdateMarketVaultsInstructionDataDecoder() {
+  return getStructDecoder57([
+    ["discriminator", fixDecoderSize55(getBytesDecoder55(), 8)],
+    ["vaultA", getAddressDecoder15()],
+    ["vaultB", getAddressDecoder15()]
+  ]);
+}
+function getUpdateMarketVaultsInstructionDataCodec() {
+  return combineCodec61(
+    getUpdateMarketVaultsInstructionDataEncoder(),
+    getUpdateMarketVaultsInstructionDataDecoder()
+  );
+}
+function getUpdateMarketVaultsInstruction(input, config) {
+  const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
+  const originalAccounts = {
+    authority: { value: input.authority ?? null, isWritable: true },
+    tunaConfig: { value: input.tunaConfig ?? null, isWritable: false },
+    market: { value: input.market ?? null, isWritable: true }
+  };
+  const accounts = originalAccounts;
+  const args = { ...input };
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
+    accounts: [
+      getAccountMeta(accounts.authority),
+      getAccountMeta(accounts.tunaConfig),
+      getAccountMeta(accounts.market)
+    ],
+    programAddress,
+    data: getUpdateMarketVaultsInstructionDataEncoder().encode(
+      args
+    )
+  };
+  return instruction;
+}
+function parseUpdateMarketVaultsInstruction(instruction) {
+  if (instruction.accounts.length < 3) {
+    throw new Error("Not enough accounts");
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = instruction.accounts[accountIndex];
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      authority: getNextAccount(),
+      tunaConfig: getNextAccount(),
+      market: getNextAccount()
+    },
+    data: getUpdateMarketVaultsInstructionDataDecoder().decode(
+      instruction.data
+    )
+  };
+}
+
+// src/generated/instructions/updateVault.ts
+import {
+  combineCodec as combineCodec62,
+  fixDecoderSize as fixDecoderSize56,
+  fixEncoderSize as fixEncoderSize57,
+  getAddressDecoder as getAddressDecoder16,
+  getAddressEncoder as getAddressEncoder16,
+  getBytesDecoder as getBytesDecoder56,
+  getBytesEncoder as getBytesEncoder57,
+  getStructDecoder as getStructDecoder58,
+  getStructEncoder as getStructEncoder58,
   getU64Decoder as getU64Decoder21,
   getU64Encoder as getU64Encoder21,
-  transformEncoder as transformEncoder55
+  transformEncoder as transformEncoder56
 } from "@solana/kit";
 var UPDATE_VAULT_DISCRIMINATOR = new Uint8Array([
   67,
@@ -8780,33 +8899,33 @@ var UPDATE_VAULT_DISCRIMINATOR = new Uint8Array([
   60
 ]);
 function getUpdateVaultDiscriminatorBytes() {
-  return fixEncoderSize56(getBytesEncoder56(), 8).encode(
+  return fixEncoderSize57(getBytesEncoder57(), 8).encode(
     UPDATE_VAULT_DISCRIMINATOR
   );
 }
 function getUpdateVaultInstructionDataEncoder() {
-  return transformEncoder55(
-    getStructEncoder57([
-      ["discriminator", fixEncoderSize56(getBytesEncoder56(), 8)],
+  return transformEncoder56(
+    getStructEncoder58([
+      ["discriminator", fixEncoderSize57(getBytesEncoder57(), 8)],
       ["interestRate", getU64Encoder21()],
       ["supplyLimit", getU64Encoder21()],
-      ["pythOraclePriceUpdate", getAddressEncoder15()],
-      ["pythOracleFeedId", getAddressEncoder15()]
+      ["pythOraclePriceUpdate", getAddressEncoder16()],
+      ["pythOracleFeedId", getAddressEncoder16()]
     ]),
     (value) => ({ ...value, discriminator: UPDATE_VAULT_DISCRIMINATOR })
   );
 }
 function getUpdateVaultInstructionDataDecoder() {
-  return getStructDecoder57([
-    ["discriminator", fixDecoderSize55(getBytesDecoder55(), 8)],
+  return getStructDecoder58([
+    ["discriminator", fixDecoderSize56(getBytesDecoder56(), 8)],
     ["interestRate", getU64Decoder21()],
     ["supplyLimit", getU64Decoder21()],
-    ["pythOraclePriceUpdate", getAddressDecoder15()],
-    ["pythOracleFeedId", getAddressDecoder15()]
+    ["pythOraclePriceUpdate", getAddressDecoder16()],
+    ["pythOracleFeedId", getAddressDecoder16()]
   ]);
 }
 function getUpdateVaultInstructionDataCodec() {
-  return combineCodec61(
+  return combineCodec62(
     getUpdateVaultInstructionDataEncoder(),
     getUpdateVaultInstructionDataDecoder()
   );
@@ -8857,16 +8976,16 @@ function parseUpdateVaultInstruction(instruction) {
 
 // src/generated/instructions/withdraw.ts
 import {
-  combineCodec as combineCodec62,
-  fixDecoderSize as fixDecoderSize56,
-  fixEncoderSize as fixEncoderSize57,
-  getBytesDecoder as getBytesDecoder56,
-  getBytesEncoder as getBytesEncoder57,
-  getStructDecoder as getStructDecoder58,
-  getStructEncoder as getStructEncoder58,
+  combineCodec as combineCodec63,
+  fixDecoderSize as fixDecoderSize57,
+  fixEncoderSize as fixEncoderSize58,
+  getBytesDecoder as getBytesDecoder57,
+  getBytesEncoder as getBytesEncoder58,
+  getStructDecoder as getStructDecoder59,
+  getStructEncoder as getStructEncoder59,
   getU64Decoder as getU64Decoder22,
   getU64Encoder as getU64Encoder22,
-  transformEncoder as transformEncoder56
+  transformEncoder as transformEncoder57
 } from "@solana/kit";
 var WITHDRAW_DISCRIMINATOR = new Uint8Array([
   183,
@@ -8879,12 +8998,12 @@ var WITHDRAW_DISCRIMINATOR = new Uint8Array([
   34
 ]);
 function getWithdrawDiscriminatorBytes() {
-  return fixEncoderSize57(getBytesEncoder57(), 8).encode(WITHDRAW_DISCRIMINATOR);
+  return fixEncoderSize58(getBytesEncoder58(), 8).encode(WITHDRAW_DISCRIMINATOR);
 }
 function getWithdrawInstructionDataEncoder() {
-  return transformEncoder56(
-    getStructEncoder58([
-      ["discriminator", fixEncoderSize57(getBytesEncoder57(), 8)],
+  return transformEncoder57(
+    getStructEncoder59([
+      ["discriminator", fixEncoderSize58(getBytesEncoder58(), 8)],
       ["funds", getU64Encoder22()],
       ["shares", getU64Encoder22()]
     ]),
@@ -8892,14 +9011,14 @@ function getWithdrawInstructionDataEncoder() {
   );
 }
 function getWithdrawInstructionDataDecoder() {
-  return getStructDecoder58([
-    ["discriminator", fixDecoderSize56(getBytesDecoder56(), 8)],
+  return getStructDecoder59([
+    ["discriminator", fixDecoderSize57(getBytesDecoder57(), 8)],
     ["funds", getU64Decoder22()],
     ["shares", getU64Decoder22()]
   ]);
 }
 function getWithdrawInstructionDataCodec() {
-  return combineCodec62(
+  return combineCodec63(
     getWithdrawInstructionDataEncoder(),
     getWithdrawInstructionDataDecoder()
   );
@@ -8970,7 +9089,7 @@ function parseWithdrawInstruction(instruction) {
 }
 
 // src/pda.ts
-import { getAddressEncoder as getAddressEncoder16, getProgramDerivedAddress } from "@solana/kit";
+import { getAddressEncoder as getAddressEncoder17, getProgramDerivedAddress } from "@solana/kit";
 
 // src/consts.ts
 import { address } from "@solana/kit";
@@ -9012,31 +9131,31 @@ async function getTunaConfigAddress() {
 async function getMarketAddress(pool) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["market", getAddressEncoder16().encode(pool)]
+    seeds: ["market", getAddressEncoder17().encode(pool)]
   });
 }
 async function getLendingVaultAddress(mint) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["vault", getAddressEncoder16().encode(mint)]
+    seeds: ["vault", getAddressEncoder17().encode(mint)]
   });
 }
 async function getLendingPositionAddress(authority, mint) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["lending_position", getAddressEncoder16().encode(authority), getAddressEncoder16().encode(mint)]
+    seeds: ["lending_position", getAddressEncoder17().encode(authority), getAddressEncoder17().encode(mint)]
   });
 }
 async function getTunaLpPositionAddress(positionMint) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_position", getAddressEncoder16().encode(positionMint)]
+    seeds: ["tuna_position", getAddressEncoder17().encode(positionMint)]
   });
 }
 async function getTunaSpotPositionAddress(authority, pool) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_spot_position", getAddressEncoder16().encode(authority), getAddressEncoder16().encode(pool)]
+    seeds: ["tuna_spot_position", getAddressEncoder17().encode(authority), getAddressEncoder17().encode(pool)]
   });
 }
 async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
@@ -9060,7 +9179,7 @@ async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
 
 // src/gpa/tunaLpPosition.ts
 import {
-  getAddressEncoder as getAddressEncoder17,
+  getAddressEncoder as getAddressEncoder18,
   getBase58Decoder,
   getI8Encoder
 } from "@solana/kit";
@@ -9088,7 +9207,7 @@ function tunaLpPositionAuthorityFilter(address4) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder().decode(getAddressEncoder17().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder18().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9097,7 +9216,7 @@ function tunaLpPositionPoolFilter(address4) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder().decode(getAddressEncoder17().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder18().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9106,7 +9225,7 @@ function tunaLpPositionMintAFilter(address4) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: getBase58Decoder().decode(getAddressEncoder17().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder18().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9115,7 +9234,7 @@ function tunaLpPositionMintBFilter(address4) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: getBase58Decoder().decode(getAddressEncoder17().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder18().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9124,7 +9243,7 @@ function tunaLpPositionMintFilter(address4) {
   return {
     memcmp: {
       offset: 139n,
-      bytes: getBase58Decoder().decode(getAddressEncoder17().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder18().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9157,14 +9276,14 @@ async function fetchAllTunaLpPositionWithFilter(rpc, ...filters) {
 
 // src/gpa/tunaSpotPosition.ts
 import {
-  getAddressEncoder as getAddressEncoder18,
+  getAddressEncoder as getAddressEncoder19,
   getBase58Decoder as getBase58Decoder2
 } from "@solana/kit";
 function tunaSpotPositionAuthorityFilter(address4) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder18().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder19().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9173,7 +9292,7 @@ function tunaSpotPositionPoolFilter(address4) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder18().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder19().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9182,7 +9301,7 @@ function tunaSpotPositionMintAFilter(address4) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder18().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder19().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9191,7 +9310,7 @@ function tunaSpotPositionMintBFilter(address4) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder18().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder19().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9215,14 +9334,14 @@ async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
 
 // src/gpa/lendingPosition.ts
 import {
-  getAddressEncoder as getAddressEncoder19,
+  getAddressEncoder as getAddressEncoder20,
   getBase58Decoder as getBase58Decoder3
 } from "@solana/kit";
 function lendingPositionAuthorityFilter(address4) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder3().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder3().decode(getAddressEncoder20().encode(address4)),
       encoding: "base58"
     }
   };
@@ -9231,7 +9350,7 @@ function lendingPositionMintFilter(address4) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder3().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder3().decode(getAddressEncoder20().encode(address4)),
       encoding: "base58"
     }
   };
@@ -11409,21 +11528,21 @@ import { fetchFusionPool as fetchFusionPool2 } from "@crypticdot/fusionamm-clien
 import {
   assertAccountExists as assertAccountExists7,
   assertAccountsExist as assertAccountsExist8,
-  combineCodec as combineCodec63,
+  combineCodec as combineCodec64,
   decodeAccount as decodeAccount7,
   fetchEncodedAccount as fetchEncodedAccount7,
   fetchEncodedAccounts as fetchEncodedAccounts7,
-  fixDecoderSize as fixDecoderSize57,
-  fixEncoderSize as fixEncoderSize58,
-  getAddressDecoder as getAddressDecoder16,
-  getAddressEncoder as getAddressEncoder20,
-  getBytesDecoder as getBytesDecoder57,
-  getBytesEncoder as getBytesEncoder58,
-  getStructDecoder as getStructDecoder59,
-  getStructEncoder as getStructEncoder59,
+  fixDecoderSize as fixDecoderSize58,
+  fixEncoderSize as fixEncoderSize59,
+  getAddressDecoder as getAddressDecoder17,
+  getAddressEncoder as getAddressEncoder21,
+  getBytesDecoder as getBytesDecoder58,
+  getBytesEncoder as getBytesEncoder59,
+  getStructDecoder as getStructDecoder60,
+  getStructEncoder as getStructEncoder60,
   getU64Decoder as getU64Decoder23,
   getU64Encoder as getU64Encoder23,
-  transformEncoder as transformEncoder57
+  transformEncoder as transformEncoder58
 } from "@solana/kit";
 import {
   isProgramError as isProgramError2
@@ -11468,11 +11587,11 @@ import {
 import {
   combineCodec as combineCodec410,
   fixDecoderSize as fixDecoderSize410,
-  fixEncoderSize as fixEncoderSize59,
+  fixEncoderSize as fixEncoderSize510,
   getBooleanDecoder as getBooleanDecoder9,
   getBooleanEncoder as getBooleanEncoder9,
   getBytesDecoder as getBytesDecoder410,
-  getBytesEncoder as getBytesEncoder59,
+  getBytesEncoder as getBytesEncoder510,
   getStructDecoder as getStructDecoder410,
   getStructEncoder as getStructEncoder410,
   getU8Decoder as getU8Decoder32,
@@ -11481,18 +11600,18 @@ import {
 } from "@solana/kit";
 import {
   combineCodec as combineCodec510,
-  fixDecoderSize as fixDecoderSize58,
+  fixDecoderSize as fixDecoderSize59,
   fixEncoderSize as fixEncoderSize62,
   getAddressEncoder as getAddressEncoder32,
-  getBytesDecoder as getBytesDecoder58,
+  getBytesDecoder as getBytesDecoder59,
   getBytesEncoder as getBytesEncoder62,
   getProgramDerivedAddress as getProgramDerivedAddress22,
   getStructDecoder as getStructDecoder510,
   getStructEncoder as getStructEncoder510,
-  transformEncoder as transformEncoder58
+  transformEncoder as transformEncoder59
 } from "@solana/kit";
 import {
-  combineCodec as combineCodec64,
+  combineCodec as combineCodec65,
   fixDecoderSize as fixDecoderSize62,
   fixEncoderSize as fixEncoderSize72,
   getAddressEncoder as getAddressEncoder42,
@@ -12216,7 +12335,7 @@ async function closeTunaSpotPositionInstruction(authority, poolAddress, mintA, m
 }
 
 // src/txbuilder/createMarket.ts
-async function createMarketInstruction(authority, pool, args) {
+async function createMarketInstruction(authority, pool, vaultA, vaultB, args) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const marketAddress = (await getMarketAddress(pool))[0];
   return getCreateMarketInstruction({
@@ -12224,6 +12343,8 @@ async function createMarketInstruction(authority, pool, args) {
     tunaConfig,
     market: marketAddress,
     pool,
+    vaultA,
+    vaultB,
     ...args
   });
 }
@@ -12684,11 +12805,154 @@ async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositio
   return ix;
 }
 
+// src/txbuilder/liquidateTunaSpotPositionJupiter.ts
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS14 } from "@solana-program/memo";
+import { findAssociatedTokenPda as findAssociatedTokenPda21 } from "@solana-program/token-2022";
+async function liquidateTunaSpotPositionJupiterInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, poolAddress, remainingAccounts, args) {
+  const instructions = [];
+  const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
+  const useNativeSol = collateralTokenMint.address == NATIVE_MINT && args.decreasePercent == HUNDRED_PERCENT;
+  if (!useNativeSol) {
+    const createPositionOwnerAtaInstructions = await getCreateAtaInstructions(
+      void 0,
+      authority,
+      collateralTokenMint.address,
+      tunaPosition.data.authority,
+      collateralTokenMint.programAddress
+    );
+    instructions.push(...createPositionOwnerAtaInstructions.init);
+  }
+  if (mintA.address != NATIVE_MINT || args.decreasePercent < HUNDRED_PERCENT) {
+    const createUserAtaAInstructions = await getCreateAtaInstructions(
+      void 0,
+      authority,
+      mintA.address,
+      authority.address,
+      mintA.programAddress
+    );
+    instructions.push(...createUserAtaAInstructions.init);
+  }
+  if (mintB.address != NATIVE_MINT || args.decreasePercent < HUNDRED_PERCENT) {
+    const createUserAtaBInstructions = await getCreateAtaInstructions(
+      void 0,
+      authority,
+      mintB.address,
+      authority.address,
+      mintB.programAddress
+    );
+    instructions.push(...createUserAtaBInstructions.init);
+  }
+  const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintA.address,
+    tunaConfig.data.feeRecipient,
+    mintA.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaAInstructions.init);
+  const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintB.address,
+    tunaConfig.data.feeRecipient,
+    mintB.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaBInstructions.init);
+  const ix = await liquidateTunaSpotPositionJupiterInstruction(
+    authority,
+    tunaPosition,
+    tunaConfig,
+    mintA,
+    mintB,
+    vaultA,
+    vaultB,
+    poolAddress,
+    remainingAccounts,
+    args
+  );
+  instructions.push(ix);
+  return instructions;
+}
+async function liquidateTunaSpotPositionJupiterInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, poolAddress, remainingAccounts, args) {
+  const marketAddress = (await getMarketAddress(poolAddress))[0];
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda21({
+    owner: tunaPosition.data.authority,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda21({
+    owner: tunaPosition.data.authority,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const tunaPositionAtaA = (await findAssociatedTokenPda21({
+    owner: tunaPosition.address,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionAtaB = (await findAssociatedTokenPda21({
+    owner: tunaPosition.address,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const feeRecipientAtaA = (await findAssociatedTokenPda21({
+    owner: tunaConfig.data.feeRecipient,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const feeRecipientAtaB = (await findAssociatedTokenPda21({
+    owner: tunaConfig.data.feeRecipient,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const vaultAAta = (await findAssociatedTokenPda21({
+    owner: vaultA.address,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const vaultBAta = (await findAssociatedTokenPda21({
+    owner: vaultB.address,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
+  const ix = getLiquidateTunaSpotPositionJupiterInstruction({
+    authority,
+    tunaConfig: tunaConfig.address,
+    mintA: mintA.address,
+    mintB: mintB.address,
+    tokenProgramA: mintA.programAddress,
+    tokenProgramB: mintB.programAddress,
+    market: marketAddress,
+    pythOraclePriceFeedA: vaultA.data.pythOraclePriceUpdate,
+    pythOraclePriceFeedB: vaultB.data.pythOraclePriceUpdate,
+    vaultA: vaultA.address,
+    vaultAAta,
+    vaultB: vaultB.address,
+    vaultBAta,
+    tunaPosition: tunaPosition.address,
+    tunaPositionAtaA,
+    tunaPositionAtaB,
+    tunaPositionOwner: tunaPosition.data.authority,
+    tunaPositionOwnerAtaA,
+    tunaPositionOwnerAtaB,
+    feeRecipientAtaA,
+    feeRecipientAtaB,
+    pool: poolAddress,
+    jupiterProgram: JUPITER_PROGRAM_ADDRESS,
+    jupiterEventAuthority: JUPITER_EVENT_AUTHORITY,
+    jupiterProgramAuthority: JUPITER_PROGRAM_AUTHORITY,
+    memoProgram: MEMO_PROGRAM_ADDRESS14,
+    ...args
+  });
+  ix.accounts.push(...remainingAccounts);
+  return ix;
+}
+
 // src/txbuilder/liquidateTunaSpotPositionOrca.ts
 import { getOracleAddress as getOracleAddress5, WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS8 } from "@orca-so/whirlpools-client";
 import { AccountRole as AccountRole14 } from "@solana/kit";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS14 } from "@solana-program/memo";
-import { findAssociatedTokenPda as findAssociatedTokenPda21 } from "@solana-program/token-2022";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS15 } from "@solana-program/memo";
+import { findAssociatedTokenPda as findAssociatedTokenPda22 } from "@solana-program/token-2022";
 async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, decreasePercent) {
   const instructions = [];
   const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
@@ -12736,42 +13000,42 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
 async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, decreasePercent) {
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress5(whirlpool.address))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda21({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda22({
     owner: tunaPosition.data.authority,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda21({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda22({
     owner: tunaPosition.data.authority,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda21({
+  const tunaPositionAtaA = (await findAssociatedTokenPda22({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda21({
+  const tunaPositionAtaB = (await findAssociatedTokenPda22({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const feeRecipientAtaA = (await findAssociatedTokenPda21({
+  const feeRecipientAtaA = (await findAssociatedTokenPda22({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda21({
+  const feeRecipientAtaB = (await findAssociatedTokenPda22({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const vaultAAta = (await findAssociatedTokenPda21({
+  const vaultAAta = (await findAssociatedTokenPda22({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda21({
+  const vaultBAta = (await findAssociatedTokenPda22({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -12819,7 +13083,7 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition,
     feeRecipientAtaB,
     whirlpool: whirlpool.address,
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS8,
-    memoProgram: MEMO_PROGRAM_ADDRESS14,
+    memoProgram: MEMO_PROGRAM_ADDRESS15,
     decreasePercent,
     remainingAccountsInfo
   });
@@ -12832,7 +13096,7 @@ import { fetchMaybeWhirlpool as fetchMaybeWhirlpool6, getPositionAddress as getP
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
   fetchAllMaybeMint as fetchAllMaybeMint15,
-  findAssociatedTokenPda as findAssociatedTokenPda22,
+  findAssociatedTokenPda as findAssociatedTokenPda23,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS13
 } from "@solana-program/token-2022";
 import assert15 from "assert";
@@ -12845,17 +13109,17 @@ async function openTunaLpPositionOrcaInstruction(rpc, authority, positionMint, w
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await getPositionAddress13(positionMint.address))[0];
   const tunaPositionAddress = (await getTunaLpPositionAddress(positionMint.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda22({
+  const tunaPositionAta = (await findAssociatedTokenPda23({
     owner: tunaPositionAddress,
     mint: positionMint.address,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS13
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda22({
+  const tunaPositionAtaA = (await findAssociatedTokenPda23({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda22({
+  const tunaPositionAtaB = (await findAssociatedTokenPda23({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -12888,7 +13152,7 @@ import { FP_NFT_UPDATE_AUTH } from "@crypticdot/fusionamm-client";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS2,
   fetchAllMaybeMint as fetchAllMaybeMint16,
-  findAssociatedTokenPda as findAssociatedTokenPda23,
+  findAssociatedTokenPda as findAssociatedTokenPda24,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS14
 } from "@solana-program/token-2022";
 import assert16 from "assert";
@@ -12901,17 +13165,17 @@ async function openTunaLpPositionFusionInstruction(rpc, authority, positionMint,
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await getPositionAddress14(positionMint.address))[0];
   const tunaPositionAddress = (await getTunaLpPositionAddress(positionMint.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda23({
+  const tunaPositionAta = (await findAssociatedTokenPda24({
     owner: tunaPositionAddress,
     mint: positionMint.address,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS14
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda23({
+  const tunaPositionAtaA = (await findAssociatedTokenPda24({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda23({
+  const tunaPositionAtaB = (await findAssociatedTokenPda24({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -12956,11 +13220,11 @@ import {
   lamports
 } from "@solana/kit";
 import { fetchSysvarRent } from "@solana/sysvars";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS15 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS16 } from "@solana-program/memo";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS3,
   fetchAllMaybeMint as fetchAllMaybeMint17,
-  findAssociatedTokenPda as findAssociatedTokenPda24,
+  findAssociatedTokenPda as findAssociatedTokenPda25,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS15
 } from "@solana-program/token-2022";
 import assert17 from "assert";
@@ -13098,47 +13362,47 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await getPositionAddress15(positionMint.address))[0];
   const orcaOracleAddress = (await getOracleAddress6(whirlpool.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda24({
+  const tunaPositionAta = (await findAssociatedTokenPda25({
     owner: tunaPositionAddress,
     mint: positionMint.address,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS15
   }))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda24({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda25({
     owner: authority.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda24({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda25({
     owner: authority.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda24({
+  const tunaPositionAtaA = (await findAssociatedTokenPda25({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda24({
+  const tunaPositionAtaB = (await findAssociatedTokenPda25({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const vaultAAta = (await findAssociatedTokenPda24({
+  const vaultAAta = (await findAssociatedTokenPda25({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda24({
+  const vaultBAta = (await findAssociatedTokenPda25({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const feeRecipientAtaA = (await findAssociatedTokenPda24({
+  const feeRecipientAtaA = (await findAssociatedTokenPda25({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda24({
+  const feeRecipientAtaB = (await findAssociatedTokenPda25({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -13194,7 +13458,7 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
     orcaPosition: orcaPositionAddress,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS15,
+    memoProgram: MEMO_PROGRAM_ADDRESS16,
     metadataUpdateAuth: WP_NFT_UPDATE_AUTH,
     associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS3,
     token2022Program: TOKEN_2022_PROGRAM_ADDRESS15,
@@ -13223,11 +13487,11 @@ import {
   lamports as lamports2
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent2 } from "@solana/sysvars";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS16 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS17 } from "@solana-program/memo";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS4,
   fetchAllMaybeMint as fetchAllMaybeMint18,
-  findAssociatedTokenPda as findAssociatedTokenPda25,
+  findAssociatedTokenPda as findAssociatedTokenPda26,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS16
 } from "@solana-program/token-2022";
 import assert18 from "assert";
@@ -13351,47 +13615,47 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
   const tunaPositionAddress = (await getTunaLpPositionAddress(positionMint.address))[0];
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await getPositionAddress16(positionMint.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda25({
+  const tunaPositionAta = (await findAssociatedTokenPda26({
     owner: tunaPositionAddress,
     mint: positionMint.address,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS16
   }))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda25({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda26({
     owner: authority.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda25({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda26({
     owner: authority.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda25({
+  const tunaPositionAtaA = (await findAssociatedTokenPda26({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda25({
+  const tunaPositionAtaB = (await findAssociatedTokenPda26({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const vaultAAta = (await findAssociatedTokenPda25({
+  const vaultAAta = (await findAssociatedTokenPda26({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda25({
+  const vaultBAta = (await findAssociatedTokenPda26({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const feeRecipientAtaA = (await findAssociatedTokenPda25({
+  const feeRecipientAtaA = (await findAssociatedTokenPda26({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda25({
+  const feeRecipientAtaB = (await findAssociatedTokenPda26({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -13445,7 +13709,7 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
     fusionPosition: fusionPositionAddress,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS16,
+    memoProgram: MEMO_PROGRAM_ADDRESS17,
     metadataUpdateAuth: FP_NFT_UPDATE_AUTH2,
     associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS4,
     token2022Program: TOKEN_2022_PROGRAM_ADDRESS16,
@@ -13466,7 +13730,7 @@ import {
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS5,
   fetchAllMaybeMint as fetchAllMaybeMint19,
-  findAssociatedTokenPda as findAssociatedTokenPda26
+  findAssociatedTokenPda as findAssociatedTokenPda27
 } from "@solana-program/token-2022";
 import assert19 from "assert";
 async function openTunaSpotPositionInstructions(rpc, authority, poolAddress, args) {
@@ -13488,12 +13752,12 @@ async function openTunaSpotPositionInstructions(rpc, authority, poolAddress, arg
 }
 async function openTunaSpotPositionInstruction(authority, mintA, mintB, poolAddress, args) {
   const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda26({
+  const tunaPositionAtaA = (await findAssociatedTokenPda27({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda26({
+  const tunaPositionAtaB = (await findAssociatedTokenPda27({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -13528,10 +13792,10 @@ import {
   AccountRole as AccountRole17,
   assertAccountsExist as assertAccountsExist9
 } from "@solana/kit";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS17 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS18 } from "@solana-program/memo";
 import {
   fetchAllMaybeMint as fetchAllMaybeMint20,
-  findAssociatedTokenPda as findAssociatedTokenPda27,
+  findAssociatedTokenPda as findAssociatedTokenPda28,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS17
 } from "@solana-program/token-2022";
 import assert20 from "assert";
@@ -13621,37 +13885,37 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await getPositionAddress17(positionMint))[0];
   const orcaOracleAddress = (await getOracleAddress7(whirlpool.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda27({
+  const tunaPositionAta = (await findAssociatedTokenPda28({
     owner: tunaPosition.address,
     mint: positionMint,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS17
   }))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda27({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda28({
     owner: authority.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda27({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda28({
     owner: authority.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda27({
+  const tunaPositionAtaA = (await findAssociatedTokenPda28({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda27({
+  const tunaPositionAtaB = (await findAssociatedTokenPda28({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const vaultAAta = (await findAssociatedTokenPda27({
+  const vaultAAta = (await findAssociatedTokenPda28({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda27({
+  const vaultBAta = (await findAssociatedTokenPda28({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -13681,7 +13945,7 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
     const rewardInfo = whirlpool.data.rewardInfos[rewardIndex];
     const rewardMint = rewardMints.find((mint) => mint.address == rewardInfo.mint);
     assert20(rewardMint, "Reward mint not found in the provided reward mint accounts");
-    const ownerAta = await findAssociatedTokenPda27({
+    const ownerAta = await findAssociatedTokenPda28({
       owner: authority.address,
       mint: rewardMint.address,
       tokenProgram: rewardMint.programAddress
@@ -13727,7 +13991,7 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS12,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS17,
+    memoProgram: MEMO_PROGRAM_ADDRESS18,
     ...args,
     remainingAccountsInfo
   });
@@ -13744,10 +14008,10 @@ import {
 import {
   AccountRole as AccountRole18
 } from "@solana/kit";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS18 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS19 } from "@solana-program/memo";
 import {
   fetchAllMaybeMint as fetchAllMaybeMint21,
-  findAssociatedTokenPda as findAssociatedTokenPda28,
+  findAssociatedTokenPda as findAssociatedTokenPda29,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS18
 } from "@solana-program/token-2022";
 import assert21 from "assert";
@@ -13803,37 +14067,37 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
   const tunaConfig = (await getTunaConfigAddress())[0];
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await getPositionAddress18(positionMint))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda28({
+  const tunaPositionAta = (await findAssociatedTokenPda29({
     owner: tunaPosition.address,
     mint: positionMint,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS18
   }))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda28({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda29({
     owner: authority.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda28({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda29({
     owner: authority.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda28({
+  const tunaPositionAtaA = (await findAssociatedTokenPda29({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda28({
+  const tunaPositionAtaB = (await findAssociatedTokenPda29({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const vaultAAta = (await findAssociatedTokenPda28({
+  const vaultAAta = (await findAssociatedTokenPda29({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda28({
+  const vaultBAta = (await findAssociatedTokenPda29({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -13890,7 +14154,7 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
     fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS12,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS18,
+    memoProgram: MEMO_PROGRAM_ADDRESS19,
     ...args,
     remainingAccountsInfo
   });
@@ -13899,19 +14163,19 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
 }
 
 // src/txbuilder/repayBadDebt.ts
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS19 } from "@solana-program/memo";
-import { fetchMaybeMint as fetchMaybeMint2, findAssociatedTokenPda as findAssociatedTokenPda29 } from "@solana-program/token-2022";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS20 } from "@solana-program/memo";
+import { fetchMaybeMint as fetchMaybeMint2, findAssociatedTokenPda as findAssociatedTokenPda30 } from "@solana-program/token-2022";
 async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, shares) {
   const mint = await fetchMaybeMint2(rpc, mintAddress);
   if (!mint.exists) throw new Error("Mint account not found");
   const tunaConfig = (await getTunaConfigAddress())[0];
   const vault = (await getLendingVaultAddress(mint.address))[0];
-  const vaultAta = (await findAssociatedTokenPda29({
+  const vaultAta = (await findAssociatedTokenPda30({
     owner: vault,
     mint: mint.address,
     tokenProgram: mint.programAddress
   }))[0];
-  const authorityAta = (await findAssociatedTokenPda29({
+  const authorityAta = (await findAssociatedTokenPda30({
     owner: authority.address,
     mint: mint.address,
     tokenProgram: mint.programAddress
@@ -13924,7 +14188,7 @@ async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, share
     tunaConfig,
     vault,
     tokenProgram: mint.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS19,
+    memoProgram: MEMO_PROGRAM_ADDRESS20,
     funds,
     shares
   });
@@ -13956,7 +14220,7 @@ async function setTunaSpotPositionLimitOrdersInstruction(authority, poolAddress,
 }
 
 // src/txbuilder/resetTunaSpotPosition.ts
-import { fetchAllMaybeMint as fetchAllMaybeMint22, findAssociatedTokenPda as findAssociatedTokenPda30 } from "@solana-program/token-2022";
+import { fetchAllMaybeMint as fetchAllMaybeMint22, findAssociatedTokenPda as findAssociatedTokenPda31 } from "@solana-program/token-2022";
 import assert22 from "assert";
 async function resetTunaSpotPositionInstruction(rpc, authority, poolAddress, args) {
   const tunaPositionAddress = (await getTunaSpotPositionAddress(authority.address, poolAddress))[0];
@@ -13964,12 +14228,12 @@ async function resetTunaSpotPositionInstruction(rpc, authority, poolAddress, arg
   const [mintA, mintB] = await fetchAllMaybeMint22(rpc, [tunaPosition.data.mintA, tunaPosition.data.mintB]);
   assert22(mintA.exists, "Token A not found");
   assert22(mintB.exists, "Token B not found");
-  const tunaPositionAtaA = (await findAssociatedTokenPda30({
+  const tunaPositionAtaA = (await findAssociatedTokenPda31({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda30({
+  const tunaPositionAtaB = (await findAssociatedTokenPda31({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14010,8 +14274,8 @@ async function updateVaultInstruction(authority, mint, args) {
 }
 
 // src/txbuilder/withdraw.ts
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS20 } from "@solana-program/memo";
-import { fetchMaybeMint as fetchMaybeMint3, findAssociatedTokenPda as findAssociatedTokenPda31 } from "@solana-program/token-2022";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS21 } from "@solana-program/memo";
+import { fetchMaybeMint as fetchMaybeMint3, findAssociatedTokenPda as findAssociatedTokenPda32 } from "@solana-program/token-2022";
 async function withdrawInstructions(rpc, authority, mintAddress, funds, shares) {
   const instructions = [];
   const mint = await fetchMaybeMint3(rpc, mintAddress);
@@ -14033,12 +14297,12 @@ async function withdrawInstruction(authority, mint, funds, shares) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const lendingPosition = (await getLendingPositionAddress(authority.address, mint.address))[0];
   const vault = (await getLendingVaultAddress(mint.address))[0];
-  const vaultAta = (await findAssociatedTokenPda31({
+  const vaultAta = (await findAssociatedTokenPda32({
     owner: vault,
     mint: mint.address,
     tokenProgram: mint.programAddress
   }))[0];
-  const authorityAta = (await findAssociatedTokenPda31({
+  const authorityAta = (await findAssociatedTokenPda32({
     owner: authority.address,
     mint: mint.address,
     tokenProgram: mint.programAddress
@@ -14052,7 +14316,7 @@ async function withdrawInstruction(authority, mint, funds, shares) {
     vault,
     vaultAta,
     tokenProgram: mint.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS20,
+    memoProgram: MEMO_PROGRAM_ADDRESS21,
     funds,
     shares
   });
@@ -14065,13 +14329,13 @@ import {
   address as address3
 } from "@solana/kit";
 import { fetchAddressLookupTable, getExtendLookupTableInstruction as getExtendLookupTableInstruction2 } from "@solana-program/address-lookup-table";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS21 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS22 } from "@solana-program/memo";
 import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
 import { TOKEN_PROGRAM_ADDRESS as TOKEN_PROGRAM_ADDRESS2 } from "@solana-program/token";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS6,
   fetchMint,
-  findAssociatedTokenPda as findAssociatedTokenPda32,
+  findAssociatedTokenPda as findAssociatedTokenPda33,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS19
 } from "@solana-program/token-2022";
 async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
@@ -14082,12 +14346,12 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
   const pool = marketMaker == 0 /* Orca */ ? await fetchWhirlpool3(rpc, poolAddress) : await fetchFusionPool3(rpc, poolAddress);
   const mintA = await fetchMint(rpc, pool.data.tokenMintA);
   const mintB = await fetchMint(rpc, pool.data.tokenMintB);
-  const feeRecipientAtaA = (await findAssociatedTokenPda32({
+  const feeRecipientAtaA = (await findAssociatedTokenPda33({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda32({
+  const feeRecipientAtaB = (await findAssociatedTokenPda33({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14096,12 +14360,12 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
     (await getLendingVaultAddress(mintA.address))[0],
     (await getLendingVaultAddress(mintB.address))[0]
   ]);
-  const vaultAAta = (await findAssociatedTokenPda32({
+  const vaultAAta = (await findAssociatedTokenPda33({
     owner: vaultA.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const vaultBAta = (await findAssociatedTokenPda32({
+  const vaultBAta = (await findAssociatedTokenPda33({
     owner: vaultB.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14113,7 +14377,7 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
     TOKEN_PROGRAM_ADDRESS2,
     TOKEN_2022_PROGRAM_ADDRESS19,
     NATIVE_MINT,
-    MEMO_PROGRAM_ADDRESS21,
+    MEMO_PROGRAM_ADDRESS22,
     tunaConfigAddress,
     marketAddress,
     mintA.address,
@@ -14168,8 +14432,8 @@ async function extendAddressLookupTableForMarketInstructions(rpc, poolAddress, m
 }
 
 // src/txbuilder/repayTunaLpPositionDebt.ts
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS22 } from "@solana-program/memo";
-import { fetchAllMaybeMint as fetchAllMaybeMint23, findAssociatedTokenPda as findAssociatedTokenPda33 } from "@solana-program/token-2022";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS23 } from "@solana-program/memo";
+import { fetchAllMaybeMint as fetchAllMaybeMint23, findAssociatedTokenPda as findAssociatedTokenPda34 } from "@solana-program/token-2022";
 import assert23 from "assert";
 async function repayTunaLpPositionDebtInstructions(rpc, authority, positionMint, collateralA, collateralB, createInstructions, cleanupInstructions) {
   const instructions = [];
@@ -14214,34 +14478,34 @@ async function repayTunaLpPositionDebtInstructions(rpc, authority, positionMint,
 }
 async function repayTunaLpPositionDebtInstruction(authority, positionMint, mintA, mintB, marketAddress, collateralA, collateralB) {
   const tunaPositionAddress = (await getTunaLpPositionAddress(positionMint))[0];
-  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda33({
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda34({
     owner: authority.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda33({
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda34({
     owner: authority.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda33({
+  const tunaPositionAtaA = (await findAssociatedTokenPda34({
     owner: tunaPositionAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda33({
+  const tunaPositionAtaB = (await findAssociatedTokenPda34({
     owner: tunaPositionAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
   const vaultAAddress = (await getLendingVaultAddress(mintA.address))[0];
-  const vaultAAta = (await findAssociatedTokenPda33({
+  const vaultAAta = (await findAssociatedTokenPda34({
     owner: vaultAAddress,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const vaultBAddress = (await getLendingVaultAddress(mintB.address))[0];
-  const vaultBAta = (await findAssociatedTokenPda33({
+  const vaultBAta = (await findAssociatedTokenPda34({
     owner: vaultBAddress,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14249,7 +14513,7 @@ async function repayTunaLpPositionDebtInstruction(authority, positionMint, mintA
   return getRepayTunaLpPositionDebtInstruction({
     authority,
     market: marketAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS22,
+    memoProgram: MEMO_PROGRAM_ADDRESS23,
     mintA: mintA.address,
     mintB: mintB.address,
     tokenProgramA: mintA.programAddress,
@@ -14283,10 +14547,10 @@ import {
   lamports as lamports3
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent3 } from "@solana/sysvars";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS23 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS24 } from "@solana-program/memo";
 import {
   fetchAllMaybeMint as fetchAllMaybeMint24,
-  findAssociatedTokenPda as findAssociatedTokenPda34,
+  findAssociatedTokenPda as findAssociatedTokenPda35,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS20
 } from "@solana-program/token-2022";
 import assert24 from "assert";
@@ -14376,27 +14640,27 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await getPositionAddress19(positionMint))[0];
   const orcaOracleAddress = (await getOracleAddress9(whirlpool.address))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda34({
+  const tunaPositionAta = (await findAssociatedTokenPda35({
     owner: tunaPosition.address,
     mint: positionMint,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS20
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda34({
+  const tunaPositionAtaA = (await findAssociatedTokenPda35({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda34({
+  const tunaPositionAtaB = (await findAssociatedTokenPda35({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const feeRecipientAtaA = (await findAssociatedTokenPda34({
+  const feeRecipientAtaA = (await findAssociatedTokenPda35({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda34({
+  const feeRecipientAtaB = (await findAssociatedTokenPda35({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14458,7 +14722,7 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS14,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS23,
+    memoProgram: MEMO_PROGRAM_ADDRESS24,
     remainingAccountsInfo
   });
   ix.accounts.push(...remainingAccounts);
@@ -14479,10 +14743,10 @@ import {
   lamports as lamports4
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent4 } from "@solana/sysvars";
-import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS24 } from "@solana-program/memo";
+import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS25 } from "@solana-program/memo";
 import {
   fetchAllMaybeMint as fetchAllMaybeMint25,
-  findAssociatedTokenPda as findAssociatedTokenPda35,
+  findAssociatedTokenPda as findAssociatedTokenPda36,
   TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS21
 } from "@solana-program/token-2022";
 import assert25 from "assert";
@@ -14567,27 +14831,27 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   const positionMint = tunaPosition.data.positionMint;
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await getPositionAddress20(positionMint))[0];
-  const tunaPositionAta = (await findAssociatedTokenPda35({
+  const tunaPositionAta = (await findAssociatedTokenPda36({
     owner: tunaPosition.address,
     mint: positionMint,
     tokenProgram: TOKEN_2022_PROGRAM_ADDRESS21
   }))[0];
-  const tunaPositionAtaA = (await findAssociatedTokenPda35({
+  const tunaPositionAtaA = (await findAssociatedTokenPda36({
     owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const tunaPositionAtaB = (await findAssociatedTokenPda35({
+  const tunaPositionAtaB = (await findAssociatedTokenPda36({
     owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const feeRecipientAtaA = (await findAssociatedTokenPda35({
+  const feeRecipientAtaA = (await findAssociatedTokenPda36({
     owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const feeRecipientAtaB = (await findAssociatedTokenPda35({
+  const feeRecipientAtaB = (await findAssociatedTokenPda36({
     owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
@@ -14647,7 +14911,7 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
     fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS14,
     tokenProgramA: mintA.programAddress,
     tokenProgramB: mintB.programAddress,
-    memoProgram: MEMO_PROGRAM_ADDRESS24,
+    memoProgram: MEMO_PROGRAM_ADDRESS25,
     remainingAccountsInfo
   });
   ix.accounts.push(...remainingAccounts);
@@ -14732,6 +14996,8 @@ export {
   TUNA_ERROR__AMOUNT_SLIPPAGE_EXCEEDED,
   TUNA_ERROR__BAD_DEBT,
   TUNA_ERROR__INCORRECT_POSITION_DIRECTION,
+  TUNA_ERROR__INCORRECT_SWAP_INPUT_AMOUNT,
+  TUNA_ERROR__INCORRECT_SWAP_OUTPUT_AMOUNT,
   TUNA_ERROR__INSUFFICIENT_LIQUIDITY,
   TUNA_ERROR__INSUFFICIENT_SWAP_OUTPUT_AMOUNT,
   TUNA_ERROR__INTEREST_RATE_IS_OUT_OF_RANGE,
@@ -14811,6 +15077,7 @@ export {
   TunaPositionState,
   UNLIMITED_SUPPLY_LIMIT,
   UPDATE_MARKET_DISCRIMINATOR,
+  UPDATE_MARKET_VAULTS_DISCRIMINATOR,
   UPDATE_VAULT_DISCRIMINATOR,
   VAULT_DISCRIMINATOR,
   WITHDRAW_DISCRIMINATOR,
@@ -15170,6 +15437,11 @@ export {
   getUpdateMarketInstructionDataCodec,
   getUpdateMarketInstructionDataDecoder,
   getUpdateMarketInstructionDataEncoder,
+  getUpdateMarketVaultsDiscriminatorBytes,
+  getUpdateMarketVaultsInstruction,
+  getUpdateMarketVaultsInstructionDataCodec,
+  getUpdateMarketVaultsInstructionDataDecoder,
+  getUpdateMarketVaultsInstructionDataEncoder,
   getUpdateVaultDiscriminatorBytes,
   getUpdateVaultInstruction,
   getUpdateVaultInstructionDataCodec,
@@ -15200,6 +15472,8 @@ export {
   liquidateTunaLpPositionOrcaInstructions,
   liquidateTunaSpotPositionFusionInstruction,
   liquidateTunaSpotPositionFusionInstructions,
+  liquidateTunaSpotPositionJupiterInstruction,
+  liquidateTunaSpotPositionJupiterInstructions,
   liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions,
   modifyTunaSpotPositionFusionInstruction,
@@ -15267,6 +15541,7 @@ export {
   parseSetTunaLpPositionRebalanceThresholdInstruction,
   parseSetTunaSpotPositionLimitOrdersInstruction,
   parseUpdateMarketInstruction,
+  parseUpdateMarketVaultsInstruction,
   parseUpdateVaultInstruction,
   parseWithdrawInstruction,
   rebalanceTunaLpPositionFusionInstruction,